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

merge r6616 from branch 2.1 to trunk

Browse source 
bug 1701 fixed: support for PNG file in browser direct upload.

If the picture is a PNG file, then the "web size" picture is also a PNG file
but the thumbnail is always a JPEG file.



git-svn-id: http://piwigo.org/svn/trunk@6617 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-06-28 20:58:38 +00:00
parent 7125711f59
commit c6d981cc58
2 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,17 @@ function add_uploaded_file($source_filepath, $original_filename=null, $categorie
$date_string = preg_replace('/[^\d]/', '', $dbnow);
$random_string = substr($md5sum, 0, 8);
$filename_wo_ext = $date_string.'-'.$random_string;
$file_path = $upload_dir.'/'.$filename_wo_ext.'.jpg';
$file_path = $upload_dir.'/'.$filename_wo_ext.'.';
list($width, $height, $type) = getimagesize($source_filepath);
if (IMAGETYPE_PNG == $type)
{
$file_path.= 'png';
}
else
{
$file_path.= 'jpg';
}
prepare_directory($upload_dir);
if (is_uploaded_file($source_filepath))
@ -198,11 +208,11 @@ function pwg_image_resize($result, $source_filepath, $destination_filepath, $max
$source_image = null;
if (in_array($extension, array('jpg', 'jpeg')))
{
$source_image = @imagecreatefromjpeg($source_filepath);
$source_image = imagecreatefromjpeg($source_filepath);
}
else if ($extension == 'png')
{
$source_image = @imagecreatefrompng($source_filepath);
$source_image = imagecreatefrompng($source_filepath);
}
else
{
@ -252,7 +262,15 @@ function pwg_image_resize($result, $source_filepath, $destination_filepath, $max
$source_height
);
imagejpeg($destination_image, $destination_filepath, $quality);
$extension = strtolower(get_extension($destination_filepath));
if ($extension == 'png')
{
imagepng($destination_image, $destination_filepath);
}
else
{
imagejpeg($destination_image, $destination_filepath, $quality);
}
// freeing memory ressources
imagedestroy($source_image);
imagedestroy($destination_image);