Merge pull request #144 from erdogan61/master

Add heic/heif support
ermig1979 · Oct 10, 2022 · 3013bb3 · 3013bb3
2 parents 7f6dff2 + dedd3f3
commit 3013bb3
Show file tree

Hide file tree

Showing 29 changed files with 254 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -331,3 +331,5 @@ ASALocalRun/
 /.svn
 /src/AntiDupl/AntiDupl/adExternal.h
 /src/AntiDupl/AntiDupl.NET/External.cs
+/src/AntiDupl/AntiDupl.NET/Form/MainForm.resx
+/src/AntiDupl/AntiDupl.NET/Form/SearchExecuterForm.resx
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ And then more these collections, then more likely to have the large number of du
 The natural desire of the user is to get rid of them. However, if the collection is large 
 enough, do this manually is a very tedious and unproductive work. AntiDupl.NET program 
 will help you automate this process. It can find and display duplicate images in the main 
-graphic formats: JPEG, GIF, TIFF, BMP, PNG, EMF, WMF, EXIF, ICON, JP2, PSD, DDS and TGA. 
+graphic formats: JPEG, GIF, TIFF, BMP, PNG, EMF, WMF, EXIF, ICON, JP2, PSD, DDS, HEIF, HEIC and TGA. 
 The comparison is based on the contents of the files, so the program can find not only 
 almost identical, but similar images. In addition, the program can find images with some 
 types of defects.

diff --git a/src/AntiDupl/AntiDupl.NET/AntiDupl.NET.csproj b/src/AntiDupl/AntiDupl.NET/AntiDupl.NET.csproj
@@ -33,7 +33,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputPath>..\..\..\bin\Debug\</OutputPath>
   </PropertyGroup>

diff --git a/src/AntiDupl/AntiDupl.NET/CoreDll.cs b/src/AntiDupl/AntiDupl.NET/CoreDll.cs
@@ -236,6 +236,7 @@ public enum ImageType : int
             Dds = 12,
             Tga = 13,
             Webp = 14,
+            Heif = 15,
         }
 
         public enum DefectType : int
@@ -288,6 +289,7 @@ public enum VersionType : int
             OpenJpeg = 2,
             Webp = 3,
             TurboJpeg = 4,
+            Heif = 5,
         }
 
         public enum SelectionType : int
@@ -326,6 +328,7 @@ public struct adSearchOptions
             public int DDS;
             public int TGA;
             public int WEBP;
+            public int HEIF;
         }
 
         [StructLayout(LayoutKind.Sequential)]

diff --git a/src/AntiDupl/AntiDupl.NET/CoreImageInfo.cs b/src/AntiDupl/AntiDupl.NET/CoreImageInfo.cs
@@ -107,6 +107,9 @@ public string GetImageTypeString()
                 case CoreDll.ImageType.Dds:
                     builder.Append("DDS");
                     break;
+                case CoreDll.ImageType.Heif:
+                    builder.Append("HEIF");
+                    break;
             }
             return builder.ToString();
         }

diff --git a/src/AntiDupl/AntiDupl.NET/CoreSearchOptions.cs b/src/AntiDupl/AntiDupl.NET/CoreSearchOptions.cs
@@ -44,6 +44,7 @@ public class CoreSearchOptions
         private static string[] s_ddsExtensions = {"DDS"};
         private static string[] s_tgaExtensions = {"TGA", "TPIC"};
         private static string[] s_webpExtensions = { "WEBP" };
+        private static string[] s_heifExtensions = { "HEIF", "HEIC" };
 
         public bool subFolders;
         public bool system;
@@ -62,6 +63,7 @@ public class CoreSearchOptions
         public bool DDS;
         public bool TGA;
         public bool WEBP;
+        public bool HEIF;
 
         public CoreSearchOptions()
         {
@@ -85,6 +87,7 @@ public CoreSearchOptions(CoreSearchOptions searchOptions)
             DDS = searchOptions.DDS;
             TGA = searchOptions.TGA;
             WEBP = searchOptions.WEBP;
+            HEIF = searchOptions.HEIF;
         }
 
         public CoreSearchOptions(CoreDll.adSearchOptions searchOptions)
@@ -105,6 +108,7 @@ public CoreSearchOptions(CoreDll.adSearchOptions searchOptions)
             DDS = searchOptions.DDS != CoreDll.FALSE;
             TGA = searchOptions.TGA != CoreDll.FALSE;
             WEBP = searchOptions.WEBP != CoreDll.FALSE;
+            HEIF = searchOptions.HEIF != CoreDll.FALSE;
         }
 
         public void ConvertTo(ref CoreDll.adSearchOptions searchOptions)
@@ -125,6 +129,7 @@ public void ConvertTo(ref CoreDll.adSearchOptions searchOptions)
             searchOptions.DDS = DDS ? CoreDll.TRUE : CoreDll.FALSE;
             searchOptions.TGA = TGA ? CoreDll.TRUE : CoreDll.FALSE;
             searchOptions.WEBP = WEBP ? CoreDll.TRUE : CoreDll.FALSE;
+            searchOptions.HEIF = HEIF ? CoreDll.TRUE : CoreDll.FALSE;
         }
 
         public CoreSearchOptions Clone()
@@ -150,7 +155,8 @@ public bool Equals(CoreSearchOptions searchOptions)
                 PSD == searchOptions.PSD &&
                 DDS == searchOptions.DDS &&
                 TGA == searchOptions.TGA &&
-                WEBP == searchOptions.WEBP;
+                WEBP == searchOptions.WEBP &&
+                HEIF == searchOptions.HEIF;
         }
 
         public string[] GetActualExtensions()
@@ -182,6 +188,8 @@ public string[] GetActualExtensions()
                 extensions.AddRange(s_tgaExtensions);
             if (WEBP)
                 extensions.AddRange(s_tgaExtensions);
+            if (HEIF)
+                extensions.AddRange(s_heifExtensions);
             return (string[])extensions.ToArray(typeof(string));
         }
     }

diff --git a/src/AntiDupl/AntiDupl.NET/Form/AboutProgramForm.cs b/src/AntiDupl/AntiDupl.NET/Form/AboutProgramForm.cs
@@ -44,7 +44,7 @@ public AboutProgramForm(CoreLib core)
 
         private void InitializeComponent()
         {
-            ClientSize = new System.Drawing.Size(310, 290);
+            ClientSize = new System.Drawing.Size(310, 350);
             FormBorderStyle = FormBorderStyle.FixedDialog;
             StartPosition = FormStartPosition.CenterScreen;
             ShowInTaskbar = false;

diff --git a/src/AntiDupl/AntiDupl.NET/Form/CoreOptionsForm.cs b/src/AntiDupl/AntiDupl.NET/Form/CoreOptionsForm.cs
@@ -94,6 +94,7 @@ public class CoreOptionsForm : Form
         private CheckBox m_ddsCheckBox;
         private CheckBox m_tgaCheckBox;
         private CheckBox m_webpCheckBox;
+        private CheckBox m_heifCheckBox;
         private CheckBox m_searchSystemCheckBox;
         private CheckBox m_searchHiddenCheckBox;
 
@@ -340,6 +341,9 @@ private void InitilizeSearchTabPage()
             m_webpCheckBox = InitFactory.CheckBox.Create(OnOptionChanged);
             searchFileTypeTableLayoutPanel.Controls.Add(m_webpCheckBox, 2, 3);
 
+            m_heifCheckBox = InitFactory.CheckBox.Create(OnOptionChanged);
+            searchFileTypeTableLayoutPanel.Controls.Add(m_heifCheckBox, 2, 4);
+
             m_searchSystemCheckBox = InitFactory.CheckBox.Create(OnOptionChanged);
             searchTableLayoutPanel.Controls.Add(m_searchSystemCheckBox, 0, 1);
 
@@ -568,6 +572,7 @@ private void GetOptions()
             m_ddsCheckBox.Checked = m_newCoreOptions.searchOptions.DDS;
             m_tgaCheckBox.Checked = m_newCoreOptions.searchOptions.TGA;
             m_webpCheckBox.Checked = m_newCoreOptions.searchOptions.WEBP;
+            m_heifCheckBox.Checked = m_newCoreOptions.searchOptions.HEIF;
             m_searchSystemCheckBox.Checked = m_newCoreOptions.searchOptions.system;
             m_searchHiddenCheckBox.Checked = m_newCoreOptions.searchOptions.hidden;
 
@@ -621,6 +626,7 @@ private void SetOptions()
             m_newCoreOptions.searchOptions.DDS = m_ddsCheckBox.Checked;
             m_newCoreOptions.searchOptions.TGA = m_tgaCheckBox.Checked;
             m_newCoreOptions.searchOptions.WEBP = m_webpCheckBox.Checked;
+            m_newCoreOptions.searchOptions.HEIF = m_heifCheckBox.Checked;
             m_newCoreOptions.searchOptions.system = m_searchSystemCheckBox.Checked;
             m_newCoreOptions.searchOptions.hidden = m_searchHiddenCheckBox.Checked;
 
@@ -682,6 +688,7 @@ private void UpdateStrings()
             m_ddsCheckBox.Text = s.CoreOptionsForm_DdsCheckBox_Text;
             m_tgaCheckBox.Text = s.CoreOptionsForm_TgaCheckBox_Text;
             m_webpCheckBox.Text = s.CoreOptionsForm_WebpCheckBox_Text;
+            m_heifCheckBox.Text = s.CoreOptionsForm_HeifCheckBox_Text;
             m_searchSystemCheckBox.Text = s.CoreOptionsForm_SearchSystemCheckBox_Text;
             m_searchHiddenCheckBox.Text = s.CoreOptionsForm_SearchHiddenCheckBox_Text;
 

diff --git a/src/AntiDupl/AntiDupl.NET/Form/StartFinishForm.cs b/src/AntiDupl/AntiDupl.NET/Form/StartFinishForm.cs
@@ -68,7 +68,7 @@ public StartFinishForm(CoreLib core, Options options)
 
         private void InitializeComponent()
         {
-            ClientSize = new System.Drawing.Size(310, 255);
+            ClientSize = new System.Drawing.Size(310, 310);
             FormBorderStyle = FormBorderStyle.FixedDialog;
             StartPosition = FormStartPosition.CenterScreen;
             ShowInTaskbar = false;

diff --git a/src/AntiDupl/AntiDupl.NET/GUIControl/AboutProgramPanel.cs b/src/AntiDupl/AntiDupl.NET/GUIControl/AboutProgramPanel.cs
@@ -100,7 +100,7 @@ private TableLayoutPanel CreateLogotype(Font font)
 
         private Control CreateInfoTable(Font font)
         {
-            TableLayoutPanel table = InitFactory.Layout.Create(2, 6, 0, 0);
+            TableLayoutPanel table = InitFactory.Layout.Create(2, 7, 0, 0);
             table.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
             table.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
             table.CellBorderStyle = TableLayoutPanelCellBorderStyle.Inset;
@@ -127,6 +127,8 @@ private Control CreateInfoTable(Font font)
             table.Controls.Add(CreateLinkLabel("libjpeg-turbo", Resources.WebLinks.LibJpegTurbo, font), 0, 5);
             table.Controls.Add(CreateLabel(m_core.GetVersion(CoreDll.VersionType.TurboJpeg).ToString(), font), 1, 5);
 
+            table.Controls.Add(CreateLinkLabel("libheif", Resources.WebLinks.LibHeif, font), 0, 6);
+            table.Controls.Add(CreateLabel(m_core.GetVersion(CoreDll.VersionType.Heif).ToString(), font), 1, 6);
             return table;
         }
 

diff --git a/src/AntiDupl/AntiDupl.NET/Resources.cs b/src/AntiDupl/AntiDupl.NET/Resources.cs
@@ -340,6 +340,7 @@ static public class WebLinks
             public const string OpenJpeg = "http://www.openjpeg.org";
             public const string LibWebp = "https://github.com/webmproject/libwebp";
             public const string LibJpegTurbo = "http://www.libjpeg-turbo.org";
+            public const string LibHeif = "http://www.libheif.org";
 
             public static string GithubComAntiduplCurrent
             {

diff --git a/src/AntiDupl/AntiDupl.NET/Strings.cs b/src/AntiDupl/AntiDupl.NET/Strings.cs
@@ -79,6 +79,7 @@ public Strings()
         public string CoreOptionsForm_DdsCheckBox_Text;
         public string CoreOptionsForm_TgaCheckBox_Text;
         public string CoreOptionsForm_WebpCheckBox_Text;
+        public string CoreOptionsForm_HeifCheckBox_Text;
         public string CoreOptionsForm_SearchSystemCheckBox_Text;
         public string CoreOptionsForm_SearchHiddenCheckBox_Text;
 

diff --git a/src/AntiDupl/AntiDupl.NET/StringsDefaultEnglish.cs b/src/AntiDupl/AntiDupl.NET/StringsDefaultEnglish.cs
@@ -76,6 +76,7 @@ static public void CopyTo(Strings s)
             s.CoreOptionsForm_DdsCheckBox_Text = "DDS";
             s.CoreOptionsForm_TgaCheckBox_Text = "TGA";
             s.CoreOptionsForm_WebpCheckBox_Text = "WEBP";
+            s.CoreOptionsForm_HeifCheckBox_Text = "HEIF";
             s.CoreOptionsForm_SearchSystemCheckBox_Text = "Search system folders/files";
             s.CoreOptionsForm_SearchHiddenCheckBox_Text = "Search hidden folders/files";
 

diff --git a/src/AntiDupl/AntiDupl.NET/StringsDefaultRussian.cs b/src/AntiDupl/AntiDupl.NET/StringsDefaultRussian.cs
@@ -76,6 +76,7 @@ static public void CopyTo(Strings s)
             s.CoreOptionsForm_DdsCheckBox_Text = "DDS";
             s.CoreOptionsForm_TgaCheckBox_Text = "TGA";
             s.CoreOptionsForm_WebpCheckBox_Text = "WEBP";
+            s.CoreOptionsForm_HeifCheckBox_Text = "HEIF";
             s.CoreOptionsForm_SearchSystemCheckBox_Text = "Искать системные каталоги/файлы";
             s.CoreOptionsForm_SearchHiddenCheckBox_Text = "Искать скрытые каталоги/файлы";
 

diff --git a/src/AntiDupl/AntiDupl.sln b/src/AntiDupl/AntiDupl.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.128
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32526.322
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibOpenJpeg32", "..\3rd\LibOpenJpeg\LibOpenJpeg32.vcxproj", "{1622C4EF-06A4-4DAA-9631-5D71B32858A4}"
 EndProject
@@ -130,6 +130,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vsx_64", "..\3rd\Simd\Vsx_64.vcxproj", "{7AE68C49-9959-4C22-A6D0-680BE7B5CA04}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntiDupl.NET", "AntiDupl.NET\AntiDupl.NET.csproj", "{5E3F8B85-9C79-4EA1-90E3-BD5C84CBA820}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7C8C9359-ED04-4415-BB91-9947B59BC71E} = {7C8C9359-ED04-4415-BB91-9947B59BC71E}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/AntiDupl/AntiDupl/AntiDupl.cpp b/src/AntiDupl/AntiDupl/AntiDupl.cpp
@@ -29,6 +29,8 @@
 
 #include "TurboJpeg/inc/jconfig.h"
 
+#include "libheif\heif.h"
+
 #include <windows.h>
 
 namespace ad
@@ -112,6 +114,9 @@ DLLAPI adError adVersionGet(adVersionType versionType, adCharA * pVersion, adSiz
     case AD_VERSION_TYPE_TURBOJPEG:
         version = AD_STRINGIFY(LIBJPEG_TURBO_VERSION);
         break;
+    case AD_VERSION_TYPE_LIBHEIF:
+        version = heif_get_version();
+        break;
 	default:
 		return AD_ERROR_INVALID_VERSION_TYPE;
 	}

diff --git a/src/AntiDupl/AntiDupl/AntiDupl.h b/src/AntiDupl/AntiDupl/AntiDupl.h
@@ -304,6 +304,7 @@ extern "C"
 		AD_IMAGE_DDS = 12,
 		AD_IMAGE_TGA = 13,
 		AD_IMAGE_WEBP = 14,
+        AD_IMAGE_HEIF = 15,
         AD_IMAGE_SIZE
     };
 
@@ -363,6 +364,7 @@ extern "C"
 		AD_VERSION_TYPE_OPENJPEG = 2,
         AD_VERSION_TYPE_WEBP = 3,
         AD_VERSION_TYPE_TURBOJPEG = 4,
+        AD_VERSION_TYPE_LIBHEIF = 5,
         AD_VERSION_TYPE_SIZE
 	};
 
@@ -403,6 +405,7 @@ extern "C"
 		adBool DDS;
 		adBool TGA;
 		adBool WEBP;
+        adBool HEIF;
     };
     typedef adSearchOptions* adSearchOptionsPtr;
 

diff --git a/src/AntiDupl/AntiDupl/AntiDupl32.vcxproj b/src/AntiDupl/AntiDupl/AntiDupl32.vcxproj
@@ -15,6 +15,7 @@
     <ProjectGuid>{7C8C9359-ED04-4415-BB91-9947B59BC71E}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <ProjectName>AntiDupl32</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -57,6 +58,7 @@
     <ClCompile Include="adFileStream.cpp" />
     <ClCompile Include="adFileUtils.cpp" />
     <ClCompile Include="adGdiplus.cpp" />
+    <ClCompile Include="adHeif.cpp" />
     <ClCompile Include="adHintSetter.cpp" />
     <ClCompile Include="adImage.cpp" />
     <ClCompile Include="adImageComparer.cpp" />
@@ -106,6 +108,7 @@
     <ClInclude Include="adFileStream.h" />
     <ClInclude Include="adFileUtils.h" />
     <ClInclude Include="adGdiplus.h" />
+    <ClInclude Include="adHeif.h" />
     <ClInclude Include="adHintSetter.h" />
     <ClInclude Include="adImage.h" />
     <ClInclude Include="adImageComparer.h" />

diff --git a/src/AntiDupl/AntiDupl/AntiDupl32.vcxproj.filters b/src/AntiDupl/AntiDupl/AntiDupl32.vcxproj.filters
@@ -70,6 +70,9 @@
     <ClCompile Include="adFileInfo.cpp">
       <Filter>Files</Filter>
     </ClCompile>
+    <ClCompile Include="adHeif.cpp">
+      <Filter>Image</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="adBlurringDetector.h" />
@@ -146,6 +149,9 @@
     <ClInclude Include="adFileInfo.h">
       <Filter>Files</Filter>
     </ClInclude>
+    <ClInclude Include="adHeif.h">
+      <Filter>Image</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Image">

diff --git a/src/AntiDupl/AntiDupl/AntiDupl64.vcxproj b/src/AntiDupl/AntiDupl/AntiDupl64.vcxproj
@@ -58,6 +58,7 @@
     <ClCompile Include="adFileStream.cpp" />
     <ClCompile Include="adFileUtils.cpp" />
     <ClCompile Include="adGdiplus.cpp" />
+    <ClCompile Include="adHeif.cpp" />
     <ClCompile Include="adHintSetter.cpp" />
     <ClCompile Include="adImage.cpp" />
     <ClCompile Include="adImageComparer.cpp" />
@@ -107,6 +108,7 @@
     <ClInclude Include="adFileStream.h" />
     <ClInclude Include="adFileUtils.h" />
     <ClInclude Include="adGdiplus.h" />
+    <ClInclude Include="adHeif.h" />
     <ClInclude Include="adHintSetter.h" />
     <ClInclude Include="adImage.h" />
     <ClInclude Include="adImageComparer.h" />

diff --git a/src/AntiDupl/AntiDupl/AntiDupl64.vcxproj.filters b/src/AntiDupl/AntiDupl/AntiDupl64.vcxproj.filters
@@ -70,6 +70,9 @@
     <ClCompile Include="adIniFile.cpp">
       <Filter>Files</Filter>
     </ClCompile>
+    <ClCompile Include="adHeif.cpp">
+      <Filter>Image</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="adBlurringDetector.h" />
@@ -146,6 +149,9 @@
     <ClInclude Include="adIO.h">
       <Filter>Files</Filter>
     </ClInclude>
+    <ClInclude Include="adHeif.h">
+      <Filter>Image</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Image">

diff --git a/src/AntiDupl/AntiDupl/adDataCollector.cpp b/src/AntiDupl/AntiDupl/adDataCollector.cpp
@@ -78,7 +78,14 @@ namespace ad
             pImageData->type = (TImageType)pImage->Format();
 
 			TView gray(pImage->View()->width, pImage->View()->height, TView::Gray8, NULL);
-			Simd::BgraToGray(*pImage->View(), gray);
+            if (pImage->View()->format == TView::Format::Rgb24)
+            {
+                Simd::RgbToGray(*pImage->View(), gray);
+            }
+            else
+            {
+                Simd::BgraToGray(*pImage->View(), gray);
+            }
 
 			pImageData->blockiness = GetBlockiness(gray);