Changeset 9953

Timestamp:

Mar 31, 2011, 5:30:43 PM (13 years ago)

Author:

patdenice

Message:

Accept gif format (only GD)

File:

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

extensions/square_thumbnails/trunk/functions.inc.php

@@ -141 +141 @@
   }
 
-  if (is_imagick())
+  $extension = strtolower(get_extension($source_filepath));
+
+  if (is_imagick() and $extension != 'gif')
   {
     return upload_square_resize_im($source_filepath, $destination_filepath, $max_width, $max_height, $quality, $strip_metadata);
@@ -157 +159 @@
     return false;
   }
+
+  $gd_info = gd_info();
 
   // extension of the picture filename
@@ -170 +174 @@
     $source_image = @imagecreatefrompng($source_filepath);
   }
-  else
-  {
-    die('unsupported file extension');
+  elseif ($extension == 'gif' and $gd_info['GIF Read Support'] and $gd_info['GIF Create Support'])
+  {
+    $source_image = @imagecreatefromgif($source_filepath);
+  }
+  else
+  {
+    die('[GD] unsupported file extension');
   }
 
@@ -224 +232 @@
     imagepng($destination_image, $destination_filepath);
   }
+  elseif ($extension == 'gif')
+  {
+    imagegif($destination_image, $destination_filepath);
+  }
   else
   {
@@ -303 +315 @@
     $conf['thumbnails_ratio_orientation'] = true;
 
-  if (!$conf['thumbnails_ratio_orientation'] and $rotation)
-    $conf['thumbnails_ratio_orientation'] = true;
-
   $x = 0;
   $y = 0;
 
-  if ($source_width >= $source_height or !$conf['thumbnails_ratio_orientation'])
+  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'])
     list($widthRatio, $heightRatio) = explode(':', $conf['thumbnails_ratio']);
+
   else
     list($heightRatio, $widthRatio) = explode(':', $conf['thumbnails_ratio']);