Author: ssteiner Date: Tue Oct 26 12:13:04 2021 New Revision: 1894579 URL: http://svn.apache.org/viewvc?rev=1894579&view=rev Log: FOP-3032: Allow to embed native PDF in AFP
Added: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java (with props) Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java 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=1894579&r1=1894578&r2=1894579&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 Tue Oct 26 12:13:04 2021 @@ -44,6 +44,7 @@ public class AFPImageHandlerRawStream ex ImageFlavor.RAW_JPEG, ImageFlavor.RAW_TIFF, ImageFlavor.RAW_EPS, + ImageFlavor.RAW }; /** logging instance */ @@ -89,10 +90,13 @@ public class AFPImageHandlerRawStream ex && (image == null || image instanceof ImageRawJPEG || image instanceof ImageRawEPS - || ((image instanceof ImageRawStream) - && (MimeConstants.MIME_TIFF.equals( - ((ImageRawStream)image).getMimeType())))); + || (image instanceof ImageRawStream && isCompatible((ImageRawStream)image))); } return false; } + + private boolean isCompatible(ImageRawStream rawStream) { + return MimeConstants.MIME_TIFF.equals(rawStream.getMimeType()) + || MimeConstants.MIME_PDF.equals(rawStream.getMimeType()); + } } Added: 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=1894579&view=auto ============================================================================== --- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java (added) +++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java Tue Oct 26 12:13:04 2021 @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id$ */ +package org.apache.fop.render.afp; + +import java.io.InputStream; + +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 + public void testIsCompatible() { + 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); + Assert.assertTrue(new AFPImageHandlerRawStream().isCompatible(context, stream)); + } +} Propchange: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerRawStreamTestCase.java ------------------------------------------------------------------------------ svn:eol-style = native --------------------------------------------------------------------- To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org