svn commit: r1842844 - /xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFResources.java

[email protected] Thu, 04 Oct 2018 19:10:32 -0000
Newsgroups gmane.text.xml.fop.cvs
Message-ID <[email protected]>
Author: matthias
Date: Thu Oct  4 19:10:32 2018
New Revision: 1842844

URL: http://svn.apache.org/viewvc?rev=1842844&view=rev
Log:
FOP-2818: fix color spaces of parent pdf resources member getting lost

Modified:
    xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFResources.java

Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFResources.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFResources.java?rev=1842844&r1=1842843&r2=1842844&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFResources.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFResources.java Thu Oct  4 19:10:32 2018
@@ -298,8 +298,13 @@ public class PDFResources extends PDFDic
             put("ExtGState", dict);
         }
 
-        if (!this.colorSpaces.isEmpty()) {
+        if (!this.colorSpaces.isEmpty() || (parent != null && !parent.colorSpaces.isEmpty())) {
             PDFDictionary dict = new PDFDictionary(this);
+            if (parent != null) {
+                for (PDFColorSpace colorSpace : parent.colorSpaces.values()) {
+                    dict.put(colorSpace.getName(), colorSpace);
+                }
+            }
             for (PDFColorSpace colorSpace : colorSpaces.values()) {
                 dict.put(colorSpace.getName(), colorSpace);
             }