Fixed issue where PNG files wouldn't be optimized anymore

devedse · Jul 26, 2017 · 530c767 · 530c767
1 parent 3791639
commit 530c767
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/DeveImageOptimizer/FileProcessing/FileOptimizerProcessor.cs b/DeveImageOptimizer/FileProcessing/FileOptimizerProcessor.cs
@@ -1,4 +1,5 @@
 using DeveImageOptimizer.Helpers;
+using ExifLibrary;
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
@@ -25,7 +26,12 @@ public async Task<bool> OptimizeFile(string fileToOptimize, bool saveFailedOptim
 
             await AsyncFileHelper.CopyFileAsync(fileToOptimize, tempFilePath, true);
 
-            var oldRotation = await ExifImageRotator.UnrotateImageAsync(tempFilePath);
+            Orientation jpegFileOrientation = Orientation.Normal;
+            bool shouldUseJpgWorkaround = FileTypeHelper.IsJpgFile(tempFilePath);
+            if (shouldUseJpgWorkaround)
+            {
+                jpegFileOrientation = await ExifImageRotator.UnrotateImageAsync(tempFilePath);
+            }
 
             var processStartInfo = new ProcessStartInfo(_pathToFileOptimizer, tempFilePath)
             {
@@ -36,7 +42,10 @@ public async Task<bool> OptimizeFile(string fileToOptimize, bool saveFailedOptim
 
             await ProcessRunner.RunProcessAsync(processStartInfo);
 
-            await ExifImageRotator.RerotateImageAsync(tempFilePath, oldRotation);
+            if (shouldUseJpgWorkaround)
+            {
+                await ExifImageRotator.RerotateImageAsync(tempFilePath, jpegFileOrientation);
+            }
 
             var imagesEqual = await ImageComparer2.AreImagesEqualAsync(fileToOptimize, tempFilePath);
 

diff --git a/DeveImageOptimizer/Helpers/FileTypeHelper.cs b/DeveImageOptimizer/Helpers/FileTypeHelper.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace DeveImageOptimizer.Helpers
+{
+    public static class FileTypeHelper
+    {
+        public static bool IsJpgFile(string file)
+        {
+            var extension = Path.GetExtension(file);
+            if (string.Equals(extension, ".jpg", StringComparison.OrdinalIgnoreCase) || string.Equals(extension, ".jpeg", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/DeveImageOptimizer/Helpers/ImageComparer2.cs b/DeveImageOptimizer/Helpers/ImageComparer2.cs
@@ -41,8 +41,7 @@ private static string GetRotatedAmount(Image<Rgba32> source)
 
         private static Image<Rgba32> LoadImageHelper(string imagePath, List<string> tempFiles, bool useImageSharpBugWorkaround)
         {
-            var imageExtension = Path.GetExtension(imagePath);
-            if (useImageSharpBugWorkaround && string.Equals(imageExtension, ".jpg", StringComparison.OrdinalIgnoreCase) || string.Equals(imageExtension, ".jpeg", StringComparison.OrdinalIgnoreCase))
+            if (useImageSharpBugWorkaround && FileTypeHelper.IsJpgFile(imagePath))
             {
                 var imageAsPngPath = ImageConverter.ConvertJpgToPngWithAutoRotate(imagePath);
                 tempFiles.Add(imageAsPngPath);