svn commit: r1894760 - in /xmlgraphics/fop/trunk: fop-core/src/main/java/org/apache/fop/render/afp/ fop-core/src/test/java/org/apache/fop/render/afp/ fop/lib/

[ssteiner]

Author: ssteiner
Date: Fri Nov  5 13:46:18 2021
New Revision: 1894760

URL: http://svn.apache.org/viewvc?rev=1894760&view=rev
Log:
FOP-3032: Embed pdf into afp using unique type

Modified:
    
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
    
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java
    xmlgraphics/fop/trunk/fop/lib/xmlgraphics-commons-svn-trunk.jar

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java?rev=1894760&r1=1894759&r2=1894760&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
 Fri Nov  5 13:46:18 2021
@@ -44,7 +44,7 @@ public class AFPImageHandlerRawStream ex
         ImageFlavor.RAW_JPEG,
         ImageFlavor.RAW_TIFF,
         ImageFlavor.RAW_EPS,
-        ImageFlavor.RAW
+        ImageFlavor.RAW_PDF
     };
 
     /** logging instance */

Modified: 
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java?rev=1894760&r1=1894759&r2=1894760&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java
 Fri Nov  5 13:46:18 2021
@@ -19,16 +19,15 @@
 package org.apache.fop.render.afp;
 
 import java.io.InputStream;
+import java.util.Arrays;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.xmlgraphics.image.loader.ImageFlavor;
-import org.apache.xmlgraphics.image.loader.MimeEnabledImageFlavor;
 import org.apache.xmlgraphics.image.loader.impl.ImageRawStream;
 
 import org.apache.fop.afp.AFPPaintingState;
-import org.apache.fop.apps.MimeConstants;
 
 public class AFPImageHandlerRawStreamTestCase {
     @Test
@@ -36,8 +35,9 @@ public class AFPImageHandlerRawStreamTes
         AFPPaintingState state = new AFPPaintingState();
         state.setNativeImagesSupported(true);
         AFPRenderingContext context = new AFPRenderingContext(null, null, 
state, null, null);
-        MimeEnabledImageFlavor flavor = new 
MimeEnabledImageFlavor(ImageFlavor.RAW, MimeConstants.MIME_PDF);
-        ImageRawStream stream = new ImageRawStream(null, flavor, (InputStream) 
null);
+        ImageRawStream stream = new ImageRawStream(null, ImageFlavor.RAW_PDF, 
(InputStream) null);
         Assert.assertTrue(new AFPImageHandlerRawStream().isCompatible(context, 
stream));
+        Assert.assertFalse(Arrays.asList(
+                new 
AFPImageHandlerRawStream().getSupportedImageFlavors()).contains(ImageFlavor.RAW));
     }
 }

Modified: xmlgraphics/fop/trunk/fop/lib/xmlgraphics-commons-svn-trunk.jar
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/lib/xmlgraphics-commons-svn-trunk.jar?rev=1894760&r1=1894759&r2=1894760&view=diff
==============================================================================
Binary files - no diff available.



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org