added FLIF format options to switch from Magick.NET encoder to flif.e…

…xe wrapper
n00mkrad · Oct 18, 2020 · 56c08a0 · 56c08a0
1 parent 7b9a948
commit 56c08a0
Show file tree

Hide file tree

Showing 12 changed files with 70 additions and 16 deletions.
diff --git a/.vs/MagickUtils/v16/.suo b/.vs/MagickUtils/v16/.suo
diff --git a/Forms/FlifOptionsWindow.Designer.cs b/Forms/FlifOptionsWindow.Designer.cs
diff --git a/Forms/FlifOptionsWindow.cs b/Forms/FlifOptionsWindow.cs
@@ -24,18 +24,25 @@ private void doneBtn_Click (object sender, EventArgs e)
 
         private void effortCombox_SelectedIndexChanged (object sender, EventArgs e)
         {
-            FlifInterface.effort = int.Parse(effortCombox.Text.Trim());
+            FlifInterface.effort = effortCombox.GetInt();
         }
 
         private void FlifOptionsWindow_Load (object sender, EventArgs e)
         {
             CenterToScreen();
             UpdateUI();
+            flifEnc.SelectedIndex = 0;
         }
 
         void UpdateUI ()
         {
             effortCombox.Text = FlifInterface.effort.ToString();
         }
+
+        private void flifEnc_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            FormatOptions.flifUseWrapper = flifEnc.SelectedIndex == 1;
+            flifWrapperPanel.Visible = flifEnc.SelectedIndex == 1;
+        }
     }
 }
diff --git a/FormsHelpers/ConvertTabHelper.cs b/FormsHelpers/ConvertTabHelper.cs
@@ -45,8 +45,11 @@ public static void ConvertFileList (string[] files, ComboBox qualityCombox, Comb
                         ConvertUtils.ConvertToJpeg2000(file, qMin, delSrcCbox.Checked);
 
                     if(selectedFormat == IF.FLIF)
-                        FlifInterface.EncodeImage(file, qMin, delSrcCbox.Checked);
-
+                    {
+                        if(FormatOptions.flifUseWrapper) FlifInterface.EncodeImage(file, qMin, delSrcCbox.Checked);
+                        else ConvertUtils.ConvertToFlif(file, qMin, delSrcCbox.Checked);
+                    }
+
                     if (selectedFormat == IF.BMP)
                         ConvertUtils.ConvertToBmp(file, delSrcCbox.Checked);
 
@@ -88,7 +91,7 @@ public static void ConvertUsingPath (ComboBox qualityCombox, ComboBox qualityMax
                 ConvertUtils.ConvertDirToJpeg2000(qMin, delSrcCbox.Checked);
 
             if(selectedFormat == IF.FLIF)
-                ConvertUtils.ConvertDirToFlif(qMin, delSrcCbox.Checked);
+                ConvertUtils.ConvertDirToFlif(FormatOptions.flifUseWrapper, qMin, delSrcCbox.Checked);
 
             if (selectedFormat == IF.BMP)
                 ConvertUtils.ConvertDirToBmp(delSrcCbox.Checked);

diff --git a/MagickUtils/ConvertUtils.cs b/MagickUtils/ConvertUtils.cs
@@ -126,7 +126,7 @@ public static async void ConvertDirToJpeg2000 (int q, bool delSrc)
             Program.PostProcessing();
         }
 
-        public static async void ConvertDirToFlif (int q, bool delSrc)
+        public static async void ConvertDirToFlif (bool useFlifExe, int q, bool delSrc)
         {
             int counter = 1;
             FileInfo[] files = IOUtils.GetFiles();
@@ -136,8 +136,10 @@ public static async void ConvertDirToFlif (int q, bool delSrc)
             {
                 Program.ShowProgress("Converting Image ", counter, files.Length);
                 counter++;
-                //FlifInterface.EncodeImage(file.FullName, q, delSrc);
-                ConvertToFlif(file.FullName, q, delSrc);
+                if(useFlifExe)
+                    FlifInterface.EncodeImage(file.FullName, q, delSrc);
+                else
+                    ConvertToFlif(file.FullName, q, delSrc);
                 await Program.PutTaskDelay();
             }
             Program.PostProcessing();

diff --git a/Utils/FormatOptions.cs b/Utils/FormatOptions.cs
@@ -9,5 +9,6 @@ namespace MagickUtils
     class FormatOptions
     {
         public static bool ddsUseCrunch = false;
+        public static bool flifUseWrapper = false;
     }
 }
diff --git a/bin/Debug/MagickUtils.exe b/bin/Debug/MagickUtils.exe
diff --git a/bin/Debug/MagickUtils.pdb b/bin/Debug/MagickUtils.pdb
diff --git a/obj/Debug/MagickUtils.csproj.GenerateResource.cache b/obj/Debug/MagickUtils.csproj.GenerateResource.cache
diff --git a/obj/Debug/MagickUtils.csprojAssemblyReference.cache b/obj/Debug/MagickUtils.csprojAssemblyReference.cache
diff --git a/obj/Debug/MagickUtils.exe b/obj/Debug/MagickUtils.exe
diff --git a/obj/Debug/MagickUtils.pdb b/obj/Debug/MagickUtils.pdb