Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h ttfont.c
Log Message:
Trivial fixes for compilation with imlib1.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -3 -r1.252 -r1.253
--- E.h 24 Apr 2004 13:16:29 -0000 1.252
+++ E.h 25 Apr 2004 08:29:52 -0000 1.253
@@ -92,6 +92,9 @@
#define imlib_image_get_height() \
pIcImg->rgb_height
+#define imlib_image_has_alpha() \
+ 0
+
#define imlib_load_image(file) \
Imlib_load_image(pI1Ctx, file)
#define imlib_create_image_from_drawable(mask, x, y, w, h, grab) \
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ttfont.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ttfont.c 21 Mar 2004 01:39:40 -0000 1.34
+++ ttfont.c 25 Apr 2004 08:29:52 -0000 1.35
@@ -263,7 +263,7 @@
char encoding_initialized = 0;
static void
-__init_iso_encoding()
+__init_iso_encoding(void)
{
/* Set the current ISO encoding based on (in that order):
* the "IMLIB_ENCODING" environment variable,
@@ -376,7 +376,7 @@
}
static TT_Raster_Map *
-calc_size(Efont * f, int *width, int *height, char *text)
+calc_size(Efont * f, int *width, int *height, const char *text)
{
int i, upm, ascent, descent, pw, ph;
TT_Instance_Metrics imetrics;
@@ -419,8 +419,8 @@
}
static void
-render_text(TT_Raster_Map * rmap, TT_Raster_Map * rchr, Efont * f, char *text,
- int *xor, int *yor)
+render_text(TT_Raster_Map * rmap, TT_Raster_Map * rchr, Efont * f,
+ const char *text, int *xor, int *yor)
{
TT_Glyph_Metrics metrics;
TT_Instance_Metrics imetrics;
-------------------------------------------------------
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
