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

WinMerge · Feb 22, 2020 · 0a3b5ed · 0a3b5ed
1 parent b2dc500
commit 0a3b5ed
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -89,6 +89,7 @@ <h4>File compare</h4>
 
 <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
@@ -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
@@ -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
+1 −1		SetVersion.cmd
+4 −4		Version.h
+2 −0		src/ImgDiffBuffer.hpp
+5 −1		src/image.hpp