Changeset 9770 for extensions/square_thumbnails

Timestamp:

Mar 19, 2011, 1:24:41 PM (14 years ago)

Author:

patdenice

Message:

User can define personalized ration.

Location:

extensions/square_thumbnails/trunk

Files:

• functions.inc.php (modified) (7 diffs)
• thumbnail.php (modified) (1 diff)

extensions/square_thumbnails/trunk/functions.inc.php

@@ -43 +43 @@
     $srcWidth    = imagesx( $srcImage ); 
     $srcHeight   = imagesy( $srcImage ); 
-    $x = 0;
-    $y = 0;
-
-    if($srcWidth > $srcHeight)
-    {
-      $x = ceil(($srcWidth - $srcHeight) / 2 );
-      $srcWidth = $srcHeight;
-    }
-    elseif ($srcHeight > $srcWidth)
-    {
-      $y = ceil(($srcHeight - $srcWidth) / 2);
-      $srcHeight = $srcWidth;
-    }
+
+    $coord = process_ratio($srcWidth, $srcHeight);
 
     $ratioWidth  = $srcWidth/$newWidth;
@@ -85 +74 @@
       // GD 2.0 or more recent -> good results (but slower)
       $destImage = imagecreatetruecolor( $destWidth, $destHeight); 
-      imagecopyresampled( $destImage, $srcImage, 0, 0, $x, $y,
+      imagecopyresampled( $destImage, $srcImage, 0, 0, $coord['x'], $coord['y'],
                           $destWidth,$destHeight,$srcWidth,$srcHeight );
     }
@@ -92 +81 @@
       // GD prior to version  2 -> pretty bad results :-/ (but fast)
       $destImage = imagecreate( $destWidth, $destHeight);
-      imagecopyresized( $destImage, $srcImage, 0, 0, $x, $y,
+      imagecopyresized( $destImage, $srcImage, 0, 0, $coord['x'], $coord['y'],
                         $destWidth,$destHeight,$srcWidth,$srcHeight );
     }
@@ -195 +184 @@
   $source_width  = imagesx($source_image); 
   $source_height = imagesy($source_image);
-  $x = 0;
-  $y = 0;
-
-  if($source_width > $source_height)
-  {
-    $x = ceil(($source_width - $source_height) / 2 );
-    $source_width = $source_height;
-  }
-  elseif ($source_height > $source_width)
-  {
-    $y = ceil(($source_height - $source_width) / 2);
-    $source_height = $source_width;
-  }
-  
+  
+  $coord = process_ratio($source_width, $source_height);
+
   $resize_dimensions = get_resize_dimensions($source_width, $source_height, $max_width, $max_height, $rotation);
 
@@ -227 +205 @@
     0,
     0,
-    $x,
-    $y,
+    $coord['x'],
+    $coord['y'],
     $resize_dimensions['width'],
     $resize_dimensions['height'],
@@ -275 +253 @@
   $source_height = $image->getImageHeight();
 
-  // Crop image -> square
-  $x = 0;
-  $y = 0;
-  if($source_width > $source_height)
-  {
-    $x = ceil(($source_width - $source_height) / 2 );
-    $source_width = $source_height;
-  }
-  elseif ($source_height > $source_width)
-  {
-    $y = ceil(($source_height - $source_width) / 2);
-    $source_height = $source_width;
-  }
-  $image->cropImage($source_width, $source_height, $x, $y);
+  $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);
@@ -326 +293 @@
 }
 
+function process_ratio(&$source_width, &$source_height)
+{
+  global $conf;
+
+  if (!isset($conf['thumbnails_ratio']) or !preg_match('/^\d+:\d+$/', $conf['thumbnails_ratio']))
+  {
+    $conf['thumbnails_ratio'] = '1:1';
+  }
+
+  $x = 0;
+  $y = 0;
+
+  if ($source_width >= $source_height)
+    list($widthRatio, $heightRatio) = explode(':', $conf['thumbnails_ratio']);
+  else
+    list($heightRatio, $widthRatio) = explode(':', $conf['thumbnails_ratio']);
+
+  $img_ratio = $source_width / $source_height;
+  $dest_ratio = $widthRatio / $heightRatio;
+
+  if($dest_ratio > $img_ratio)
+  {
+    $destHeight = ceil(($source_width * $heightRatio) / $widthRatio);
+    $y = ceil(($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 ;
+  }
+
+  return array('x' => $x, 'y' => $y);
+}
+
 add_event_handler('thumbnail_resize', 'thumbnail_square_resize', 40, 5);
 add_event_handler('upload_thumbnail_resize', 'upload_square_resize', 40, 7);

extensions/square_thumbnails/trunk/thumbnail.php

@@ -46 +46 @@
 
       <li>
-        <span class="property">{\'Square Thumbnails\'|@translate}</span>
+        <span class="property"><label for="square">{\'Square Thumbnails\'|@translate}</label></span>
              <label><input type="checkbox" name="square" id="square" {if $params.SQUARE}checked="checked"{/if}></label>
       </li>