Fixed problem with jpegs with icc profile and acrobat reader 5 (Bug #11301)

Submitted by: Stephan Neuhaus <stephan.neuhaus@myview.de>

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@195496 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 9aefd4eb0192c12be2e7fe7570e0c530c7b230de..5fcdabf94c63436a2b9ce5d17d512663a6a3fa10 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 ==============================================================================
 Done since 0.20.4 release
 
+- Fixed problem with jpegs with icc profile and acrobat reader 5 (Bug #11301)
+  Submitted by: Stephan Neuhaus <stephan.neuhaus@myview.de>
 - Fix bug in LinkSet.mergeLinks() (ArrayOutOfBoundsException when number of 
   rects is zero) (Jeremias Maerki)
 - Removed the necessity for a buildtools.jar (Jeremias Maerki)

diff --git a/src/org/apache/fop/image/JpegImage.java b/src/org/apache/fop/image/JpegImage.java
index 0e439a8a85bd9dada532f61c49214d7a52193a2b..5b265e58d548be15bce6d2203a3439a895a81acf 100644 (file)
--- a/src/org/apache/fop/image/JpegImage.java
+++ b/src/org/apache/fop/image/JpegImage.java
@@ -124,11 +124,7 @@ public class JpegImage extends AbstractFopImage {
                             int chunkSize = calcBytes(this.m_bitmaps[index + 2],
                                                       this.m_bitmaps[index + 3]) + 2;
 
-                            if (iccStream.size() == 0)
-                                iccStream.write(this.m_bitmaps, index+18, chunkSize - 20);
-                            else
-                                iccStream.write(this.m_bitmaps, index+16, chunkSize - 18); // eller 18..
-
+                            iccStream.write(this.m_bitmaps, index+16, chunkSize - 18); // eller 18..
                         }
 
                         index += calcBytes(this.m_bitmaps[index + 2],