aboutsummaryrefslogtreecommitdiffstats
path: root/include/photo
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-08-03 00:18:14 +0200
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-08-03 00:18:14 +0200
commitf09ac4e5972a77dfe73338ee207e40ec463355e9 (patch)
tree77232d70031622a162f4e00aec128961ecc7a764 /include/photo
parent9294f72adb3c076932558b6f29a4c570e7962764 (diff)
downloadvolse-hubzilla-f09ac4e5972a77dfe73338ee207e40ec463355e9.tar.gz
volse-hubzilla-f09ac4e5972a77dfe73338ee207e40ec463355e9.tar.bz2
volse-hubzilla-f09ac4e5972a77dfe73338ee207e40ec463355e9.zip
Revert "Revert "merge""
This reverts commit 9294f72adb3c076932558b6f29a4c570e7962764.
Diffstat (limited to 'include/photo')
-rw-r--r--include/photo/photo_imagick.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/photo/photo_imagick.php b/include/photo/photo_imagick.php
index 2737c8f69..3f84fd06c 100644
--- a/include/photo/photo_imagick.php
+++ b/include/photo/photo_imagick.php
@@ -153,14 +153,14 @@ class photo_imagick extends photo_driver {
do {
$this->image->cropImage($w, $h, $x, $y);
/**
- * We need to remove the canva,
+ * We need to remove the canvas,
* or the image is not resized to the crop:
* http://php.net/manual/en/imagick.cropimage.php#97232
*/
$this->image->setImagePage(0, 0, 0, 0);
} while ($this->image->nextImage());
- $this->doScaleImage($max);
+ $this->doScaleImage($max,$max);
}
public function imageString() {