Changeset 12750 for branches/2.3/include/ws_functions.inc.php

Timestamp:

Dec 16, 2011, 6:02:16 PM (12 years ago)

Author:

patdenice

Message:

merge r12749 from trunk to branch 2.3
bug:2535
Image is not cropped and ressized if requested size is bigger than image size.

File:

• branches/2.3/include/ws_functions.inc.php (modified) (2 diffs)

branches/2.3/include/ws_functions.inc.php

@@ -3251 +3251 @@
   $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,
@@ -3258 +3263 @@
     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']
   );