images with pixel aspect ratio from width

YetiForceCompany · Feb 15, 2019 · 1a67192 · 1a67192
1 parent 7bbb63c
commit 1a67192
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/lib/Layout/ImageBox.php b/lib/Layout/ImageBox.php
@@ -53,18 +53,14 @@ public function measureWidth()
 	public function measureHeight(bool $afterPageDividing = false)
 	{
 		$style = $this->getStyle();
-		if ($style->getRules('height') === 'auto') {
-			$img = $style->getBackgroundImageStream();
-			$height = $img->getHeight();
-			if ($style->getRules('width') !== 'auto') {
-				$ratio = Math::div($img->getWidth(), $img->getHeight());
-				$height = Math::div($this->getDimensions()->getInnerWidth(), $ratio);
-			}
-			$height = Math::add($height, $style->getVerticalBordersWidth(), $style->getVerticalPaddingsWidth());
-			$this->getDimensions()->setHeight($height);
-		} else {
-			$this->applyStyleHeight();
+		$img = $style->getBackgroundImageStream();
+		$height = $img->getHeight();
+		if ($style->getRules('width') !== 'auto') {
+			$ratio = Math::div($img->getWidth(), $img->getHeight());
+			$height = Math::div($this->getDimensions()->getInnerWidth(), $ratio);
 		}
+		$height = Math::add($height, $style->getVerticalBordersWidth(), $style->getVerticalPaddingsWidth());
+		$this->getDimensions()->setHeight($height);
 		return $this;
 	}
 }