PDFBOX-5660: optimize, as suggested by Valery Bokov, closes #359

THausherr · THausherr · commit b9f0ef7de562 · 2025-12-03T05:28:44.000Z
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1930219 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/filter/DCTFilter.java b/pdfbox/src/main/java/org/apache/pdfbox/filter/DCTFilter.java
@@ -82,18 +82,17 @@ public DecodeResult decode(InputStream encoded, OutputStream decoded, COSDiction
             if (raster.getNumBands() == 4)
             {
                 // get APP14 marker
-                Integer transform;
+                int colorTransform;
                 try
                 {
-                    transform = getAdobeTransform(reader.getImageMetadata(0));
+                    colorTransform = getAdobeTransform(reader.getImageMetadata(0));
                 }
                 catch (IIOException | NegativeArraySizeException e)
                 {
                     // we really tried asking nicely, now we're using brute force.
                     LOG.debug("Couldn't read usíng getAdobeTransform() - using getAdobeTransformByBruteForce() as fallback", e);
-                    transform = getAdobeTransformByBruteForce(iis);
+                    colorTransform = getAdobeTransformByBruteForce(iis);
                 }
-                int colorTransform = transform != null ? transform : 0;
 
                 // 0 = Unknown (RGB or CMYK), 1 = YCbCr, 2 = YCCK
                 // https://exiftool.org/TagNames/JPEG.html#Adobe

Original file line number	Diff line number	Diff line change
`@@ -82,18 +82,17 @@ public DecodeResult decode(InputStream encoded, OutputStream decoded, COSDiction`
`82`	`82`	`if (raster.getNumBands() == 4)`
`83`	`83`	`{`
`84`	`84`	`// get APP14 marker`
`85`		`- Integer transform;`
	`85`	`+ int colorTransform;`
`86`	`86`	`try`
`87`	`87`	`{`
`88`		`- transform = getAdobeTransform(reader.getImageMetadata(0));`
	`88`	`+ colorTransform = getAdobeTransform(reader.getImageMetadata(0));`
`89`	`89`	`}`
`90`	`90`	`catch (IIOException \| NegativeArraySizeException e)`
`91`	`91`	`{`
`92`	`92`	`// we really tried asking nicely, now we're using brute force.`
`93`	`93`	`LOG.debug("Couldn't read usíng getAdobeTransform() - using getAdobeTransformByBruteForce() as fallback", e);`
`94`		`- transform = getAdobeTransformByBruteForce(iis);`
	`94`	`+ colorTransform = getAdobeTransformByBruteForce(iis);`
`95`	`95`	`}`
`96`		`- int colorTransform = transform != null ? transform : 0;`
`97`	`96`
`98`	`97`	`// 0 = Unknown (RGB or CMYK), 1 = YCbCr, 2 = YCCK`
`99`	`98`	`// https://exiftool.org/TagNames/JPEG.html#Adobe`