Changeset 13843 for trunk/admin

Timestamp:

Apr 1, 2012, 2:02:36 AM (12 years ago)

Author:

plg

Message:

feature 2604: support rotation on derivatives

Location:

trunk/admin/include

Files:

• functions_upload.inc.php (modified) (3 diffs)
• image.class.php (modified) (3 diffs)

trunk/admin/include/functions_upload.inc.php

@@ -270 +270 @@
   }
 
+  // we need to save the rotation angle in the database to compute
+  // width/height of "multisizes"
+  $rotation_angle = pwg_image::get_rotation_angle($file_path);
+  $rotation = pwg_image::get_rotation_code_from_angle($rotation_angle);
+  
   $file_infos = pwg_image_infos($file_path);
 
@@ -281 +286 @@
       'md5sum' => $md5sum,
       'added_by' => $user['id'],
+      'rotation' => $rotation,
       );
 
@@ -308 +314 @@
       'md5sum' => $md5sum,
       'added_by' => $user['id'],
+      'rotation' => $rotation,
       );
 

trunk/admin/include/image.class.php

@@ -239 +239 @@
     }
 
-    $rotation = null;
+    $rotation = 0;
 
     $exif = exif_read_data($source_filepath);
@@ -261 +261 @@
 
     return $rotation;
+  }
+
+  static function get_rotation_code_from_angle($rotation_angle)
+  {
+    switch($rotation_angle)
+    {
+      case 0:   return 0;
+      case 90:  return 1;
+      case 180: return 2;
+      case 270: return 3;
+    }
+  }
+
+  static function get_rotation_angle_from_code($rotation_code)
+  {
+    switch($rotation_code)
+    {
+      case 0: return 0;
+      case 1: return 90;
+      case 2: return 180;
+      case 3: return 270;
+    }
   }
 
@@ -424 +446 @@
   {
     $this->image->setInterlaceScheme(Imagick::INTERLACE_LINE);
-    if ($this->get_width()%2 == 0 && $this->get_height()%2 == 0
-      && $this->get_width() > 3*$width)
+    
+    // TODO need to explain this condition
+    if ($this->get_width()%2 == 0
+        && $this->get_height()%2 == 0
+        && $this->get_width() > 3*$width)
     {
       $this->image->scaleImage($this->get_width()/2, $this->get_height()/2);
     }
+
     return $this->image->resizeImage($width, $height, Imagick::FILTER_LANCZOS, 0.9);
   }