EMF support review: Copyright years, rounding problems, code simplifications

PDF Renderer should not fail with an exception if it receives an EMF image. It should ignore it.
Test case for EMF image and an EMF image added.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@331805 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/image/EmfImage.java b/src/java/org/apache/fop/image/EmfImage.java
index bbe3794c5ed0acf005273d8a105a82c8f844f625..0954e97d76205947538c91df476975a868819e20 100644 (file)
--- a/src/java/org/apache/fop/image/EmfImage.java
+++ b/src/java/org/apache/fop/image/EmfImage.java
@@ -1,5 +1,5 @@
 /*\r
- * Copyright 1999-2005 The Apache Software Foundation.\r
+ * Copyright 2005 The Apache Software Foundation.\r
  * \r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -14,23 +14,22 @@
  * limitations under the License.\r
  */\r
 \r
+/* $Id$ */\r
 \r
 package org.apache.fop.image;\r
 \r
-// Java\r
-import java.io.ByteArrayOutputStream;\r
-\r
 import org.apache.commons.io.IOUtils;\r
 \r
 /**\r
  * Enhanced metafile image.\r
- * This supports loading a emf image.\r
+ * This supports loading a EMF image.\r
  *\r
  * @author Peter Herweg\r
  * @see AbstractFopImage\r
  * @see FopImage\r
  */\r
 public class EmfImage extends AbstractFopImage {\r
+    \r
     /**\r
      * Create a bitmap image with the image data.\r
      *\r
@@ -41,31 +40,23 @@ public class EmfImage extends AbstractFopImage {
     }\r
 \r
     /**\r
-     * Load the original jpeg data.\r
-     * This loads the original jpeg data and reads the color space,\r
+     * Load the original EMF data.\r
+     * This loads the original EMF data and reads the color space,\r
      * and icc profile if any.\r
      *\r
      * @return true if loaded false for any error\r
      */\r
     protected boolean loadOriginalData() {\r
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();\r
-\r
         try {\r
-            byte[] readBuf = new byte[4096];\r
-            int bytesRead;\r
-            while ((bytesRead = inputStream.read(readBuf)) != -1) {\r
-                baos.write(readBuf, 0, bytesRead);\r
-            }\r
+            this.raw = IOUtils.toByteArray(inputStream);\r
         } catch (java.io.IOException ex) {\r
-            log.error("Error while loading image (Emf): " + ex.getMessage(), ex);\r
+            log.error("Error while loading image (EMF): " + ex.getMessage(), ex);\r
             return false;\r
         } finally {\r
             IOUtils.closeQuietly(inputStream);\r
             inputStream = null;\r
         }\r
 \r
-        this.raw = baos.toByteArray();\r
-        \r
         return true;\r
     }\r
 }\r

diff --git a/src/java/org/apache/fop/image/analyser/EMFReader.java b/src/java/org/apache/fop/image/analyser/EMFReader.java
index a5c01845fc376090b5cb4ffae593fc35cc3a8cf7..404c65945cd0bbcb999baf7815f1395252ec0c53 100644 (file)
--- a/src/java/org/apache/fop/image/analyser/EMFReader.java
+++ b/src/java/org/apache/fop/image/analyser/EMFReader.java
@@ -1,5 +1,5 @@
 /*\r
- * Copyright 1999-2005 The Apache Software Foundation.\r
+ * Copyright 2005 The Apache Software Foundation.\r
  * \r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -14,6 +14,8 @@
  * limitations under the License.\r
  */\r
 \r
+/* $Id$ */\r
+\r
 package org.apache.fop.image.analyser;\r
 \r
 // Java\r
@@ -53,8 +55,8 @@ public class EMFReader implements ImageReader {
     public FopImage.ImageInfo verifySignature(String uri, InputStream bis,\r
                 FOUserAgent ua) throws IOException {\r
         byte[] header = getDefaultHeader(bis);\r
-        boolean supported = \r
-                 ( (header[SIGNATURE_OFFSET + 0] == (byte) 0x20)\r
+        boolean supported \r
+                = ( (header[SIGNATURE_OFFSET + 0] == (byte) 0x20)\r
                 && (header[SIGNATURE_OFFSET + 1] == (byte) 0x45)\r
                 && (header[SIGNATURE_OFFSET + 2] == (byte) 0x4D)\r
                 && (header[SIGNATURE_OFFSET + 3] == (byte) 0x46) );\r
@@ -114,8 +116,8 @@ public class EMFReader implements ImageReader {
         byte4 = header[VRES_PIXEL_OFFSET + 3] & 0xff;\r
         long vresPixel = (long) ((byte4 << 24) | (byte3 << 16) | (byte2 << 8) | byte1);\r
         \r
-        info.dpiHorizontal = hresPixel / (hresMM/25.4);\r
-        info.dpiVertical   = vresPixel / (vresMM/25.4);;\r
+        info.dpiHorizontal = hresPixel / (hresMM / 25.4f);\r
+        info.dpiVertical   = vresPixel / (vresMM / 25.4f);\r
         \r
         //width\r
         byte1 = header[WIDTH_OFFSET] & 0xff;\r
@@ -124,7 +126,7 @@ public class EMFReader implements ImageReader {
         byte4 = header[WIDTH_OFFSET + 3] & 0xff;\r
         value = (long) ((byte4 << 24) | (byte3 << 16)\r
                 | (byte2 << 8) | byte1);\r
-        value = (long) (value / 100f / 25.4 * info.dpiHorizontal);\r
+        value = Math.round(value / 100f / 25.4f * info.dpiHorizontal);\r
         info.width = (int) (value & 0xffffffff);\r
 \r
         //height\r
@@ -133,7 +135,7 @@ public class EMFReader implements ImageReader {
         byte3 = header[HEIGHT_OFFSET + 2] & 0xff;\r
         byte4 = header[HEIGHT_OFFSET + 3] & 0xff;\r
         value = (long) ((byte4 << 24) | (byte3 << 16) | (byte2 << 8) | byte1);\r
-        value = (long) (value / 100f / 25.4 * info.dpiVertical);\r
+        value = Math.round(value / 100f / 25.4f * info.dpiVertical);\r
         info.height = (int) (value & 0xffffffff);\r
 \r
         return info;\r

diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
index d9591802e20001b7cad5989a2147eb0e751cacdb..f30b0e0d06c0a41b421411149801e3c01a71eb6b 100644 (file)
--- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
@@ -1394,6 +1394,9 @@ public class PDFRenderer extends AbstractPathOrientedRenderer {
             placeImage((float) pos.getX() / 1000,
                        (float) pos.getY() / 1000, w, h, xobj);
         } else {
+            if (!fopimage.load(FopImage.BITMAP)) {
+                return;
+            }
             FopPDFImage pdfimage = new FopPDFImage(fopimage, url);
             int xobj = pdfDoc.addImage(currentContext, pdfimage).getXNumber();
             fact.releaseImage(url, userAgent);

diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
index 5f0bb1e3d09c6ee0ec93b29f6f714ae934943835..a0d8ebbae9cba283d7d665dc1819d9ff1efc2c42 100644 (file)
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -280,7 +280,7 @@ public class RtfExternalGraphic extends RtfElement {
      private byte[] imagedata = null;
 
      /** The image format */
-     FormatBase imageformat;
+     private FormatBase imageformat;
 
     //////////////////////////////////////////////////
     // @@ Construction

diff --git a/test/layoutengine/testcases/external-graphic_emf.xml b/test/layoutengine/testcases/external-graphic_emf.xml
new file mode 100644 (file)
index 0000000..6cf9405
--- /dev/null
+++ b/test/layoutengine/testcases/external-graphic_emf.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed 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$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks external-graphics.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>EMF external-graphic</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/img.emf"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="56692" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="56692" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="56692" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="56692" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>

diff --git a/test/resources/images/img.emf b/test/resources/images/img.emf
new file mode 100644 (file)
index 0000000..f8534da
Binary files /dev/null and b/test/resources/images/img.emf differ