XGC-105: AFP rounded corners not in CMYK

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1754512 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java b/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java
index 3fae2e0a048221e62b5cab88f216142841ad82c4..72e83fa67227eea0fe1851da6b23da57ae961daf 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java
@@ -193,7 +193,7 @@ public class AFPPainter extends AbstractIFPainter<AFPDocumentHandler> {
         //AFP doesn't support alpha channels
         hints.put(ImageProcessingHints.TRANSPARENCY_INTENT,
                 ImageProcessingHints.TRANSPARENCY_INTENT_IGNORE);
-        hints.put("CMYK", getDocumentHandler().getFS45());
+        hints.put("CMYK", getDocumentHandler().getPaintingState().isCMYKImagesSupported());
         return hints;
     }
 

diff --git a/fop/lib/xmlgraphics-commons-svn-trunk.jar b/fop/lib/xmlgraphics-commons-svn-trunk.jar
index 4942340cc3dd0abe65e779e9bc1102117e4dba96..6f2cb65c502c70459b5d1e1e0fe474c5bf2dd75e 100644 (file)
Binary files a/fop/lib/xmlgraphics-commons-svn-trunk.jar and b/fop/lib/xmlgraphics-commons-svn-trunk.jar differ