symbol fixup :) (conflict with imlib2)

SVN revision: 6604
This commit is contained in:
Carsten Haitzler 2003-01-20 23:04:38 +00:00
parent 81eea1bd27
commit 07af96e2c9
4 changed files with 8 additions and 8 deletions

View File

@ -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 @@ const DATA8 _dither_44[4][4] =
#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 },

View File

@ -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

View File

@ -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

View File

@ -88,7 +88,7 @@
(((x) & 0xff00 ) >> 8))
#ifdef BUILD_SMALL_DITHER_MASK
# define DM_TABLE _dither_44
# define DM_TABLE _evas_dither_44
# define DM_SIZE 4
# define DM_BITS 4
# define DM_DIV 16
@ -96,7 +96,7 @@
# define DM_MSK (DM_SIZE - 1)
# define DM_SHF(_b) (DM_BITS - (8 - _b))
#else
# define DM_TABLE _dither_128128
# define DM_TABLE _evas_dither_128128
# define DM_SIZE 128
# define DM_BITS 6
# define DM_DIV 64