Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Round the values in wxDC coordinate calculations.

Browse Source 
Make the conversion of logical coordinates to the device ones more precise by
avoiding errors due to truncation of floating point values to integer ones.

See #13284.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-06-16 15:13:52 +00:00
parent f76c3ff677
commit 1fdce0aeb9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/dc.cpp
View File

@@ -34,6 +34,7 @@
#include "wx/bitmap.h"
#include "wx/dcmemory.h"
#include "wx/log.h"
#include "wx/math.h"
#include "wx/icon.h"
#include "wx/dcprint.h"
#include "wx/module.h"
@@ -1978,24 +1979,24 @@ void wxMSWDCImpl::RealizeScaleAndOrigin()
logExtX, logExtY; // Window, i.e. logical coordinate space, extents.
if ( m_scaleX >= 1 )
{
devExtX = VIEWPORT_EXTENT*m_scaleX;
devExtX = wxRound(VIEWPORT_EXTENT*m_scaleX);
logExtX = m_signX*VIEWPORT_EXTENT;
}
else
{
devExtX = VIEWPORT_EXTENT;
logExtX = m_signX*VIEWPORT_EXTENT/m_scaleX;
logExtX = wxRound(m_signX*VIEWPORT_EXTENT/m_scaleX);
}
if ( m_scaleY >= 1 )
{
devExtY = VIEWPORT_EXTENT*m_scaleY;
devExtY = wxRound(VIEWPORT_EXTENT*m_scaleY);
logExtY = m_signY*VIEWPORT_EXTENT;
}
else
{
devExtY = VIEWPORT_EXTENT;
logExtY = m_signY*VIEWPORT_EXTENT/m_scaleY;
logExtY = wxRound(m_signY*VIEWPORT_EXTENT/m_scaleY);
}
::SetViewportExtEx(GetHdc(), devExtX, devExtY, NULL);