From b8d01b1718c12bf67105b5dbcbd0a6cba524d32f Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Mon, 23 Sep 2019 12:01:09 +0900 Subject: [PATCH] Fix GitHub issue #188: Image compare breaks when zoomed too much with large pictures --- DownloadDeps.cmd | 2 +- Externals/versions.txt | 2 +- Externals/winimerge | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd index c26b43173..edeb659cd 100644 --- 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.10.0/winimerge-1-0-10-0-exe.zip!Build ^ +https://github.com/WinMerge/winimerge/releases/download/1.0.11.0/winimerge-1-0-11-0-exe.zip!Build ^ https://github.com/WinMerge/patch/releases/download/v2.5.9-7/patch-2.5.9-7-bin.zip!Build\GnuWin32 pushd "%~dp0" diff --git a/Externals/versions.txt b/Externals/versions.txt index 8cf51313e..916d6a90d 100644 --- a/Externals/versions.txt +++ b/Externals/versions.txt @@ -7,7 +7,7 @@ POCO: 1.4.3p1 boost: 1.64.0 frhed: 0.10904.2017.1 freeimage: 3.18.0 -WinIMerge: 1.0.10.0 +WinIMerge: 1.0.11.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 99ababb01..788e7b7be 160000 --- a/Externals/winimerge +++ b/Externals/winimerge @@ -1 +1 @@ -Subproject commit 99ababb01a3987174bff0637fe6b546ea7a2f455 +Subproject commit 788e7b7bea0fa13cfe9f69fc48d642db1c2cfe1b -- 2.11.0