|
From: <jt...@us...> - 2010-06-13 09:02:51
|
Revision: 7184
http://winmerge.svn.sourceforge.net/winmerge/?rev=7184&view=rev
Author: jtuc
Date: 2010-06-13 09:02:45 +0000 (Sun, 13 Jun 2010)
Log Message:
-----------
CMergeDiffDetailView: Fix an inconsistency in m_lineBegin vs. m_lineEnd vs. m_diffLength, which was occurring after rescan.
Modified Paths:
--------------
trunk/Src/MergeDiffDetailView.cpp
Modified: trunk/Src/MergeDiffDetailView.cpp
===================================================================
--- trunk/Src/MergeDiffDetailView.cpp 2010-06-13 08:25:01 UTC (rev 7183)
+++ trunk/Src/MergeDiffDetailView.cpp 2010-06-13 09:02:45 UTC (rev 7184)
@@ -666,7 +666,7 @@
{
// just check that all positions all valid
m_lineEnd = min(m_lineEnd, GetLineCount()-1);
- m_diffLength = GetLineCount() - m_lineBegin;
+ m_diffLength = m_lineEnd - m_lineBegin + 1;
m_ptCursorPos.y = min(m_ptCursorPos.y, GetLineCount()-1);
m_ptCursorPos.x = min(m_ptCursorPos.x, GetLineLength(m_ptCursorPos.y));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
