system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

gdiplus: Fix arc2polybezier.

Browse source
This commit is contained in:
Evan Stade 2007-07-25 19:15:33 -07:00 committed by Alexandre Julliard
parent e11f7b7bbd
commit a4f238a117
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/gdiplus/gdiplus.c
View file

@ -151,10 +151,10 @@ static void unstretch_angle(REAL * angle, REAL rad_x, REAL rad_y)
*angle = deg2rad(*angle);
if(cos(*angle) == 0 || sin(*angle) == 0)
if(fabs(cos(*angle)) < 0.00001 || fabs(sin(*angle)) < 0.00001)
return;
stretched = gdiplus_atan2(sin(*angle) / rad_y, cos(*angle) / rad_x);
stretched = gdiplus_atan2(sin(*angle) / fabs(rad_y), cos(*angle) / fabs(rad_x));
revs_off = roundr(*angle / (2.0 * M_PI)) - roundr(stretched / (2.0 * M_PI));
stretched += ((REAL)revs_off) * M_PI * 2.0;
*angle = stretched;

33
dlls/gdiplus/tests/graphicspath.c
View file

@ -448,20 +448,20 @@ static path_test_t ellipse_path[] = {
{30.00, 111.30, PathPointTypeBezier, 0, 0}, /*11*/
{30.00, 125.25, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0}, /*12*/
{7.00, 11.00, PathPointTypeStart, 0, 0}, /*13*/
{13.00, 17.00, PathPointTypeLine, 0, 1}, /*14*/
{5.00, 195.00, PathPointTypeStart, 0, 1}, /*15*/
{5.00, 192.24, PathPointTypeBezier, 0, 1}, /*16*/
{6.12, 190.00, PathPointTypeBezier, 0, 1}, /*17*/
{7.50, 190.00, PathPointTypeBezier, 0, 1}, /*18*/
{8.88, 190.00, PathPointTypeBezier, 0, 1}, /*19*/
{10.00, 192.24, PathPointTypeBezier, 0, 1}, /*20*/
{10.00, 195.00, PathPointTypeBezier, 0, 1}, /*21*/
{10.00, 197.76, PathPointTypeBezier, 0, 1}, /*22*/
{8.88, 200.00, PathPointTypeBezier, 0, 1}, /*23*/
{7.50, 200.00, PathPointTypeBezier, 0, 1}, /*24*/
{6.12, 200.00, PathPointTypeBezier, 0, 1}, /*25*/
{5.00, 197.76, PathPointTypeBezier, 0, 1}, /*26*/
{5.00, 195.00, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 1}, /*27*/
{13.00, 17.00, PathPointTypeLine, 0, 0}, /*14*/
{5.00, 195.00, PathPointTypeStart, 0, 0}, /*15*/
{5.00, 192.24, PathPointTypeBezier, 0, 0}, /*16*/
{6.12, 190.00, PathPointTypeBezier, 0, 0}, /*17*/
{7.50, 190.00, PathPointTypeBezier, 0, 0}, /*18*/
{8.88, 190.00, PathPointTypeBezier, 0, 0}, /*19*/
{10.00, 192.24, PathPointTypeBezier, 0, 0}, /*20*/
{10.00, 195.00, PathPointTypeBezier, 0, 0}, /*21*/
{10.00, 197.76, PathPointTypeBezier, 0, 0}, /*22*/
{8.88, 200.00, PathPointTypeBezier, 0, 0}, /*23*/
{7.50, 200.00, PathPointTypeBezier, 0, 0}, /*24*/
{6.12, 200.00, PathPointTypeBezier, 0, 0}, /*25*/
{5.00, 197.76, PathPointTypeBezier, 0, 0}, /*26*/
{5.00, 195.00, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0}, /*27*/
{10.00, 300.50, PathPointTypeStart, 0, 0}, /*28*/
{10.00, 300.78, PathPointTypeBezier, 0, 0}, /*29*/
{10.00, 301.00, PathPointTypeBezier, 0, 0}, /*30*/
@ -493,13 +493,12 @@ static void test_ellipse(void)
expect(Ok, status);
GdipAddPathLine2(path, points, 2);
status = GdipAddPathEllipse(path, 10.0, 200.0, -5.0, -10.0);
todo_wine
expect(Ok, status);
expect(Ok, status);
GdipClosePathFigure(path);
status = GdipAddPathEllipse(path, 10.0, 300.0, 0.0, 1.0);
expect(Ok, status);
ok_path(path, ellipse_path, sizeof(ellipse_path)/sizeof(path_test_t), TRUE);
ok_path(path, ellipse_path, sizeof(ellipse_path)/sizeof(path_test_t), FALSE);
GdipDeletePath(path);
}