OSDN Git Service

winmerge-jp/winmerge-jp.git
9 years agoBump revision to 0.9.8.0 0.9.8.0
sdottaka [Mon, 29 Dec 2014 12:46:56 +0000 (21:46 +0900)]
Bump revision to 0.9.8.0

9 years agocidiff.vcxproj: define _CRT_SECURE_NO_WARNINGS macro to reduce warnings
sdottaka [Mon, 29 Dec 2014 12:46:32 +0000 (21:46 +0900)]
cidiff.vcxproj: define _CRT_SECURE_NO_WARNINGS macro to reduce warnings

9 years agoImageDiff: Make comparing position adjustable by Shift+Arrow keys
sdottaka [Mon, 29 Dec 2014 12:45:34 +0000 (21:45 +0900)]
ImageDiff: Make comparing position adjustable by Shift+Arrow keys

9 years agoAdd IImgMergeWindow::EVENT_TYPE::KEYDOWN, KEYUP
sdottaka [Mon, 29 Dec 2014 12:39:46 +0000 (21:39 +0900)]
Add IImgMergeWindow::EVENT_TYPE::KEYDOWN, KEYUP

9 years agoAdd IImgMergeWindow::AddImageOffset(), GetImageOffset() function
sdottaka [Mon, 29 Dec 2014 12:37:28 +0000 (21:37 +0900)]
Add IImgMergeWindow::AddImageOffset(), GetImageOffset() function

9 years agoAdded tag 0.9.7.0 for changeset c48abf5626bd
sdottaka [Sat, 29 Nov 2014 12:27:08 +0000 (21:27 +0900)]
Added tag 0.9.7.0 for changeset c48abf5626bd

9 years agoBump revision to 0.9.7.0 0.9.7.0
sdottaka [Sat, 29 Nov 2014 12:26:56 +0000 (21:26 +0900)]
Bump revision to 0.9.7.0

9 years agoImgWindow.hpp: Fix a bug that CImgWindow::ConvertDPtoLP() returns wrong position...
sdottaka [Sat, 29 Nov 2014 12:25:10 +0000 (21:25 +0900)]
ImgWindow.hpp: Fix a bug that CImgWindow::ConvertDPtoLP() returns wrong position when zooming in

9 years agoimage.hpp: Fix a bug that Image::pixel() returns a wrong RGB value
sdottaka [Sat, 29 Nov 2014 12:22:04 +0000 (21:22 +0900)]
image.hpp: Fix a bug that Image::pixel() returns a wrong RGB value

9 years agoAdded tag 0.9.6.0 for changeset 8cd8da53a343
sdottaka [Tue, 28 Oct 2014 12:37:55 +0000 (21:37 +0900)]
Added tag 0.9.6.0 for changeset 8cd8da53a343

9 years agoBump revision to 0.9.6.0 0.9.6.0
sdottaka [Tue, 28 Oct 2014 12:36:45 +0000 (21:36 +0900)]
Bump revision to 0.9.6.0

9 years ago*.ficache file was not deleted
sdottaka [Tue, 28 Oct 2014 12:31:39 +0000 (21:31 +0900)]
*.ficache file was not deleted

9 years agoAdded tag 0.9.5.0 for changeset 078109b91064
sdottaka [Sun, 19 Oct 2014 02:39:09 +0000 (11:39 +0900)]
Added tag 0.9.5.0 for changeset 078109b91064

9 years agoBump revision to 0.9.5.0 0.9.5.0
sdottaka [Sun, 19 Oct 2014 02:38:02 +0000 (11:38 +0900)]
Bump revision to 0.9.5.0

9 years agoRename CImg*.hpp to Img*.hpp
sdottaka [Sun, 19 Oct 2014 01:53:08 +0000 (10:53 +0900)]
Rename CImg*.hpp to Img*.hpp

9 years agoRemove FreeImage dependency from CImgDiffBuffer.hpp and CImgMergeBuffer.hpp
sdottaka [Sun, 19 Oct 2014 01:32:50 +0000 (10:32 +0900)]
Remove FreeImage dependency from CImgDiffBuffer.hpp and CImgMergeBuffer.hpp

9 years agoSplit CImgMergeBuffer.hpp into 2 files
sdottaka [Tue, 7 Oct 2014 12:04:16 +0000 (21:04 +0900)]
Split CImgMergeBuffer.hpp into 2 files

9 years agoCImgMergeBuffer.hpp: Did not merge diff area correctly when comparing images of diffe...
sdottaka [Tue, 7 Oct 2014 11:12:43 +0000 (20:12 +0900)]
CImgMergeBuffer.hpp: Did not merge diff area correctly when comparing images of different size

9 years agoCImgMergeBuffer.hpp: Did not colorize image diff area properly when comparing images...
sdottaka [Tue, 7 Oct 2014 11:09:05 +0000 (20:09 +0900)]
CImgMergeBuffer.hpp: Did not colorize image diff area properly when comparing images of different size

9 years agoCImgMergeWindow.hpp: Did not deselect the current diff area when double-clicking...
sdottaka [Tue, 7 Oct 2014 10:49:13 +0000 (19:49 +0900)]
CImgMergeWindow.hpp: Did not deselect the current diff area when double-clicking non-diff area

9 years agoAdd cidiff command to archive file
sdottaka [Sun, 5 Oct 2014 12:11:59 +0000 (21:11 +0900)]
Add cidiff command to archive file

9 years agoAdded tag 0.9.4.0 for changeset 0ef16028a292
sdottaka [Sun, 5 Oct 2014 11:58:13 +0000 (20:58 +0900)]
Added tag 0.9.4.0 for changeset 0ef16028a292

9 years agoBump revision to 0.9.4.0 0.9.4.0
sdottaka [Sun, 5 Oct 2014 11:57:55 +0000 (20:57 +0900)]
Bump revision to 0.9.4.0

9 years agoAdd cidiff command
sdottaka [Sat, 4 Oct 2014 09:51:29 +0000 (18:51 +0900)]
Add cidiff command

9 years agomake CImgMergeBuffer.hpp compilable on Linux
sdottaka [Sat, 4 Oct 2014 09:48:09 +0000 (18:48 +0900)]
make CImgMergeBuffer.hpp compilable on Linux

9 years agoCImgMergeWindow.hpp: Move non-GUI code to CImgMergeBuffer.hpp
sdottaka [Fri, 3 Oct 2014 13:20:21 +0000 (22:20 +0900)]
CImgMergeWindow.hpp: Move non-GUI code to CImgMergeBuffer.hpp

9 years agoCImgMergeWindow.hpp: File state was not changed from the "modified" state when saving...
sdottaka [Mon, 29 Sep 2014 11:27:37 +0000 (20:27 +0900)]
CImgMergeWindow.hpp: File state was not changed from the "modified" state when saving images

9 years agoAdded tag 0.9.3.0 for changeset 9e83a2640c31
sdottaka [Sun, 28 Sep 2014 16:42:27 +0000 (01:42 +0900)]
Added tag 0.9.3.0 for changeset 9e83a2640c31

9 years agoBump revision to 0.9.3.0 0.9.3.0
sdottaka [Sun, 28 Sep 2014 16:40:25 +0000 (01:40 +0900)]
Bump revision to 0.9.3.0

9 years agoCImgWindow.hpp: - Change background color
sdottaka [Sun, 28 Sep 2014 16:39:57 +0000 (01:39 +0900)]
CImgWindow.hpp: - Change background color
  - Draw margins for image

9 years agoAssign Ctrl+0 key to reset zoom
sdottaka [Sun, 28 Sep 2014 14:57:59 +0000 (23:57 +0900)]
Assign Ctrl+0 key to reset zoom

9 years agoAdded tag 0.9.2.0 for changeset 5710fff75af9
sdottaka [Sun, 28 Sep 2014 00:34:32 +0000 (09:34 +0900)]
Added tag 0.9.2.0 for changeset 5710fff75af9

9 years agoBump revision to 0.9.2.0 0.9.2.0
sdottaka [Sun, 28 Sep 2014 00:23:36 +0000 (09:23 +0900)]
Bump revision to 0.9.2.0

9 years agoAdd BuildArc.cmd
sdottaka [Sun, 28 Sep 2014 00:23:22 +0000 (09:23 +0900)]
Add BuildArc.cmd

9 years agoAdd .hgignore
sdottaka [Sun, 28 Sep 2014 00:22:28 +0000 (09:22 +0900)]
Add .hgignore

9 years agoAdd IImgMergeWindow::GetPixelColor() function and GetColorDistance() function
sdottaka [Sun, 28 Sep 2014 00:01:49 +0000 (09:01 +0900)]
Add IImgMergeWindow::GetPixelColor() function and GetColorDistance() function

9 years agoWinIMerge.rc: move menu items
sdottaka [Sat, 27 Sep 2014 12:52:39 +0000 (21:52 +0900)]
WinIMerge.rc: move menu items

9 years agoAdd IImgMergeWindow::SetColorDistanceThreshold() and GetColorDistanceThreshold()
sdottaka [Fri, 26 Sep 2014 14:12:59 +0000 (23:12 +0900)]
Add IImgMergeWindow::SetColorDistanceThreshold() and GetColorDistanceThreshold()

9 years agoAdd IImgMergeWindow::ReloadImages() function
sdottaka [Fri, 26 Sep 2014 04:36:04 +0000 (13:36 +0900)]
Add IImgMergeWindow::ReloadImages() function

9 years agoCImgMergeWindow.hpp: Fix a bug of FirstConflict() function
sdottaka [Thu, 25 Sep 2014 13:43:22 +0000 (22:43 +0900)]
CImgMergeWindow.hpp: Fix a bug of FirstConflict() function

9 years agoAdd IImgMergeWindow::CopyDiffAll() function and CopyDiff3Way() function
sdottaka [Thu, 25 Sep 2014 12:26:15 +0000 (21:26 +0900)]
Add IImgMergeWindow::CopyDiffAll() function and CopyDiff3Way() function

9 years agoSelect the diff when double-clicking a diff
sdottaka [Thu, 25 Sep 2014 06:17:50 +0000 (15:17 +0900)]
Select the diff when double-clicking a diff

9 years agoAdd IImgMergeWindow::GetCursorPos() function
sdottaka [Thu, 25 Sep 2014 06:15:21 +0000 (15:15 +0900)]
Add IImgMergeWindow::GetCursorPos() function

9 years agoDraw the borders of an image
sdottaka [Thu, 25 Sep 2014 06:13:12 +0000 (15:13 +0900)]
Draw the borders of an image

9 years agoAdd BuildBin_vc11.cmd for VS2012
sdottaka [Thu, 25 Sep 2014 01:41:10 +0000 (10:41 +0900)]
Add BuildBin_vc11.cmd for VS2012

9 years agoBump revision to 0.9.1.0
sdottaka [Wed, 24 Sep 2014 10:32:58 +0000 (19:32 +0900)]
Bump revision to 0.9.1.0

9 years agoAdd "Generate Report" menu item
sdottaka [Wed, 24 Sep 2014 09:56:14 +0000 (18:56 +0900)]
Add "Generate Report" menu item

9 years agoCImgMergeWindow.hpp: Implement SaveImageAs()
sdottaka [Mon, 22 Sep 2014 10:22:47 +0000 (19:22 +0900)]
CImgMergeWindow.hpp: Implement SaveImageAs()

9 years agoWinIMerge.rc: Fix typo
sdottaka [Mon, 22 Sep 2014 07:40:05 +0000 (16:40 +0900)]
WinIMerge.rc: Fix typo

9 years agoAdd GetReadOnly(), SetReadOnly(), IsUndoable(), IsRedoable() to IImgMergeWindow
sdottaka [Mon, 22 Sep 2014 07:39:15 +0000 (16:39 +0900)]
Add GetReadOnly(), SetReadOnly(), IsUndoable(), IsRedoable() to IImgMergeWindow

9 years agoMerge
sdottaka [Sun, 21 Sep 2014 05:11:28 +0000 (14:11 +0900)]
Merge

9 years agoFix build error
sdottaka [Sun, 21 Sep 2014 04:53:16 +0000 (13:53 +0900)]
Fix build error

9 years agoREADME.md edited online with Bitbucket
sdottaka [Sun, 21 Sep 2014 04:38:08 +0000 (04:38 +0000)]
README.md edited online with Bitbucket

9 years agoREADME.md edited online with Bitbucket
sdottaka [Sun, 21 Sep 2014 04:18:25 +0000 (04:18 +0000)]
README.md edited online with Bitbucket

9 years agoAdd an image merge feature
sdottaka [Sun, 21 Sep 2014 04:04:55 +0000 (13:04 +0900)]
Add an image merge feature

9 years agoAdd BuildBin.cmd and its dependencies
sdottaka [Sun, 21 Sep 2014 03:55:34 +0000 (12:55 +0900)]
Add BuildBin.cmd and its dependencies

9 years ago- Fix some cppcheck warnings
sdottaka [Tue, 16 Sep 2014 10:43:17 +0000 (19:43 +0900)]
- Fix some cppcheck warnings
- Improve zoom

9 years agoWinIMergeLib: Add new member functions as listed below:
sdottaka [Mon, 15 Sep 2014 15:09:54 +0000 (00:09 +0900)]
WinIMergeLib: Add new member functions as listed below:
virtual int  GetPaneCount() const = 0;
virtual RECT GetPaneWindowRect(int pane) const = 0;
virtual RECT GetWindowRect() const = 0;
virtual COLORREF GetDiffColor() const = 0;
virtual void SetDiffColor(COLORREF clrDiffColor) = 0;
virtual COLORREF GetSelDiffColor() const = 0;
virtual void SetSelDiffColor(COLORREF clrSelDiffColor) = 0;
virtual double GetDiffColorAlpha() const = 0;
virtual void SetDiffColorAlpha(double diffColorAlpha) = 0;
virtual int  GetConflictCount() const = 0;
virtual bool SelectDiff(int diffIndex) = 0;
virtual int  GetNextDiffIndex() const = 0;
virtual int  GetPrevDiffIndex() const = 0;
virtual int  GetNextConflictIndex() const = 0;
virtual int  GetPrevConflictIndex() const = 0;
virtual HWND GetPaneHWND(int pane) const = 0;
virtual int  GetImageWidth(int pane) const = 0;
virtual int  GetImageHeight(int pane) const = 0;
virtual int  GetImageBitsPerPixel(int pane) const = 0;

9 years ago* WinIMergeLib: Add GetActivePane(), SetActivePane(),
sdottaka [Fri, 12 Sep 2014 10:19:47 +0000 (19:19 +0900)]
* WinIMergeLib: Add GetActivePane(), SetActivePane(),
                FirstConflict(),
                LastConflict(), NextConflict(), PrevConflict(),
                AddEventListener()
* WinIMergeLib: Draw focus rectangle
* WinIMerge: Add context menu
* WinIMerge: Add "Next Conflict", "Previous conflict" menu item

9 years agoInitial import
sdottaka [Thu, 11 Sep 2014 00:52:24 +0000 (09:52 +0900)]
Initial import