timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

load_error now stored and retrievable for image objects :) 

SVN revision: 4238
This commit is contained in:
Carsten Haitzler 2001-02-17 20:26:57 +00:00
parent f1d5f4f049
commit ed56013f72
3 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/evas/src/Evas.h
View File

@ -183,6 +183,7 @@ void evas_hide(Evas e, Evas_Object o);
/* image query ops */ /* image query ops */
void evas_get_image_size(Evas e, Evas_Object o, int *w, int *h); void evas_get_image_size(Evas e, Evas_Object o, int *w, int *h);
void evas_get_image_border(Evas e, Evas_Object o, int *l, int *r, int *t, int *b); void evas_get_image_border(Evas e, Evas_Object o, int *l, int *r, int *t, int *b);
Imlib_Load_Error evas_get_image_load_error(Evas e, Evas_Object o);
/* coordinate space transforms */ /* coordinate space transforms */
int evas_world_x_to_screen(Evas e, double x); int evas_world_x_to_screen(Evas e, double x);

1
legacy/evas/src/Evas_private.h
View File

@ -216,6 +216,7 @@ struct _Evas_Object_Image
int r, g, b, a; int r, g, b, a;
} color; } color;
} current, previous; } current, previous;
Imlib_Load_Error load_error;
}; };
struct _Evas_Object_Text struct _Evas_Object_Text

51
legacy/evas/src/evas_image.c
View File

@ -52,13 +52,15 @@ evas_add_image_from_file(Evas e, char *file)
o->object_free = _evas_free_image; o->object_free = _evas_free_image;
o->object_renderer_data_free = _evas_free_image_renderer_data; o->object_renderer_data_free = _evas_free_image_renderer_data;
oo->load_error = IMLIB_LOAD_ERROR_NONE;
if (file) if (file)
{ {
oo->current.file = strdup(file); oo->current.file = strdup(file);
{ {
Imlib_Image im; Imlib_Image im;
im = imlib_load_image(file); im = imlib_load_image_with_error_return(file, &oo->load_error);
if (im) if (im)
{ {
imlib_context_set_image(im); imlib_context_set_image(im);
@ -116,7 +118,8 @@ evas_set_image_file(Evas e, Evas_Object o, char *file)
if (!o) return; if (!o) return;
IF_OBJ(o, OBJECT_IMAGE) return; IF_OBJ(o, OBJECT_IMAGE) return;
oo = o; oo = o;
if ((oo->current.file) && (file) && (strcmp(file, oo->current.file))) if (((oo->current.file) && (file) && (strcmp(file, oo->current.file))) ||
((!oo->current.file) && (file)))
{ {
if (oo->current.file) if (oo->current.file)
free(oo->current.file); free(oo->current.file);
@ -125,7 +128,7 @@ evas_set_image_file(Evas e, Evas_Object o, char *file)
{ {
Imlib_Image im; Imlib_Image im;
im = imlib_load_image(file); im = imlib_load_image_with_error_return(file, &oo->load_error);
if (im) if (im)
{ {
imlib_context_set_image(im); imlib_context_set_image(im);
@ -158,19 +161,22 @@ evas_set_image_file(Evas e, Evas_Object o, char *file)
} }
else else
{ {
if (!file) if (oo->current.file)
{ free(oo->current.file);
oo->current.file = NULL; oo->previous.file = NULL;
o->changed = 1; oo->current.file = NULL;
e->changed = 1; oo->current.image.w = 0;
} oo->current.image.h = 0;
else evas_resize(e, o,
{ (double)oo->current.image.w,
oo->current.fill.x = 0; (double)oo->current.image.h);
oo->current.fill.y = 0; oo->current.fill.x = 0;
oo->current.fill.w = (double)oo->current.image.w; oo->current.fill.y = 0;
oo->current.fill.h = (double)oo->current.image.h; oo->current.fill.w = (double)oo->current.image.w;
} oo->current.fill.h = (double)oo->current.image.h;
oo->load_error = IMLIB_LOAD_ERROR_NONE;
o->changed = 1;
e->changed = 1;
} }
} }
@ -246,3 +252,16 @@ evas_get_image_border(Evas e, Evas_Object o, int *l, int *r, int *t, int *b)
if (t) *t = oo->current.border.t; if (t) *t = oo->current.border.t;
if (b) *b = oo->current.border.b; if (b) *b = oo->current.border.b;
} }
Imlib_Load_Error
evas_get_image_load_error(Evas e, Evas_Object o)
{
Evas_Object_Image oo;
if (!e) return;
if (!o) return;
IF_OBJ(o, OBJECT_IMAGE) return;
oo = o;
return oo->load_error;
}