PDF Output: Made sure the XMP Metadata stream is never compressed.

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

diff --git a/src/java/org/apache/fop/pdf/PDFFilterList.java b/src/java/org/apache/fop/pdf/PDFFilterList.java
index 5eab5c81a184f708bfcaccde05a31062c41b330d..3025b878890b3cc257b87c43b3630f9f65d3e10c 100644 (file)
--- a/src/java/org/apache/fop/pdf/PDFFilterList.java
+++ b/src/java/org/apache/fop/pdf/PDFFilterList.java
@@ -163,6 +163,11 @@ public class PDFFilterList {
      * @param type which filter list to modify
      */
     public void addDefaultFilters(Map filters, String type) {
+        if (METADATA_FILTER.equals(type)) {
+            //XMP metadata should not be embedded in clear-text
+            addFilter(new NullFilter());
+            return;
+        }
         List filterset = null;
         if (filters != null) {
             filterset = (List)filters.get(type);
@@ -171,10 +176,7 @@ public class PDFFilterList {
             }
         }
         if (filterset == null || filterset.size() == 0) {
-            if (METADATA_FILTER.equals(type)) {
-                //XMP metadata should not be embedded in clear-text
-                addFilter(new NullFilter());
-            } else if (JPEG_FILTER.equals(type)) {
+            if (JPEG_FILTER.equals(type)) {
                 //JPEG is already well compressed
                 addFilter(new NullFilter());
             } else if (TIFF_FILTER.equals(type)) {

diff --git a/status.xml b/status.xml
index 8fc7c7b07e839cf3ee91491d5643d4b026c3c51b..637445cfa06c629ef44619657e9abf8afb928ca9 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -53,6 +53,9 @@
 
   <changes>
     <release version="FOP Trunk" date="TBD">
+      <action context="Renderers" dev="JM" type="fix">
+        PDF Output: Made sure the XMP Metadata stream is never compressed.
+      </action>
       <action context="Fonts" dev="JM" type="fix" fixes-bug="45734" due-to="J. Frantzius">
         Fix for PFMReader after bug #43089 changed the behavior of PFMFile. Fixes baseline
         problems when Type 1 fonts are used in conjunction with XML font metric files.