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
|
--- a/lib/FXFont.cpp
+++ b/lib/FXFont.cpp
@@ -829,26 +829,26 @@
// Weight
if(wantweight){
- dweight=Math::iabs(weight-wantweight);
+ dweight=Math::iabs((FXint)(weight-wantweight));
}
else{
- dweight=Math::iabs(weight-FXFont::Normal);
+ dweight=Math::iabs((FXint)(weight-FXFont::Normal));
}
// Slant
if(wantslant){
- dslant=Math::iabs(slant-wantslant);
+ dslant=Math::iabs((FXint)(slant-wantslant));
}
else{
- dslant=Math::iabs(slant-FXFont::Straight);
+ dslant=Math::iabs((FXint)(slant-FXFont::Straight));
}
// Set width
if(wantsetwidth){
- dsetwidth=Math::iabs(setwidth-wantsetwidth);
+ dsetwidth=Math::iabs((FXint)(setwidth-wantsetwidth));
}
else{
- dsetwidth=Math::iabs(setwidth-FXFont::NonExpanded);
+ dsetwidth=Math::iabs((FXint)(setwidth-FXFont::NonExpanded));
}
// Pitch
@@ -900,7 +900,7 @@
// should be multiplied by (100/90).
else{
size=(yres*points)/res;
- dsize=Math::iabs(size-wantsize);
+ dsize=Math::iabs((FXint)(size-wantsize));
}
FXTRACE((160,"%4d: dweight=%-3d dsize=%3d dslant=%d dsetwidth=%d dscalable=%d dpolymorph=%d xres=%-3d yres=%-3d xlfd=\"%s\"\n",f,dweight,dsize,dslant,dsetwidth,dscalable,dpolymorph,xres,yres,fontnames[f]));
|
