gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 04:56:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

catch imagemagick exception

Browse Source
This commit is contained in:
Uwe Steinmann 2021-10-19 12:18:16 +02:00
parent d422927f87
commit 359be28912
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/inc.ClassConversionServiceImageToImage.php
View File

@ -47,6 +47,7 @@ class SeedDMS_ConversionServiceImageToImage extends SeedDMS_ConversionServiceBas
public function convert($infile, $target = null, $params = array()) { public function convert($infile, $target = null, $params = array()) {
$start = microtime(true); $start = microtime(true);
$imagick = new Imagick(); $imagick = new Imagick();
try {
if($imagick->readImage($infile)) { if($imagick->readImage($infile)) {
if(!empty($params['width'])) if(!empty($params['width']))
$imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0); $imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0);
@ -60,6 +61,9 @@ class SeedDMS_ConversionServiceImageToImage extends SeedDMS_ConversionServiceBas
return $imagick->getImageBlob(); return $imagick->getImageBlob();
} }
} }
} catch (ImagickException $e) {
return false;
}
return false; return false;
} }
} }

4
inc/inc.ClassConversionServicePdfToImage.php
View File

@ -55,6 +55,7 @@ class SeedDMS_ConversionServicePdfToImage extends SeedDMS_ConversionServiceBase
$page = 0; $page = 0;
if(!empty($params['page']) && intval($params['page']) > 0) if(!empty($params['page']) && intval($params['page']) > 0)
$page = intval($params['page'])-1; $page = intval($params['page'])-1;
try {
if($imagick->readImage($infile.'['.$page.']')) { if($imagick->readImage($infile.'['.$page.']')) {
if(!empty($params['width'])) if(!empty($params['width']))
$imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0); $imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0);
@ -69,6 +70,9 @@ class SeedDMS_ConversionServicePdfToImage extends SeedDMS_ConversionServiceBase
return $imagick->getImageBlob(); return $imagick->getImageBlob();
} }
} }
} catch (ImagickException $e) {
return false;
}
return false; return false;
} }
} }