git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1175808 13f79535-47bb-0310-9956-ffa450edef68tags/fop-1_1rc1old
@@ -124,8 +124,10 @@ public class AFPDataObjectFactory { | |||
break; | |||
case 4: | |||
case 8: | |||
//A grayscale image | |||
ideStruct = content.needIDEStructureParameter(); | |||
ideStruct.setBitsPerComponent(new int[] {bitsPerPixel}); | |||
ideStruct.setColorModel(IDEStructureParameter.COLOR_MODEL_YCBCR); | |||
break; | |||
case 24: | |||
ideStruct = content.needIDEStructureParameter(); | |||
@@ -139,7 +141,7 @@ public class AFPDataObjectFactory { | |||
throw new IllegalArgumentException("Unsupported number of bits per pixel: " | |||
+ bitsPerPixel); | |||
} | |||
if (imageObjectInfo.isSubtractive()) { | |||
if (bitsPerPixel > 1 && imageObjectInfo.isSubtractive()) { | |||
ideStruct = content.needIDEStructureParameter(); | |||
ideStruct.setSubtractive(imageObjectInfo.isSubtractive()); | |||
} |
@@ -46,7 +46,7 @@ public class IDEStructureParameter implements Streamable { | |||
private boolean grayCoding = false; | |||
/** the image color model */ | |||
private byte colorModel = COLOR_MODEL_YCRCB; | |||
private byte colorModel = COLOR_MODEL_RGB; | |||
/** the array with the number of bits/IDE for each component */ | |||
private byte[] bitsPerIDE = new byte[] {(byte)1}; //1-bit by default |
@@ -60,6 +60,10 @@ | |||
documents. Example: the fix of marks layering will be such a case when it's done. | |||
--> | |||
<release version="FOP Trunk" date="TBD"> | |||
<action context="Fonts" dev="PH" type="fix" fixes-bug="48696"> | |||
Bugfix for color model in IOCA IDE structure parameter for 4- and 8-bit grayscale images. | |||
Revision 4. | |||
</action> | |||
<action context="Fonts" dev="PH" type="fix" fixes-bug="51760" due-to="Mehdi Houshmand"> | |||
Changes the way PostScript handles Graphics2D images such that if the language is set to | |||
level 3, the image is stored as an embedded file which has no length limit. Previously it |