git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197244 13f79535-47bb-0310-9956-ffa450edef68pull/30/head
@@ -520,7 +520,10 @@ list of possible build targets. | |||
<!--include name="org/apache/fop/layout/Font*.class"/--> | |||
<include name="org/apache/fop/image/FopImag*.class"/> | |||
<include name="org/apache/fop/image/Jpeg*"/> | |||
<include name="org/apache/fop/image/EPS*"/> | |||
<include name="org/apache/fop/image/Abstract*"/> | |||
<include name="org/apache/fop/image/analyser/*.class"/> | |||
<include name="org/apache/fop/util/CMYKColorSpace*.class"/> | |||
<include name="org/apache/fop/util/StreamUtilities.class"/> | |||
<include name="org/apache/fop/util/*OutputStream.class"/> | |||
<include name="org/apache/fop/util/Finalizable.class"/> | |||
@@ -580,7 +583,7 @@ list of possible build targets. | |||
<fileset dir="${build.dest}"> | |||
<patternset refid="transcoder-classes"/> | |||
</fileset> | |||
<fileset dir="${build.dir}/transcoder-dependencies"/> | |||
<fileset dir="${transcoder-deps}"/> | |||
<manifest> | |||
<attribute name="Implementation-Title" value="${fop-transcoder.name}"/> | |||
<attribute name="Implementation-Version" value="${fop-transcoder.version}"/> |
@@ -151,6 +151,12 @@ public class PDFGraphics2D extends AbstractGraphics2D { | |||
*/ | |||
protected int baseLevel = 0; | |||
/** | |||
* The count of JPEG images added to document so they recieve | |||
* unique keys. | |||
*/ | |||
protected int jpegCount = 0; | |||
/** | |||
* The current font information. | |||
*/ | |||
@@ -340,9 +346,13 @@ public class PDFGraphics2D extends AbstractGraphics2D { | |||
* @param width the width to draw the image | |||
* @param height the height to draw the image | |||
*/ | |||
public void addJpegImage(JpegImage jpeg, float x, float y, float width, float height) { | |||
FopPDFImage fopimage = new FopPDFImage(jpeg, ""); | |||
int xObjectNum = this.pdfDoc.addImage(resourceContext, fopimage).getXNumber(); | |||
public void addJpegImage(JpegImage jpeg, float x, float y, | |||
float width, float height) { | |||
String key = "__AddJPEG_"+jpegCount; | |||
jpegCount++; | |||
FopPDFImage fopimage = new FopPDFImage(jpeg, key); | |||
int xObjectNum = this.pdfDoc.addImage(resourceContext, | |||
fopimage).getXNumber(); | |||
AffineTransform at = getTransform(); | |||
double[] matrix = new double[6]; |
@@ -97,6 +97,7 @@ public class PDFImageElementBridge extends SVGImageElementBridge { | |||
(purl.toString(), purl.openStream(), null); | |||
if (ii.mimeType.toLowerCase() == "image/jpeg") { | |||
JpegImage jpeg = new JpegImage(ii); | |||
jpeg.load(FopImage.ORIGINAL_DATA, null); | |||
PDFJpegNode node = new PDFJpegNode(jpeg, origGN); | |||
Rectangle2D imgBounds = getImageBounds(ctx, e); | |||
@@ -154,7 +155,6 @@ public class PDFImageElementBridge extends SVGImageElementBridge { | |||
public void primitivePaint(Graphics2D g2d) { | |||
if (g2d instanceof PDFGraphics2D) { | |||
PDFGraphics2D pdfg = (PDFGraphics2D) g2d; | |||
pdfg.setTransform(getTransform()); | |||
float x = 0; | |||
float y = 0; | |||
try { |