Changeset 3640 for libcaca/trunk/caca/dither.c

Timestamp:

08/13/09 15:04:40 (4 years ago)

Author:

sam

Message:

Make "fullgray" dithering work properly, to force greyscale rendering. To use
it, just call caca_set_dither_color(d, "fullgray") on the dither object.

File:

• libcaca/trunk/caca/dither.c (modified) (4 diffs)

libcaca/trunk/caca/dither.c

@@ -1034 +1034 @@
         }
 
+        /* FIXME: hack to force greyscale */
+        if(d->color == COLOR_MODE_FULLGRAY)
+        {
+            unsigned int gray = (3 * rgba[0] + 4 * rgba[1] + rgba[2] + 4) / 8;
+            rgba[0] = rgba[1] = rgba[2] = gray;
+        }
+
         if(d->has_alpha && rgba[3] < 0x800)
         {
@@ -1060 +1067 @@
         for(i = 0; i < 16; i++)
         {
+            if(d->color == COLOR_MODE_FULLGRAY
+                && (rgb_palette[i * 3] != rgb_palette[i * 3 + 1]
+                     || rgb_palette[i * 3] != rgb_palette[i * 3 + 2]))
+                continue;
             dist = sq(rgba[0] - rgb_palette[i * 3])
                  + sq(rgba[1] - rgb_palette[i * 3 + 1])
@@ -1075 +1086 @@
 
         /* FIXME: we currently only honour "full16" */
-        if(d->color == COLOR_MODE_FULL16)
+        if(d->color == COLOR_MODE_FULL16 || d->color == COLOR_MODE_FULLGRAY)
         {
             distmin = INT_MAX;
@@ -1081 +1092 @@
             {
                 if(i == outbg)
+                    continue;
+                if(d->color == COLOR_MODE_FULLGRAY
+                    && (rgb_palette[i * 3] != rgb_palette[i * 3 + 1]
+                         || rgb_palette[i * 3] != rgb_palette[i * 3 + 2]))
                     continue;
                 dist = sq(rgba[0] - rgb_palette[i * 3])