1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
--- x11drive/gra2wmf.c.orig Sun Aug 15 11:43:50 2004
+++ x11drive/gra2wmf.c Sun Aug 15 11:44:55 2004
@@ -334,7 +334,7 @@
return FALSE;
}
-int round(double x)
+int iround(double x)
{
int ix;
double dx;
@@ -831,8 +831,8 @@
len2=len=sqrt(dx*dx+dy*dy);
while (len2>((dashlist)[dashi]-dashlen)) {
dd=(len-len2+(dashlist)[dashi]-dashlen)/len;
- gx=gx1+round(dx*dd);
- gy=gy1+round(dy*dd);
+ gx=gx1+iround(dx*dd);
+ gy=gy1+iround(dy*dd);
if (dotf) LineTo(DC,gx,gy);
else MoveTo(DC,gx,gy);
dotf=dotf ? FALSE : TRUE;
@@ -853,22 +853,22 @@
int dot2pixel(int r)
{
- return round(r*pixel_dot);
+ return iround(r*pixel_dot);
}
int dot2pixelx(int x)
{
- return round(x*pixel_dot+offsetx-scrollx);
+ return iround(x*pixel_dot+offsetx-scrollx);
}
int dot2pixely(int y)
{
- return round(y*pixel_dot+offsety-scrolly);
+ return iround(y*pixel_dot+offsety-scrolly);
}
int pixel2dot(int r)
{
- return round(r/pixel_dot);
+ return iround(r/pixel_dot);
}
void draw(char code,int *cpar,char *cstr)
@@ -1018,10 +1018,10 @@
dot2pixely(cpar[2]-cpar[4]),
dot2pixelx(cpar[1]+cpar[3]),
dot2pixely(cpar[2]+cpar[4]),
- dot2pixelx(cpar[1]+round(cpar[3]*cos(Theta1)))-1,
- dot2pixely(cpar[2]-round(cpar[4]*sin(Theta1)))-1,
- dot2pixelx(cpar[1]+round(cpar[3]*cos(Theta2)))-1,
- dot2pixely(cpar[2]-round(cpar[4]*sin(Theta2)))-1);
+ dot2pixelx(cpar[1]+iround(cpar[3]*cos(Theta1)))-1,
+ dot2pixely(cpar[2]-iround(cpar[4]*sin(Theta1)))-1,
+ dot2pixelx(cpar[1]+iround(cpar[3]*cos(Theta2)))-1,
+ dot2pixely(cpar[2]-iround(cpar[4]*sin(Theta2)))-1);
} else {
TmpPen=OrgPen;
SelectObject(DC,TmpPen);
@@ -1033,19 +1033,19 @@
dot2pixely(cpar[2]-cpar[4]),
dot2pixelx(cpar[1]+cpar[3]),
dot2pixely(cpar[2]+cpar[4]),
- dot2pixelx(cpar[1]+round(cpar[3]*cos(Theta1)))-1,
- dot2pixely(cpar[2]-round(cpar[4]*sin(Theta1)))-1,
- dot2pixelx(cpar[1]+round(cpar[3]*cos(Theta2)))-1,
- dot2pixely(cpar[2]-round(cpar[4]*sin(Theta2)))-1);
+ dot2pixelx(cpar[1]+iround(cpar[3]*cos(Theta1)))-1,
+ dot2pixely(cpar[2]-iround(cpar[4]*sin(Theta1)))-1,
+ dot2pixelx(cpar[1]+iround(cpar[3]*cos(Theta2)))-1,
+ dot2pixely(cpar[2]-iround(cpar[4]*sin(Theta2)))-1);
} else {
Chord(DC,dot2pixelx(cpar[1]-cpar[3]),
dot2pixely(cpar[2]-cpar[4]),
dot2pixelx(cpar[1]+cpar[3]),
dot2pixely(cpar[2]+cpar[4]),
- dot2pixelx(cpar[1]+round(cpar[3]*cos(Theta1)))-1,
- dot2pixely(cpar[2]-round(cpar[4]*sin(Theta1)))-1,
- dot2pixelx(cpar[1]+round(cpar[3]*cos(Theta2)))-1,
- dot2pixely(cpar[2]-round(cpar[4]*sin(Theta2)))-1);
+ dot2pixelx(cpar[1]+iround(cpar[3]*cos(Theta1)))-1,
+ dot2pixely(cpar[2]-iround(cpar[4]*sin(Theta1)))-1,
+ dot2pixelx(cpar[1]+iround(cpar[3]*cos(Theta2)))-1,
+ dot2pixely(cpar[2]-iround(cpar[4]*sin(Theta2)))-1);
}
SelectObject(DC,ThePen);
}
@@ -1129,9 +1129,9 @@
loadfontf=FALSE;
break;
}
- IDFont.lfHeight=-round(pixel_dot*fontsize);
+ IDFont.lfHeight=-iround(pixel_dot*fontsize);
IDFont.lfWidth=0;
- IDFont.lfEscapement=IDFont.lfOrientation=round(fontdir*10);
+ IDFont.lfEscapement=IDFont.lfOrientation=iround(fontdir*10);
IDFont.lfUnderline=0;
IDFont.lfStrikeOut=0;
IDFont.lfPitchAndFamily=0;
@@ -1199,8 +1199,8 @@
if (s==NULL) break;
x0=cpx;
y0=cpy;
- TextOut(DC,dot2pixelx(round(x0)),
- dot2pixely(round(y0)),s,strlen(s));
+ TextOut(DC,dot2pixelx(iround(x0)),
+ dot2pixely(iround(y0)),s,strlen(s));
fontwidth=0;
for (i=0;i<strlen(s);i++) {
fontwidth+=charwidth((unsigned char)s[i],fontalias,fontsize/25.4*72);
@@ -1209,15 +1209,15 @@
free(s);
x0+=fontwidth*fontcos;
y0-=fontwidth*fontsin;
- cpx=round(x0);
- cpy=round(y0);
+ cpx=iround(x0);
+ cpy=iround(y0);
break;
case 'K':
if (!loadfontf) break;
x0=cpx;
y0=cpy;
- TextOut(DC,dot2pixelx(round(x0)),
- dot2pixely(round(y0)),cstr,strlen(cstr));
+ TextOut(DC,dot2pixelx(iround(x0)),
+ dot2pixely(iround(y0)),cstr,strlen(cstr));
fontwidth=0;
for (i=0;i<strlen(s);i+=2) {
fontwidth+=charwidth((((unsigned char)cstr[i+1])<<8)+(unsigned char)cstr[i],
@@ -1226,8 +1226,8 @@
}
x0+=fontwidth*fontcos;
y0-=fontwidth*fontsin;
- cpx=round(x0);
- cpy=round(y0);
+ cpx=iround(x0);
+ cpy=iround(y0);
break;
default: break;
}
|
