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

Fix precision in wxGraphicsContext::{Stroke,Draw}Lines() under MSW.

Browse Source 
Use floating point coordinates instead of ints which were used for some
reason, resulting in a loss of precision.

Closes #16187.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-04-27 22:39:01 +00:00
parent 4e61289210
commit 2b147475fd
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -655,6 +655,7 @@ wxMSW:
- Fix expander in non left-most position in wxDataViewCtrl (Laurent Poujoulat). - Fix expander in non left-most position in wxDataViewCtrl (Laurent Poujoulat).
- Don't fail when using large paper sizes in print preview. - Don't fail when using large paper sizes in print preview.
- Fix wxRichMessageDialog return value for dialog with only "OK" button. - Fix wxRichMessageDialog return value for dialog with only "OK" button.
- Fix precision loss in wxGraphicsContext::{Draw,Stroke}Lines() (tibo_).
wxOSX: wxOSX:

12
src/msw/graphics.cpp
View File

@@ -1488,11 +1488,11 @@ void wxGDIPlusContext::StrokeLines( size_t n, const wxPoint2DDouble *points)
if ( !m_pen.IsNull() ) if ( !m_pen.IsNull() )
{ {
wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() ); wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
Point *cpoints = new Point[n]; PointF *cpoints = new PointF[n];
for (size_t i = 0; i < n; i++) for (size_t i = 0; i < n; i++)
{ {
cpoints[i].X = (int)(points[i].m_x ); cpoints[i].X = static_cast<REAL>(points[i].m_x);
cpoints[i].Y = (int)(points[i].m_y ); cpoints[i].Y = static_cast<REAL>(points[i].m_y);
} // for (size_t i = 0; i < n; i++) } // for (size_t i = 0; i < n; i++)
m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ; m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ;
@@ -1506,11 +1506,11 @@ void wxGDIPlusContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPol
return; return;
wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() ); wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
Point *cpoints = new Point[n]; PointF *cpoints = new PointF[n];
for (size_t i = 0; i < n; i++) for (size_t i = 0; i < n; i++)
{ {
cpoints[i].X = (int)(points[i].m_x ); cpoints[i].X = static_cast<REAL>(points[i].m_x);
cpoints[i].Y = (int)(points[i].m_y ); cpoints[i].Y = static_cast<REAL>(points[i].m_y);
} // for (int i = 0; i < n; i++) } // for (int i = 0; i < n; i++)
if ( !m_brush.IsNull() ) if ( !m_brush.IsNull() )