Changeset 198 for libcaca/trunk/src/blit.cTweet

Timestamp:

Nov 17, 2003, 5:11:34 PM (19 years ago)

Author:

Sam Hocevar

Message:

• src/io.c src/caca.h: + Interpret escape sequences for F1, F2, left, right, etc.
• src/Makefile.am examples/Makefile.am: + Install caca.h in /usr/include. + Do not install example programs.
• src/blit.c: + Minor improvements to grayscale colors.

File:

• libcaca/trunk/src/blit.c (modified) (4 diffs)

libcaca/trunk/src/blit.c

@@ -86 +86 @@
 void caca_blit(int x1, int y1, int x2, int y2, void *pixels, int w, int h)
 {
+    static int white_colors[] = {CACA_COLOR_DARKGRAY, CACA_COLOR_LIGHTGRAY, CACA_COLOR_WHITE};
     static int light_colors[] = {CACA_COLOR_LIGHTMAGENTA, CACA_COLOR_LIGHTRED, CACA_COLOR_YELLOW, CACA_COLOR_LIGHTGREEN, CACA_COLOR_LIGHTCYAN, CACA_COLOR_LIGHTBLUE, CACA_COLOR_LIGHTMAGENTA};
     static int dark_colors[] = {CACA_COLOR_MAGENTA, CACA_COLOR_RED, CACA_COLOR_BROWN, CACA_COLOR_GREEN, CACA_COLOR_CYAN, CACA_COLOR_BLUE, CACA_COLOR_MAGENTA};
@@ -101 +102 @@
     }
 
-    pitch = (3 * w + 3) / 4 * 4;
+    //pitch = (3 * w + 3) / 4 * 4;
+    pitch = 4 * w;
 
     for(y = y1 > 0 ? y1 : 0; y <= y2 && y <= (int)caca_get_height(); y++)
@@ -113 +115 @@
             int fromx = w * (x - x1) / (x2 - x1 + 1);
             int fromy = h * (y - y1) / (y2 - y1 + 1);
-            int r = ((unsigned char *)pixels)[3 * fromx + pitch * fromy];
-            int g = ((unsigned char *)pixels)[3 * fromx + 1 + pitch * fromy];
-            int b = ((unsigned char *)pixels)[3 * fromx + 2 + pitch * fromy];
+            //int r = ((unsigned char *)pixels)[3 * fromx + pitch * fromy];
+            //int g = ((unsigned char *)pixels)[3 * fromx + 1 + pitch * fromy];
+            //int b = ((unsigned char *)pixels)[3 * fromx + 2 + pitch * fromy];
+            int b = ((unsigned char *)pixels)[4 * fromx + pitch * fromy];
+            int g = ((unsigned char *)pixels)[4 * fromx + 1 + pitch * fromy];
+            int r = ((unsigned char *)pixels)[4 * fromx + 2 + pitch * fromy];
             int hue, sat, val;
 
@@ -147 +152 @@
             else
             {
-                caca_set_color(CACA_COLOR_LIGHTGRAY);
+                caca_set_color(white_colors[max * 3 / 256]);
             }