handling width and height in wp:drawing (images)

Author: begnini

src/PhpWord/Element/Image.php

@@ -142,7 +142,7 @@ class Image extends AbstractElement
     public function __construct($source, $style = null, $watermark = false, $name = null)
     {
         $this->source = $source;
-        $this->style = $this->setNewStyle(new ImageStyle(), $style, true);
+        $this->style = $this->setNewStyle(new ImageStyle(), $style, is_null($style));
         $this->setIsWatermark($watermark);
         $this->setName($name);
 

src/PhpWord/Reader/Word2007/AbstractPart.php

@@ -23,6 +23,7 @@
 use PhpOffice\PhpWord\Element\TextRun;
 use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Style\Image as ImageStyle;
 
 /**
  * Abstract part reader
@@ -263,23 +264,7 @@ protected function readRunChild(XMLReader $xmlReader, \DOMElement $node, Abstrac
             }
         } elseif ($node->nodeName == 'w:drawing') {
             // Office 2011 Image
-            $xmlReader->registerNamespace('wp', 'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing');
-            $xmlReader->registerNamespace('r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-            $xmlReader->registerNamespace('pic', 'http://schemas.openxmlformats.org/drawingml/2006/picture');
-            $xmlReader->registerNamespace('a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
-
-            $name = $xmlReader->getAttribute('name', $node, 'wp:inline/a:graphic/a:graphicData/pic:pic/pic:nvPicPr/pic:cNvPr');
-            $embedId = $xmlReader->getAttribute('r:embed', $node, 'wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip');
-            if (is_null($name) && is_null($embedId)) {
-                $name = $xmlReader->getAttribute('name', $node, 'wp:anchor/a:graphic/a:graphicData/pic:pic/pic:nvPicPr/pic:cNvPr');
-                $embedId = $xmlReader->getAttribute('r:embed', $node, 'wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip');
-            }
-
-            $target = $this->getMediaTarget($docPart, $embedId);
-            if (!is_null($target)) {
-                $imageSource = "zip://{$this->docFile}#{$target}";
-                $parent->addImage($imageSource, null, false, $name);
-            }
+            $this->readImage($xmlReader, $node, $parent, $docPart);
         } elseif ($node->nodeName == 'w:object') {
             // Object
             $rId = $xmlReader->getAttribute('r:id', $node, 'o:OLEObject');
@@ -318,6 +303,53 @@ protected function readRunChild(XMLReader $xmlReader, \DOMElement $node, Abstrac
         }
     }
 
+    /**
+     * Parses node w:drawing
+     *
+     * @param XMLReader $xmlReader
+     * @param \DOMElement $node
+     * @param AbstractContainer $parent
+     * @param string $docPart
+     */
+    protected function readImage(xmlReader $xmlReader, \DOMElement $node, AbstractContainer $parent, $docPart)
+    {
+        $xmlReader->registerNamespace('wp', 'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing');
+        $xmlReader->registerNamespace('r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+        $xmlReader->registerNamespace('pic', 'http://schemas.openxmlformats.org/drawingml/2006/picture');
+        $xmlReader->registerNamespace('a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
+
+        $name = null;
+        $embedId = null;
+
+        $graphicParent = $xmlReader->getElement('wp:inline', $node);
+        if (is_null($graphicParent)) {
+            $graphicParent = $xmlReader->getElement('wp:anchor', $node);
+        }
+        /* get the height and width of the image in this document */
+        $imageWidth = $xmlReader->getAttribute('cx', $graphicParent, 'wp:extent');
+        $imageHeight = $xmlReader->getAttribute('cy', $graphicParent, 'wp:extent');
+        $style = null;
+        if (!is_null($imageWidth) && !is_null($imageHeight)) {
+            $style = new ImageStyle();
+            $style->setUnit(ImageStyle::UNIT_PT);
+
+            /* transform EMUs to pt - 1 inch is 914400 EMUs */
+            $imageWidth = (int) ($imageWidth) / (914400 / 72);
+            $imageHeight = (int) ($imageHeight) / (914400 / 72);
+            $style->setWidth($imageWidth);
+            $style->setHeight($imageHeight);
+        }
+
+        $name = $xmlReader->getAttribute('name', $graphicParent, 'a:graphic/a:graphicData/pic:pic/pic:nvPicPr/pic:cNvPr');
+        $embedId = $xmlReader->getAttribute('r:embed', $graphicParent, 'a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip');
+
+        $target = $this->getMediaTarget($docPart, $embedId);
+        if (!is_null($target)) {
+            $imageSource = "zip://{$this->docFile}#{$target}";
+            $parent->addImage($imageSource, $style, false, $name);
+        }
+    }
+
     /**
      * Read w:tbl.
      *

tests/PhpWord/Reader/Word2007/ElementTest.php

@@ -341,5 +341,12 @@ public function testReadDrawingWithAnchor()
 
         $children = $elements[0]->getElements();
         $this->assertInstanceOf('PhpOffice\PhpWord\Element\Image', $children[0]);
+
+        $style = $children[0]->getStyle();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Style\Image', $style);
+
+        $this->assertEquals('pt', $style->getUnit());
+        $this->assertEquals('451', $style->getWidth());
+        $this->assertEquals('521.35', $style->getHeight());
     }
 }