Adding Autorotate

Former-commit-id: d32cd0082a0ef28e721b37eadb650dfb55776694

src/ImageProcessor.Web/NET45/Config/Resources/processing.config

@@ -3,6 +3,7 @@
   </presets>
   <plugins autoLoadPlugins="true">
     <plugin name="Alpha" type="ImageProcessor.Processors.Alpha, ImageProcessor"/>
+    <plugin name="AutoRotate" type="ImageProcessor.Processors.AutoRotate, ImageProcessor"/>
     <plugin name="Brightness" type="ImageProcessor.Processors.Brightness, ImageProcessor"/>
     <plugin name="Contrast" type="ImageProcessor.Processors.Contrast, ImageProcessor"/>
     <plugin name="Crop" type="ImageProcessor.Processors.Crop, ImageProcessor"/>

src/ImageProcessor/ImageFactory.cs

@@ -182,12 +182,10 @@ namespace ImageProcessor
             this.backupImageFormat = this.ImageFormat;
             this.isIndexed = ImageUtils.IsIndexed(this.Image);
 
-            if (this.PreserveExifData)
+            // Always load the data.
+            foreach (PropertyItem propertyItem in this.Image.PropertyItems)
             {
-                foreach (PropertyItem propertyItem in this.Image.PropertyItems)
-                {
-                    this.ExifPropertyItems[propertyItem.Id] = propertyItem;
-                }
+                this.ExifPropertyItems[propertyItem.Id] = propertyItem;
             }
 
             this.ShouldProcess = true;
@@ -244,12 +242,10 @@ namespace ImageProcessor
                     this.ImageFormat = imageFormat;
                     this.isIndexed = ImageUtils.IsIndexed(this.Image);
 
-                    if (this.PreserveExifData)
+                    // Always load the data.
+                    foreach (PropertyItem propertyItem in this.Image.PropertyItems)
                     {
-                        foreach (PropertyItem propertyItem in this.Image.PropertyItems)
-                        {
-                            this.ExifPropertyItems[propertyItem.Id] = propertyItem;
-                        }
+                        this.ExifPropertyItems[propertyItem.Id] = propertyItem;
                     }
 
                     this.ShouldProcess = true;
@@ -347,6 +343,24 @@ namespace ImageProcessor
             return this;
         }
 
+        /// <summary>
+        /// Performs auto-rotation to ensure that EXIF defined rotation is reflected in 
+        /// the final image.
+        /// </summary>
+        /// <returns>
+        /// The current instance of the <see cref="T:ImageProcessor.ImageFactory"/> class.
+        /// </returns>
+        public ImageFactory AutoRotate()
+        {
+            if (this.ShouldProcess)
+            {
+                AutoRotate autoRotate = new AutoRotate();
+                this.ApplyProcessor(autoRotate.ProcessImage);
+            }
+
+            return this;
+        }
+
         /// <summary>
         /// Changes the brightness of the current image.
         /// </summary>
@@ -868,6 +882,25 @@ namespace ImageProcessor
                 // Fix the colour palette of indexed images.
                 this.FixIndexedPallete();
 
+                // Set the property item information from any Exif metadata.
+                // We do this here so that they can be changed between processor methods.
+                if (this.PreserveExifData)
+                {
+                    foreach (KeyValuePair<int, PropertyItem> propertItem in this.ExifPropertyItems)
+                    {
+                        try
+                        {
+                            this.Image.SetPropertyItem(propertItem.Value);
+                        }
+                        // ReSharper disable once EmptyGeneralCatchClause
+                        catch
+                        {
+                            // Do nothing. The image format does not handle EXIF data.
+                            // TODO: empty catch is fierce code smell.
+                        }
+                    }
+                }
+
                 // ReSharper disable once AssignNullToNotNullAttribute
                 DirectoryInfo directoryInfo = new DirectoryInfo(Path.GetDirectoryName(filePath));
 
@@ -944,6 +977,25 @@ namespace ImageProcessor
                 // Fix the colour palette of gif and png8 images.
                 this.FixIndexedPallete();
 
+                // Set the property item information from any Exif metadata.
+                // We do this here so that they can be changed between processor methods.
+                if (this.PreserveExifData)
+                {
+                    foreach (KeyValuePair<int, PropertyItem> propertItem in this.ExifPropertyItems)
+                    {
+                        try
+                        {
+                            this.Image.SetPropertyItem(propertItem.Value);
+                        }
+                        // ReSharper disable once EmptyGeneralCatchClause
+                        catch
+                        {
+                            // Do nothing. The image format does not handle EXIF data.
+                            // TODO: empty catch is fierce code smell.
+                        }
+                    }
+                }
+
                 if (this.ImageFormat.Equals(ImageFormat.Jpeg))
                 {
                     // Jpegs can be saved with different settings to include a quality setting for the JPEG compression.
@@ -1074,25 +1126,6 @@ namespace ImageProcessor
             {
                 this.Image = processor.Invoke(this);
             }
-
-            // Set the property item information from any Exif metadata.
-            // We do this here so that they can be changed between processor methods.
-            if (this.PreserveExifData)
-            {
-                foreach (KeyValuePair<int, PropertyItem> propertItem in this.ExifPropertyItems)
-                {
-                    try
-                    {
-                        this.Image.SetPropertyItem(propertItem.Value);
-                    }
-                    // ReSharper disable once EmptyGeneralCatchClause
-                    catch
-                    {
-                        // Do nothing. The image format does not handle EXIF data.
-                        // TODO: empty catch is fierce code smell.
-                    }
-                }
-            }
         }
         #endregion
     }

src/ImageProcessor/ImageProcessor.csproj

@@ -100,6 +100,7 @@
     <Compile Include="Imaging\TextLayer.cs" />
     <Compile Include="Imaging\OctreeQuantizer.cs" />
     <Compile Include="Processors\Alpha.cs" />
+    <Compile Include="Processors\AutoRotate.cs" />
     <Compile Include="Processors\GaussianBlur.cs" />
     <Compile Include="Processors\Brightness.cs" />
     <Compile Include="Processors\Contrast.cs" />

src/ImageProcessor/Processors/AutoRotate.cs

@@ -0,0 +1,158 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AutoRotate.cs" company="James South">
+//   Copyright (c) James South.
+//   Licensed under the Apache License, Version 2.0.
+// </copyright>
+// <summary>
+//   Performs auto-rotation to ensure that EXIF defined rotation is reflected in
+//   the final image.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace ImageProcessor.Processors
+{
+    using System.Collections.Generic;
+    using System.Drawing;
+    using System.Text.RegularExpressions;
+    using ImageProcessor.Imaging;
+
+    /// <summary>
+    /// Performs auto-rotation to ensure that EXIF defined rotation is reflected in 
+    /// the final image.
+    /// </summary>
+    public class AutoRotate : IGraphicsProcessor
+    {
+        /// <summary>
+        /// The regular expression to search strings for.
+        /// </summary>
+        private static readonly Regex QueryRegex = new Regex(@"autorotate=true", RegexOptions.Compiled);
+
+        /// <summary>
+        /// Gets the regular expression to search strings for.
+        /// </summary>
+        public Regex RegexPattern
+        {
+            get
+            {
+                return QueryRegex;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets DynamicParameter.
+        /// </summary>
+        public dynamic DynamicParameter
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets the order in which this processor is to be used in a chain.
+        /// </summary>
+        public int SortOrder
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets or sets any additional settings required by the processor.
+        /// </summary>
+        public Dictionary<string, string> Settings
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The position in the original string where the first character of the captured substring was found.
+        /// </summary>
+        /// <param name="queryString">
+        /// The query string to search.
+        /// </param>
+        /// <returns>
+        /// The zero-based starting position in the original string where the captured substring was found.
+        /// </returns>
+        public int MatchRegexIndex(string queryString)
+        {
+            int index = 0;
+
+            // Set the sort order to max to allow filtering.
+            this.SortOrder = int.MaxValue;
+
+            foreach (Match match in this.RegexPattern.Matches(queryString))
+            {
+                if (match.Success)
+                {
+                    if (index == 0)
+                    {
+                        // Set the index on the first instance only.
+                        this.SortOrder = match.Index;
+                    }
+
+                    index += 1;
+                }
+            }
+
+            return this.SortOrder;
+        }
+
+        /// <summary>
+        /// Processes the image.
+        /// </summary>
+        /// <param name="factory">The the current instance of the 
+        /// <see cref="T:ImageProcessor.ImageFactory" /> class containing
+        /// the image to process.</param>
+        /// <returns>
+        /// The processed image from the current instance of the <see cref="T:ImageProcessor.ImageFactory" /> class.
+        /// </returns>
+        public Image ProcessImage(ImageFactory factory)
+        {
+            Bitmap newImage = null;
+            Image image = factory.Image;
+
+            try
+            {
+                const int Orientation = (int)ExifPropertyTag.Orientation;
+                if (!factory.PreserveExifData && factory.ExifPropertyItems.ContainsKey(Orientation))
+                {
+                    newImage = new Bitmap(image);
+
+                    int rotationValue = factory.ExifPropertyItems[Orientation].Value[0];
+                    switch (rotationValue)
+                    {
+                        case 1: // Landscape, do nothing
+                            break;
+
+                        case 8: // Rotated 90 right
+                            // De-rotate:
+                            newImage.RotateFlip(RotateFlipType.Rotate270FlipNone);
+                            break;
+
+                        case 3: // Bottoms up
+                            newImage.RotateFlip(RotateFlipType.Rotate180FlipNone);
+                            break;
+
+                        case 6: // Rotated 90 left
+                            newImage.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                            break;
+                    }
+
+                    // Reassign the image.
+                    image.Dispose();
+                    image = newImage;
+                }
+            }
+            catch
+            {
+                if (newImage != null)
+                {
+                    newImage.Dispose();
+                }
+            }
+
+            return image;
+        }
+    }
+}

src/Images/rotate.jpg.REMOVED.git-id

@@ -0,0 +1 @@
+406a6a7916628c0c0bea8243565a7162ebd5a505