Changeset 10386 for extensions/square_thumbnails/trunk

Timestamp:

Apr 15, 2011, 4:41:51 PM (14 years ago)

Author:

patdenice

Message:

Minor bug corrected.

File:

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

extensions/square_thumbnails/trunk/functions.inc.php

@@ -259 +259 @@
   $image = new Imagick($source_filepath);
 
-  $rotation = get_rotation_angle($source_filepath);
-  
   // width/height
   $source_width  = $image->getImageWidth();
   $source_height = $image->getImageHeight();
 
-  $coord = process_ratio($source_width, $source_height, $rotation);
+  $coord = process_ratio($source_width, $source_height);
 
   $image->cropImage($source_width, $source_height, $coord['x'], $coord['y']);
   
-  $resize_dimensions = get_resize_dimensions($source_width, $source_height, $max_width, $max_height, $rotation);
+  $resize_dimensions = get_resize_dimensions($source_width, $source_height, $max_width, $max_height);
 
   // testing on height is useless in theory: if width is unchanged, there
@@ -292 +290 @@
   $image->resizeImage($resize_dimensions['width'], $resize_dimensions['height'], Imagick::FILTER_LANCZOS, 0.9);
 
-  if (isset($rotation))
-  {
-    $image->rotateImage(new ImagickPixel(), -$rotation);
-    $image->setImageOrientation(Imagick::ORIENTATION_TOPLEFT);
-  }
-
   $image->writeImage($destination_filepath);
   $image->destroy();
@@ -305 +297 @@
 }
 
-function process_ratio(&$source_width, &$source_height, $rotation=null)
+function process_ratio(&$source_width, &$source_height)
 {
   global $conf;
@@ -318 +310 @@
   $y = 0;
 
-  if (!$conf['thumbnails_ratio_orientation'] and in_array($rotation, array(90, 270)))
-    list($heightRatio, $widthRatio) = explode(':', $conf['thumbnails_ratio']);
-
-  elseif ($source_width >= $source_height or !$conf['thumbnails_ratio_orientation'])
+  if ($source_width >= $source_height or !$conf['thumbnails_ratio_orientation'])
     list($widthRatio, $heightRatio) = explode(':', $conf['thumbnails_ratio']);
 
@@ -332 +321 @@
   if($dest_ratio > $img_ratio)
   {
-    $destHeight = ceil(($source_width * $heightRatio) / $widthRatio);
-    $y = ceil(($source_height - $destHeight) / 2 );
-    $source_height = $destHeight ;
+    $destHeight = round($source_width * $heightRatio / $widthRatio);
+    $y = round(($source_height - $destHeight) / 2 );
+    $source_height = $destHeight;
   }
   elseif ($dest_ratio < $img_ratio)
   {
-    $destWidth = ceil(($source_height * $widthRatio) / $heightRatio);
-    $x = ceil(($source_width - $destWidth) / 2 );
-    $source_width = $destWidth ;
+    $destWidth = round($source_height * $widthRatio / $heightRatio);
+    $x = round(($source_width - $destWidth) / 2 );
+    $source_width = $destWidth;
   }