summaryrefslogtreecommitdiff
path: root/x11-libs/cairo/files/cairo-1.2.4-lcd-cleartype-like.diff
blob: 2f908b855387da9cb66a6fdbeb871e1bf3a209e7 (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
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
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
diff -rup libcairo-1.2.4.orig/src/cairo-ft-font.c libcairo-1.2.4/src/cairo-ft-font.c
--- libcairo-1.2.4.orig/src/cairo-ft-font.c	2006-08-22 21:40:02.802247352 +0800
+++ libcairo-1.2.4/src/cairo-ft-font.c	2006-08-22 21:40:39.443677008 +0800
@@ -53,6 +53,8 @@
 #include FT_SYNTHESIS_H
 #endif
 
+#define FIR_FILTER 1
+
 #define DOUBLE_TO_26_6(d) ((FT_F26Dot6)((d) * 64.0))
 #define DOUBLE_FROM_26_6(t) ((double)(t) / 64.0)
 #define DOUBLE_TO_16_16(d) ((FT_Fixed)((d) * 65536.0))
@@ -492,6 +494,8 @@ _cairo_ft_unscaled_font_destroy (void *a
     }
 }
 
+static const int   fir_filter[5] = { 0x1C, 0x38, 0x55, 0x38, 0x1C };
+
 static cairo_bool_t
 _has_unlocked_face (void *entry)
 {
@@ -779,7 +783,220 @@ _get_bitmap_surface (FT_Bitmap		     *bi
 	    }
 	    format = CAIRO_FORMAT_A8;
 	    break;
-	case CAIRO_ANTIALIAS_SUBPIXEL: {
+	case CAIRO_ANTIALIAS_SUBPIXEL:
+#ifdef FIR_FILTER
+	{
+	    unsigned char*  line;
+	    unsigned char*  bufBitmap;
+	    int		    pitch;
+	    unsigned char   *data_rgba;
+	    unsigned int    width_rgba, stride_rgba;
+	    int		    vmul = 1;
+	    int		    hmul = 1;
+
+	    switch (font_options->subpixel_order) {
+	    case CAIRO_SUBPIXEL_ORDER_DEFAULT:
+	    case CAIRO_SUBPIXEL_ORDER_RGB:
+	    case CAIRO_SUBPIXEL_ORDER_BGR:
+	    default:
+		width /= 3;
+		hmul = 3;
+		break;
+	    case CAIRO_SUBPIXEL_ORDER_VRGB:
+	    case CAIRO_SUBPIXEL_ORDER_VBGR:
+		vmul = 3;
+		height /= 3;
+		break;
+	    }
+	    /*
+	     * Filter the glyph to soften the color fringes
+	     */
+	    width_rgba = width;
+	    stride = bitmap->pitch;
+	    stride_rgba = (width_rgba * 4 + 3) & ~3;
+	    data_rgba = calloc (1, stride_rgba * height);
+
+	    /* perform in-place FIR filtering in either the horizontal or
+	     * vertical direction. We're going to modify the RGB graymap,
+	     * but that's ok, because we either own it, or its part of
+	     * the FreeType glyph slot, which will not be used anymore.
+	     */
+	    pitch  = bitmap->pitch;
+	    line   = (unsigned char*)bitmap->buffer;
+	    if ( pitch < 0 )
+		line -= pitch*(height-1);
+
+	    bufBitmap = line;
+
+	    switch (font_options->subpixel_order) {
+	    case CAIRO_SUBPIXEL_ORDER_DEFAULT:
+	    case CAIRO_SUBPIXEL_ORDER_RGB:
+	    case CAIRO_SUBPIXEL_ORDER_BGR:
+	    {
+		int  h;
+
+		for ( h = height; h > 0; h--, line += pitch ) {
+		    int             pix[6] = { 0, 0, 0, 0, 0, 0 };
+		    unsigned char*  p      = line;
+		    unsigned char*  limit  = line + width*3;
+		    int             nn, val, val2;
+
+		    val = p[0];
+		    for (nn = 0; nn < 3; nn++)
+			pix[2 + nn] += val * fir_filter[nn];
+
+		    val = p[1];
+		    for (nn = 0; nn < 4; nn++)
+			pix[1 + nn] += val * fir_filter[nn];
+
+		    p += 2;
+
+		    for ( ; p  < limit; p++ ) {
+			val = p[0];
+			for (nn = 0; nn < 5; nn++)
+			    pix[nn] += val * fir_filter[nn];
+
+			val2  = pix[0] / 256;
+			val2 |= -(val2 >> 8);
+			p[-2]  = (unsigned char)val2;
+
+			for (nn = 0; nn < 5; nn++)
+			    pix[nn] = pix[nn + 1];
+		    }
+		    for (nn = 0; nn < 2; nn++ ) {
+			val2  = pix[nn] / 256;
+			val2 |= -(val2 >> 8);
+			p[nn - 2] = (unsigned char)val2;
+		    }
+		}
+	    }
+	    break;
+	    case CAIRO_SUBPIXEL_ORDER_VRGB:
+	    case CAIRO_SUBPIXEL_ORDER_VBGR:
+	    {
+		int  w;
+
+		for (w = 0; w < width; w++ ) {
+		    int  pix[6] = { 0, 0, 0, 0, 0, 0 };
+		    unsigned char*  p     = bufBitmap + w;
+		    unsigned char*  limit = bufBitmap + w + height*3*pitch;
+		    int             nn, val, val2;
+
+		    val = p[0];
+		    for (nn = 0; nn < 3; nn++)
+			pix[2 + nn] += val*fir_filter[nn];
+
+		    val = p[pitch];
+		    for (nn = 0; nn < 4; nn++ )
+			pix[1 + nn] += val * fir_filter[nn];
+
+		    p += 2*pitch;
+		    for ( ; p < limit; p += pitch ) {
+			val = p[0];
+			for (nn = 0; nn < 5; nn++ )
+			    pix[nn] += val * fir_filter[nn];
+
+			val2  = pix[0] / 256;
+			val2 |= -(val2 >> 8);
+			p[-2 * pitch] = (unsigned char)val2;
+
+			for (nn = 0; nn < 5; nn++)
+			    pix[nn] = pix[nn+1];
+		    }
+
+		    for (nn = 0; nn < 2; nn++) {
+			val2  = pix[nn] / 256;
+			val2 |= -(val2 >> 8);
+			p[(nn - 2) * pitch] = (unsigned char)val2;
+		    }
+		}
+	    }
+	    break;
+	    default:  /* shouldn't happen */
+		break;
+	    }
+
+	    /* now copy the resulting graymap into an ARGB32 image */
+	    {
+		unsigned char*  in_line  = bufBitmap;
+		unsigned char*  out_line = data_rgba;
+		int             h        = height;
+
+		switch (font_options->subpixel_order) {
+		case CAIRO_SUBPIXEL_ORDER_DEFAULT:
+		case CAIRO_SUBPIXEL_ORDER_RGB:
+		    for ( ; h > 0; h--, in_line += pitch, out_line += stride_rgba) {
+			unsigned char*  in  = in_line;
+			int*            out = (int*)out_line;
+			int             w;
+
+			for (w = width; w > 0; w--, in += 3, out += 1) {
+			    int  r = in[0];
+			    int  g = in[1];
+			    int  b = in[2];
+
+			    out[0] = (g << 24) | (r << 16) | (g << 8) | b;
+			}
+		    }
+		    break;
+		case CAIRO_SUBPIXEL_ORDER_BGR:
+		    for ( ; h > 0; h--, in_line += pitch, out_line += stride_rgba) {
+			unsigned char*  in  = in_line;
+			int*            out = (int*)out_line;
+			int             w;
+
+			for (w = width; w > 0; w--, in += 3, out += 1) {
+			    int  r = in[2];
+			    int  g = in[1];
+			    int  b = in[0];
+
+			    out[0] = (g << 24) | (r << 16) | (g << 8) | b;
+			}
+		    }
+		    break;
+		case CAIRO_SUBPIXEL_ORDER_VRGB:
+		    for ( ; h > 0; h--, in_line += pitch*3, out_line += stride_rgba) {
+			unsigned char*  in  = in_line;
+			int*            out = (int*)out_line;
+			int             w;
+
+			for (w = width; w > 0; w--, in += 1, out += 1) {
+			    int  r = in[0];
+			    int  g = in[pitch];
+			    int  b = in[pitch*2];
+
+			    out[0] = (g << 24) | (r << 16) | (g << 8) | b;
+			}
+		    }
+		    break;
+		case CAIRO_SUBPIXEL_ORDER_VBGR:
+		    for ( ; h > 0; h--, in_line += pitch*3, out_line += stride_rgba) {
+			unsigned char*  in  = in_line;
+			int*            out = (int*)out_line;
+			int             w;
+
+			for (w = width; w > 0; w--, in += 1, out += 1) {
+			    int  r = in[2*pitch];
+			    int  g = in[pitch];
+			    int  b = in[0];
+
+			    out[0] = (g << 24) | (r << 16) | (g << 8) | b;
+			}
+		    }
+		    break;
+		}
+	    }
+
+	    if (own_buffer)
+		free (bitmap->buffer);
+	    data = data_rgba;
+	    stride = stride_rgba;
+	    format = CAIRO_FORMAT_ARGB32;
+	    subpixel = TRUE;
+	    break;
+	}
+#else /* !FIR_FILTER */
+	{
 	    int		    x, y;
 	    unsigned char   *in_line, *out_line, *in;
 	    unsigned int    *out;
@@ -871,6 +1088,7 @@ _get_bitmap_surface (FT_Bitmap		     *bi
 	    subpixel = TRUE;
 	    break;
 	}
+#endif /* !FIR_FILTER */
 	}
 	break;
     case FT_PIXEL_MODE_GRAY2:
@@ -986,12 +1204,22 @@ _render_glyph_outline (FT_Face          
 		matrix.xx *= 3;
 		hmul = 3;
 		subpixel = TRUE;
+#ifdef FIR_FILTER
+		cbox.xMin -= 64;
+		cbox.xMax += 64;
+		width    += 2;
+#endif
 		break;
 	    case CAIRO_SUBPIXEL_ORDER_VRGB:
 	    case CAIRO_SUBPIXEL_ORDER_VBGR:
 		matrix.yy *= 3;
 		vmul = 3;
 		subpixel = TRUE;
+#ifdef FIR_FILTER
+		cbox.yMin -= 64;
+		cbox.yMax += 64;
+		height    += 2;
+#endif
 		break;
 	    }
 	    FT_Outline_Transform (outline, &matrix);
Only in libcairo-1.2.4/src: cairo-ft-font.c.orig