keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set the Imagick image format in the constructor, so we can uset [get|set](image)XXX methods as intended

This commit is contained in:
Domovoy 2012-07-22 16:12:47 +02:00
parent 689e3028bf
commit 83075c2f27
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/Photo.php
View File

@ -46,8 +46,14 @@ class Photo {
$this->image = new Imagick(); $this->image = new Imagick();
$this->image->readImageBlob($data); $this->image->readImageBlob($data);
/**
* Setup the image to the format of the one we just loaded,
* we'll change it to something else if we need to at the time we save it
*/
$this->image->setFormat($this->image->getImageFormat());
// If it is a gif, it may be animated, get it ready for any future operations // If it is a gif, it may be animated, get it ready for any future operations
if($this->image->getImageFormat() !== "GIF") $this->image = $this->image->coalesceImages(); if($this->image->getFormat() !== "GIF") $this->image = $this->image->coalesceImages();
$this->ext = strtolower($this->image->getImageFormat()); $this->ext = strtolower($this->image->getImageFormat());
} else { } else {
@ -111,8 +117,8 @@ class Photo {
if(!$this->is_valid()) if(!$this->is_valid())
return FALSE; return FALSE;
/* Clean it */
if($this->is_imagick()) { if($this->is_imagick()) {
/* Clean it */
$this->image = $this->image->deconstructImages(); $this->image = $this->image->deconstructImages();
return $this->image; return $this->image;
} }
@ -147,7 +153,7 @@ class Photo {
* If it is not animated, there will be only one iteration here, * If it is not animated, there will be only one iteration here,
* so don't bother checking * so don't bother checking
*/ */
// Don't forget to go back to the first frame for any further operation // Don't forget to go back to the first frame
$this->image->setFirstIterator(); $this->image->setFirstIterator();
do { do {
$this->image->resizeImage($max, $max, imagick::FILTER_LANCZOS, 1, true); $this->image->resizeImage($max, $max, imagick::FILTER_LANCZOS, 1, true);
@ -461,17 +467,17 @@ class Photo {
if((! $quality) || ($quality > 100)) if((! $quality) || ($quality > 100))
$quality = JPEG_QUALITY; $quality = JPEG_QUALITY;
if($this->is_imagick()) { if($this->is_imagick()) {
$this->image->setImageFormat('jpeg'); $this->image->setFormat('jpeg');
logger('Photo: imageString: Unhandled mime type ('. $this->getType() .'), Imagick format is "'. $this->image->getImageFormat() .'"', LOGGER_DEBUG); logger('Photo: imageString: Unhandled mime type ('. $this->getType() .'), Imagick format is "'. $this->image->getFormat() .'"', LOGGER_DEBUG);
} }
else imagejpeg($this->image,NULL,$quality); else imagejpeg($this->image,NULL,$quality);
} }
if($this->is_imagick()) { if($this->is_imagick()) {
if($quality !== FALSE) { if($quality !== FALSE) {
// Do we need to iterate for animations? // Do we need to iterate for animations?
$this->image->setImageCompressionQuality($quality); $this->image->setCompressionQuality($quality);
$this->image->stripImage(); $this->image->stripImage();
} }
$string = $this->image->getImagesBlob(); $string = $this->image->getImagesBlob();