Merge pull request #11 from LazZiya/vNext

V next

LazZiya.ImageResize/Animated/AnimatedImage.cs

@@ -178,7 +178,6 @@ public static AnimatedImage FromHBitmap(IntPtr hbitmap, IntPtr hpalatte)
         /// Save animated gif
         /// </summary>
         /// <param name="path"></param>
-        /// <param name="repeat">Frame delay in milliseconds</param>
         public void SaveAs(string path)
         {
             var e = new AnimatedGifEncoder();

LazZiya.ImageResize/ImageResize.cs

@@ -231,11 +231,11 @@ public static Image Resize(this Image img, Rectangle source, Rectangle target, G
                     using (var ms = new MemoryStream())
                     {
                         outputImage.Save(ms, img.RawFormat);
-                        return Image.FromStream(ms);
+                        return Image.FromStream(ms).ReserveOriginalRotation(img);
                     }
                 }
 
-                return Image.FromHbitmap(outputImage.GetHbitmap());
+                return Image.FromHbitmap(outputImage.GetHbitmap()).ReserveOriginalRotation(img);
             }
         }
     }

LazZiya.ImageResize/ImageRotation.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Drawing;
+using System.Linq;
+
+namespace LazZiya.ImageResize
+{
+    /// <summary>
+    /// Image rotation operations
+    /// </summary>
+    public static class ImageRotation
+    {
+        private const int exifOrientationId = 0x112;
+
+        /// <summary>
+        /// Keep resized image rotation as the original image
+        /// </summary>
+        /// <param name="img"></param>
+        /// <param name="originalImage"></param>
+        /// <returns></returns>
+        public static Image ReserveOriginalRotation(this Image img, Image originalImage)
+        {
+            if (!originalImage.PropertyIdList.Contains(exifOrientationId))
+                return img;
+
+            var rotation = originalImage.GetPropertyItem(exifOrientationId);
+            int val = BitConverter.ToUInt16(rotation.Value, 0);
+            var rot = RotateFlipType.RotateNoneFlipNone;
+
+            if (val == 3 || val == 4)
+                rot = RotateFlipType.Rotate180FlipNone;
+            else if (val == 5 || val == 6)
+                rot = RotateFlipType.Rotate90FlipNone;
+            else if (val == 7 || val == 8)
+                rot = RotateFlipType.Rotate270FlipNone;
+
+            if (val == 2 || val == 4 || val == 5 || val == 7)
+                rot |= RotateFlipType.RotateNoneFlipX;
+
+            if (rot != RotateFlipType.RotateNoneFlipNone)
+                img.RotateFlip(rot);
+
+            return img;
+        }
+
+        /// <summary>
+        /// Rotate and/or flip the image
+        /// </summary>
+        /// <param name="img"></param>
+        /// <param name="rotateFlipType"></param>
+        /// <returns></returns>
+        public static Image RotateFlipImage(this Image img, RotateFlipType rotateFlipType)
+        {
+            img.RotateFlip(rotateFlipType);
+            return img;
+        }
+
+        /// <summary>
+        /// Rotate and/or flip the image
+        /// </summary>
+        /// <param name="img"></param>
+        /// <param name="condition"></param>
+        /// <param name="rotateFlipType"></param>
+        /// <returns></returns>
+        public static Image RotateFlipImageIf(this Image img, bool condition, RotateFlipType rotateFlipType)
+        {
+            if(condition)
+                img.RotateFlip(rotateFlipType);
+
+            return img;
+        }
+    }
+}

LazZiya.ImageResize/LazZiya.ImageResize.csproj

@@ -10,22 +10,17 @@
 		<PackageTags>asp.net,core,.net,dotnet,image,resize,text,overlay</PackageTags>
 		<RepositoryUrl>https://github.com/LazZiya/ImageResize</RepositoryUrl>
 		<PackageProjectUrl>https://docs.ziyad.info/en/LazZiya.ImageResize/v4.0/index.md</PackageProjectUrl>
-		<VersionPrefix>4.0.0</VersionPrefix>
+		<VersionPrefix>4.1.0</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
-		<AssemblyVersion>4.0.0.0</AssemblyVersion>
-		<FileVersion>4.0.0.0</FileVersion>
+		<AssemblyVersion>4.1.0.0</AssemblyVersion>
+		<FileVersion>4.1.0.0</FileVersion>
 		<PackageReleaseNotes>
 			Fixed:
-			- Linux support (https://github.com/LazZiya/ImageResize/issues/1)
-			
+			- Rotate the photo #10 (https://github.com/LazZiya/ImageResize/issues/10)
+
 			New Features:
-			- New - "Conditional" resizing methods: The resize will done depending on a conditional parameter.
-			- New - "AddFrame" method: Draw a frame (border) around the image and specify distance, color, etc.
-			- New - "Mask" method: Applies a mask over the image.
-			- New - "AnimatedImage" - Edit animated gif images (resize, text watewrmark, image water etc.)
-
-			Other updates:
-			- Update ref for System.Drawing.Common https://github.com/dotnet/core/issues/3244
+			- New - "RotateFlipImage" method: rotate or flip images
+			- New - "RotateFlipImageIf" method: conditionally rotate or flip images
 
 			- See all details in the docs https://docs.ziyad.info
 		</PackageReleaseNotes>