Fixed 2 bugs:

1. If no orientation was preset it would throw a divide by 0 exception 2. If metadata was not kept, it would throw the wrong exception
devedse · Jul 31, 2017 · b525f34 · b525f34
1 parent faab37e
commit b525f34
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 18 deletions.
diff --git a/DeveImageOptimizer.Tests/DeveImageOptimizer.Tests.csproj b/DeveImageOptimizer.Tests/DeveImageOptimizer.Tests.csproj
@@ -45,6 +45,9 @@
     <None Update="TestImages\Image3B.JPG">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="TestImages\pexels-photo.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/DeveImageOptimizer.Tests/ImageOptimizerWorks.cs b/DeveImageOptimizer.Tests/ImageOptimizerWorks.cs
@@ -120,6 +120,12 @@ public async void CorrectlyOptimizesStandingRotatedImage()
             await OptimizeFileTest("Image2A.JPG");
         }
 
+        [SkippableFact]
+        public async void CorrectlyOptimizedPexelsPhoto()
+        {
+            await OptimizeFileTest("pexels-photo.jpg");
+        }
+
         [Fact]
         public async void RemovesExifRotationAndReapliesAfterwards()
         {
@@ -160,7 +166,7 @@ public async void RemovesExifRotationAndReapliesAfterwards()
 
         private async Task OptimizeFileTest(string fileName)
         {
-            var fileOptimizerPath = @"C:\Users\Davy\Downloads\FileOptimizerFull\FileOptimizer64.exe";
+            var fileOptimizerPath = @"C:\Program Files\FileOptimizer\FileOptimizer64.exe";
 
             Skip.IfNot(File.Exists(fileOptimizerPath), $"FileOptimizerFull exe file can't be found. Expected location: {fileOptimizerPath}");
 
@@ -187,7 +193,7 @@ private async Task OptimizeFileTest(string fileName)
             finally
             {
                 File.Delete(image1temppath);
-                Directory.Delete(tempfortestdir);
+                Directory.Delete(tempfortestdir, true);
             }
         }
     }

diff --git a/DeveImageOptimizer.Tests/TestImages/pexels-photo.jpg b/DeveImageOptimizer.Tests/TestImages/pexels-photo.jpg
diff --git a/DeveImageOptimizer/Exif/MathEx.cs b/DeveImageOptimizer/Exif/MathEx.cs
@@ -1252,8 +1252,11 @@ private static UFraction32 FromString(string s)
             private static void Reduce(ref uint numerator, ref uint denominator)
             {
                 uint gcd = MathEx.GCD(numerator, denominator);
-                numerator = numerator / gcd;
-                denominator = denominator / gcd;
+                if (gcd > 1)
+                {
+                    numerator = numerator / gcd;
+                    denominator = denominator / gcd;
+                }
             }
             #endregion
         }

diff --git a/DeveImageOptimizer/FileProcessing/FileOptimizerProcessor.cs b/DeveImageOptimizer/FileProcessing/FileOptimizerProcessor.cs
@@ -39,7 +39,7 @@ public async Task<OptimizedFileResult> OptimizeFile(string fileToOptimize, bool
 
                 await AsyncFileHelper.CopyFileAsync(fileToOptimize, tempFilePath, true);
 
-                Orientation jpegFileOrientation = Orientation.Normal;
+                Orientation? jpegFileOrientation = null;
                 bool shouldUseJpgWorkaround = FileTypeHelper.IsJpgFile(tempFilePath);
                 if (shouldUseJpgWorkaround)
                 {

diff --git a/DeveImageOptimizer/Helpers/ExifImageRotator.cs b/DeveImageOptimizer/Helpers/ExifImageRotator.cs
@@ -8,43 +8,62 @@ namespace DeveImageOptimizer.Helpers
 {
     public static class ExifImageRotator
     {
-        public async static Task<Orientation> UnrotateImageAsync(string path)
+        public async static Task<Orientation?> UnrotateImageAsync(string path)
         {
             return await Task.Run(() =>
             {
                 return UnrotateImage(path);
             });
         }
 
-        private static Orientation UnrotateImage(string path)
+        private static Orientation? UnrotateImage(string path)
         {
             var file = ExifFile.Read(path);
 
-            var orientationExif = file.Properties[ExifTag.Orientation];
-            var retval = (Orientation)orientationExif.Value;
-            orientationExif.Value = Orientation.Normal;
+            ExifProperty orientationExif;
 
-            file.Save(path);
+            if (file.Properties.TryGetValue(ExifTag.Orientation, out orientationExif))
+            {
+                var retval = (Orientation)orientationExif.Value;
+                orientationExif.Value = Orientation.Normal;
+
+                file.Save(path);
 
-            return retval;
+                return retval;
+            }
+            else
+            {
+                return null;
+            }
         }
 
-        public async static Task RerotateImageAsync(string path, Orientation newOrientation)
+        public async static Task RerotateImageAsync(string path, Orientation? newOrientation)
         {
             await Task.Run(() =>
             {
                 RerotateImage(path, newOrientation);
             });
         }
 
-        private static void RerotateImage(string path, Orientation newOrientation)
+        private static void RerotateImage(string path, Orientation? newOrientation)
         {
-            var file = ExifFile.Read(path);
+            if (newOrientation != null)
+            {
+                var file = ExifFile.Read(path);
+
+                ExifProperty orientationExif;
 
-            var orientationExif = file.Properties[ExifTag.Orientation];
-            orientationExif.Value = newOrientation;
+                if (file.Properties.TryGetValue(ExifTag.Orientation, out orientationExif))
+                {
+                    orientationExif.Value = newOrientation;
+                }
+                else
+                {
+                    throw new Exception("MetaData is not kept equal");
+                }
 
-            file.Save(path);
+                file.Save(path);
+            }
         }
     }
 }