Changeset 9772

Timestamp:

Mar 19, 2011, 1:46:33 PM (13 years ago)

Author:

patdenice

Message:

Take $rotation parameter into account

File:

• extensions/square_thumbnails/trunk/functions.inc.php (modified) (4 diffs)

extensions/square_thumbnails/trunk/functions.inc.php

@@ -185 +185 @@
   $source_height = imagesy($source_image);
   
-  $coord = process_ratio($source_width, $source_height);
+  $coord = process_ratio($source_width, $source_height, $rotation);
 
   $resize_dimensions = get_resize_dimensions($source_width, $source_height, $max_width, $max_height, $rotation);
@@ -253 +253 @@
   $source_height = $image->getImageHeight();
 
-  $coord = process_ratio($source_width, $source_height);
+  $coord = process_ratio($source_width, $source_height, $rotation);
 
   $image->cropImage($source_width, $source_height, $coord['x'], $coord['y']);
@@ -293 +293 @@
 }
 
-function process_ratio(&$source_width, &$source_height)
+function process_ratio(&$source_width, &$source_height, $rotation=null)
 {
   global $conf;
@@ -301 +301 @@
 
   if (!isset($conf['thumbnails_ratio_orientation']))
+    $conf['thumbnails_ratio_orientation'] = true;
+
+  if (!$conf['thumbnails_ratio_orientation'] and !$rotation)
     $conf['thumbnails_ratio_orientation'] = true;