warnigns cleanups + fb 32bpp transparency support for evas from celement

SVN revision: 14893

legacy/evas/src/lib/Evas.h

@@ -263,9 +263,9 @@ struct _Evas_Event_Key_Down /** Key press event */
    Evas_Modifier *modifiers;
    Evas_Lock     *locks;
 
-   char          *key; /**< The logical key : (eg shift+1 == exclamation) */
-   char          *string; /**< A UTF8 string if this keystroke has produced a visible string to be ADDED */
-   char          *compose; /**< A UTF8 string if this keystroke has modified a string in the middle of being composed - this string replaces the previous one */
+   const char    *key; /**< The logical key : (eg shift+1 == exclamation) */
+   const char    *string; /**< A UTF8 string if this keystroke has produced a visible string to be ADDED */
+   const char    *compose; /**< A UTF8 string if this keystroke has modified a string in the middle of being composed - this string replaces the previous one */
 };
 
 struct _Evas_Event_Key_Up /** Key release event */
@@ -275,9 +275,9 @@ struct _Evas_Event_Key_Up /** Key release event */
    Evas_Modifier *modifiers;
    Evas_Lock     *locks;
 
-   char          *key; /**< The logical key : (eg shift+1 == exclamation) */
-   char          *string; /**< A UTF8 string if this keystroke has produced a visible string to be ADDED */
-   char          *compose; /**< A UTF8 string if this keystroke has modified a string in the middle of being composed - this string replaces the previous one */
+   const char    *key; /**< The logical key : (eg shift+1 == exclamation) */
+   const char    *string; /**< A UTF8 string if this keystroke has produced a visible string to be ADDED */
+   const char    *compose; /**< A UTF8 string if this keystroke has modified a string in the middle of being composed - this string replaces the previous one */
 };
 
 #ifdef __cplusplus

legacy/evas/src/lib/canvas/evas_font_dir.c

@@ -87,7 +87,7 @@ evas_font_dir_cache_find(char *dir, char *font)
 }
 
 static Evas_List *
-evas_font_set_get(char *name)
+evas_font_set_get(const char *name)
 {
    Evas_List *fonts = NULL;
    char *p;
@@ -99,7 +99,8 @@ evas_font_set_get(char *name)
      }
    else
      {
-	char *nm, *pp;
+	const char *pp;
+	char *nm;
 
 	pp = name;
 	while (p)
@@ -153,7 +154,7 @@ evas_font_free(Evas *evas, void *font)
 }
 
 void *
-evas_font_load(Evas *evas, char *name, char *source, int size)
+evas_font_load(Evas *evas, const char *name, const char *source, int size)
 {
    void *font = NULL;
    Evas_List *fonts, *l;

legacy/evas/src/lib/canvas/evas_object_image.c

@@ -905,8 +905,8 @@ evas_object_image_pixels_import(Evas_Object *obj, Evas_Pixel_Import_Source *pixe
 								  1,
 								  &image_pixels);
 		  if (image_pixels)
-		    evas_common_convert_yuv_420p_601_rgba(pixels->rows,
-							  image_pixels,
+		    evas_common_convert_yuv_420p_601_rgba((DATA8 **) pixels->rows,
+							  (DATA8 *) image_pixels,
 							  o->cur.image.w,
 							  o->cur.image.h);
 		  if (o->engine_data)

legacy/evas/src/lib/canvas/evas_object_text.c

@@ -749,7 +749,7 @@ evas_string_char_next_get(const char *str, int pos, int *decoded)
    if (!str) return 0;
    if (pos < 0) return 0;
    p = pos;
-   d = evas_common_font_utf8_get_next((char *)str, &p);
+   d = evas_common_font_utf8_get_next((unsigned char *)str, &p);
    if (decoded) *decoded = d;
    return p;
 }
@@ -769,7 +769,7 @@ evas_string_char_prev_get(const char *str, int pos, int *decoded)
    if (!str) return 0;
    if (pos < 1) return 0;
    p = pos;
-   d = evas_common_font_utf8_get_prev((char *)str, &p);
+   d = evas_common_font_utf8_get_prev((unsigned char *)str, &p);
    if (decoded) *decoded = d;
    return p;
 }

legacy/evas/src/lib/engines/fb/evas_outbuf.c

@@ -230,7 +230,13 @@ evas_fb_outbuf_fb_new_region_for_update(Outbuf *buf, int x, int y, int w, int h,
 
 	*cx = 0; *cy = 0; *cw = w; *ch = h;
 	im = evas_common_image_create(w, h);
-	return im;
+
+        /* handle framebuffers with alpha channel */
+        if (buf->priv.fb.fb->fb_var.transp.length > 0) {
+           im->flags |= RGBA_IMAGE_HAS_ALPHA;
+           memset(im->image->data, 0, w * h * sizeof(DATA32));
+        }
+        return im;
      }
    return NULL;
 }

legacy/evas/src/lib/engines/software_x11/evas_outbuf.c

@@ -259,7 +259,7 @@ evas_software_x11_outbuf_new_region_for_update(Outbuf * buf, int x, int y, int w
 							 w, h,
 							 use_shm,
 							 NULL);
-	im->image->data = evas_software_x11_x_output_buffer_data(obr->xob, &bpl);
+	im->image->data = (DATA32 *) evas_software_x11_x_output_buffer_data(obr->xob, &bpl);
 	if (buf->priv.x.mask)
 	  obr->mxob = evas_software_x11_x_output_buffer_new(buf->priv.x.disp,
 							    buf->priv.x.vis,

legacy/evas/src/lib/file/evas_path.c

@@ -28,7 +28,7 @@ evas_file_path_is_full_path(char *path)
 }
 
 char *
-evas_file_path_join(char *path, char *end)
+evas_file_path_join(const char *path, const char *end)
 {
    char *res = NULL;
    int len;

legacy/evas/src/lib/include/evas_private.h

@@ -654,7 +654,7 @@ void evas_object_event_callback_call(Evas_Object *obj, Evas_Callback_Type type,
 int evas_event_passes_through(Evas_Object *obj);
 Evas_List *evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y);
 int evas_file_path_is_full_path(char *path);
-char *evas_file_path_join(char *path, char *end);
+char *evas_file_path_join(const char *path, const char *end);
 int evas_file_path_exists(char *path);
 int evas_file_path_is_file(char *path);
 int evas_file_path_is_dir(char *path);
@@ -695,7 +695,7 @@ void evas_key_grab_free(Evas_Object *obj, const char *keyname, Evas_Modifier_Mas
 void evas_font_dir_cache_free(void);
 char *evas_font_dir_cache_find(char *dir, char *font);
 void evas_font_free(Evas *evas, void *font);
-void *evas_font_load(Evas *evas, char *name, char *source, int size);
+void *evas_font_load(Evas *evas, const char *name, const char *source, int size);
 
 extern int _evas_alloc_error;