major oopsie. :)

SVN revision: 6691
This commit is contained in:
Carsten Haitzler 2003-02-15 01:30:32 +00:00
parent d115d3a677
commit 90a63a715f
1 changed files with 11 additions and 7 deletions

View File

@ -20,7 +20,7 @@ struct _Evas_Object_Image
short w, h; short w, h;
} image; } image;
struct { struct {
short l, r, t, b; short l, r, t, b;
} border; } border;
char *file; char *file;
@ -155,12 +155,14 @@ evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key)
&o->load_error); &o->load_error);
if (o->engine_data) if (o->engine_data)
{ {
int w, h;
obj->layer->evas->engine.func->image_size_get(obj->layer->evas->engine.data.output, obj->layer->evas->engine.func->image_size_get(obj->layer->evas->engine.data.output,
o->engine_data, o->engine_data, &w, &h);
&(o->cur.image.w),
&(o->cur.image.h));
o->cur.has_alpha = obj->layer->evas->engine.func->image_alpha_get(obj->layer->evas->engine.data.output, o->cur.has_alpha = obj->layer->evas->engine.func->image_alpha_get(obj->layer->evas->engine.data.output,
o->engine_data); o->engine_data);
o->cur.image.w = w;
o->cur.image.h = h;
} }
else else
{ {
@ -699,12 +701,14 @@ evas_object_image_load(Evas_Object *obj)
&o->load_error); &o->load_error);
if (o->engine_data) if (o->engine_data)
{ {
int w, h;
obj->layer->evas->engine.func->image_size_get(obj->layer->evas->engine.data.output, obj->layer->evas->engine.func->image_size_get(obj->layer->evas->engine.data.output,
o->engine_data, o->engine_data, &w, &h);
&(o->cur.image.w),
&(o->cur.image.h));
o->cur.has_alpha = obj->layer->evas->engine.func->image_alpha_get(obj->layer->evas->engine.data.output, o->cur.has_alpha = obj->layer->evas->engine.func->image_alpha_get(obj->layer->evas->engine.data.output,
o->engine_data); o->engine_data);
o->cur.image.w = w;
o->cur.image.h = h;
} }
else else
{ {