OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Takashi Sawanaka [Sun, 13 Nov 2016 09:18:56 +0000 (18:18 +0900)]
Bump revision to 1.0.4.0
Takashi Sawanaka [Sun, 13 Nov 2016 09:04:21 +0000 (18:04 +0900)]
- Make diff block blinkable
- Add 'Alpha Animation' item to 'Overlay' combobox
Takashi Sawanaka [Thu, 18 Aug 2016 13:17:50 +0000 (22:17 +0900)]
Cppcheck: C-style pointer casting
Takashi Sawanaka [Sun, 27 Mar 2016 10:53:55 +0000 (19:53 +0900)]
EnableDpiAwareness = true
Takashi Sawanaka [Sat, 26 Mar 2016 13:10:30 +0000 (22:10 +0900)]
Retry to upgrade project files to VS2015
sdottaka [Tue, 29 Dec 2015 15:03:10 +0000 (00:03 +0900)]
Backed out changeset:
400548bf5ec9
sdottaka [Sun, 6 Dec 2015 07:55:33 +0000 (16:55 +0900)]
Upgrade project files to VS2015
sdottaka [Sun, 13 Sep 2015 07:32:04 +0000 (16:32 +0900)]
Added tag 1.0.3.0 for changeset
e2dcd9dd397e
sdottaka [Sun, 13 Sep 2015 07:30:29 +0000 (16:30 +0900)]
Bump revision to 1.0.3.0
sdottaka [Sat, 12 Sep 2015 09:24:41 +0000 (18:24 +0900)]
WinIMergeLib.rc: enlarge the width of the static control "Block Alpha"
sdottaka [Sat, 12 Sep 2015 09:23:49 +0000 (18:23 +0900)]
Update freeimage to 3.17.0 (2)
sdottaka [Sat, 12 Sep 2015 07:54:37 +0000 (16:54 +0900)]
ImgDiffBuffer.hpp: Fix crash in CImgDiffBuffer::GetDiffMapImage() function
sdottaka [Sat, 12 Sep 2015 05:56:51 +0000 (14:56 +0900)]
Update freeimage to 3.17.0
sdottaka [Sun, 2 Aug 2015 01:57:12 +0000 (10:57 +0900)]
Added tag 1.0.2.0 for changeset
224658994c21
sdottaka [Sun, 2 Aug 2015 01:56:55 +0000 (10:56 +0900)]
Bump revision to 1.0.2.0
sdottaka [Sun, 2 Aug 2015 01:54:11 +0000 (10:54 +0900)]
Cppcheck: Variable 'image_' is assigned in constructor body. Consider performing initialization in initialization list.
Cppcheck: Class '...' has a constructor with 1 argument that is not explicit.
Cppcheck: %s in format string (no. 1) requires 'char *' but the argument type is 'const std::wstring'.
sdottaka [Sun, 2 Aug 2015 01:42:47 +0000 (10:42 +0900)]
Add Tool Window
sdottaka [Sat, 20 Jun 2015 02:29:16 +0000 (11:29 +0900)]
Added tag 1.0.1.0 for changeset
f8b9b9746939
sdottaka [Sat, 20 Jun 2015 02:28:47 +0000 (11:28 +0900)]
Bump revision to 1.0.1.0
sdottaka [Sat, 20 Jun 2015 02:17:42 +0000 (11:17 +0900)]
ImageWindow.hpp: Fix flashing when moving to the next/previous difference
sdottaka [Sat, 23 May 2015 06:08:44 +0000 (15:08 +0900)]
Added tag 1.0.0.0 for changeset
824742a4a5ae
sdottaka [Sat, 23 May 2015 06:02:34 +0000 (15:02 +0900)]
Bump revision to 1.0.0.0
sdottaka [Sat, 23 May 2015 06:02:10 +0000 (15:02 +0900)]
Rename BuildBin_vc12.cmd to BuildBin.cmd
sdottaka [Sat, 23 May 2015 06:01:19 +0000 (15:01 +0900)]
BuildBin_vc12.cmd: sign *.exe and *.dll
sdottaka [Sat, 23 May 2015 05:36:41 +0000 (14:36 +0900)]
Remove BuildBin.cmd, BuildBin_vc11.cmd
sdottaka [Sat, 23 May 2015 05:26:53 +0000 (14:26 +0900)]
Don't use SSE2 instructions for Pentium III
sdottaka [Sat, 23 May 2015 05:18:37 +0000 (14:18 +0900)]
WinIMerge.sln: Update to VS2013
sdottaka [Sat, 23 May 2015 05:10:18 +0000 (14:10 +0900)]
Update copyright year and fix wrong email address
sdottaka [Sat, 23 May 2015 05:08:56 +0000 (14:08 +0900)]
Fix compiler warnings
sdottaka [Sat, 23 May 2015 05:06:18 +0000 (14:06 +0900)]
Fix the bug that images are not displayed after clicking [View]/[Prev Page] menu item
sdottaka [Thu, 15 Jan 2015 06:40:16 +0000 (15:40 +0900)]
Added tag 0.9.9.0 for changeset
219aa7716b51
sdottaka [Thu, 15 Jan 2015 06:39:01 +0000 (15:39 +0900)]
Bump revision to 0.9.9.0
sdottaka [Thu, 15 Jan 2015 06:38:25 +0000 (15:38 +0900)]
Update copyright year and wrong email address
sdottaka [Thu, 15 Jan 2015 06:37:27 +0000 (15:37 +0900)]
Reduce some compiler warnings
sdottaka [Thu, 15 Jan 2015 06:36:17 +0000 (15:36 +0900)]
Fix crash when comparing with 0-size image file
sdottaka [Thu, 15 Jan 2015 06:32:58 +0000 (15:32 +0900)]
Upgrade project files to VS2013
sdottaka [Mon, 29 Dec 2014 12:47:13 +0000 (21:47 +0900)]
Added tag 0.9.8.0 for changeset
183e12ead29f
sdottaka [Mon, 29 Dec 2014 12:46:56 +0000 (21:46 +0900)]
Bump revision to 0.9.8.0
sdottaka [Mon, 29 Dec 2014 12:46:32 +0000 (21:46 +0900)]
cidiff.vcxproj: define _CRT_SECURE_NO_WARNINGS macro to reduce warnings
sdottaka [Mon, 29 Dec 2014 12:45:34 +0000 (21:45 +0900)]
ImageDiff: Make comparing position adjustable by Shift+Arrow keys
sdottaka [Mon, 29 Dec 2014 12:39:46 +0000 (21:39 +0900)]
Add IImgMergeWindow::EVENT_TYPE::KEYDOWN, KEYUP
sdottaka [Mon, 29 Dec 2014 12:37:28 +0000 (21:37 +0900)]
Add IImgMergeWindow::AddImageOffset(), GetImageOffset() function
sdottaka [Sat, 29 Nov 2014 12:27:08 +0000 (21:27 +0900)]
Added tag 0.9.7.0 for changeset
c48abf5626bd
sdottaka [Sat, 29 Nov 2014 12:26:56 +0000 (21:26 +0900)]
Bump revision to 0.9.7.0
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
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
sdottaka [Tue, 28 Oct 2014 12:37:55 +0000 (21:37 +0900)]
Added tag 0.9.6.0 for changeset
8cd8da53a343
sdottaka [Tue, 28 Oct 2014 12:36:45 +0000 (21:36 +0900)]
Bump revision to 0.9.6.0
sdottaka [Tue, 28 Oct 2014 12:31:39 +0000 (21:31 +0900)]
*.ficache file was not deleted
sdottaka [Sun, 19 Oct 2014 02:39:09 +0000 (11:39 +0900)]
Added tag 0.9.5.0 for changeset
078109b91064
sdottaka [Sun, 19 Oct 2014 02:38:02 +0000 (11:38 +0900)]
Bump revision to 0.9.5.0
sdottaka [Sun, 19 Oct 2014 01:53:08 +0000 (10:53 +0900)]
Rename CImg*.hpp to Img*.hpp
sdottaka [Sun, 19 Oct 2014 01:32:50 +0000 (10:32 +0900)]
Remove FreeImage dependency from CImgDiffBuffer.hpp and CImgMergeBuffer.hpp
sdottaka [Tue, 7 Oct 2014 12:04:16 +0000 (21:04 +0900)]
Split CImgMergeBuffer.hpp into 2 files
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
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
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
sdottaka [Sun, 5 Oct 2014 12:11:59 +0000 (21:11 +0900)]
Add cidiff command to archive file
sdottaka [Sun, 5 Oct 2014 11:58:13 +0000 (20:58 +0900)]
Added tag 0.9.4.0 for changeset
0ef16028a292
sdottaka [Sun, 5 Oct 2014 11:57:55 +0000 (20:57 +0900)]
Bump revision to 0.9.4.0
sdottaka [Sat, 4 Oct 2014 09:51:29 +0000 (18:51 +0900)]
Add cidiff command
sdottaka [Sat, 4 Oct 2014 09:48:09 +0000 (18:48 +0900)]
make CImgMergeBuffer.hpp compilable on Linux
sdottaka [Fri, 3 Oct 2014 13:20:21 +0000 (22:20 +0900)]
CImgMergeWindow.hpp: Move non-GUI code to CImgMergeBuffer.hpp
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
sdottaka [Sun, 28 Sep 2014 16:42:27 +0000 (01:42 +0900)]
Added tag 0.9.3.0 for changeset
9e83a2640c31
sdottaka [Sun, 28 Sep 2014 16:40:25 +0000 (01:40 +0900)]
Bump revision to 0.9.3.0
sdottaka [Sun, 28 Sep 2014 16:39:57 +0000 (01:39 +0900)]
CImgWindow.hpp: - Change background color
- Draw margins for image
sdottaka [Sun, 28 Sep 2014 14:57:59 +0000 (23:57 +0900)]
Assign Ctrl+0 key to reset zoom
sdottaka [Sun, 28 Sep 2014 00:34:32 +0000 (09:34 +0900)]
Added tag 0.9.2.0 for changeset
5710fff75af9
sdottaka [Sun, 28 Sep 2014 00:23:36 +0000 (09:23 +0900)]
Bump revision to 0.9.2.0
sdottaka [Sun, 28 Sep 2014 00:23:22 +0000 (09:23 +0900)]
Add BuildArc.cmd
sdottaka [Sun, 28 Sep 2014 00:22:28 +0000 (09:22 +0900)]
Add .hgignore
sdottaka [Sun, 28 Sep 2014 00:01:49 +0000 (09:01 +0900)]
Add IImgMergeWindow::GetPixelColor() function and GetColorDistance() function
sdottaka [Sat, 27 Sep 2014 12:52:39 +0000 (21:52 +0900)]
WinIMerge.rc: move menu items
sdottaka [Fri, 26 Sep 2014 14:12:59 +0000 (23:12 +0900)]
Add IImgMergeWindow::SetColorDistanceThreshold() and GetColorDistanceThreshold()
sdottaka [Fri, 26 Sep 2014 04:36:04 +0000 (13:36 +0900)]
Add IImgMergeWindow::ReloadImages() function
sdottaka [Thu, 25 Sep 2014 13:43:22 +0000 (22:43 +0900)]
CImgMergeWindow.hpp: Fix a bug of FirstConflict() function
sdottaka [Thu, 25 Sep 2014 12:26:15 +0000 (21:26 +0900)]
Add IImgMergeWindow::CopyDiffAll() function and CopyDiff3Way() function
sdottaka [Thu, 25 Sep 2014 06:17:50 +0000 (15:17 +0900)]
Select the diff when double-clicking a diff
sdottaka [Thu, 25 Sep 2014 06:15:21 +0000 (15:15 +0900)]
Add IImgMergeWindow::GetCursorPos() function
sdottaka [Thu, 25 Sep 2014 06:13:12 +0000 (15:13 +0900)]
Draw the borders of an image
sdottaka [Thu, 25 Sep 2014 01:41:10 +0000 (10:41 +0900)]
Add BuildBin_vc11.cmd for VS2012
sdottaka [Wed, 24 Sep 2014 10:32:58 +0000 (19:32 +0900)]
Bump revision to 0.9.1.0
sdottaka [Wed, 24 Sep 2014 09:56:14 +0000 (18:56 +0900)]
Add "Generate Report" menu item
sdottaka [Mon, 22 Sep 2014 10:22:47 +0000 (19:22 +0900)]
CImgMergeWindow.hpp: Implement SaveImageAs()
sdottaka [Mon, 22 Sep 2014 07:40:05 +0000 (16:40 +0900)]
WinIMerge.rc: Fix typo
sdottaka [Mon, 22 Sep 2014 07:39:15 +0000 (16:39 +0900)]
Add GetReadOnly(), SetReadOnly(), IsUndoable(), IsRedoable() to IImgMergeWindow
sdottaka [Sun, 21 Sep 2014 05:11:28 +0000 (14:11 +0900)]
Merge
sdottaka [Sun, 21 Sep 2014 04:53:16 +0000 (13:53 +0900)]
Fix build error
sdottaka [Sun, 21 Sep 2014 04:38:08 +0000 (04:38 +0000)]
README.md edited online with Bitbucket
sdottaka [Sun, 21 Sep 2014 04:18:25 +0000 (04:18 +0000)]
README.md edited online with Bitbucket
sdottaka [Sun, 21 Sep 2014 04:04:55 +0000 (13:04 +0900)]
Add an image merge feature
sdottaka [Sun, 21 Sep 2014 03:55:34 +0000 (12:55 +0900)]
Add BuildBin.cmd and its dependencies
sdottaka [Tue, 16 Sep 2014 10:43:17 +0000 (19:43 +0900)]
- Fix some cppcheck warnings
- Improve zoom
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;
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
sdottaka [Thu, 11 Sep 2014 00:52:24 +0000 (09:52 +0900)]
Initial import