From: Enlightenment C. <no...@cv...> - 2006-03-29 22:56:38
|
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: eimage.c eimage.h iclass.c Log Message: Oops - Imlib wrapping broke theme transparency change. Fix. =================================================================== RCS file: /cvs/e/e16/e/src/eimage.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eimage.c 29 Mar 2006 19:13:16 -0000 1.1 +++ eimage.c 29 Mar 2006 22:56:29 -0000 1.2 @@ -449,14 +449,19 @@ } EImageColorModifier * -EImageColorModifierCreate(unsigned char *r, unsigned char *g, unsigned char *b, - unsigned char *a) +EImageColorModifierCreate(void) { - EImageColorModifier *icm; + return imlib_create_color_modifier(); +} - icm = imlib_create_color_modifier(); +void +EImageColorModifierSetTables(EImageColorModifier * icm, + unsigned char *r, unsigned char *g, + unsigned char *b, unsigned char *a) +{ if (!icm) - return NULL; + return; + imlib_context_set_color_modifier(icm); #if 0 /* Useful in this context? */ imlib_modify_color_modifier_gamma(0.5); @@ -465,6 +470,4 @@ #endif imlib_set_color_modifier_tables(r, g, b, a); imlib_context_set_color_modifier(NULL); - - return icm; } =================================================================== RCS file: /cvs/e/e16/e/src/eimage.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eimage.h 29 Mar 2006 19:13:16 -0000 1.1 +++ eimage.h 29 Mar 2006 22:56:29 -0000 1.2 @@ -82,10 +82,12 @@ int w, int h); void EImagePixmapFree(Pixmap pmap); -EImageColorModifier *EImageColorModifierCreate(unsigned char *r, - unsigned char *g, - unsigned char *b, - unsigned char *a); +EImageColorModifier *EImageColorModifierCreate(void); +void EImageColorModifierSetTables(EImageColorModifier * icm, + unsigned char *r, + unsigned char *g, + unsigned char *b, + unsigned char *a); void ScaleRect(Window src, Pixmap dst, Pixmap * pdst, int sx, int sy, int sw, int sh, =================================================================== RCS file: /cvs/e/e16/e/src/iclass.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -3 -r1.90 -r1.91 --- iclass.c 29 Mar 2006 19:13:16 -0000 1.90 +++ iclass.c 29 Mar 2006 22:56:29 -0000 1.91 @@ -121,7 +121,8 @@ } if (icm == NULL) - icm = EImageColorModifierCreate(gray, gray, gray, alpha); + icm = EImageColorModifierCreate(); + EImageColorModifierSetTables(icm, gray, gray, gray, alpha); } void |