Extract WMF-specific logic from ImgWMF into

LibrePDF · Nov 27, 2024 · 9834d9b · 9834d9b
1 parent 1b065aa
commit 9834d9b
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 22 deletions.
diff --git a/openpdf/src/main/java/com/lowagie/text/ImgWMF.java b/openpdf/src/main/java/com/lowagie/text/ImgWMF.java
@@ -50,9 +50,7 @@
 
 package com.lowagie.text;
 
-import com.lowagie.text.error_messages.MessageLocalization;
 import com.lowagie.text.pdf.PdfTemplate;
-import com.lowagie.text.pdf.codec.wmf.InputMeta;
 import com.lowagie.text.pdf.codec.wmf.MetaDo;
 import java.io.IOException;
 import java.io.InputStream;
@@ -122,9 +120,7 @@ public ImgWMF(byte[] img) throws BadElementException, IOException {
      * @throws IOException
      */
 
-    private void processParameters() throws BadElementException, IOException {
-        type = IMGTEMPLATE;
-        originalType = ORIGINAL_WMF;
+     private void processParameters() throws BadElementException, IOException {
         InputStream is = null;
         try {
             String errorID;
@@ -135,23 +131,13 @@ private void processParameters() throws BadElementException, IOException {
                 is = new java.io.ByteArrayInputStream(rawData);
                 errorID = "Byte array";
             }
-            InputMeta in = new InputMeta(is);
-            if (in.readInt() != 0x9AC6CDD7) {
-                throw new BadElementException(
-                        MessageLocalization.getComposedMessage("1.is.not.a.valid.placeable.windows.metafile", errorID));
-            }
-            in.readWord();
-            int left = in.readShort();
-            int top = in.readShort();
-            int right = in.readShort();
-            int bottom = in.readShort();
-            int inch = in.readWord();
-            dpiX = 72;
-            dpiY = 72;
-            scaledHeight = (float) (bottom - top) / inch * 72f;
-            setTop(scaledHeight);
-            scaledWidth = (float) (right - left) / inch * 72f;
-            setRight(scaledWidth);
+
+            WMFData data = WMFProcessor.processWMF(is, errorID);
+            this.scaledHeight = data.scaledHeight;
+            setTop(data.scaledHeight);
+            this.scaledWidth = data.scaledWidth;
+            setRight(data.scaledWidth);
+
         } finally {
             if (is != null) {
                 is.close();

diff --git a/openpdf/src/main/java/com/lowagie/text/WMFData.java b/openpdf/src/main/java/com/lowagie/text/WMFData.java
@@ -0,0 +1,15 @@
+package com.lowagie.text;
+
+public class WMFData {
+    public final float scaledWidth;
+    public final float scaledHeight;
+    public final float dpiX;
+    public final float dpiY;
+
+    public WMFData(float scaledWidth, float scaledHeight, float dpiX, float dpiY) {
+        this.scaledWidth = scaledWidth;
+        this.scaledHeight = scaledHeight;
+        this.dpiX = dpiX;
+        this.dpiY = dpiY;
+    }
+}
diff --git a/openpdf/src/main/java/com/lowagie/text/WMFProcessor.java b/openpdf/src/main/java/com/lowagie/text/WMFProcessor.java
@@ -0,0 +1,29 @@
+package com.lowagie.text;
+
+import com.lowagie.text.error_messages.MessageLocalization;
+import com.lowagie.text.pdf.codec.wmf.InputMeta;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class WMFProcessor {
+    public static WMFData processWMF(InputStream is, String errorID) throws IOException, BadElementException {
+        InputMeta in = new InputMeta(is);
+        if (in.readInt() != 0x9AC6CDD7) {
+            throw new BadElementException(
+                    MessageLocalization.getComposedMessage("1.is.not.a.valid.placeable.windows.metafile", errorID));
+        }
+        in.readWord();
+        int left = in.readShort();
+        int top = in.readShort();
+        int right = in.readShort();
+        int bottom = in.readShort();
+        int inch = in.readWord();
+
+        float dpiX = 72;
+        float dpiY = 72;
+        float scaledHeight = (float) (bottom - top) / inch * 72f;
+        float scaledWidth = (float) (right - left) / inch * 72f;
+
+        return new WMFData(scaledWidth, scaledHeight, dpiX, dpiY);
+    }
+}