You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2007/12/17 20:03:49 UTC
svn commit: r604968 [2/2] - in
/xmlgraphics/fop/branches/Temp_ImagePackageRedesign:
examples/mathml/src/org/apache/fop/mathml/ src/java/META-INF/services/
src/java/org/apache/fop/image2/ src/java/org/apache/fop/image2/impl/
src/java/org/apache/fop/imag...
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/PSRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/PSRenderer.java?rev=604968&r1=604967&r2=604968&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/PSRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/PSRenderer.java Mon Dec 17 11:03:45 2007
@@ -51,7 +51,6 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.apps.MimeConstants;
import org.apache.fop.area.Area;
import org.apache.fop.area.BlockViewport;
import org.apache.fop.area.CTM;
@@ -80,6 +79,7 @@
import org.apache.fop.image2.ImageManager;
import org.apache.fop.image2.ImageSessionContext;
import org.apache.fop.image2.impl.ImageGraphics2D;
+import org.apache.fop.image2.impl.ImageRawCCITTFax;
import org.apache.fop.image2.impl.ImageRawEPS;
import org.apache.fop.image2.impl.ImageRawJPEG;
import org.apache.fop.image2.impl.ImageRawStream;
@@ -412,7 +412,7 @@
ImageManager manager = getUserAgent().getFactory().getImageManager();
ImageProviderPipeline[] inlineCandidates
= manager.getPipelineFactory().determineCandidatePipelines(
- info.getMimeType(), inlineFlavors);
+ info, inlineFlavors);
ImageProviderPipeline inlineChoice = manager.choosePipeline(inlineCandidates);
ImageFlavor inlineFlavor = (inlineChoice != null ? inlineChoice.getTargetFlavor() : null);
@@ -420,7 +420,7 @@
ImageFlavor[] formFlavors = getFormFlavors();
ImageProviderPipeline[] formCandidates
= manager.getPipelineFactory().determineCandidatePipelines(
- info.getMimeType(), formFlavors);
+ info, formFlavors);
ImageProviderPipeline formChoice = manager.choosePipeline(formCandidates);
ImageFlavor formFlavor = (formChoice != null ? formChoice.getTargetFlavor() : null);
@@ -478,7 +478,7 @@
pos, foreignAttributes);
} else if (img instanceof ImageRawStream) {
final ImageRawStream raw = (ImageRawStream)img;
- if (MimeConstants.MIME_EPS.equals(raw.getInfo().getMimeType())) {
+ if (raw instanceof ImageRawEPS) {
ImageRawEPS eps = (ImageRawEPS)raw;
Rectangle2D bbox = eps.getBoundingBox();
InputStream in = raw.createInputStream();
@@ -490,21 +490,22 @@
} finally {
IOUtils.closeQuietly(in);
}
- } else if (MimeConstants.MIME_JPEG.equals(raw.getInfo().getMimeType())) {
+ } else if (raw instanceof ImageRawCCITTFax) {
+ final ImageRawCCITTFax ccitt = (ImageRawCCITTFax)raw;
+ ImageEncoder encoder = new ImageEncoderCCITTFax(ccitt);
+ Rectangle2D targetRect = new Rectangle2D.Float(
+ ptx, pty, ptw, pth);
+ PSImageUtils.writeImage(encoder, info.getSize().getDimensionPx(),
+ uri, targetRect,
+ ccitt.getColorSpace(), 1, false, gen);
+ } else if (raw instanceof ImageRawJPEG) {
ImageRawJPEG jpeg = (ImageRawJPEG)raw;
- ImageEncoder encoder = new ImageEncoder() {
- public void writeTo(OutputStream out) throws IOException {
- raw.writeTo(out);
- }
- public String getImplicitFilter() {
- return "<< >> /DCTDecode";
- }
- };
+ ImageEncoder encoder = new ImageEncoderJPEG(jpeg);
Rectangle2D targetRect = new Rectangle2D.Float(
ptx, pty, ptw, pth);
PSImageUtils.writeImage(encoder, info.getSize().getDimensionPx(),
uri, targetRect,
- jpeg.getColorSpace(), jpeg.isInverted(), gen);
+ jpeg.getColorSpace(), 8, jpeg.isInverted(), gen);
} else {
throw new UnsupportedOperationException("Unsupported raw image: " + info);
}
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/PSSupportedFlavors.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/PSSupportedFlavors.java?rev=604968&r1=604967&r2=604968&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/PSSupportedFlavors.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/PSSupportedFlavors.java Mon Dec 17 11:03:45 2007
@@ -29,6 +29,7 @@
/** The flavors supported inline with PostScript level 2. */
ImageFlavor[] LEVEL_2_FLAVORS_INLINE = new ImageFlavor[]
{ImageFlavor.RAW_EPS,
+ ImageFlavor.RAW_CCITTFAX,
ImageFlavor.GRAPHICS2D,
ImageFlavor.BUFFERED_IMAGE,
ImageFlavor.RENDERED_IMAGE,
@@ -38,6 +39,7 @@
ImageFlavor[] LEVEL_3_FLAVORS_INLINE = new ImageFlavor[]
{ImageFlavor.RAW_EPS,
ImageFlavor.RAW_JPEG,
+ ImageFlavor.RAW_CCITTFAX,
ImageFlavor.GRAPHICS2D,
ImageFlavor.BUFFERED_IMAGE,
ImageFlavor.RENDERED_IMAGE,
@@ -46,6 +48,7 @@
/** The flavors supported as forms with PostScript level 2. */
ImageFlavor[] LEVEL_2_FLAVORS_FORM = new ImageFlavor[]
{//ImageFlavor.RAW_EPS,
+ ImageFlavor.RAW_CCITTFAX,
ImageFlavor.GRAPHICS2D,
ImageFlavor.BUFFERED_IMAGE,
ImageFlavor.RENDERED_IMAGE/*,
@@ -55,6 +58,7 @@
ImageFlavor[] LEVEL_3_FLAVORS_FORM = new ImageFlavor[]
{//ImageFlavor.RAW_EPS,
ImageFlavor.RAW_JPEG,
+ ImageFlavor.RAW_CCITTFAX,
ImageFlavor.GRAPHICS2D,
ImageFlavor.BUFFERED_IMAGE,
ImageFlavor.RENDERED_IMAGE/*,
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/ResourceHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/ResourceHandler.java?rev=604968&r1=604967&r2=604968&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/ResourceHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/ps/ResourceHandler.java Mon Dec 17 11:03:45 2007
@@ -59,6 +59,7 @@
import org.apache.fop.image2.ImageManager;
import org.apache.fop.image2.ImageSessionContext;
import org.apache.fop.image2.impl.ImageGraphics2D;
+import org.apache.fop.image2.impl.ImageRawCCITTFax;
import org.apache.fop.image2.impl.ImageRawEPS;
import org.apache.fop.image2.impl.ImageRawJPEG;
import org.apache.fop.image2.impl.ImageRawStream;
@@ -283,16 +284,19 @@
} finally {
IOUtils.closeQuietly(in);
}*/
+ } else if (raw instanceof ImageRawCCITTFax) {
+ ImageRawCCITTFax jpeg = (ImageRawCCITTFax)raw;
+ ImageEncoder encoder = new ImageEncoderCCITTFax(jpeg);
+ FormGenerator formGen = new ImageFormGenerator(
+ form.getName(), imageDescription,
+ info.getSize().getDimensionPt(),
+ info.getSize().getDimensionPx(),
+ encoder,
+ jpeg.getColorSpace(), 1, false);
+ formGen.generate(gen);
} else if (raw instanceof ImageRawJPEG) {
ImageRawJPEG jpeg = (ImageRawJPEG)raw;
- ImageEncoder encoder = new ImageEncoder() {
- public void writeTo(OutputStream out) throws IOException {
- raw.writeTo(out);
- }
- public String getImplicitFilter() {
- return "<< >> /DCTDecode";
- }
- };
+ ImageEncoder encoder = new ImageEncoderJPEG(jpeg);
FormGenerator formGen = new ImageFormGenerator(
form.getName(), imageDescription,
info.getSize().getDimensionPt(),
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/ImagePreloaderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/ImagePreloaderTestCase.java?rev=604968&r1=604967&r2=604968&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/ImagePreloaderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/ImagePreloaderTestCase.java Mon Dec 17 11:03:45 2007
@@ -46,8 +46,9 @@
public void testImageLoaderFactory() throws Exception {
ImageManager manager = fopFactory.getImageManager();
+ ImageInfo info = new ImageInfo(null, MimeConstants.MIME_PNG);
ImageLoaderFactory ilf = manager.getRegistry().getImageLoaderFactory(
- MimeConstants.MIME_PNG, ImageFlavor.BUFFERED_IMAGE);
+ info, ImageFlavor.BUFFERED_IMAGE);
assertNotNull(ilf);
}
Added: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/tiff_group3-1d.tif
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/tiff_group3-1d.tif?rev=604968&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/tiff_group3-1d.tif
------------------------------------------------------------------------------
svn:mime-type = image/tiff
Added: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/tiff_group3-2d.tif
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/tiff_group3-2d.tif?rev=604968&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/tiff_group3-2d.tif
------------------------------------------------------------------------------
svn:mime-type = image/tiff
Added: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/tiff_group3-multi-strip.tif
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/tiff_group3-multi-strip.tif?rev=604968&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/tiff_group3-multi-strip.tif
------------------------------------------------------------------------------
svn:mime-type = image/tiff
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org