- Sync gdiplus with Wine head
[reactos.git] / reactos / dll / win32 / gdiplus / gdiplus_ros.diff
1 Index: gdiplus.c
2 ===================================================================
3 RCS file: /home/wine/wine/dlls/gdiplus/gdiplus.c,v
4 retrieving revision 1.15
5 diff -u -r1.15 gdiplus.c
6 --- gdiplus.c 8 Jan 2008 16:22:52 -0000 1.15
7 +++ gdiplus.c 23 Mar 2008 21:21:23 -0000
8 @@ -200,7 +200,7 @@
9 unstretch_angle(&startAngle, x2 / 2.0, y2 / 2.0);
10 unstretch_angle(&endAngle, x2 / 2.0, y2 / 2.0);
11
12 - count = ceilf(fabs(endAngle - startAngle) / M_PI_2) * 3 + 1;
13 + count = ceil(fabs(endAngle - startAngle) / M_PI_2) * 3 + 1;
14 /* don't make more than a full circle */
15 count = min(MAX_ARC_PTS, count);
16
17 Index: gdiplus_private.h
18 ===================================================================
19 RCS file: /home/wine/wine/dlls/gdiplus/gdiplus_private.h,v
20 retrieving revision 1.58
21 diff -u -r1.58 gdiplus_private.h
22 --- gdiplus_private.h 15 Aug 2007 09:36:31 -0000 1.58
23 +++ gdiplus_private.h 23 Mar 2008 09:25:54 -0000
24 @@ -46,7 +46,7 @@
25
26 static inline INT roundr(REAL x)
27 {
28 - return (INT) floorf(x + 0.5);
29 + return (INT) floor(x + 0.5);
30 }
31
32 static inline REAL deg2rad(REAL degrees)
33 Index: graphics.c
34 ===================================================================
35 RCS file: /home/wine/wine/dlls/gdiplus/graphics.c,v
36 retrieving revision 1.102
37 diff -u -r1.102 graphics.c
38 --- graphics.c 1 Mar 2008 12:15:48 -0000 1.102
39 +++ graphics.c 23 Mar 2008 21:21:23 -0000
40 @@ -1464,7 +1464,7 @@
41 DeleteObject(SelectObject(graphics->hdc, CreateFontIndirectW(&lfw)));
42
43 for(i = 0, j = 0; i < length; i++){
44 - if(!isprintW(string[i]) && (string[i] != '\n'))
45 + if(!isprint(string[i]) && (string[i] != '\n'))
46 continue;
47
48 stringdup[j] = string[i];
49 @@ -1873,7 +1873,7 @@
50 nwidth = nheight = INT_MAX;
51
52 for(i = 0, j = 0; i < length; i++){
53 - if(!isprintW(string[i]) && (string[i] != '\n'))
54 + if(!isprint(string[i]) && (string[i] != '\n'))
55 continue;
56
57 stringdup[j] = string[i];
58