adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 09:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r12749 from trunk to branch 2.3

Browse Source 
bug:2535
Image is not cropped and ressized if requested size is bigger than image size.

git-svn-id: http://piwigo.org/svn/branches/2.3@12750 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2011-12-16 17:02:16 +00:00
parent 2372b25a1c
commit 39410697f5
2 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ws_functions.inc.php
+7 -2
View File
@@ -3250,6 +3250,11 @@ SELECT id, path, tn_ext, has_high
prepare_directory(dirname($thumb_path));
$img = new pwg_image($image_path, $params['library']);
if (!is_bool($params['crop']))
$params['crop'] = get_boolean($params['crop']);
if (!is_bool($params['follow_orientation']))
$params['follow_orientation'] = get_boolean($params['follow_orientation']);
$result = $img->pwg_resize(
$thumb_path,
$params['maxwidth'],
@@ -3257,8 +3262,8 @@ SELECT id, path, tn_ext, has_high
$params['quality'],
false, // automatic rotation is not needed for thumbnails.
true, // strip metadata
get_boolean($params['crop']),
get_boolean($params['follow_orientation'])
$params['crop'],
$params['follow_orientation']
);
$img->destroy();