Update winimerge to 1.0.28

diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
index c804837..aff82c2 100644 (file)
--- a/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@ -10,7 +10,7 @@ https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.7-win32.zip!Build ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.7-x64.zip!Build\X64 ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.7-ARM64.zip!Build\ARM64 ^
-https://github.com/WinMerge/winimerge/releases/download/v1.0.27/winimerge-1.0.27.0-exe.zip!Build ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.28/winimerge-1.0.28.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 de0d837..46e7129 100644 (file)
--- a/Externals/versions.txt
+++ b/Externals/versions.txt
@@ -7,7 +7,7 @@ POCO: 1.10.1
 boost: 1.72.0
 frhed: 0.10904.2017.6
 freeimage: 3.18.0
-WinIMerge: 1.0.27.0
+WinIMerge: 1.0.28.0
 Google C++ Testing Framework: 1.70
 GnuWin32 Patch for Windows: 2.5.9-7
 7-zip: 19.00

diff --git a/Src/WinIMergeLib.h b/Src/WinIMergeLib.h
index 9c10fe4..6708249 100644 (file)
--- a/Src/WinIMergeLib.h
+++ b/Src/WinIMergeLib.h
@@ -169,6 +169,8 @@ struct IImgMergeWindow
        virtual bool IsCancellable() const = 0;\r
        virtual bool IsRectangleSelectionVisible(int pane) const = 0;\r
        virtual BSTR ExtractTextFromImage(int pane, int page, OCR_RESULT_TYPE resultType) = 0;\r
+       virtual int GetSavePoint(int pane) const = 0;\r
+       virtual void SetSavePoint(int pane, int pos) = 0;\r
 };\r
 \r
 struct IImgToolWindow\r