gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-08 20:46:05 +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

26
inc/inc.ClassConversionServiceImageToImage.php
View File

@ -47,18 +47,22 @@ 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();
if($imagick->readImage($infile)) { try {
if(!empty($params['width'])) if($imagick->readImage($infile)) {
$imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0); if(!empty($params['width']))
$end = microtime(true); $imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0);
if($this->logger) { $end = microtime(true);
$this->logger->log('Conversion from '.$this->from.' to '.$this->to.' with image service took '.($end-$start).' sec.', PEAR_LOG_INFO); if($this->logger) {
} $this->logger->log('Conversion from '.$this->from.' to '.$this->to.' with image service took '.($end-$start).' sec.', PEAR_LOG_INFO);
if($target) { }
return $imagick->writeImage($target); if($target) {
} else { return $imagick->writeImage($target);
return $imagick->getImageBlob(); } else {
return $imagick->getImageBlob();
}
} }
} catch (ImagickException $e) {
return false;
} }
return false; return false;
} }

28
inc/inc.ClassConversionServicePdfToImage.php
View File

@ -55,19 +55,23 @@ 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;
if($imagick->readImage($infile.'['.$page.']')) { try {
if(!empty($params['width'])) if($imagick->readImage($infile.'['.$page.']')) {
$imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0); if(!empty($params['width']))
$imagick->setImageFormat('png'); $imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0);
$end = microtime(true); $imagick->setImageFormat('png');
if($this->logger) { $end = microtime(true);
$this->logger->log('Conversion from '.$this->from.' to '.$this->to.' with pdf service took '.($end-$start).' sec.', PEAR_LOG_INFO); if($this->logger) {
} $this->logger->log('Conversion from '.$this->from.' to '.$this->to.' with pdf service took '.($end-$start).' sec.', PEAR_LOG_INFO);
if($target) { }
return $imagick->writeImage($target); if($target) {
} else { return $imagick->writeImage($target);
return $imagick->getImageBlob(); } else {
return $imagick->getImageBlob();
}
} }
} catch (ImagickException $e) {
return false;
} }
return false; return false;
} }