mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 03:39:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

feature:2274

Browse source 
Create thumbnail through ajax.
Remove $conf['tn_width'], $conf['tn_height'] and $conf['tn_compression_level'] parameters.

git-svn-id: http://piwigo.org/svn/trunk@10570 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2011-04-22 13:19:36 +00:00
parent 041fc62aa1
commit a3963aedef
5 changed files with 190 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

37
admin/include/functions_upload.inc.php
View file

@ -604,7 +604,7 @@ function pwg_image_resize_gd($source_filepath, $destination_filepath, $max_width
{
// the image doesn't need any resize! We just copy it to the destination
copy($source_filepath, $destination_filepath);
return true;
return get_resize_result($source_filepath, $destination_filepath, $resize_dimensions['width'], $resize_dimensions['height'], $starttime, 'GD');
}
$destination_image = imagecreatetruecolor($resize_dimensions['width'], $resize_dimensions['height']);
@ -646,15 +646,7 @@ function pwg_image_resize_gd($source_filepath, $destination_filepath, $max_width
imagedestroy($destination_image);
// everything should be OK if we are here!
return array(
'source' => $source_filepath,
'destination' => $destination_filepath,
'width' => $resize_dimensions['width'],
'height' => $resize_dimensions['height'],
'size' => floor(filesize($destination_filepath) / 1024).' KB',
'time' => number_format((get_moment() - $starttime) * 1000, 2, '.', ' ').' ms',
'library' => 'GD',
);
return get_resize_result($source_filepath, $destination_filepath, $resize_dimensions['width'], $resize_dimensions['height'], $starttime, 'GD');
}
function pwg_image_resize_im($source_filepath, $destination_filepath, $max_width, $max_height, $quality, $strip_metadata=false, $crop=false, $follow_orientation=true)
@ -691,7 +683,7 @@ function pwg_image_resize_im($source_filepath, $destination_filepath, $max_width
{
// the image doesn't need any resize! We just copy it to the destination
copy($source_filepath, $destination_filepath);
return true;
get_resize_result($source_filepath, $destination_filepath, $resize_dimensions['width'], $resize_dimensions['height'], $starttime, 'ImageMagick');
}
$image->setImageCompressionQuality($quality);
@ -716,15 +708,7 @@ function pwg_image_resize_im($source_filepath, $destination_filepath, $max_width
$image->destroy();
// everything should be OK if we are here!
return array(
'source' => $source_filepath,
'destination' => $destination_filepath,
'width' => $resize_dimensions['width'],
'height' => $resize_dimensions['height'],
'size' => floor(filesize($destination_filepath) / 1024).' KB',
'time' => number_format((get_moment() - $starttime) * 1000, 2, '.', ' ').' ms',
'library' => 'ImageMagick',
);
return get_resize_result($source_filepath, $destination_filepath, $resize_dimensions['width'], $resize_dimensions['height'], $starttime, 'ImageMagick');
}
function get_rotation_angle($source_filepath)
@ -966,4 +950,17 @@ function file_path_for_type($file_path, $type='thumb')
return $file_path;
}
function get_resize_result($source_filepath, $destination_filepath, $width, $height, $time, $library)
{
return array(
'source' => $source_filepath,
'destination' => $destination_filepath,
'width' => $width,
'height' => $height,
'size' => floor(filesize($destination_filepath) / 1024).' KB',
'time' => number_format((get_moment() - $time) * 1000, 2, '.', ' ').' ms',
'library' => $library,
);
}
?>