(commons-imaging) branch master updated: [IMAGING-355] Add option to skip reading GIF metadata #301

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git


The following commit(s) were added to refs/heads/master by this push:
     new 9d6c4ca1 [IMAGING-355] Add option to skip reading GIF metadata #301
9d6c4ca1 is described below

commit 9d6c4ca1a6aa6208a3a63c923e9e6719746b58c2
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Dec 23 10:46:56 2023 -0500

    [IMAGING-355] Add option to skip reading GIF metadata #301
---
 src/changes/changes.xml                                      |  3 +++
 .../apache/commons/imaging/formats/gif/GifImageParser.java   | 12 ++----------
 .../commons/imaging/formats/gif/GifImagingParameters.java    |  5 +++++
 .../org/apache/commons/imaging/formats/gif/GifReadTest.java  |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index aa7220c7..2a7bcbd0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -94,6 +94,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action issue="IMAGING-339" dev="kinow" type="add" due-to="Glavo">
         Basic WebP Support #254.
       </action>
+      <action issue="IMAGING-355" dev="ggregory" type="add" due-to="Andrew 
Khoury, Bruno P. Kinoshita, Gary Gregory">
+        Add option to skip reading GIF metadata #301.
+      </action>
       <!-- UPDATE -->
       <action dev="kinow" type="update" due-to="Dependabot, Gary Gregory">
         Bump actions/cache #225, #228, #239, #240.
diff --git 
a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java 
b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
index 662cb861..4d31aa37 100644
--- a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
@@ -409,11 +409,7 @@ public class GifImageParser extends 
AbstractImageParser<GifImagingParameters> im
     @Override
     public ImageInfo getImageInfo(final ByteSource byteSource, final 
GifImagingParameters params)
             throws ImagingException, IOException {
-        boolean stopReadingBeforeImageData = true;
-        if (params != null) {
-            stopReadingBeforeImageData = 
params.getStopReadingBeforeImageData();
-        }
-        final GifImageContents blocks = readFile(byteSource, 
stopReadingBeforeImageData);
+        final GifImageContents blocks = readFile(byteSource, 
GifImagingParameters.getStopReadingBeforeImageData(params));
 
         final GifHeaderInfo bhi = blocks.gifHeaderInfo;
         if (bhi == null) {
@@ -488,11 +484,7 @@ public class GifImageParser extends 
AbstractImageParser<GifImagingParameters> im
     @Override
     public ImageMetadata getMetadata(final ByteSource byteSource, final 
GifImagingParameters params)
             throws ImagingException, IOException {
-        boolean stopReadingBeforeImageData = true;
-        if (params != null) {
-            stopReadingBeforeImageData = 
params.getStopReadingBeforeImageData();
-        }
-        final GifImageContents imageContents = readFile(byteSource, 
stopReadingBeforeImageData);
+        final GifImageContents imageContents = readFile(byteSource, 
GifImagingParameters.getStopReadingBeforeImageData(params));
 
         final GifHeaderInfo bhi = imageContents.gifHeaderInfo;
         if (bhi == null) {
diff --git 
a/src/main/java/org/apache/commons/imaging/formats/gif/GifImagingParameters.java
 
b/src/main/java/org/apache/commons/imaging/formats/gif/GifImagingParameters.java
index 1bca589b..c759614c 100644
--- 
a/src/main/java/org/apache/commons/imaging/formats/gif/GifImagingParameters.java
+++ 
b/src/main/java/org/apache/commons/imaging/formats/gif/GifImagingParameters.java
@@ -25,6 +25,11 @@ import 
org.apache.commons.imaging.common.XmpImagingParameters;
  * @since 1.0-alpha3
  */
 public class GifImagingParameters extends 
XmpImagingParameters<GifImagingParameters> {
+
+    public static boolean getStopReadingBeforeImageData(final 
GifImagingParameters params) {
+        return params != null && params.getStopReadingBeforeImageData();
+    }
+
     private boolean stopReadingBeforeImageData;
 
     public boolean getStopReadingBeforeImageData() {
diff --git 
a/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java 
b/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
index 561fd974..17978815 100644
--- a/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
@@ -146,8 +146,8 @@ public class GifReadTest extends AbstractGifTest {
         final ImageMetadata metadata = Imaging.getMetadata(imageFile);
         assertNotNull(metadata);
         assertTrue(metadata instanceof GifImageMetadata);
-        assertTrue(((GifImageMetadata)metadata).getWidth() > 0);
-        assertTrue(((GifImageMetadata)metadata).getHeight() > 0);
+        assertTrue(((GifImageMetadata) metadata).getWidth() > 0);
+        assertTrue(((GifImageMetadata) metadata).getHeight() > 0);
         assertNotNull(metadata.getItems());
     }