FOP-3032: Embed pdf into afp using unique type
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1894760 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java b/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
index 36e5a9d..cc072e3 100644
--- a/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
+++ b/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
@@ -44,7 +44,7 @@
ImageFlavor.RAW_JPEG,
ImageFlavor.RAW_TIFF,
ImageFlavor.RAW_EPS,
- ImageFlavor.RAW
+ ImageFlavor.RAW_PDF
};
/** logging instance */
diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java
index 9a9ea85..36460ae 100644
--- a/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java
@@ -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 @@
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));
}
}
diff --git a/fop/lib/xmlgraphics-commons-svn-trunk.jar b/fop/lib/xmlgraphics-commons-svn-trunk.jar
index 3cdc9a7..542966f 100644
--- a/fop/lib/xmlgraphics-commons-svn-trunk.jar
+++ b/fop/lib/xmlgraphics-commons-svn-trunk.jar
Binary files differ
