From b78dc37c391957129683d4aad72aaff1abedc6d6 Mon Sep 17 00:00:00 2001 From: Christian Geisert Date: Mon, 11 Nov 2002 18:30:15 +0000 Subject: [PATCH] Fixed problem with jpegs with icc profile and acrobat reader 5 (Bug #11301) Submitted by: Stephan Neuhaus git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@195496 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 2 ++ src/org/apache/fop/image/JpegImage.java | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 9aefd4eb0..5fcdabf94 100644 --- 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 - 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 0e439a8a8..5b265e58d 100644 --- 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], -- 2.39.5