Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_convert_main.c evas_convert_rgb_16.c evas_convert_rgb_8.c
Log Message:
symbol fixup :) (conflict with imlib2)
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_convert_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_convert_main.c 14 Nov 2002 05:38:10 -0000 1.2
+++ evas_convert_main.c 20 Jan 2003 23:04:37 -0000 1.3
@@ -1,7 +1,7 @@
#include "evas_common.h"
#ifdef USE_DITHER_44
-const DATA8 _dither_44[4][4] =
+const DATA8 _evas_dither_44[4][4] =
{
{ 0, 8, 2, 10},
{12, 4, 14, 6},
@@ -11,7 +11,7 @@
#endif
#ifdef USE_DITHER_128128
-const DATA8 _dither_128128[128][128] =
+const DATA8 _evas_dither_128128[128][128] =
{
{ 0, 41, 23, 5, 17, 39, 7, 15, 62, 23, 40, 51, 31, 47, 9, 32, 52, 27, 57, 25, 6,
61, 27, 52, 37, 7, 40, 63, 18, 36, 10, 42, 25, 62, 45, 34, 20, 42, 37, 14, 35, 29, 50,
10, 61, 2, 40, 8, 37, 12, 58, 22, 5, 41, 10, 39, 0, 60, 11, 46, 2, 55, 38, 17, 36, 59,
13, 54, 37, 56, 8, 29, 16, 13, 63, 22, 41, 55, 7, 20, 49, 14, 23, 55, 37, 23, 19, 36,
15, 49, 23, 63, 30, 14, 38, 27, 53, 13, 22, 41, 19, 31, 7, 19, 50, 30, 49, 16, 3, 32,
56, 40, 29, 34, 8, 48, 19, 45, 4, 51, 12, 46, 35, 49, 16, 42, 12, 62 },
{ 30, 57, 36, 54, 47, 34, 52, 27, 43, 4, 28, 7, 17, 36, 62, 13, 44, 7, 18, 48,
33, 21, 44, 14, 30, 47, 12, 33, 5, 55, 31, 58, 13, 30, 4, 17, 52, 10, 60, 26, 46, 0,
39, 27, 42, 22, 47, 25, 60, 32, 9, 38, 48, 17, 59, 30, 49, 18, 34, 25, 51, 19, 5, 48,
21, 8, 28, 46, 1, 32, 41, 19, 54, 47, 37, 18, 28, 11, 44, 30, 39, 56, 2, 33, 8, 42,
61, 28, 58, 8, 46, 9, 41, 4, 58, 7, 21, 48, 59, 10, 52, 14, 42, 57, 12, 25, 7, 53, 42,
24, 11, 50, 17, 59, 42, 2, 36, 60, 32, 17, 63, 29, 21, 7, 59, 32, 24, 39 },
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_convert_rgb_16.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_convert_rgb_16.c 14 Nov 2002 05:38:10 -0000 1.2
+++ evas_convert_rgb_16.c 20 Jan 2003 23:04:38 -0000 1.3
@@ -1,10 +1,10 @@
#include "evas_common.h"
#ifdef USE_DITHER_44
-extern const DATA8 _dither_44[4][4];
+extern const DATA8 _evas_dither_44[4][4];
#endif
#ifdef USE_DITHER_128128
-extern const DATA8 _dither_128128[128][128];
+extern const DATA8 _evas_dither_128128[128][128];
#endif
#ifdef BUILD_CONVERT_16_RGB_565
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_convert_rgb_8.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_convert_rgb_8.c 14 Nov 2002 05:38:10 -0000 1.2
+++ evas_convert_rgb_8.c 20 Jan 2003 23:04:38 -0000 1.3
@@ -1,10 +1,10 @@
#include "evas_common.h"
#ifdef USE_DITHER_44
-extern const DATA8 _dither_44[4][4];
+extern const DATA8 _evas_dither_44[4][4];
#endif
#ifdef USE_DITHER_128128
-extern const DATA8 _dither_128128[128][128];
+extern const DATA8 _evas_dither_128128[128][128];
#endif
#ifdef BUILD_CONVERT_8_RGB_332
-------------------------------------------------------
This SF.NET email is sponsored by: FREE SSL Guide from Thawte
are you planning your Web Server Security? Click here to get a FREE
Thawte SSL guide and find the answers to all your SSL security issues.
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0026en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
