You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
39 lines
1.6 KiB
39 lines
1.6 KiB
From 148971013ee48926dfe153ca39c94be92acde37c Mon Sep 17 00:00:00 2001
|
|
From: Paul Cornett <paulcor@bullseye.com>
|
|
Date: Wed, 15 Oct 2014 16:53:54 +0000
|
|
Subject: [PATCH] fix crash in wxGCDC::DrawEllipticArc() after r76954, closes
|
|
#16623
|
|
|
|
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
|
|
---
|
|
src/common/dcgraph.cpp | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
|
|
index d27e9cc..c390eb4 100644
|
|
--- a/src/common/dcgraph.cpp
|
|
+++ b/src/common/dcgraph.cpp
|
|
@@ -646,13 +646,12 @@ void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
|
|
m_graphicContext->PushState();
|
|
m_graphicContext->Translate(dx, dy);
|
|
m_graphicContext->Scale(factor, 1.0);
|
|
- wxGraphicsPath path;
|
|
+ wxGraphicsPath path = m_graphicContext->CreatePath();
|
|
|
|
// since these angles (ea,sa) are measured counter-clockwise, we invert them to
|
|
// get clockwise angles
|
|
if ( m_brush.GetStyle() != wxTRANSPARENT )
|
|
{
|
|
- path = m_graphicContext->CreatePath();
|
|
path.MoveToPoint( 0, 0 );
|
|
path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
|
|
path.AddLineToPoint( 0, 0 );
|
|
@@ -664,7 +663,6 @@ void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
|
|
}
|
|
else
|
|
{
|
|
- wxGraphicsPath path = m_graphicContext->CreatePath();
|
|
path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
|
|
m_graphicContext->DrawPath( path );
|
|
}
|