Changeset 2329

Timestamp:

10/04/10 18:51:51 (3 years ago)

Author:

tboutell

Message:

Fixed #626 (don't play with EXIF if the file is not a JPEG)

Location:

plugins/apostrophePlugin/trunk/lib/toolkit

Files:

• BaseaTools.class.php (modified) (1 diff)
• aImageConverter.class.php (modified) (8 diffs)

plugins/apostrophePlugin/trunk/lib/toolkit/BaseaTools.class.php

@@ -644 +644 @@
   static public function getRealUrl()
   {
-    if(isset(aTools::$realUrl))
+    if (isset(aTools::$realUrl))
     {
       return aTools::$realUrl;

plugins/apostrophePlugin/trunk/lib/toolkit/aImageConverter.class.php

@@ -122 +122 @@
   static private function scaleBody($fileIn, $fileOut, $scaleParameters = array(), $cropParameters = array(), $quality = 75) 
   {    
-    error_log("ENTERING scaleBody");
     if (sfConfig::get('app_aimageconverter_netpbm', true))
     {
@@ -132 +131 @@
       if (sfConfig::get('app_aimageconverter_netpbm', true) === 'always')
       {
-        error_log("Calling scaleNetpbm");
         return self::scaleNetpbm($fileIn, $fileOut, $scaleParameters, $cropParameters, $quality);
       }
@@ -139 +137 @@
       if (($info !== false) && (($info[0] <= 1024) && ($info[1] <= 768)) && function_exists('imagetypes') && isset($mapTypes[$info[2]]) && (imagetypes() & $mapTypes[$info[2]]))
       {
-        error_log("FALLBACK");
         return self::scaleGd($fileIn, $fileOut, $scaleParameters, $cropParameters, $quality);
       }
@@ -150 +147 @@
     else
     {
-      error_log("GD");
       return self::scaleGd($fileIn, $fileOut, $scaleParameters, $cropParameters, $quality);
     }
@@ -165 +161 @@
   // case 8:    // 90 rotate left
 
-  static public function getRotation($file)
-  {
+  static public function getRotation($file, $getimagesize = null)
+  {
+    if (is_null($getimagesize))
+    {
+      $getimagesize = getimagesize($file);
+    }
+    if ($getimagesize[2] !== IMAGETYPE_JPEG)
+    {
+      return 1;
+    }
     if (!extension_loaded("exif"))
     {
@@ -263 +267 @@
     $rotate = '';
     
-    $rotation = aImageConverter::getRotation($fileIn);
+    $rotation = aImageConverter::getRotation($fileIn, $info);
     switch ($rotation)
     {
@@ -361 +365 @@
       $width = $imageInfo[0];
       $height = $imageInfo[1];
-      $orientation = aImageConverter::getRotation($fileIn);
+      $orientation = aImageConverter::getRotation($fileIn, $imageInfo);
       if ($imageInfo[2] === IMAGETYPE_JPEG)
       {
@@ -728 +732 @@
       {
         // Some EXIF orientations swap width and height
-        switch (aImageConverter::getRotation($file))
+        switch (aImageConverter::getRotation($file, $data))
         {
           case 5: // vertical flip + 90 rotate right