|
@@ 1800-1806 (lines=7) @@
|
| 1797 |
|
} else { |
| 1798 |
|
$this->DebugMessage('Skipping "-repage" because ImageMagick (v'.$this->ImageMagickVersion().') does not support it', __FILE__, __LINE__); |
| 1799 |
|
} |
| 1800 |
|
if ($IMuseExplicitImageOutputDimensions) { |
| 1801 |
|
if ($this->w && !$this->h) { |
| 1802 |
|
$this->h = ceil($this->w / ($this->source_width / $this->source_height)); |
| 1803 |
|
} elseif ($this->h && !$this->w) { |
| 1804 |
|
$this->w = ceil($this->h * ($this->source_width / $this->source_height)); |
| 1805 |
|
} |
| 1806 |
|
} |
| 1807 |
|
$commandline .= ' -'.$IMresizeParameter.' '.phpthumb_functions::escapeshellarg_replacement($this->w.'x'.$this->h); |
| 1808 |
|
} |
| 1809 |
|
|
|
@@ 1821-1827 (lines=7) @@
|
| 1818 |
|
$this->w = ((($this->aoe || $this->far) && $this->w) ? $this->w : ($this->w ? phpthumb_functions::nonempty_min($this->w, $getimagesize[0]) : '')); |
| 1819 |
|
$this->h = ((($this->aoe || $this->far) && $this->h) ? $this->h : ($this->h ? phpthumb_functions::nonempty_min($this->h, $getimagesize[1]) : '')); |
| 1820 |
|
if ($this->w || $this->h) { |
| 1821 |
|
if ($IMuseExplicitImageOutputDimensions) { |
| 1822 |
|
if ($this->w && !$this->h) { |
| 1823 |
|
$this->h = ceil($this->w / ($this->source_width / $this->source_height)); |
| 1824 |
|
} elseif ($this->h && !$this->w) { |
| 1825 |
|
$this->w = ceil($this->h * ($this->source_width / $this->source_height)); |
| 1826 |
|
} |
| 1827 |
|
} |
| 1828 |
|
list($nw, $nh) = phpthumb_functions::TranslateWHbyAngle($this->w, $this->h, $this->ra); |
| 1829 |
|
$nw = ((round($nw) != 0) ? round($nw) : ''); |
| 1830 |
|
$nh = ((round($nh) != 0) ? round($nh) : ''); |