Changeset 9754 for extensions/square_thumbnails

Timestamp:

Mar 18, 2011, 2:55:32 PM (13 years ago)

Author:

patdenice

Message:

Create trunk and branch directories

Location:

extensions/square_thumbnails

Files:

• branch (added)
• branch/2.1 (added)
• branch/2.1/functions.inc.php (copied) (copied from extensions/square_thumbnails/functions.inc.php) (5 diffs)
• branch/2.1/index.php (copied) (copied from extensions/square_thumbnails/index.php)
• branch/2.1/language (copied) (copied from extensions/square_thumbnails/language)
• branch/2.1/main.inc.php (copied) (copied from extensions/square_thumbnails/main.inc.php)
• branch/2.1/photo_add_settings.php (copied) (copied from extensions/square_thumbnails/photo_add_settings.php)
• branch/2.1/thumbnail.php (copied) (copied from extensions/square_thumbnails/thumbnail.php)
• trunk (added)
• trunk/functions.inc.php (moved) (moved from extensions/square_thumbnails/functions.inc.php) (5 diffs)
• trunk/index.php (moved) (moved from extensions/square_thumbnails/index.php)
• trunk/language (moved) (moved from extensions/square_thumbnails/language)
• trunk/main.inc.php (moved) (moved from extensions/square_thumbnails/main.inc.php)
• trunk/photo_add_settings.php (moved) (moved from extensions/square_thumbnails/photo_add_settings.php)
• trunk/thumbnail.php (moved) (moved from extensions/square_thumbnails/thumbnail.php)

extensions/square_thumbnails/branch/2.1/functions.inc.php

@@ -152 +152 @@
   }
 
+  if (is_imagick())
+  {
+    return pwg_image_resize_im($source_filepath, $destination_filepath, $max_width, $max_height, $quality, $strip_metadata);
+  }
+  else
+  {
+    return pwg_image_resize_gd($source_filepath, $destination_filepath, $max_width, $max_height, $quality);
+  }
+}
+
+function upload_square_resize_gd($result, $source_filepath, $destination_filepath, $max_width, $max_height, $quality)
+{
   if (!function_exists('gd_info'))
   {
@@ -163 +175 @@
   if (in_array($extension, array('jpg', 'jpeg')))
   {
-    $source_image = @imagecreatefromjpeg($source_filepath);
+    $source_image = imagecreatefromjpeg($source_filepath);
   }
   else if ($extension == 'png')
   {
-    $source_image = @imagecreatefrompng($source_filepath);
+    $source_image = imagecreatefrompng($source_filepath);
   }
   else
   {
     die('unsupported file extension');
+  }
+
+  $rotation = null;
+  if (function_exists('imagerotate'))
+  {
+    $rotation = get_rotation_angle($source_filepath);
   }
   
@@ -191 +209 @@
   }
   
-  $ratio_width  = $source_width / $max_width;
-  $ratio_height = $source_height / $max_height;
-  
-  // maximal size exceeded ?
-  if ($ratio_width > 1 or $ratio_height > 1)
-  {
-    if ($ratio_width < $ratio_height)
-    { 
-      $destination_width = ceil($source_width / $ratio_height);
-      $destination_height = $max_height; 
-    }
-    else
-    { 
-      $destination_width = $max_width; 
-      $destination_height = ceil($source_height / $ratio_width);
-    }
-  }
-  else
+  $resize_dimensions = get_resize_dimensions($source_width, $source_height, $max_width, $max_height, $rotation);
+
+  // testing on height is useless in theory: if width is unchanged, there
+  // should be no resize, because width/height ratio is not modified.
+  if ($resize_dimensions['width'] == $source_width and $resize_dimensions['height'] == $source_height)
   {
     // the image doesn't need any resize! We just copy it to the destination
@@ -215 +220 @@
   }
   
-  $destination_image = imagecreatetruecolor($destination_width, $destination_height);
+  $destination_image = imagecreatetruecolor($resize_dimensions['width'], $resize_dimensions['height']);
   
   imagecopyresampled(
@@ -224 +229 @@
     $x,
     $y,
-    $destination_width,
-    $destination_height,
+    $resize_dimensions['width'],
+    $resize_dimensions['height'],
     $source_width,
     $source_height
     );
-  
-  imagejpeg($destination_image, $destination_filepath, $quality);
+
+  // rotation occurs only on resized photo to avoid useless memory use
+  if (isset($rotation))
+  {
+    $destination_image = imagerotate($destination_image, $rotation, 0);
+  }
+  
+  $extension = strtolower(get_extension($destination_filepath));
+  if ($extension == 'png')
+  {
+    imagepng($destination_image, $destination_filepath);
+  }
+  else
+  {
+    imagejpeg($destination_image, $destination_filepath, $quality);
+  }
   // freeing memory ressources
   imagedestroy($source_image);

extensions/square_thumbnails/trunk/functions.inc.php

@@ -152 +152 @@
   }
 
+  if (is_imagick())
+  {
+    return pwg_image_resize_im($source_filepath, $destination_filepath, $max_width, $max_height, $quality, $strip_metadata);
+  }
+  else
+  {
+    return pwg_image_resize_gd($source_filepath, $destination_filepath, $max_width, $max_height, $quality);
+  }
+}
+
+function upload_square_resize_gd($result, $source_filepath, $destination_filepath, $max_width, $max_height, $quality)
+{
   if (!function_exists('gd_info'))
   {
@@ -163 +175 @@
   if (in_array($extension, array('jpg', 'jpeg')))
   {
-    $source_image = @imagecreatefromjpeg($source_filepath);
+    $source_image = imagecreatefromjpeg($source_filepath);
   }
   else if ($extension == 'png')
   {
-    $source_image = @imagecreatefrompng($source_filepath);
+    $source_image = imagecreatefrompng($source_filepath);
   }
   else
   {
     die('unsupported file extension');
+  }
+
+  $rotation = null;
+  if (function_exists('imagerotate'))
+  {
+    $rotation = get_rotation_angle($source_filepath);
   }
   
@@ -191 +209 @@
   }
   
-  $ratio_width  = $source_width / $max_width;
-  $ratio_height = $source_height / $max_height;
-  
-  // maximal size exceeded ?
-  if ($ratio_width > 1 or $ratio_height > 1)
-  {
-    if ($ratio_width < $ratio_height)
-    { 
-      $destination_width = ceil($source_width / $ratio_height);
-      $destination_height = $max_height; 
-    }
-    else
-    { 
-      $destination_width = $max_width; 
-      $destination_height = ceil($source_height / $ratio_width);
-    }
-  }
-  else
+  $resize_dimensions = get_resize_dimensions($source_width, $source_height, $max_width, $max_height, $rotation);
+
+  // testing on height is useless in theory: if width is unchanged, there
+  // should be no resize, because width/height ratio is not modified.
+  if ($resize_dimensions['width'] == $source_width and $resize_dimensions['height'] == $source_height)
   {
     // the image doesn't need any resize! We just copy it to the destination
@@ -215 +220 @@
   }
   
-  $destination_image = imagecreatetruecolor($destination_width, $destination_height);
+  $destination_image = imagecreatetruecolor($resize_dimensions['width'], $resize_dimensions['height']);
   
   imagecopyresampled(
@@ -224 +229 @@
     $x,
     $y,
-    $destination_width,
-    $destination_height,
+    $resize_dimensions['width'],
+    $resize_dimensions['height'],
     $source_width,
     $source_height
     );
-  
-  imagejpeg($destination_image, $destination_filepath, $quality);
+
+  // rotation occurs only on resized photo to avoid useless memory use
+  if (isset($rotation))
+  {
+    $destination_image = imagerotate($destination_image, $rotation, 0);
+  }
+  
+  $extension = strtolower(get_extension($destination_filepath));
+  if ($extension == 'png')
+  {
+    imagepng($destination_image, $destination_filepath);
+  }
+  else
+  {
+    imagejpeg($destination_image, $destination_filepath, $quality);
+  }
   // freeing memory ressources
   imagedestroy($source_image);