Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_convert_rgb_8.c
Log Message:
8bpp rendering sucked. now it doesnt suck as much.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_convert_rgb_8.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_convert_rgb_8.c 20 Jan 2003 23:04:38 -0000 1.3
+++ evas_convert_rgb_8.c 3 Dec 2003 05:07:12 -0000 1.4
@@ -20,14 +20,20 @@
CONVERT_LOOP_START_ROT_0();
- r = (R_VAL(src_ptr)) >> (8 - 3);
- g = (G_VAL(src_ptr)) >> (8 - 3);
- b = (B_VAL(src_ptr)) >> (8 - 2);
dith = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK] >> DM_SHF(3);
dith2 = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK] >> DM_SHF(2);
- if (((R_VAL(src_ptr) - (r << (8 - 3))) >= dith ) && (r < 0x07)) r++;
- if (((G_VAL(src_ptr) - (g << (8 - 3))) >= dith ) && (g < 0x07)) g++;
- if (((B_VAL(src_ptr) - (b << (8 - 2))) >= dith2) && (b < 0x03)) b++;
+/* r = (R_VAL(src_ptr)) >> (8 - 3);*/
+/* g = (G_VAL(src_ptr)) >> (8 - 3);*/
+/* b = (B_VAL(src_ptr)) >> (8 - 2);*/
+/* if (((R_VAL(src_ptr) - (r << (8 - 3))) >= dith ) && (r < 0x07)) r++;*/
+/* if (((G_VAL(src_ptr) - (g << (8 - 3))) >= dith ) && (g < 0x07)) g++;*/
+/* if (((B_VAL(src_ptr) - (b << (8 - 2))) >= dith2) && (b < 0x03)) b++;*/
+ r = (R_VAL(src_ptr)) * 7 / 255;
+ if (((R_VAL(src_ptr) - (r * 255 / 7)) >= dith ) && (r < 0x07)) r++;
+ g = (G_VAL(src_ptr)) * 7 / 255;
+ if (((G_VAL(src_ptr) - (g * 255 / 7)) >= dith ) && (g < 0x07)) g++;
+ b = (B_VAL(src_ptr)) * 3 / 255;
+ if (((B_VAL(src_ptr) - (b * 255 / 3)) >= dith2) && (b < 0x03)) b++;
*dst_ptr = pal[(r << 5) | (g << 2) | (b)];
@@ -87,14 +93,20 @@
CONVERT_LOOP_START_ROT_0();
- r = (R_VAL(src_ptr)) >> (8 - 2);
- g = (G_VAL(src_ptr)) >> (8 - 3);
- b = (B_VAL(src_ptr)) >> (8 - 2);
dith = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK] >> DM_SHF(3);
dith2 = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK] >> DM_SHF(2);
- if (((R_VAL(src_ptr) - (r << (8 - 2))) >= dith2) && (r < 0x03)) r++;
- if (((G_VAL(src_ptr) - (g << (8 - 3))) >= dith ) && (g < 0x07)) g++;
- if (((B_VAL(src_ptr) - (b << (8 - 2))) >= dith2) && (b < 0x03)) b++;
+/* r = (R_VAL(src_ptr)) >> (8 - 2);*/
+/* g = (G_VAL(src_ptr)) >> (8 - 3);*/
+/* b = (B_VAL(src_ptr)) >> (8 - 2);*/
+/* if (((R_VAL(src_ptr) - (r << (8 - 2))) >= dith2) && (r < 0x03)) r++;*/
+/* if (((G_VAL(src_ptr) - (g << (8 - 3))) >= dith ) && (g < 0x07)) g++;*/
+/* if (((B_VAL(src_ptr) - (b << (8 - 2))) >= dith2) && (b < 0x03)) b++;*/
+ r = (R_VAL(src_ptr)) * 3 / 255;
+ if (((R_VAL(src_ptr) - (r * 255 / 3)) >= dith2) && (r < 0x03)) r++;
+ g = (G_VAL(src_ptr)) * 7 / 255;
+ if (((G_VAL(src_ptr) - (g * 255 / 7)) >= dith ) && (g < 0x07)) g++;
+ b = (B_VAL(src_ptr)) * 3 / 255;
+ if (((B_VAL(src_ptr) - (b * 255 / 3)) >= dith2) && (b < 0x03)) b++;
*dst_ptr = pal[(r << 5) | (g << 2) | (b)];
@@ -114,13 +126,19 @@
CONVERT_LOOP_START_ROT_0();
- r = (R_VAL(src_ptr)) >> (8 - 2);
- g = (G_VAL(src_ptr)) >> (8 - 2);
- b = (B_VAL(src_ptr)) >> (8 - 2);
dith = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK] >> DM_SHF(2);
- if (((R_VAL(src_ptr) - (r << (8 - 2))) >= dith ) && (r < 0x03)) r++;
- if (((G_VAL(src_ptr) - (g << (8 - 2))) >= dith ) && (g < 0x03)) g++;
- if (((B_VAL(src_ptr) - (b << (8 - 2))) >= dith ) && (b < 0x03)) b++;
+/* r = (R_VAL(src_ptr)) >> (8 - 2);*/
+/* g = (G_VAL(src_ptr)) >> (8 - 2);*/
+/* b = (B_VAL(src_ptr)) >> (8 - 2);*/
+/* if (((R_VAL(src_ptr) - (r << (8 - 2))) >= dith ) && (r < 0x03)) r++;*/
+/* if (((G_VAL(src_ptr) - (g << (8 - 2))) >= dith ) && (g < 0x03)) g++;*/
+/* if (((B_VAL(src_ptr) - (b << (8 - 2))) >= dith ) && (b < 0x03)) b++;*/
+ r = (R_VAL(src_ptr)) * 3 / 255;
+ if (((R_VAL(src_ptr) - (r * 255 / 3)) >= dith ) && (r < 0x03)) r++;
+ g = (G_VAL(src_ptr)) * 3 / 255;
+ if (((G_VAL(src_ptr) - (g * 255 / 3)) >= dith ) && (g < 0x03)) g++;
+ b = (B_VAL(src_ptr)) * 3 / 255;
+ if (((B_VAL(src_ptr) - (b * 255 / 3)) >= dith ) && (b < 0x03)) b++;
*dst_ptr = pal[(r << 4) | (g << 2) | (b)];
@@ -140,14 +158,20 @@
CONVERT_LOOP_START_ROT_0();
- r = (R_VAL(src_ptr)) >> (8 - 2);
- g = (G_VAL(src_ptr)) >> (8 - 2);
- b = (B_VAL(src_ptr)) >> (8 - 1);
dith = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK] >> DM_SHF(2);
dith2 = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK] >> DM_SHF(1);
- if (((R_VAL(src_ptr) - (r << (8 - 2))) >= dith ) && (r < 0x03)) r++;
- if (((G_VAL(src_ptr) - (g << (8 - 2))) >= dith ) && (g < 0x03)) g++;
- if (((B_VAL(src_ptr) - (b << (8 - 1))) >= dith2) && (b < 0x01)) b++;
+/* r = (R_VAL(src_ptr)) >> (8 - 2);*/
+/* g = (G_VAL(src_ptr)) >> (8 - 2);*/
+/* b = (B_VAL(src_ptr)) >> (8 - 1);*/
+/* if (((R_VAL(src_ptr) - (r << (8 - 2))) >= dith ) && (r < 0x03)) r++;*/
+/* if (((G_VAL(src_ptr) - (g << (8 - 2))) >= dith ) && (g < 0x03)) g++;*/
+/* if (((B_VAL(src_ptr) - (b << (8 - 1))) >= dith2) && (b < 0x01)) b++;*/
+ r = (R_VAL(src_ptr)) * 3 / 255;
+ if (((R_VAL(src_ptr) - (r * 255 / 3)) >= dith ) && (r < 0x03)) r++;
+ g = (G_VAL(src_ptr)) * 3 / 255;
+ if (((G_VAL(src_ptr) - (g * 255 / 3)) >= dith ) && (g < 0x03)) g++;
+ b = (B_VAL(src_ptr)) * 1 / 255;
+ if (((B_VAL(src_ptr) - (b * 255 / 1)) >= dith2) && (b < 0x01)) b++;
*dst_ptr = pal[(r << 3) | (g << 1) | (b)];
@@ -167,14 +191,21 @@
CONVERT_LOOP_START_ROT_0();
- r = (R_VAL(src_ptr)) >> (8 - 1);
- g = (G_VAL(src_ptr)) >> (8 - 2);
- b = (B_VAL(src_ptr)) >> (8 - 1);
dith = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK] >> DM_SHF(2);
dith2 = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK] >> DM_SHF(1);
- if (((R_VAL(src_ptr) - (r << (8 - 1))) >= dith2) && (r < 0x01)) r++;
- if (((G_VAL(src_ptr) - (g << (8 - 2))) >= dith ) && (g < 0x03)) g++;
- if (((B_VAL(src_ptr) - (b << (8 - 1))) >= dith2) && (b < 0x01)) b++;
+/* r = (R_VAL(src_ptr)) >> (8 - 1);*/
+/* g = (G_VAL(src_ptr)) >> (8 - 2);*/
+/* b = (B_VAL(src_ptr)) >> (8 - 1);*/
+/* if (((R_VAL(src_ptr) - (r << (8 - 1))) >= dith2) && (r < 0x01)) r++;*/
+/* if (((G_VAL(src_ptr) - (g << (8 - 2))) >= dith ) && (g < 0x03)) g++;*/
+/* if (((B_VAL(src_ptr) - (b << (8 - 1))) >= dith2) && (b < 0x01)) b++;*/
+
+ r = (R_VAL(src_ptr)) * 1 / 255;
+ if (((R_VAL(src_ptr) - (r * 255 / 1)) >= dith2) && (r < 0x01)) r++;
+ g = (G_VAL(src_ptr)) * 3 / 255;
+ if (((G_VAL(src_ptr) - (g * 255 / 3)) >= dith ) && (g < 0x03)) g++;
+ b = (B_VAL(src_ptr)) * 1 / 255;
+ if (((B_VAL(src_ptr) - (b * 255 / 1)) >= dith2) && (b < 0x01)) b++;
*dst_ptr = pal[(r << 3) | (g << 1) | (b)];
@@ -194,13 +225,20 @@
CONVERT_LOOP_START_ROT_0();
- r = (R_VAL(src_ptr)) >> (8 - 1);
- g = (G_VAL(src_ptr)) >> (8 - 1);
- b = (B_VAL(src_ptr)) >> (8 - 1);
dith = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK] >> DM_SHF(1);
- if (((R_VAL(src_ptr) - (r << (8 - 1))) >= dith ) && (r < 0x01)) r++;
- if (((G_VAL(src_ptr) - (g << (8 - 1))) >= dith ) && (g < 0x01)) g++;
- if (((B_VAL(src_ptr) - (b << (8 - 1))) >= dith ) && (b < 0x01)) b++;
+/* r = (R_VAL(src_ptr)) >> (8 - 1);*/
+/* g = (G_VAL(src_ptr)) >> (8 - 1);*/
+/* b = (B_VAL(src_ptr)) >> (8 - 1);*/
+/* if (((R_VAL(src_ptr) - (r << (8 - 1))) >= dith ) && (r < 0x01)) r++;*/
+/* if (((G_VAL(src_ptr) - (g << (8 - 1))) >= dith ) && (g < 0x01)) g++;*/
+/* if (((B_VAL(src_ptr) - (b << (8 - 1))) >= dith ) && (b < 0x01)) b++;*/
+
+ r = (R_VAL(src_ptr)) * 1 / 255;
+ if (((R_VAL(src_ptr) - (r * 255 / 1)) >= dith ) && (r < 0x01)) r++;
+ g = (G_VAL(src_ptr)) * 1 / 255;
+ if (((G_VAL(src_ptr) - (g * 255 / 1)) >= dith ) && (g < 0x01)) g++;
+ b = (B_VAL(src_ptr)) * 1 / 255;
+ if (((B_VAL(src_ptr) - (b * 255 / 1)) >= dith ) && (b < 0x01)) b++;
*dst_ptr = pal[(r << 2) | (g << 1) | (b)];
-------------------------------------------------------
This SF.net email is sponsored by OSDN's Audience Survey.
Help shape OSDN's sites and tell us what you think. Take this
five minute survey and you could win a $250 Gift Certificate.
http://www.wrgsurveys.com/2003/osdntech03.php?site=8
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
