Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 17:31:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32K] Fix drawing the Start and End Segments with Pie(). Brought to you by Barrett Karish. CORE-6851

Browse source 
svn path=/trunk/; revision=67420
This commit is contained in:
Amine Khaldi 2015-04-25 17:30:43 +00:00
parent 3cd624bc90
commit df00499cad
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reactos/win32ss/gdi/ntgdi/arc.c
View file

@ -22,9 +22,6 @@
&RectBounds, \ &RectBounds, \
ROP2_TO_MIX(pdcattr->jROP2)); ROP2_TO_MIX(pdcattr->jROP2));
#define Rsin(d) ((d) == 0.0 ? 0.0 : ((d) == 90.0 ? 1.0 : sin(d*M_PI/180.0)))
#define Rcos(d) ((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 : cos(d*M_PI/180.0)))
static static
BOOL BOOL
FASTCALL FASTCALL
@ -46,8 +43,7 @@ IntArc( DC *dc,
BOOL ret = TRUE; BOOL ret = TRUE;
LONG PenWidth, PenOrigWidth; LONG PenWidth, PenOrigWidth;
double AngleStart, AngleEnd; double AngleStart, AngleEnd;
LONG RadiusX, RadiusY, CenterX, CenterY; LONG CenterX, CenterY;
LONG SfCx, SfCy, EfCx, EfCy;
if (Right < Left) if (Right < Left)
{ {
@ -124,8 +120,6 @@ IntArc( DC *dc,
DPRINT("1: Left: %d, Top: %d, Right: %d, Bottom: %d\n", DPRINT("1: Left: %d, Top: %d, Right: %d, Bottom: %d\n",
RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom);
RadiusX = max((RectBounds.right - RectBounds.left) / 2, 1);
RadiusY = max((RectBounds.bottom - RectBounds.top) / 2, 1);
CenterX = (RectBounds.right + RectBounds.left) / 2; CenterX = (RectBounds.right + RectBounds.left) / 2;
CenterY = (RectBounds.bottom + RectBounds.top) / 2; CenterY = (RectBounds.bottom + RectBounds.top) / 2;
AngleEnd = atan2((RectSEpts.bottom - CenterY), RectSEpts.right - CenterX)*(360.0/(M_PI*2)); AngleEnd = atan2((RectSEpts.bottom - CenterY), RectSEpts.right - CenterX)*(360.0/(M_PI*2));
@ -137,11 +131,6 @@ IntArc( DC *dc,
AngleStart = AngleEnd + 360.0; // Arc(), ArcTo(), Pie() and Chord() are counterclockwise APIs. AngleStart = AngleEnd + 360.0; // Arc(), ArcTo(), Pie() and Chord() are counterclockwise APIs.
} }
SfCx = (LONG)(Rcos(AngleStart) * RadiusX);
SfCy = (LONG)(Rsin(AngleStart) * RadiusY);
EfCx = (LONG)(Rcos(AngleEnd) * RadiusX);
EfCy = (LONG)(Rsin(AngleEnd) * RadiusY);
if ((arctype == GdiTypePie) || (arctype == GdiTypeChord)) if ((arctype == GdiTypePie) || (arctype == GdiTypeChord))
{ {
ret = IntFillArc( dc, ret = IntFillArc( dc,
@ -175,11 +164,11 @@ IntArc( DC *dc,
if (arctype == GdiTypePie) if (arctype == GdiTypePie)
{ {
PUTLINE(CenterX, CenterY, SfCx + CenterX, SfCy + CenterY, dc->eboLine); PUTLINE(CenterX, CenterY, RectSEpts.left, RectSEpts.top, dc->eboLine);
PUTLINE(EfCx + CenterX, EfCy + CenterY, CenterX, CenterY, dc->eboLine); PUTLINE(RectSEpts.right, RectSEpts.bottom, CenterX, CenterY, dc->eboLine);
} }
if (arctype == GdiTypeChord) if (arctype == GdiTypeChord)
PUTLINE(EfCx + CenterX, EfCy + CenterY, SfCx + CenterX, SfCy + CenterY, dc->eboLine); PUTLINE(RectSEpts.right, RectSEpts.bottom, RectSEpts.left, RectSEpts.top, dc->eboLine);
pbrPen->lWidth = PenOrigWidth; pbrPen->lWidth = PenOrigWidth;
PEN_ShareUnlockPen(pbrPen); PEN_ShareUnlockPen(pbrPen);