Changeset 1632 for trunk/docx4j/src/main

Timestamp:

08/01/11 13:53:24 (10 months ago)

Author:

jharrop

Message:

Antoine's patch of 28 July: for a picture content control, if it has a size use that, but respect the aspect ratio of the image being injected.

File:

• trunk/docx4j/src/main/java/org/docx4j/model/datastorage/BindingHandler.java (modified) (3 diffs)

trunk/docx4j/src/main/java/org/docx4j/model/datastorage/BindingHandler.java

@@ -19 +19 @@
 import org.apache.commons.codec.binary.Base64;
 import org.apache.log4j.Logger;
+import org.apache.xmlgraphics.image.loader.ImageSize;
 import org.docx4j.XmlUtils;
 import org.docx4j.dml.wordprocessingDrawing.Inline;
@@ -315 +316 @@
                         try {
                                 cxl = Long.parseLong(cx);
-                                cyl = Long.parseLong(cx);
+                                cyl = Long.parseLong(cy);
                         } catch (Exception e) {}
-                        if (cxl==0 || cxl==0) {
+                        if (cxl==0 || cyl==0) {
                                 // Let BPAI work out size
                                 log.debug("image size - from image");
@@ -325 +326 @@
                                 // Use existing size
                                 log.debug("image size - from content control size");
+                    // Respect aspect ratio of injected image
+                    ImageSize size = imagePart.getImageInfo().getSize();
+                    double ratio = (double) size.getHeightPx() / (double) size.getWidthPx();
+                    log.debug("fit ratio: " + ratio);
+                    if (ratio > 1) {
+                        cxl =  (long)((double) cyl / ratio);
+                    } else {
+                        cyl =  (long)((double) cxl * ratio);
+                    }
                                 inline = imagePart.createImageInline( filenameHint, altText, 
                                                 id1, id2, cxl, cyl, false);