[stsf-commit] stsf/STFontServer/dropins/freetype2 ft2_glue.c, 1.1.1.1, 1.2

[Alexander Gelfenbain]

Committed by: adg


Index: ft2_glue.c
===================================================================
RCS file: /cvs/stsf/stsf/STFontServer/dropins/freetype2/ft2_glue.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- a/ft2_glue.c	26 Mar 2004 19:19:56 -0000	1.1.1.1
+++ b/ft2_glue.c	25 May 2004 02:47:24 -0000	1.2
@@ -104,7 +104,10 @@
 
     FMatrix scale;                      // [sx, sy] part of the transformation matrix
     FMatrix ras;                        // rotate and shear part of the transformation matrix
-    int gmode;                          // grey-scale mode: 0 - black and white, 1 - gray-scale, 2 - LCD Optimized
+    int gmode;                          // 0 - black and white
+                                        // 1 - gray-scale
+                                        // 2 - LCD Optimized
+                                        // 3 - bit-swapped B&W
 } ScalerCacheRecord, *ScalerCacheRecordPtr;
 
 
@@ -165,10 +168,10 @@
     //res->loadFlags = FT_LOAD_RENDER;
     res->loadFlags = FT_LOAD_DEFAULT;
 
-    if (instance->flags & fBlackAndWhite) {
+    if (instance->flags & FS_RF_BLACKANDWHITE) {
         res->renderMode = FT_RENDER_MODE_MONO;
         res->loadFlags |= FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO;
-    } else if (instance->flags & fLCDOptimizedMode) {
+    } else if (instance->flags & FS_RF_LCD) {
         res->renderMode = FT_RENDER_MODE_LCD;
         res->loadFlags |= FT_LOAD_TARGET_LCD;
     } else {
@@ -176,11 +179,11 @@
         res->loadFlags |= FT_LOAD_TARGET_NORMAL;
     }
     
-    if (!(instance->flags & fEnableSbits)) {
+    if (!(instance->flags & FS_RF_SBITS)) {
         res->loadFlags |= FT_LOAD_NO_BITMAP;
     }
-    if (!(instance->flags & fEnableHints)) {
-        if (instance->flags & fEnableAutoHinting) {
+    if (!(instance->flags & FS_RF_HINTS)) {
+        if (instance->flags & FS_RF_AUTOHINT) {
             res->loadFlags |= FT_LOAD_FORCE_AUTOHINT;
         } else {
             res->loadFlags |= FT_LOAD_NO_HINTING;
@@ -210,10 +213,12 @@
     //res->matrix.xy = res->ras.yx;
     //res->matrix.yx = res->ras.xy;
 
-    if (instance->flags & fGreyScaleMode) {
+    if (instance->flags & FS_RF_GRAYSCALE) {
         res->gmode = 1;
-    } else if (instance->flags & fLCDOptimizedMode) {
+    } else if (instance->flags & FS_RF_LCD) {
         res->gmode = 2;
+    } else if (instance->flags & FS_RF_BLACKANDWHITE && instance->flags & FS_RF_BITSWAPPED) {
+        res->gmode = 3;
     } else {
         res->gmode = 0;
     }
@@ -493,17 +498,17 @@
         return ret;
     }
     
-    if ((instance->flags & fBlackAndWhite) || font->frclass == STFS_BITMAPFONT) {
+    if ((instance->flags & FS_RF_BLACKANDWHITE) || font->frclass == STFS_BITMAPFONT) {
         *mode = ST_RM_SIMPLEBITMAP;
         *bitsPerPixel = 1;
         clut->n = 0;
-    } else if (instance->flags & fGreyScaleMode) {
+    } else if (instance->flags & FS_RF_GREYSCALE) {
         int i;
         *mode = ST_RM_ALPHAMASK;
         *bitsPerPixel = 8;
         clut->n = 256;
         for (i=0; i<256; i++) clut->c[i] = i;
-    } else if (instance->flags & fLCDOptimizedMode) {
+    } else if (instance->flags & FS_RF_LCD) {
 	*mode = ST_RM_LOOKUPTABLE;
         *bitsPerPixel = 8;
         clut->n = LookupTableCount;
@@ -520,6 +525,26 @@
 
 #include "ftrenderglyph.inc"
 
+
+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
+}; 
+
 static int RenderGlyph(FSFontInstanceRecordPtr instance,
                        FSFontRecordPtr vfont,
                        STGlyph glyphID,
@@ -570,6 +595,12 @@
     ret = FTRenderGlyphPrim(p->library, p->face, ftglyphID, p->loadFlags, p->renderMode, &p->matrix, 1 /* pad32 */,
                             metrics, &tbuf, &tbufsize);
 
+    if (p->gmode == 3) {
+        int i;
+        for (i=0; i<tbufsize; i++) {
+            tbuf[i] = swappedbits[tbuf[i]];
+        }
+    }
     
     if (tbufsize < MAX_CACHED_GLYPH_SIZE && glue.gcache !=0) {
         ScaledGlyphData *m = glue.malloc(sizeof(ScaledGlyphData));