Changeset 695131

Timestamp:

04/10/2013 09:56:47 AM (13 years ago)

Author:

macbrink

Message:

Rotate and resize images based on exif information.

Location:

eazyest-gallery/trunk

Files:

• eazyest-gallery.php (modified) (1 diff)
• includes/class-eazyest-folderbase.php (modified) (3 diffs)
• includes/class-eazyest-image-editor.php (modified) (4 diffs)

eazyest-gallery/trunk/eazyest-gallery.php

@@ -9 +9 @@
  * Author: Brimosoft
  * Author URI: http://brimosoft.nl
- * Version: 0.2.0-alpha-321
+ * Version: 0.2.0-alpha-322
  * Text Domain: eazyest-gallery
  * Domain Path: /languages/
  * License: GNU General Public License, version 3
  *
- * @version 0.2.0 (r321)  
+ * @version 0.2.0 (r322)  
  * @package Eazyest Gallery
  * @subpackage Main

eazyest-gallery/trunk/includes/class-eazyest-folderbase.php

@@ -9 +9 @@
  * @copyright 2012-2013 Brimosoft
  * @since @since 0.1.0 (r2)
- * @version 0.1.0 (r308)
+ * @version 0.2.0 (r322)
  * @access public
  */
@@ -1852 +1852 @@
     function sizes_metadata( $metadata, $attachment_id ) {
         if ( ! $this->is_gallery_image( $attachment_id ) )
-            return $metadata;   
-        
-        
+            return $metadata;
+                
         $file = get_post_meta( $attachment_id, '_wp_attached_file', true );
         if ( false !== strpos( $file, eazyest_gallery()->root() ) )
@@ -1862 +1861 @@
             $metadata['file'] = $file;
     
+    $orientation = 0;
+        if ( function_exists( 'exif_read_data' ) ) {
+            if ( ! isset( $metadata['eazyest_exif'] ) ) {
+                if ( $exif = exif_read_data( eazyest_gallery()->root() . $file ) ) {
+                    $orientation = isset ( $exif['Orientation'] ) ? $exif['Orientation'] : 0;
+                    if ( $orientation && apply_filters( 'eazyest_gallery_rotate_original', true ) ) {
+                        $image = wp_get_image_editor( eazyest_gallery()->root() . $file );
+                        $image->save( eazyest_gallery()->root() . $file ); 
+                    }
+                }
+            }
+        }
+        
+        if ( in_array( $orientation, array( 6, 8) ) ) {
+            $width = $metadata['width'];
+            $metadata['width']  = $metadata['height'];
+            $metadata['height'] = $width; 
+        }
+    
     if ( isset( $metadata['sizes'] ) ) {
         foreach( $metadata['sizes'] as $key => $size ) {
             $metadata['sizes'][$key]['file'] = '_cache/' . basename( $metadata['sizes'][$key]['file'] );
+            if ( in_array( $orientation, array( 6, 8) ) ) {
+                    $width = $metadata['sizes'][$key]['width'];
+                    $metadata['sizes'][$key]['width']  = $metadata['sizes'][$key]['height'];
+                    $metadata['sizes'][$key]['height'] = $width; 
+                }
         }
     }
+    $metadata['eazyest_exif'] = 1;
         return $metadata;           
     }

eazyest-gallery/trunk/includes/class-eazyest-image-editor.php

@@ -14 +14 @@
  * 
  * @since 0.1.0 (r36)
- * @version 0.1.0 (r277)
+ * @version 0.2.0 (r322)
  * @package Eazyest Gallery
  * @subpackage Image Editor
@@ -20 +20 @@
  */
 class Eazyest_Image_Editor extends _Eazyest_Image_Editor {
+    
+        
+    /**
+     * Eazyest_Image_Editor::load()
+     * Apply exif orientation after image loaded in memory.
+     * 
+     * @since 0.2.0 (r322)
+     * @access public
+     * @return bool
+     */
+    public function load() {
+        if ( $this->image )
+         return true;   
+        if( $load = parent::load() ) {
+            if ( ( false === strpos( $this->file, eazyest_gallery()->address() ) ) && ( false === strpos( $this->file, eazyest_gallery()->root() ) ) )
+                return true;
+            $this->exif_orientation();
+            return true;     
+        }
+        return $load;
+    }
 
     /**
@@ -48 +69 @@
             
         return trailingslashit( $dest_path ) . $name;   
+    }
+    
+    /**
+     * Eazyest_Image_Editor::exif_orientation()
+     * Re-orient resized images based on exif orientation in source file.
+     * 
+     * @since 0.2.0 (r322)
+     * @access protected
+     * @return void
+     */
+    protected function exif_orientation() {
+        if ( apply_filters( 'eazyest_gallery_skip_exif_orientation', false ) )
+            return;
+        
+        if ( ! function_exists( 'exif_read_data' ) )
+            return;
+            
+        if ( $exif = exif_read_data( $this->file ) ) {
+            $orientation = isset ( $exif['Orientation'] ) ? $exif['Orientation'] : false;
+            if ( $orientation ) {
+                switch( $orientation ) {
+                    case 3: // 180 rotate left              
+                        $this->rotate( 180 );               
+                        break;              
+                    case 6: // 90 rotate right              
+                        $this->rotate( -90 );               
+                        break;              
+                    case 8: // 90 rotate left               
+                        $this->rotate( 90 );                
+                        break;              
+                }   
+            }
+        }   
     }
     
@@ -83 +137 @@
                                 
             $filename = $dirname . '/' . basename( $filename );
-        }               
+        }           
         return parent::save( $filename, $mime_type );       
     }