blob: e80c5deac1af35a7c9d733301373d7632c023740 (
plain)
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
|
diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c
index 25c1e5e5b..cf4555b34 100644
--- a/src/smooth/ftsmooth.c
+++ b/src/smooth/ftsmooth.c
@@ -290,14 +290,28 @@
for ( ; count--; spans++ )
+ {
+ unsigned int inc0 = ( (unsigned int)spans->coverage * target->wght[0] + 85 ) >> 8;
+ unsigned int inc1 = ( (unsigned int)spans->coverage * target->wght[1] + 85 ) >> 8;
+ unsigned int inc2 = ( (unsigned int)spans->coverage * target->wght[2] + 85 ) >> 8;
+ unsigned int inc3 = ( (unsigned int)spans->coverage * target->wght[3] + 85 ) >> 8;
+ unsigned int inc4 = ( (unsigned int)spans->coverage * target->wght[4] + 85 ) >> 8;
+
for ( dst = dst_line + spans->x, w = spans->len; w--; dst++ )
{
- dst[0] += ( spans->coverage * target->wght[0] + 85 ) >> 8;
- dst[1] += ( spans->coverage * target->wght[1] + 85 ) >> 8;
- dst[2] += ( spans->coverage * target->wght[2] + 85 ) >> 8;
- dst[3] += ( spans->coverage * target->wght[3] + 85 ) >> 8;
- dst[4] += ( spans->coverage * target->wght[4] + 85 ) >> 8;
+ unsigned int val;
+ val = dst[0] + inc0;
+ dst[0] = (unsigned char)( val > 255 ? 255 : val );
+ val = dst[1] + inc1;
+ dst[1] = (unsigned char)( val > 255 ? 255 : val );
+ val = dst[2] + inc2;
+ dst[2] = (unsigned char)( val > 255 ? 255 : val );
+ val = dst[3] + inc3;
+ dst[3] = (unsigned char)( val > 255 ? 255 : val );
+ val = dst[4] + inc4;
+ dst[4] = (unsigned char)( val > 255 ? 255 : val );
}
+ }
}
@@ -385,14 +399,28 @@
for ( ; count--; spans++ )
+ {
+ unsigned int inc0 = ( (unsigned int)spans->coverage * target->wght[0] + 85 ) >> 8;
+ unsigned int inc1 = ( (unsigned int)spans->coverage * target->wght[1] + 85 ) >> 8;
+ unsigned int inc2 = ( (unsigned int)spans->coverage * target->wght[2] + 85 ) >> 8;
+ unsigned int inc3 = ( (unsigned int)spans->coverage * target->wght[3] + 85 ) >> 8;
+ unsigned int inc4 = ( (unsigned int)spans->coverage * target->wght[4] + 85 ) >> 8;
+
for ( dst = dst_line + spans->x, w = spans->len; w--; dst++ )
{
- dst[ 0] += ( spans->coverage * target->wght[0] + 85 ) >> 8;
- dst[ pitch] += ( spans->coverage * target->wght[1] + 85 ) >> 8;
- dst[2 * pitch] += ( spans->coverage * target->wght[2] + 85 ) >> 8;
- dst[3 * pitch] += ( spans->coverage * target->wght[3] + 85 ) >> 8;
- dst[4 * pitch] += ( spans->coverage * target->wght[4] + 85 ) >> 8;
+ unsigned int val;
+ val = dst[ 0] + inc0;
+ dst[ 0] = (unsigned char)( val > 255 ? 255 : val );
+ val = dst[ pitch] + inc1;
+ dst[ pitch] = (unsigned char)( val > 255 ? 255 : val );
+ val = dst[2 * pitch] + inc2;
+ dst[2 * pitch] = (unsigned char)( val > 255 ? 255 : val );
+ val = dst[3 * pitch] + inc3;
+ dst[3 * pitch] = (unsigned char)( val > 255 ? 255 : val );
+ val = dst[4 * pitch] + inc4;
+ dst[4 * pitch] = (unsigned char)( val > 255 ? 255 : val );
}
+ }
}
static FT_Error
|