Changeset 13843 for trunk/i.php

Timestamp:

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

Author:

plg

Message:

feature 2604: support rotation on derivatives

File:

• trunk/i.php (modified) (5 diffs)

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'] );