Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Ivan Lanin 2014-04-13 17:45:50 +07:00
parent a5b5e0cff0 833dfea1e0
commit abc67edb50
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/PhpWord/Element/Image.php
View File

@ -131,9 +131,17 @@ class Image extends AbstractElement
$this->source = $source; $this->source = $source;
$this->isWatermark = $isWatermark; $this->isWatermark = $isWatermark;
$this->style = $this->setStyle(new ImageStyle(), $style, true); $this->style = $this->setStyle(new ImageStyle(), $style, true);
if ($this->style->getWidth() == null && $this->style->getHeight() == null) { $styleWidth = $this->style->getWidth();
$this->style->setWidth($imgData[0]); $styleHeight = $this->style->getHeight();
$this->style->setHeight($imgData[1]); 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(); $this->setImageFunctions();
} }