Fix GitHub WinMerge/winimerge issue #6: Support 16-bit images

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 2776d74..82bca9e 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -17,6 +17,7 @@ WinMerge 2.16.6
   - Bugfix: Non-moved lines are treated as moved lines (osdn.net #39851)
   - Add support for touchpad horizontal scroll (GitHub #254)
   Image compare:
+  - Bugfix: Support 16-bit images (GitHub WinMerge/winimerge issue #6)
   - Add support for SVG, PDF, WMF and EMF file types
     (Only available in WinMerge 64bit version on Windows 10)
       Demo1: https://gyazo.com/b605edb820bc52d0f4f6232eb8ad78aa

diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html
index 3a7bce1..5af3fcc 100644 (file)
--- a/Docs/Users/ReleaseNotes.html
+++ b/Docs/Users/ReleaseNotes.html
@@ -89,6 +89,7 @@ Please submit bug reports to our <a href="http://github.com/winmerge/winmerge/is
 
 <h4>Image compare</h4>
 <ul>
+  <li>Bugfix: Support 16-bit images (GitHub WinMerge/winimerge issue #6)</li>
   <li>Add support for SVG, PDF, WMF and EMF file types
     (Only available in WinMerge 64bit version on Windows 10)
     <a href="https://gyazo.com/b605edb820bc52d0f4f6232eb8ad78aa">Demo1</a>

diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
index bae1dee..55b5bf4 100644 (file)
--- a/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@ -8,7 +8,7 @@ https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.1/Merge7z1900
 https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.1/Merge7z1900.1-x64.zip!Build\X64 ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.1-win32.zip!Build ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.1-x64.zip!Build\X64 ^
-https://github.com/WinMerge/winimerge/releases/download/1.0.14.0/winimerge-1-0-14-0-exe.zip!Build ^
+https://github.com/WinMerge/winimerge/releases/download/1.0.15.0/winimerge-1-0-15-0-exe.zip!Build ^
 https://github.com/WinMerge/patch/releases/download/v2.5.9-7/patch-2.5.9-7-bin.zip!Build\GnuWin32 ^
 http://www.magicnotes.com/steelbytes/SBAppLocale_ENG.zip!Docs\Manual\Tools
 

diff --git a/Externals/versions.txt b/Externals/versions.txt
index f834c9a..88b534a 100644 (file)
--- a/Externals/versions.txt
+++ b/Externals/versions.txt
@@ -7,7 +7,7 @@ POCO: 1.4.3p1
 boost: 1.72.0
 frhed: 0.10904.2017.1
 freeimage: 3.18.0
-WinIMerge: 1.0.14.0
+WinIMerge: 1.0.15.0
 Google C++ Testing Framework: 1.70
 GnuWin32 Patch for Windows: 2.5.9-7
 7-zip: 19.00

diff --git a/Externals/winimerge b/Externals/winimerge
index 5212df1..745f7bf 160000 (submodule)
--- a/Externals/winimerge
+++ b/Externals/winimerge
@@ -1 +1 @@
-Subproject commit 5212df14d871222f0fbd4b7d63b4af681257f21d
+Subproject commit 745f7bf77bdd9c4ea3de1ee07020e7d2a9563ced