Changeset 13843 for trunk/include

Timestamp:

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

Author:

plg

Message:

feature 2604: support rotation on derivatives

Location:

trunk/include

Files:

• dblayer/functions_mysql.inc.php (modified) (1 diff)
• derivative.inc.php (modified) (1 diff)

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