[stsf-commit] stsf/STFontServer/dropins/freetype2 ft2_glue.c, 1.4,
1.5 ftrenderglyph.inc, 1.2, 1.3
Alan Coopersmith
stsf-commit at pdx.freedesktop.org
Mon Feb 28 19:15:07 PST 2005
Committed by: alanc
Index: ft2_glue.c
===================================================================
RCS file: /cvs/stsf/stsf/STFontServer/dropins/freetype2/ft2_glue.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ft2_glue.c 2 Jul 2004 05:00:13 -0000 1.4
+++ ft2_glue.c 1 Mar 2005 03:15:05 -0000 1.5
@@ -64,6 +64,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
+#include FT_OUTLINE_H
#define POS_TO_FLOAT(x) (((float) x) / 64.0)
@@ -107,9 +108,10 @@
// 1 - gray-scale
// 2 - LCD Optimized
// 3 - bit-swapped B&W
- unsigned int aconv; // algorithmic conversion
- // bit flags: 0x1 - embolden 0x2 - italicize
-
+ unsigned int aconv; // algorithmic conversion bit flags
+ // 0x1 - embolden
+ // 0x2 - italicize
+ // 0x4 - embolden bitmap
} ScalerCacheRecord, *ScalerCacheRecordPtr;
typedef struct {
@@ -277,7 +279,9 @@
res->aconv = 0;
if (instance->flags & FS_RF_EMBOLDEN) {
res->aconv |= 0x01;
- }
+ } else if (instance->flags & FS_RF_EMBOLDENBITMAPS) {
+ res->aconv |= 0x04;
+ }
if (instance->flags & FS_RF_ITALICISE) {
res->aconv |= 0x02;
}
@@ -586,22 +590,38 @@
static byte swappedbits[256] = {
- 0, 128, 64, 192, 32, 160, 96, 224, 16, 144, 80, 208, 48, 176, 112, 240,
- 8, 136, 74, 200, 40, 168, 104, 232, 24, 152, 88, 216, 56, 184, 120, 248,
- 4, 132, 68, 196, 36, 164, 100, 228, 20, 148, 84, 212, 52, 180, 116, 244,
- 12, 140, 78, 204, 44, 172, 108, 236, 28, 156, 92, 220, 60, 188, 124, 252,
- 2, 130, 66, 194, 34, 162, 98, 226, 18, 146, 82, 210, 50, 178, 114, 242,
- 10, 138, 76, 202, 42, 170, 106, 234, 26, 154, 90, 218, 58, 186, 122, 250,
- 6, 134, 70, 198, 38, 166, 102, 230, 22, 150, 86, 214, 54, 182, 118, 246,
- 14, 142, 80, 206, 46, 174, 110, 238, 30, 158, 94, 222, 62, 190, 126, 254,
- 1, 129, 65, 193, 33, 161, 97, 225, 17, 145, 81, 209, 49, 177, 113, 241,
- 9, 137, 75, 201, 41, 169, 105, 233, 25, 153, 89, 217, 57, 185, 121, 249,
- 5, 133, 69, 197, 37, 165, 101, 229, 21, 149, 85, 213, 53, 181, 117, 245,
- 13, 141, 79, 205, 45, 173, 109, 237, 29, 157, 93, 221, 61, 189, 125, 253,
- 3, 131, 67, 195, 35, 163, 99, 227, 19, 147, 83, 211, 51, 179, 115, 243,
- 11, 139, 77, 203, 43, 171, 107, 235, 27, 155, 91, 219, 59, 187, 123, 251,
- 7, 135, 71, 199, 39, 167, 103, 231, 23, 151, 87, 215, 55, 183, 119, 247,
- 15, 143, 81, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255
+ 0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30
+, 0xB0, 0x70, 0xF0,
+ 0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, 0x18, 0x98, 0x58, 0xD8, 0x38
+, 0xB8, 0x78, 0xF8,
+ 0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4, 0x14, 0x94, 0x54, 0xD4, 0x34
+, 0xB4, 0x74, 0xF4,
+ 0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC, 0x1C, 0x9C, 0x5C, 0xDC, 0x3C
+, 0xBC, 0x7C, 0xFC,
+ 0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2, 0x12, 0x92, 0x52, 0xD2, 0x32
+, 0xB2, 0x72, 0xF2,
+ 0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA, 0x1A, 0x9A, 0x5A, 0xDA, 0x3A
+, 0xBA, 0x7A, 0xFA,
+ 0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6, 0x16, 0x96, 0x56, 0xD6, 0x36
+, 0xB6, 0x76, 0xF6,
+ 0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE, 0x1E, 0x9E, 0x5E, 0xDE, 0x3E
+, 0xBE, 0x7E, 0xFE,
+ 0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1, 0x11, 0x91, 0x51, 0xD1, 0x31
+, 0xB1, 0x71, 0xF1,
+ 0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9, 0x19, 0x99, 0x59, 0xD9, 0x39
+, 0xB9, 0x79, 0xF9,
+ 0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5, 0x15, 0x95, 0x55, 0xD5, 0x35
+, 0xB5, 0x75, 0xF5,
+ 0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED, 0x1D, 0x9D, 0x5D, 0xDD, 0x3D
+, 0xBD, 0x7D, 0xFD,
+ 0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3, 0x13, 0x93, 0x53, 0xD3, 0x33
+, 0xB3, 0x73, 0xF3,
+ 0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB, 0x1B, 0x9B, 0x5B, 0xDB, 0x3B
+, 0xBB, 0x7B, 0xFB,
+ 0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7, 0x17, 0x97, 0x57, 0xD7, 0x37
+, 0xB7, 0x77, 0xF7,
+ 0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF, 0x1F, 0x9F, 0x5F, 0xDF, 0x3F
+, 0xBF, 0x7F, 0xFF
};
static int RenderGlyph(FSFontInstanceRecordPtr instance,
@@ -672,6 +692,7 @@
if (tbufsize > *buffersize) {
+// *buffersize = tbufsize;
ret = ST_FSG_BUFFER;
} else {
memcpy(buffer, tbuf, tbufsize);
Index: ftrenderglyph.inc
===================================================================
RCS file: /cvs/stsf/stsf/STFontServer/dropins/freetype2/ftrenderglyph.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ftrenderglyph.inc 2 Jul 2004 05:00:13 -0000 1.2
+++ ftrenderglyph.inc 1 Mar 2005 03:15:05 -0000 1.3
@@ -34,23 +34,36 @@
byte lsb, tmp;
int i, x, y;
- for (y=0; y<height; y++) {
- lsb = 0;
- for (x=0; x<sbpr; x++) {
- switch (mode) {
- case FT_PIXEL_MODE_GRAY:
- tmp = s[x];
- d[x] = s[x] | lsb;
- break;
- case FT_PIXEL_MODE_MONO:
+
+ switch (mode) {
+ case FT_PIXEL_MODE_MONO:
+ for (y=0; y<height; y++) {
+ lsb = 0;
+ for (x=0; x<sbpr; x++) {
tmp = s[x] << 7;
d[x] = s[x] | (s[x] >> 1) | lsb;
- break;
+ lsb = tmp;
+ }
+ s += sbpr;
+ d += dbpr;
}
- lsb = tmp;
- }
- s += sbpr;
- d += dbpr;
+ break;
+
+ case FT_PIXEL_MODE_GRAY:
+ for (y=0; y<height; y++) {
+ lsb = 0;
+ /* target bitmap is quaranteed to have one extra pixel to the right */
+ for(x=sbpr; x>0; x--) {
+ d[x-1] = s[x-1];
+ if (lsb < d[x-1]) {
+ d[x] = lsb | d[x-1];
+ }
+ lsb = d[x-1];
+ }
+ s += sbpr;
+ d += dbpr;
+ }
+ break;
}
}
@@ -127,9 +140,19 @@
} else {
FT_GlyphSlot_Embolden(slot);
}
+ } else if (aconv & 0x04) {
+ emboldenhack = 1;
}
if (aconv & 0x02) {
- FT_GlyphSlot_Oblique(slot);
+ if (slot->format == FT_GLYPH_FORMAT_OUTLINE) {
+ FT_Matrix m;
+ FT_Outline *o = &slot->outline;
+ m.xx = 0x10000L;
+ m.yx = 0x00000L;
+ m.xy = 0x03000L;
+ m.yy = 0x10000L;
+ FT_Outline_Transform(o, &m);
+ }
}
slotr = (FT_GlyphSlotRec *) slot;
More information about the stsf-commit
mailing list