first auto-rotation of images based on exif-Orientation tag

git-svn-id: file:///var/lib/svn/phpfspot/trunk@85 fa6a889d-dae6-447d-9e79-4ba9a3039384

diff --git a/phpfspot.class.php b/phpfspot.class.php
index c954a3ac95f35625531dc8f3fdc3435610195bf3..42d3075a2d665bd22bbc8b40e09c6ad505496548 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -121,7 +121,7 @@ class PHPFSPOT {
       $details = $this->get_photo_details($photo);
       $meta = $this->get_meta_informations($this->translate_path($details['directory_path']) ."/". $details['name']);
       $info = getimagesize($this->translate_path($details['directory_path']) ."/thumbs/". $this->cfg->photo_width ."_". $details['name']);
       $details = $this->get_photo_details($photo);
       $meta = $this->get_meta_informations($this->translate_path($details['directory_path']) ."/". $details['name']);
       $info = getimagesize($this->translate_path($details['directory_path']) ."/thumbs/". $this->cfg->photo_width ."_". $details['name']);

-
+   

       $this->tmpl->assign('width', $info[0]);
       $this->tmpl->assign('height', $info[1]);
       $this->tmpl->assign('c_date', $meta['DateTime']);
       $this->tmpl->assign('width', $info[0]);
       $this->tmpl->assign('height', $info[1]);
       $this->tmpl->assign('c_date', $meta['DateTime']);


@@ -362,6 +362,54 @@ class PHPFSPOT {
       if(file_exists(dirname($image) ."/thumbs/". $width ."_". basename($image)))
          return;
 
       if(file_exists(dirname($image) ."/thumbs/". $width ."_". basename($image)))
          return;
 

+      $meta = $this->get_meta_informations($image);
+
+      $rotate = 0;
+      $flip = false;
+
+      switch($meta['Orientation']) {
+
+         case 1:
+            $rotate = 0;
+            $flip = false;
+            break;
+
+         case 2:
+            $rotate = 0;
+            $flip = true;
+            break;
+
+         case 3:
+            $rotate = 180;
+            $flip = false;
+            break;
+
+         case 4:
+            $rotate = 180;
+            $flip = true;
+            break;
+
+         case 5:
+            $rotate = 90;
+            $flip = true;
+            break;
+
+         case 6:
+            $rotate = 90;
+            $flip = false;
+            break;
+
+         case 7:
+            $rotate = 270;
+            $flip = true;
+            break;
+
+         case 8:
+            $rotate = 270;
+            $flip = false;
+            break;
+      }
+

       $src_img = @imagecreatefromjpeg($image);
 
       if($src_img)
       $src_img = @imagecreatefromjpeg($image);
 
       if($src_img)


@@ -393,6 +441,20 @@ class PHPFSPOT {
          /* copies resized portion of original image into new image */
          imagecopyresampled($dst_img,$src_img,0,0,0,0,$new_w,$new_h,imagesx($src_img),imagesy($src_img));
 
          /* copies resized portion of original image into new image */
          imagecopyresampled($dst_img,$src_img,0,0,0,0,$new_w,$new_h,imagesx($src_img),imagesy($src_img));
 

+         /* needs the image to be flipped horizontal? */
+         if($flip) {
+            print "(FLIP)";
+            $image = $dst_img;
+            for($x = 0; $x < $new_w; $x++) {
+               imagecopy($dst_img, $image, $x, 0, $w - $x - 1, 0, 1, $h);
+            }
+         }
+
+         if($rotate) {
+            print "(ROTATE)";
+            $dst_img = $this->rotateImage($dst_img, $rotate);
+         }
+

          /* write down new generated file */
 
          if(!file_exists(dirname($image) ."/thumbs"))
          /* write down new generated file */
 
          if(!file_exists(dirname($image) ."/thumbs"))


@@ -410,7 +472,6 @@ class PHPFSPOT {
 
    public function get_meta_informations($file)
    {
 
    public function get_meta_informations($file)
    {

-

       return exif_read_data($file);
 
    } // get_meta_informations()
       return exif_read_data($file);
 
    } // get_meta_informations()


@@ -511,6 +572,76 @@ class PHPFSPOT {
 
    } // startSearch()
 
 
    } // startSearch()
 

+   private function rotateImage($img, $degrees)
+   {
+      if(function_exists("imagerotate"))
+         $img = imagerotate($img, $degrees, 0);
+      else
+      {
+         function imagerotate($src_img, $angle)
+         {
+            $src_x = imagesx($src_img);
+            $src_y = imagesy($src_img);
+            if ($angle == 180) {
+               $dest_x = $src_x;
+               $dest_y = $src_y;
+            }
+            elseif ($src_x <= $src_y) {
+               $dest_x = $src_y;
+               $dest_y = $src_x;
+            }
+            elseif ($src_x >= $src_y) {
+               $dest_x = $src_y;
+               $dest_y = $src_x;
+            }
+               
+            $rotate=imagecreatetruecolor($dest_x,$dest_y);
+            imagealphablending($rotate, false);
+               
+            switch ($angle) {
+            
+               case 90:
+                  for ($y = 0; $y < ($src_y); $y++) {
+                     for ($x = 0; $x < ($src_x); $x++) {
+                        $color = imagecolorat($src_img, $x, $y);
+                        imagesetpixel($rotate, $dest_x - $y - 1, $x, $color);
+                     }
+                  }
+                  break;
+
+               case 270:
+                  for ($y = 0; $y < ($src_y); $y++) {
+                     for ($x = 0; $x < ($src_x); $x++) {
+                        $color = imagecolorat($src_img, $x, $y);
+                        imagesetpixel($rotate, $y, $dest_y - $x - 1, $color);
+                     }
+                  }
+                  break;
+
+               case 180:
+                  for ($y = 0; $y < ($src_y); $y++) {
+                     for ($x = 0; $x < ($src_x); $x++) {
+                        $color = imagecolorat($src_img, $x, $y);
+                        imagesetpixel($rotate, $dest_x - $x - 1, $dest_y - $y - 1, $color);
+                     }
+                  }
+                  break;
+
+               default: $rotate = $src_img;
+            };
+
+            return $rotate;
+
+         }
+
+         $img = imagerotate($img, $degrees);
+
+      }
+
+      return $img;
+
+   } // rotateImage()
+

 }
 
 ?>
 }
 
 ?>