Fixed a critical issue where images that have power-of-two dimensions…

… were resized when the difference between their dimensions was smaller than the threshold Fixed an issue where instead of treating the images as (Width x Height) they were treated as (Height x Width)
Hancapo · Feb 23, 2022 · 8569fb6 · 8569fb6
1 parent 2517b3d
commit 8569fb6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 16 deletions.
diff --git a/Folder2YTD/Folder2YTD.csproj b/Folder2YTD/Folder2YTD.csproj
@@ -11,7 +11,7 @@
     <DebugType>full</DebugType>
     <Platforms>AnyCPU;x64</Platforms>
     <FileVersion>0.3.4.0</FileVersion>
-    <AssemblyVersion>0.3.4.0</AssemblyVersion>
+    <AssemblyVersion>0.3.4.1</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Folder2YTD/MainWindow.xaml.cs b/Folder2YTD/MainWindow.xaml.cs
@@ -220,25 +220,41 @@ private void ToggleControls(bool State)
         }
 
 
-        public (int,int) ConvertHeightAndWidthToPowerOfTwo(int height, int width, double threshold)
+        public (int,int) ConvertHeightAndWidthToPowerOfTwo(int width, int height, double threshold)
         {
-            if (Math.Abs(height - width) < threshold)
+
+
+            if ((Math.Log2(width) % 1) == 0 && (Math.Log2(height) % 1) == 0)
+            {
+                return (width, height);
+            }
+            else
             {
-                if (height < width)
+                if (Math.Abs(height - width) < threshold)
                 {
-                    width = height;
+                    if (height < width)
+                    {
+                        width = height;
 
+                    }
+                    else
+                    {
+                        height = width;
+                    }
                 }
-                else
-                {
-                    height = width;
-                }
+
+                height = (int)Math.Pow(2, Math.Round(Math.Log2(height)));
+                width = (int)Math.Pow(2, Math.Round(Math.Log2(width)));
+
+                return (width, height);
             }
 
-            height = (int)Math.Pow(2, Math.Round(Math.Log2(height)));
-            width = (int)Math.Pow(2, Math.Round(Math.Log2(width)));
 
-            return (height,width);  
+
+
+
+
+
 
 
         }
@@ -582,10 +598,10 @@ private Image<Rgba32> ResizedImage(Image<Rgba32> image)
             double ThresholdA = 0;
             ThresPower.Dispatcher.Invoke(() => { ThresholdA = ThresPower.Value; });
 
-            int Height = ConvertHeightAndWidthToPowerOfTwo(image.Height, image.Width, ThresholdA).Item1;
-            int Width = ConvertHeightAndWidthToPowerOfTwo(image.Height, image.Width, ThresholdA).Item2;
+            int Height = ConvertHeightAndWidthToPowerOfTwo(image.Width, image.Height, ThresholdA).Item2;
+            int Width = ConvertHeightAndWidthToPowerOfTwo(image.Width, image.Height, ThresholdA).Item1;
 
-            image.Mutate(x => x.Resize(Height, Width, KnownResamplers.Lanczos3));
+            image.Mutate(x => x.Resize(Width, Height, KnownResamplers.Lanczos3));
             return image;
         }
         private void btnClose_Click(object sender, RoutedEventArgs e)

diff --git a/Folder2YTD/updateinfo.xml b/Folder2YTD/updateinfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-	<version>0.3.4.0</version>
+	<version>0.3.4.1</version>
 	<url>https://github.com/Hancapo/Folder2YTD/releases/latest/download/Folders2YTD.zip</url>
 	<changelog>https://pastebin.com/raw/6rp2VuLS</changelog>
 	<mandatory>true</mandatory>