Merge branch 'develop' of https://github.com/japonicus/PHPWord into develop

Author: ivanlanin

src/PhpWord/Element/Image.php

@@ -131,9 +131,17 @@ public function __construct($source, $style = null, $isWatermark = false)
         $this->source = $source;
         $this->isWatermark = $isWatermark;
         $this->style = $this->setStyle(new ImageStyle(), $style, true);
-        if ($this->style->getWidth() == null && $this->style->getHeight() == null) {
-            $this->style->setWidth($imgData[0]);
-            $this->style->setHeight($imgData[1]);
+        $styleWidth = $this->style->getWidth();
+        $styleHeight = $this->style->getHeight();
+        if (!($styleWidth && $styleHeight)) {
+            if ($styleWidth == null && $styleHeight == null) {
+                $this->style->setWidth($imgData[0]);
+                $this->style->setHeight($imgData[1]);
+            } else if ($styleWidth) {
+                $this->style->setHeight($imgData[1] * ($styleWidth / $imgData[0]));
+            } else {
+                $this->style->setWidth($imgData[0] * ($styleHeight / $imgData[1]));
+            }
         }
         $this->setImageFunctions();
     }