aboutsummaryrefslogtreecommitdiffstats
path: root/include/photo/photo_imagick.php
diff options
context:
space:
mode:
authorManuel Jiménez Friaza <mjfriaza@openmailbox.org>2018-12-05 12:32:33 +0100
committerManuel Jiménez Friaza <mjfriaza@openmailbox.org>2018-12-05 12:32:33 +0100
commit4cd5529027efa19288ddce125f0d41ccb5519578 (patch)
tree69b5bb1b43d807908d38d7febec21732fd334a49 /include/photo/photo_imagick.php
parent5ac08ec3aa8ede14141390670a8097a60769e11e (diff)
parentd12744011affe7f6b79201442ad9fce6e083bdbb (diff)
downloadvolse-hubzilla-4cd5529027efa19288ddce125f0d41ccb5519578.tar.gz
volse-hubzilla-4cd5529027efa19288ddce125f0d41ccb5519578.tar.bz2
volse-hubzilla-4cd5529027efa19288ddce125f0d41ccb5519578.zip
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/photo/photo_imagick.php')
-rw-r--r--include/photo/photo_imagick.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/photo/photo_imagick.php b/include/photo/photo_imagick.php
index 89577e71e..f04c00245 100644
--- a/include/photo/photo_imagick.php
+++ b/include/photo/photo_imagick.php
@@ -31,8 +31,12 @@ class photo_imagick extends photo_driver {
if(! $data)
return;
- $this->image->readImageBlob($data);
-
+ try {
+ $this->image->readImageBlob($data);
+ }
+ catch (Exception $e) {
+ logger('imagick readImageBlob() exception:' . print_r($e,true));
+ }
/**
* Setup the image to the format it will be saved to
@@ -205,4 +209,4 @@ class photo_imagick extends photo_driver {
-} \ No newline at end of file
+}