var $height;
var $width;
var $rotate=0; // degrees to rotate for properly oriented image (extrapolated from EXIF etc.)
+ var $animated = false; // Animated image? (has more than 2 frames)
function __construct($id=null, $filepath=null, $type=null, $width=null, $height=null)
{
// If we ever write this back, Orientation should be set to '1'
}
}
+
+ Event::handle('FillImageFileMetadata', array($this));
}
public static function fromFileObject(File $file)
$size,
common_timestamp());
$outpath = Avatar::path($outname);
- $this->resizeTo($outpath, $size, $size, $x, $y, $w, $h);
+ $this->resizeTo($outpath, array('width'=>$size, 'height'=>$size,
+ 'x'=>$x, 'y'=>$y,
+ 'w'=>$w, 'h'=>$h));
return $outname;
}
/**
* Copy the image file to the given destination.
- * For obscure formats, this will automatically convert to PNG;
- * otherwise the original file will be copied as-is.
+ *
+ * This function may modify the resulting file. Please use the
+ * returned ImageFile object to read metadata (width, height etc.)
*
* @param string $outpath
- * @return string filename
+ * @return ImageFile the image stored at target path
*/
function copyTo($outpath)
{
- return $this->resizeTo($outpath, $this->width, $this->height);
+ return new ImageFile(null, $this->resizeTo($outpath));
}
/**
* Create and save a thumbnail image.
*
* @param string $outpath
- * @param int $width target width
- * @param int $height target height
- * @param int $x (default 0) upper-left corner to crop from
- * @param int $y (default 0) upper-left corner to crop from
- * @param int $w (default full) width of image area to crop
- * @param int $h (default full) height of image area to crop
+ * @param array $box width, height, boundary box (x,y,w,h) defaults to full image
* @return string full local filesystem filename
*/
- function resizeTo($outpath, $width, $height, $x=0, $y=0, $w=null, $h=null)
+ function resizeTo($outpath, array $box=array())
{
- $w = ($w === null) ? $this->width:$w;
- $h = ($h === null) ? $this->height:$h;
- $targetType = $this->preferredType();
+ $box['width'] = isset($box['width']) ? intval($box['width']) : $this->width;
+ $box['height'] = isset($box['height']) ? intval($box['height']) : $this->height;
+ $box['x'] = isset($box['x']) ? intval($box['x']) : 0;
+ $box['y'] = isset($box['y']) ? intval($box['y']) : 0;
+ $box['w'] = isset($box['w']) ? intval($box['w']) : $this->width;
+ $box['h'] = isset($box['h']) ? intval($box['h']) : $this->height;
if (!file_exists($this->filepath)) {
// TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
throw new Exception(_('Lost our file.'));
}
- // Don't crop/scale if it isn't necessary
- if ($width === $this->width
- && $height === $this->height
- && $x === 0
- && $y === 0
- && $w === $this->width
- && $h === $this->height
- && $this->type == $targetType) {
-
- @copy($this->filepath, $outpath);
- return $outpath;
+ // Don't rotate/crop/scale if it isn't necessary
+ if ($box['width'] === $this->width
+ && $box['height'] === $this->height
+ && $box['x'] === 0
+ && $box['y'] === 0
+ && $box['w'] === $this->width
+ && $box['h'] === $this->height
+ && $this->type == $this->preferredType()) {
+ if ($this->rotate == 0) {
+ // No rotational difference, just copy it as-is
+ @copy($this->filepath, $outpath);
+ return $outpath;
+ } elseif (abs($this->rotate) == 90) {
+ // Box is rotated 90 degrees in either direction,
+ // so we have to redefine x to y and vice versa.
+ $tmp = $box['width'];
+ $box['width'] = $box['height'];
+ $box['height'] = $tmp;
+ $tmp = $box['x'];
+ $box['x'] = $box['y'];
+ $box['y'] = $tmp;
+ $tmp = $box['w'];
+ $box['w'] = $box['h'];
+ $box['h'] = $tmp;
+ }
+ }
+
+
+ if (Event::handle('StartResizeImageFile', array($this, $outpath, $box))) {
+ $this->resizeToFile($outpath, $box);
}
+ if (!file_exists($outpath)) {
+ throw new UseFileAsThumbnailException($this->id);
+ }
+
+ return $outpath;
+ }
+
+ protected function resizeToFile($outpath, array $box)
+ {
switch ($this->type) {
- case IMAGETYPE_GIF:
+ case IMAGETYPE_GIF:
$image_src = imagecreatefromgif($this->filepath);
break;
- case IMAGETYPE_JPEG:
+ case IMAGETYPE_JPEG:
$image_src = imagecreatefromjpeg($this->filepath);
break;
- case IMAGETYPE_PNG:
+ case IMAGETYPE_PNG:
$image_src = imagecreatefrompng($this->filepath);
break;
- case IMAGETYPE_BMP:
+ case IMAGETYPE_BMP:
$image_src = imagecreatefrombmp($this->filepath);
break;
- case IMAGETYPE_WBMP:
+ case IMAGETYPE_WBMP:
$image_src = imagecreatefromwbmp($this->filepath);
break;
- case IMAGETYPE_XBM:
+ case IMAGETYPE_XBM:
$image_src = imagecreatefromxbm($this->filepath);
break;
- default:
+ default:
// TRANS: Exception thrown when trying to resize an unknown file type.
throw new Exception(_('Unknown file type'));
}
$image_src = imagerotate($image_src, $this->rotate, 0);
}
- $image_dest = imagecreatetruecolor($width, $height);
+ $image_dest = imagecreatetruecolor($box['width'], $box['height']);
if ($this->type == IMAGETYPE_GIF || $this->type == IMAGETYPE_PNG || $this->type == IMAGETYPE_BMP) {
}
}
- imagecopyresampled($image_dest, $image_src, 0, 0, $x, $y, $width, $height, $w, $h);
+ imagecopyresampled($image_dest, $image_src, 0, 0, $box['x'], $box['y'], $box['width'], $box['height'], $box['w'], $box['h']);
- switch ($targetType) {
+ switch ($this->preferredType()) {
case IMAGETYPE_GIF:
imagegif($image_dest, $outpath);
break;
imagedestroy($image_src);
imagedestroy($image_dest);
-
- return $outpath;
}
+
/**
* Several obscure file types should be normalized to PNG on resize.
*