Changeset 13843

Timestamp:

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

Author:

plg

Message:

feature 2604: support rotation on derivatives

Location:

trunk

Files:

• admin/include/functions_upload.inc.php (modified) (3 diffs)
• admin/include/image.class.php (modified) (3 diffs)
• i.php (modified) (5 diffs)
• include/dblayer/functions_mysql.inc.php (modified) (1 diff)
• include/derivative.inc.php (modified) (1 diff)
• install/db/120-database.php (added)

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);
   }

trunk/i.php

@@ -445 +445 @@
   try
   {
-    $query = 'SELECT coi, width, height FROM '.$prefixeTable.'images WHERE path=\''.$page['src_location'].'\'';
+    $query = '
+SELECT
+    id,
+    coi,
+    width,
+    height,
+    rotation
+  FROM '.$prefixeTable.'images
+  WHERE path=\''.$page['src_location'].'\'
+;';
+    
     if ( ($row=pwg_db_fetch_assoc(pwg_query($query))) )
     {
@@ -453 +463 @@
       }
       $page['coi'] = $row['coi'];
+
+      include_once(PHPWG_ROOT_PATH . 'admin/include/image.class.php');
+
+      if (empty($row['rotation']))
+      {
+        $page['rotation_angle'] = pwg_image::get_rotation_angle($page['src_path']);
+        
+        single_update(
+          $prefixeTable.'images',
+          array('rotation' => pwg_image::get_rotation_code_from_angle($page['rotation_angle'])),
+          array('id' => $row['id'])
+          );
+      }
+      else
+      {
+        $page['rotation_angle'] = pwg_image::get_rotation_angle_from_code($row['rotation']);
+      }
+
     }
     if (!$row)
@@ -472 +500 @@
   ierror("dir create error", 500);
 }
-
-include_once(PHPWG_ROOT_PATH . 'admin/include/image.class.php');
 
 ignore_user_abort(true);
@@ -483 +509 @@
 $changes = 0;
 
-// todo rotate
+// rotate
+if (0 != $page['rotation_angle'])
+{
+  $image->rotate($page['rotation_angle']);
+}
 
 // Crop & scale
@@ -555 +585 @@
   $image->strip();
 }
+
 $image->set_compression_quality( $params->quality );
 $image->write( $page['derivative_path'] );

trunk/include/dblayer/functions_mysql.inc.php

@@ -371 +371 @@
     $separator = $is_first ? '' : ",\n    ";
 
-    if (isset($value) and $value != '')
+    if (isset($value) and $value !== '')
     {
       $query.= $separator.$key.' = \''.$value.'\'';

trunk/include/derivative.inc.php

@@ -56 +56 @@
     if (!$this->size && isset($infos['width']) && isset($infos['height']))
     {
-      $this->size = array($infos['width'], $infos['height']);
+      $width = $infos['width'];
+      $height = $infos['height'];
+
+      // 1 or 5 =>  90 clockwise
+      // 3 or 7 => 270 clockwise
+      if ($infos['rotation'] % 2 != 0)
+      {
+        $width = $infos['height'];
+        $height = $infos['width'];
+      }
+      
+      $this->size = array($width, $height);
     }
   }