extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle non 4:3 pictures

Browse Source
This commit is contained in:
Cornelius Weiß 2005-02-22 19:02:07 +00:00
parent a4ab0b3a73
commit 4b7aa62694
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/TODO
View File

@ -8,7 +8,6 @@ TODO:
- delete dialog --> also delete pictures from vfs - delete dialog --> also delete pictures from vfs
- show dialog - show dialog
- make delete, show and edit dialoges popup - make delete, show and edit dialoges popup
- handle non 4:3 picutres
- some artwork : general resource pictures like (room, car, beamer ...) - some artwork : general resource pictures like (room, car, beamer ...)
- sitemgr module - sitemgr module

22
resources/inc/class.bo_resources.inc.php
View File

@ -176,7 +176,6 @@ class bo_resources
@param int $resource_id @param int $resource_id
@return mixed string with msg if somthing went wrong; nothing if all right @return mixed string with msg if somthing went wrong; nothing if all right
TODO make thumb an picture sizes choosable by preferences TODO make thumb an picture sizes choosable by preferences
TODO better handling for not 4:3 images
*/ */
function save_picture($file,$resouce_id) function save_picture($file,$resouce_id)
{ {
@ -210,17 +209,24 @@ class bo_resources
return lang('Picture type is not supported, sorry!'); return lang('Picture type is not supported, sorry!');
} }
$img_size = getimagesize($file['tmp_name']); $src_img_size = getimagesize($file['tmp_name']);
$dst_img_size = array( 0 => 320, 1 => 240);
$thumb_size = array( 0 => 64, 1 => 48);
$tmp_dir = $GLOBALS['phpgw_info']['server']['temp_dir'].'/'; $tmp_dir = $GLOBALS['phpgw_info']['server']['temp_dir'].'/';
if($img_size[0] > 64 || $img_size[1] > 48) if($src_img_size[0] > 64 || $src_img_size[1] > 48)
{ {
$dst_img = imagecreatetruecolor(64, 48); $f = $thumb_size[0] / $src_img_size[0];
imagecopyresized($dst_img,$src_img,0,0,0,0,64,48,$img_size[0],$img_size[1]); $f = $thumb_size[1] / $src_img_size[1] < $f ? $thumb_size[1] / $src_img_size[1] : $f;
$dst_img = imagecreatetruecolor($src_img_size[0] * $f, $src_img_size[1] * $f);
imagecopyresized($dst_img,$src_img,0,0,0,0,$src_img_size[0] * $f,$src_img_size[1] * $f,$src_img_size[0],$src_img_size[1]);
imagejpeg($dst_img,$tmp_dir.$resouce_id.'.thumb.jpg'); imagejpeg($dst_img,$tmp_dir.$resouce_id.'.thumb.jpg');
if($img_size[0] > 320 || $img_size[1] > 240) if($src_img_size[0] > $dst_img_size[0] || $src_img_size[1] > $dst_img_size[1])
{ {
$dst_img = imagecreatetruecolor(320, 240); $f = $dst_img_size[0] / $src_img_size[0];
imagecopyresized($dst_img,$src_img,0,0,0,0,320,240,$img_size[0],$img_size[1]); $f = $dst_img_size[1] / $src_img_size[1] < $f ? $dst_img_size[1] / $src_img_size[1] : $f;
$dst_img = imagecreatetruecolor($src_img_size[0] * $f, $src_img_size[1] * $f);
imagecopyresized($dst_img,$src_img,0,0,0,0,$src_img_size[0] * $f,$src_img_size[1] * $f,$src_img_size[0],$src_img_size[1]);
imagejpeg($dst_img,$tmp_dir.$resouce_id.'.jpg'); imagejpeg($dst_img,$tmp_dir.$resouce_id.'.jpg');
} }
else else