Photo now uses Imagick instead of gd.
This commit is contained in:
Domovoy
parent
0ff93edeee
commit
fb2f4b6b35
|
|
@ -4,145 +4,125 @@ if(! class_exists("Photo")) {
|
||||||
class Photo {
|
class Photo {
|
||||||
|
|
||||||
private $image;
|
private $image;
|
||||||
private $width;
|
private $ext;
|
||||||
private $height;
|
|
||||||
private $valid;
|
|
||||||
private $type;
|
|
||||||
private $types;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* supported mimetypes and corresponding file extensions
|
* supported mimetypes and corresponding file extensions
|
||||||
*/
|
*/
|
||||||
static function supportedTypes() {
|
static function supportedTypes() {
|
||||||
$t = array();
|
/**
|
||||||
$t['image/jpeg'] ='jpg';
|
* Imagick::queryFormats won't help us a lot there...
|
||||||
if (imagetypes() & IMG_PNG) $t['image/png'] = 'png';
|
* At least, not yet, other parts of friendica uses this array
|
||||||
|
*/
|
||||||
|
$t = array(
|
||||||
|
'image/jpeg' => 'jpg',
|
||||||
|
'image/png' => 'png',
|
||||||
|
'image/gif' => 'gif'
|
||||||
|
);
|
||||||
return $t;
|
return $t;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function __construct($data, $type="image/jpeg") {
|
public function __construct($data, $type=null) {
|
||||||
|
$this->image = new Imagick();
|
||||||
|
$this->image->readImageBlob($data);
|
||||||
|
|
||||||
$this->types = $this->supportedTypes();
|
// If it is a gif, it may be animated, get it ready for any future operations
|
||||||
if (!array_key_exists($type,$this->types)){
|
if($this->image->getFormat() !== "GIF") $this->image = $this->image->coalesceImages();
|
||||||
$type='image/jpeg';
|
|
||||||
}
|
$this->ext = strtolower($this->image->getImageFormat());
|
||||||
$this->valid = false;
|
|
||||||
$this->type = $type;
|
|
||||||
$this->image = @imagecreatefromstring($data);
|
|
||||||
if($this->image !== FALSE) {
|
|
||||||
$this->width = imagesx($this->image);
|
|
||||||
$this->height = imagesy($this->image);
|
|
||||||
$this->valid = true;
|
|
||||||
imagealphablending($this->image, false);
|
|
||||||
imagesavealpha($this->image, true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function __destruct() {
|
public function __destruct() {
|
||||||
if($this->image)
|
if($this->image) {
|
||||||
imagedestroy($this->image);
|
$this->image->clear();
|
||||||
|
$this->image->destroy();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function is_valid() {
|
public function is_valid() {
|
||||||
return $this->valid;
|
return ($this->image !== FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getWidth() {
|
public function getWidth() {
|
||||||
return $this->width;
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
return $this->image->getImageWidth();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHeight() {
|
public function getHeight() {
|
||||||
return $this->height;
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
return $this->image->getImageHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getImage() {
|
public function getImage() {
|
||||||
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
/* Clean it */
|
||||||
|
$this->image = $this->image->deconstructImages();
|
||||||
return $this->image;
|
return $this->image;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getType() {
|
public function getType() {
|
||||||
return $this->type;
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
// This should do the trick (see supportedTypes above)
|
||||||
|
return 'image/'. $this->getExt();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getExt() {
|
public function getExt() {
|
||||||
return $this->types[$this->type];
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
return $this->ext;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scaleImage($max) {
|
public function scaleImage($max) {
|
||||||
|
if(!$this->is_valid())
|
||||||
$width = $this->width;
|
|
||||||
$height = $this->height;
|
|
||||||
|
|
||||||
$dest_width = $dest_height = 0;
|
|
||||||
|
|
||||||
if((! $width)|| (! $height))
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if($width > $max && $height > $max) {
|
/**
|
||||||
if($width > $height) {
|
* If it is not animated, there will be only one iteration here,
|
||||||
$dest_width = $max;
|
* so don't bother checking
|
||||||
$dest_height = intval(( $height * $max ) / $width);
|
*/
|
||||||
}
|
// Don't forget to go back to the first frame for any further operation
|
||||||
else {
|
$this->image->setFirstIterator();
|
||||||
$dest_width = intval(( $width * $max ) / $height);
|
do {
|
||||||
$dest_height = $max;
|
$this->image->resizeImage($max, $max, imagick::FILTER_LANCZOS, 1, true);
|
||||||
}
|
} while ($this->image->nextImage());
|
||||||
}
|
|
||||||
else {
|
|
||||||
if( $width > $max ) {
|
|
||||||
$dest_width = $max;
|
|
||||||
$dest_height = intval(( $height * $max ) / $width);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if( $height > $max ) {
|
|
||||||
$dest_width = intval(( $width * $max ) / $height);
|
|
||||||
$dest_height = $max;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$dest_width = $width;
|
|
||||||
$dest_height = $height;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$dest = imagecreatetruecolor( $dest_width, $dest_height );
|
|
||||||
imagealphablending($dest, false);
|
|
||||||
imagesavealpha($dest, true);
|
|
||||||
if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
|
|
||||||
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
|
|
||||||
if($this->image)
|
|
||||||
imagedestroy($this->image);
|
|
||||||
$this->image = $dest;
|
|
||||||
$this->width = imagesx($this->image);
|
|
||||||
$this->height = imagesy($this->image);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function rotate($degrees) {
|
public function rotate($degrees) {
|
||||||
$this->image = imagerotate($this->image,$degrees,0);
|
if(!$this->is_valid())
|
||||||
$this->width = imagesx($this->image);
|
return FALSE;
|
||||||
$this->height = imagesy($this->image);
|
|
||||||
|
$this->image->setFirstIterator();
|
||||||
|
do {
|
||||||
|
$this->image->rotateImage(new ImagickPixel(), $degrees);
|
||||||
|
} while ($this->image->nextImage());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function flip($horiz = true, $vert = false) {
|
public function flip($horiz = true, $vert = false) {
|
||||||
$w = imagesx($this->image);
|
if(!$this->is_valid())
|
||||||
$h = imagesy($this->image);
|
return FALSE;
|
||||||
$flipped = imagecreate($w, $h);
|
|
||||||
if($horiz) {
|
$this->image->setFirstIterator();
|
||||||
for ($x = 0; $x < $w; $x++) {
|
do {
|
||||||
imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h);
|
if($horiz) $this->image->flipImage();
|
||||||
}
|
if($vert) $this->image->flopImage();
|
||||||
}
|
} while ($this->image->nextImage());
|
||||||
if($vert) {
|
|
||||||
for ($y = 0; $y < $h; $y++) {
|
|
||||||
imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$this->image = $flipped;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function orient($filename) {
|
public function orient($filename) {
|
||||||
// based off comment on http://php.net/manual/en/function.imagerotate.php
|
// based off comment on http://php.net/manual/en/function.imagerotate.php
|
||||||
|
|
||||||
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') )
|
if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
@ -189,122 +169,96 @@ class Photo {
|
||||||
|
|
||||||
|
|
||||||
public function scaleImageUp($min) {
|
public function scaleImageUp($min) {
|
||||||
|
if(!$this->is_valid())
|
||||||
$width = $this->width;
|
|
||||||
$height = $this->height;
|
|
||||||
|
|
||||||
$dest_width = $dest_height = 0;
|
|
||||||
|
|
||||||
if((! $width)|| (! $height))
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if($width < $min && $height < $min) {
|
$this->scaleImage($min);
|
||||||
if($width > $height) {
|
|
||||||
$dest_width = $min;
|
|
||||||
$dest_height = intval(( $height * $min ) / $width);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$dest_width = intval(( $width * $min ) / $height);
|
|
||||||
$dest_height = $min;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if( $width < $min ) {
|
|
||||||
$dest_width = $min;
|
|
||||||
$dest_height = intval(( $height * $min ) / $width);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if( $height < $min ) {
|
|
||||||
$dest_width = intval(( $width * $min ) / $height);
|
|
||||||
$dest_height = $min;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$dest_width = $width;
|
|
||||||
$dest_height = $height;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$dest = imagecreatetruecolor( $dest_width, $dest_height );
|
|
||||||
imagealphablending($dest, false);
|
|
||||||
imagesavealpha($dest, true);
|
|
||||||
if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
|
|
||||||
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
|
|
||||||
if($this->image)
|
|
||||||
imagedestroy($this->image);
|
|
||||||
$this->image = $dest;
|
|
||||||
$this->width = imagesx($this->image);
|
|
||||||
$this->height = imagesy($this->image);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function scaleImageSquare($dim) {
|
public function scaleImageSquare($dim) {
|
||||||
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
$dest = imagecreatetruecolor( $dim, $dim );
|
$this->image->setFirstIterator();
|
||||||
imagealphablending($dest, false);
|
do {
|
||||||
imagesavealpha($dest, true);
|
$this->image->resizeImage($max, $max, imagick::FILTER_LANCZOS, 1, false);
|
||||||
if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
|
} while ($this->image->nextImage());
|
||||||
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height);
|
|
||||||
if($this->image)
|
|
||||||
imagedestroy($this->image);
|
|
||||||
$this->image = $dest;
|
|
||||||
$this->width = imagesx($this->image);
|
|
||||||
$this->height = imagesy($this->image);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function cropImage($max,$x,$y,$w,$h) {
|
public function cropImage($max,$x,$y,$w,$h) {
|
||||||
$dest = imagecreatetruecolor( $max, $max );
|
if(!$this->is_valid())
|
||||||
imagealphablending($dest, false);
|
return FALSE;
|
||||||
imagesavealpha($dest, true);
|
|
||||||
if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
|
$this->image->setFirstIterator();
|
||||||
imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
|
do {
|
||||||
if($this->image)
|
$this->image->cropImage($w, $h, $x, $y);
|
||||||
imagedestroy($this->image);
|
/**
|
||||||
$this->image = $dest;
|
* We need to remove the canva,
|
||||||
$this->width = imagesx($this->image);
|
* or the image is not resized to the crop:
|
||||||
$this->height = imagesy($this->image);
|
* http://php.net/manual/en/imagick.cropimage.php#97232
|
||||||
|
*/
|
||||||
|
$this->image->setImagePage(0, 0, 0, 0);
|
||||||
|
} while ($this->image->nextImage());
|
||||||
|
$this->scaleImage($max);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function saveImage($path) {
|
public function saveImage($path) {
|
||||||
switch($this->type){
|
if(!$this->is_valid())
|
||||||
case "image/png":
|
return FALSE;
|
||||||
$quality = get_config('system','png_quality');
|
|
||||||
if((! $quality) || ($quality > 9))
|
|
||||||
$quality = PNG_QUALITY;
|
|
||||||
imagepng($this->image, $path, $quality);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
$quality = get_config('system','jpeg_quality');
|
|
||||||
if((! $quality) || ($quality > 100))
|
|
||||||
$quality = JPEG_QUALITY;
|
|
||||||
imagejpeg($this->image,$path,$quality);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
$string = $this->imageString();
|
||||||
|
file_put_contents($path, $string);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function imageString() {
|
public function imageString() {
|
||||||
ob_start();
|
if(!$this->is_valid())
|
||||||
switch($this->type){
|
return FALSE;
|
||||||
case "image/png":
|
|
||||||
|
$quality = FALSE;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hmmm,
|
||||||
|
* we should do the conversion/compression at the initialisation i think
|
||||||
|
* This method may be called several times,
|
||||||
|
* and there is no need to do that more than once
|
||||||
|
*/
|
||||||
|
switch($this->image->getImageFormat()){
|
||||||
|
case "PNG":
|
||||||
$quality = get_config('system','png_quality');
|
$quality = get_config('system','png_quality');
|
||||||
if((! $quality) || ($quality > 9))
|
if((! $quality) || ($quality > 9))
|
||||||
$quality = PNG_QUALITY;
|
$quality = PNG_QUALITY;
|
||||||
imagepng($this->image,NULL, $quality);
|
/**
|
||||||
|
* From http://www.imagemagick.org/script/command-line-options.php#quality:
|
||||||
|
*
|
||||||
|
* 'For the MNG and PNG image formats, the quality value sets
|
||||||
|
* the zlib compression level (quality / 10) and filter-type (quality % 10).
|
||||||
|
* The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering,
|
||||||
|
* unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
|
||||||
|
*/
|
||||||
|
$quality = $quality * 10;
|
||||||
|
break;
|
||||||
|
case "GIF":
|
||||||
|
// We change nothing here, do we?
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
// Convert to jpeg by default
|
||||||
$quality = get_config('system','jpeg_quality');
|
$quality = get_config('system','jpeg_quality');
|
||||||
if((! $quality) || ($quality > 100))
|
if((! $quality) || ($quality > 100))
|
||||||
$quality = JPEG_QUALITY;
|
$quality = JPEG_QUALITY;
|
||||||
|
$this->image->setImageFormat('jpeg');
|
||||||
imagejpeg($this->image,NULL,$quality);
|
|
||||||
}
|
}
|
||||||
$s = ob_get_contents();
|
|
||||||
ob_end_clean();
|
if($quality !== FALSE) {
|
||||||
return $s;
|
// Do we need to iterate for animations?
|
||||||
|
$this->image->setImageCompressionQuality($quality);
|
||||||
|
$this->image->stripImage();
|
||||||
|
}
|
||||||
|
|
||||||
|
$string = $this->image->getImagesBlob();
|
||||||
|
return $string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -354,10 +308,10 @@ class Photo {
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc(basename($filename)),
|
dbesc(basename($filename)),
|
||||||
dbesc($this->type),
|
dbesc($this->getType()),
|
||||||
dbesc($album),
|
dbesc($album),
|
||||||
intval($this->height),
|
intval($this->getHeight()),
|
||||||
intval($this->width),
|
intval($this->getWidth()),
|
||||||
dbesc($this->imageString()),
|
dbesc($this->imageString()),
|
||||||
intval($scale),
|
intval($scale),
|
||||||
intval($profile),
|
intval($profile),
|
||||||
|
|
@ -379,10 +333,10 @@ class Photo {
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc(basename($filename)),
|
dbesc(basename($filename)),
|
||||||
dbesc($this->type),
|
dbesc($this->getType()),
|
||||||
dbesc($album),
|
dbesc($album),
|
||||||
intval($this->height),
|
intval($this->getHeight()),
|
||||||
intval($this->width),
|
intval($this->getWidth()),
|
||||||
dbesc($this->imageString()),
|
dbesc($this->imageString()),
|
||||||
intval($scale),
|
intval($scale),
|
||||||
intval($profile),
|
intval($profile),
|
||||||
|
|
@ -418,13 +372,20 @@ function guess_image_type($filename, $fromcurl=false) {
|
||||||
$type = $headers['Content-Type'];
|
$type = $headers['Content-Type'];
|
||||||
}
|
}
|
||||||
if (is_null($type)){
|
if (is_null($type)){
|
||||||
$ext = pathinfo($filename, PATHINFO_EXTENSION);
|
// Guessing from extension? Isn't that... dangerous?
|
||||||
|
/*$ext = pathinfo($filename, PATHINFO_EXTENSION);
|
||||||
$types = Photo::supportedTypes();
|
$types = Photo::supportedTypes();
|
||||||
$type = "image/jpeg";
|
$type = "image/jpeg";
|
||||||
foreach ($types as $m=>$e){
|
foreach ($types as $m=>$e){
|
||||||
if ($ext==$e) $type = $m;
|
if ($ext==$e) $type = $m;
|
||||||
}
|
}*/
|
||||||
|
/**
|
||||||
|
* Well, this not much better,
|
||||||
|
* but at least it comes from the data inside the image,
|
||||||
|
* we won't be tricked by a manipulated extension
|
||||||
|
*/
|
||||||
|
$image = new Imagick($filename);
|
||||||
|
$type = 'image/'. strtolower($image->getImageFormat());
|
||||||
}
|
}
|
||||||
logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
|
logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
|
||||||
return $type;
|
return $type;
|
||||||
|
|
@ -451,11 +412,7 @@ function import_profile_photo($photo,$uid,$cid) {
|
||||||
$filename = basename($photo);
|
$filename = basename($photo);
|
||||||
$img_str = fetch_url($photo,true);
|
$img_str = fetch_url($photo,true);
|
||||||
|
|
||||||
// guess mimetype from headers or filename
|
$img = new Photo($img_str);
|
||||||
$type = guess_image_type($photo,true);
|
|
||||||
|
|
||||||
|
|
||||||
$img = new Photo($img_str, $type);
|
|
||||||
if($img->is_valid()) {
|
if($img->is_valid()) {
|
||||||
|
|
||||||
$img->scaleImageSquare(175);
|
$img->scaleImageSquare(175);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user