Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/xrender_x11
Modified Files:
evas_engine.c evas_engine.h evas_engine_image.c
Log Message:
Add const.
Remove unused variables.
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_engine.c 2 May 2006 07:28:49 -0000 1.8
+++ evas_engine.c 31 May 2006 18:33:46 -0000 1.9
@@ -65,7 +65,7 @@
static int eng_gradient_alpha_get(void *data, void *gradient, int spread, int
op);
static void eng_gradient_map(void *data, void *context, void *gradient, int
spread);
static void eng_gradient_draw(void *data, void *context, void *surface, void
*gradient, int x, int y, int w, int h, double angle, int spread);
-static void *eng_image_load(void *data, char *file, char *key, int *error);
+static void *eng_image_load(void *data, const char *file, const char *key, int
*error);
static void *eng_image_new_from_data(void *data, int w, int h, DATA32
*image_data);
static void *eng_image_new_from_copied_data(void *data, int w, int h, DATA32
*image_data);
static void eng_image_free(void *data, void *image);
@@ -77,12 +77,12 @@
static void *eng_image_alpha_set(void *data, void *image, int has_alpha);
static int eng_image_alpha_get(void *data, void *image);
static void eng_image_draw(void *data, void *context, void *surface, void
*image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int
dst_w, int dst_h, int smooth);
-static char *eng_image_comment_get(void *data, void *image, char *key);
+static const char *eng_image_comment_get(void *data, void *image, char *key);
static char *eng_image_format_get(void *data, void *image);
static void eng_image_cache_flush(void *data);
static void eng_image_cache_set(void *data, int bytes);
static int eng_image_cache_get(void *data);
-static void eng_font_draw(void *data, void *context, void *surface, void
*font, int x, int y, int w, int h, int ow, int oh, char *text);
+static void eng_font_draw(void *data, void *context, void *surface, void
*font, int x, int y, int w, int h, int ow, int oh, const char *text);
/* internal engine routines */
@@ -474,7 +474,7 @@
}
static void *
-eng_image_load(void *data, char *file, char *key, int *error)
+eng_image_load(void *data, const char *file, const char *key, int *error)
{
Render_Engine *re;
XR_Image *im;
@@ -671,7 +671,7 @@
smooth);
}
-static char *
+static const char *
eng_image_comment_get(void *data, void *image, char *key)
{
if (!image) return NULL;
@@ -710,7 +710,7 @@
}
static void
-eng_font_draw(void *data, void *context, void *surface, void *font, int x, int
y, int w, int h, int ow, int oh, char *text)
+eng_font_draw(void *data, void *context, void *surface, void *font, int x, int
y, int w, int h, int ow, int oh, const char *text)
{
Render_Engine *re;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_engine.h 2 May 2006 07:28:49 -0000 1.2
+++ evas_engine.h 31 May 2006 18:33:46 -0000 1.3
@@ -87,8 +87,8 @@
struct _XR_Image
{
Ximage_Info *xinf;
- char *file;
- char *key;
+ const char *file;
+ const char *key;
char *fkey;
RGBA_Image *im;
void *data;
@@ -96,14 +96,14 @@
Xrender_Surface *surface;
int references;
char *format;
- char *comment;
+ const char *comment;
Tilebuf *updates;
unsigned char alpha : 1;
unsigned char dirty : 1;
unsigned char free_data : 1;
};
-XR_Image *_xre_image_load(Ximage_Info *xinf, char *file, char *key);
+XR_Image *_xre_image_load(Ximage_Info *xinf, const char *file, const char
*key);
XR_Image *_xre_image_new_from_data(Ximage_Info *xinf, int w, int h, void
*data);
XR_Image *_xre_image_new_from_copied_data(Ximage_Info *xinf, int w, int h,
void *data);
XR_Image *_xre_image_new(Ximage_Info *xinf, int w, int h);
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine_image.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_engine_image.c 2 May 2006 07:28:49 -0000 1.4
+++ evas_engine_image.c 31 May 2006 18:33:46 -0000 1.5
@@ -66,7 +66,7 @@
}
XR_Image *
-_xre_image_load(Ximage_Info *xinf, char *file, char *key)
+_xre_image_load(Ximage_Info *xinf, const char *file, const char *key)
{
XR_Image *im;
char buf[4096];
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
