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

fixed images allways get resized, because mb_substring returned 3 bytes, using cut_bytes now

Browse Source
This commit is contained in:
Ralf Becker 2012-01-30 19:48:24 +00:00
parent 3db7b2f5c2
commit 4450c87ff1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -955,8 +955,9 @@ class addressbook_bo extends addressbook_so
//error_log(__METHOD__."() got image $src_w * $src_h, is_jpeg=".array2string(substr($photo,0,2) === "\377\330")); //error_log(__METHOD__."() got image $src_w * $src_h, is_jpeg=".array2string(substr($photo,0,2) === "\377\330"));
// if $photo is to width or not a jpeg image --> resize it // if $photo is to width or not a jpeg image --> resize it
if ($src_w > $dst_w || substr($photo,0,2) !== "\377\330") if ($src_w > $dst_w || cut_bytes($photo,0,2) !== "\377\330")
{ {
//error_log(__METHOD__."(,dst_w=$dst_w) src_w=$src_w, cut_bytes(photo,0,2)=".array2string(cut_bytes($photo,0,2)).' --> resizing');
// scale the image to a width of 60 and a height according to the proportion of the source image // scale the image to a width of 60 and a height according to the proportion of the source image
$resized = imagecreatetruecolor($dst_w,$dst_h = round($src_h * $dst_w / $src_w)); $resized = imagecreatetruecolor($dst_w,$dst_h = round($src_h * $dst_w / $src_w));
imagecopyresized($resized,$image,0,0,0,0,$dst_w,$dst_h,$src_w,$src_h); imagecopyresized($resized,$image,0,0,0,0,$dst_w,$dst_h,$src_w,$src_h);
@ -969,6 +970,8 @@ class addressbook_bo extends addressbook_so
imagedestroy($resized); imagedestroy($resized);
//error_log(__METHOD__."() resized image $src_w*$src_h to $dst_w*$dst_h"); //error_log(__METHOD__."() resized image $src_w*$src_h to $dst_w*$dst_h");
} }
//else error_log(__METHOD__."(,dst_w=$dst_w) src_w=$src_w, cut_bytes(photo,0,2)=".array2string(cut_bytes($photo,0,2)).' --> NOT resizing');
imagedestroy($image); imagedestroy($image);
return $photo; return $photo;