summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2019-05-31 11:57:53 -0700
committerCedric BAIL <cedric.bail@free.fr>2019-07-12 09:54:14 -0700
commitce076d1323ef89cad5d9b4fe185d14101e8d5d3e (patch)
tree06dc1a46d8033e3e8365d1857e62f86745fba65e
parent9f35c74d9d66181ff609e325d23796efc823e95e (diff)
evas: break Image_Loader API to allow for getting property from the data field of an image.
Reviewed-by: Hermet Park <hermetpark@gmail.com> Differential Revision: https://phab.enlightenment.org/D9101
-rw-r--r--src/lib/evas/Evas_Loader.h22
-rw-r--r--src/lib/evas/common/evas_image_load.c50
-rw-r--r--src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c9
-rw-r--r--src/modules/evas/image_loaders/dds/evas_image_load_dds.c11
-rw-r--r--src/modules/evas/image_loaders/eet/evas_image_load_eet.c9
-rw-r--r--src/modules/evas/image_loaders/generic/evas_image_load_generic.c11
-rw-r--r--src/modules/evas/image_loaders/gif/evas_image_load_gif.c9
-rw-r--r--src/modules/evas/image_loaders/ico/evas_image_load_ico.c9
-rw-r--r--src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c9
-rw-r--r--src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c9
-rw-r--r--src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c9
-rw-r--r--src/modules/evas/image_loaders/png/evas_image_load_png.c9
-rw-r--r--src/modules/evas/image_loaders/psd/evas_image_load_psd.c11
-rw-r--r--src/modules/evas/image_loaders/tga/evas_image_load_tga.c9
-rw-r--r--src/modules/evas/image_loaders/tgv/evas_image_load_tgv.c9
-rw-r--r--src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c9
-rw-r--r--src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c9
-rw-r--r--src/modules/evas/image_loaders/webp/evas_image_load_webp.c9
-rw-r--r--src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c11
19 files changed, 130 insertions, 103 deletions
diff --git a/src/lib/evas/Evas_Loader.h b/src/lib/evas/Evas_Loader.h
index e60647d..220deab 100644
--- a/src/lib/evas/Evas_Loader.h
+++ b/src/lib/evas/Evas_Loader.h
@@ -130,7 +130,14 @@ struct _Evas_Image_Load_Opts
130}; 130};
131 131
132typedef Emile_Image_Animated Evas_Image_Animated; 132typedef Emile_Image_Animated Evas_Image_Animated;
133typedef Emile_Image_Property Evas_Image_Property; 133typedef struct _Evas_Image_Property Evas_Image_Property;
134
135struct _Evas_Image_Property
136{
137 Emile_Image_Property info;
138 // need_data is set to True when to get accurate property, data need to be loaded
139 Eina_Bool need_data;
140};
134 141
135typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func; 142typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func;
136 143
@@ -186,7 +193,7 @@ typedef Emile_Colorspace Evas_Colorspace; /**< Colorspaces for pixel data suppor
186#define EVAS_COLORSPACE_RGBA_S3TC_DXT4 EMILE_COLORSPACE_RGBA_S3TC_DXT4 193#define EVAS_COLORSPACE_RGBA_S3TC_DXT4 EMILE_COLORSPACE_RGBA_S3TC_DXT4
187#define EVAS_COLORSPACE_RGBA_S3TC_DXT5 EMILE_COLORSPACE_RGBA_S3TC_DXT5 194#define EVAS_COLORSPACE_RGBA_S3TC_DXT5 EMILE_COLORSPACE_RGBA_S3TC_DXT5
188 195
189#define EVAS_IMAGE_LOAD_VERSION 1 196#define EVAS_IMAGE_LOAD_VERSION 2
190 197
191struct _Evas_Image_Load_Func 198struct _Evas_Image_Load_Func
192{ 199{
@@ -198,11 +205,14 @@ struct _Evas_Image_Load_Func
198 void (*file_close) (void *loader_data); 205 void (*file_close) (void *loader_data);
199 206
200 Eina_Bool (*file_head) (void *loader_data, 207 Eina_Bool (*file_head) (void *loader_data,
201 Evas_Image_Property *prop, 208 Evas_Image_Property *prop,
202 int *error); 209 int *error);
210 Eina_Bool (*file_head_with_data) (void *loader_data,
211 Evas_Image_Property *prop,
212 void *pixels, int *error);
203 Eina_Bool (*file_data) (void *loader_data, 213 Eina_Bool (*file_data) (void *loader_data,
204 Evas_Image_Property *prop, 214 Evas_Image_Property *prop,
205 void *pixels, int *error); 215 void *pixels, int *error);
206 double (*frame_duration) (void *loader_data, 216 double (*frame_duration) (void *loader_data,
207 int start, int frame_num); 217 int start, int frame_num);
208 218
diff --git a/src/lib/evas/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c
index c012139..f8d00cc 100644
--- a/src/lib/evas/common/evas_image_load.c
+++ b/src/lib/evas/common/evas_image_load.c
@@ -215,17 +215,17 @@ _evas_image_file_header(Evas_Module *em, Image_Entry *ie, int *error)
215 DBG("loaded file head using module '%s' (%p): %s", 215 DBG("loaded file head using module '%s' (%p): %s",
216 em->definition->name, em, file); 216 em->definition->name, em, file);
217 217
218 ie->w = property.w; 218 ie->w = property.info.w;
219 ie->h = property.h; 219 ie->h = property.info.h;
220 ie->borders.l = property.borders.l; 220 ie->borders.l = property.info.borders.l;
221 ie->borders.r = property.borders.r; 221 ie->borders.r = property.info.borders.r;
222 ie->borders.t = property.borders.t; 222 ie->borders.t = property.info.borders.t;
223 ie->borders.b = property.borders.b; 223 ie->borders.b = property.info.borders.b;
224 ie->scale = property.scale; 224 ie->scale = property.info.scale;
225 ie->flags.alpha = property.alpha; 225 ie->flags.alpha = property.info.alpha;
226 if (property.cspaces) ie->cspaces = property.cspaces; 226 if (property.info.cspaces) ie->cspaces = property.info.cspaces;
227 ie->flags.rotated = property.rotated; 227 ie->flags.rotated = property.info.rotated;
228 ie->flags.flipped = property.flipped; 228 ie->flags.flipped = property.info.flipped;
229 r = EINA_FALSE; 229 r = EINA_FALSE;
230 } 230 }
231 else 231 else
@@ -448,20 +448,20 @@ end:
448 _timestamp_build(&(ie->tstamp), &st); 448 _timestamp_build(&(ie->tstamp), &st);
449 449
450 memset(&property, 0, sizeof (property)); 450 memset(&property, 0, sizeof (property));
451 property.w = ie->w; 451 property.info.w = ie->w;
452 property.h = ie->h; 452 property.info.h = ie->h;
453 property.scale = ie->scale; 453 property.info.scale = ie->scale;
454 property.rotated = ie->flags.rotated; 454 property.info.rotated = ie->flags.rotated;
455 property.flipped = ie->flags.flipped; 455 property.info.flipped = ie->flags.flipped;
456 property.premul = EINA_FALSE; 456 property.info.premul = EINA_FALSE;
457 property.alpha_sparse = EINA_FALSE; 457 property.info.alpha_sparse = EINA_FALSE;
458 property.cspace = ie->space; 458 property.info.cspace = ie->space;
459 459
460 evas_cache_image_surface_alloc(ie, ie->w, ie->h); 460 evas_cache_image_surface_alloc(ie, ie->w, ie->h);
461 property.borders.l = ie->borders.l; 461 property.info.borders.l = ie->borders.l;
462 property.borders.r = ie->borders.r; 462 property.info.borders.r = ie->borders.r;
463 property.borders.t = ie->borders.t; 463 property.info.borders.t = ie->borders.t;
464 property.borders.b = ie->borders.b; 464 property.info.borders.b = ie->borders.b;
465 465
466 pixels = evas_cache_image_pixels(ie); 466 pixels = evas_cache_image_pixels(ie);
467 if (!pixels) 467 if (!pixels)
@@ -472,9 +472,9 @@ end:
472 472
473 evas_image_load_func->file_data(ie->loader_data, &property, pixels, &ret); 473 evas_image_load_func->file_data(ie->loader_data, &property, pixels, &ret);
474 474
475 ie->flags.alpha_sparse = property.alpha_sparse; 475 ie->flags.alpha_sparse = property.info.alpha_sparse;
476 476
477 if (property.premul) evas_common_image_premul(ie); 477 if (property.info.premul) evas_common_image_premul(ie);
478 478
479 return ret; 479 return ret;
480} 480}
diff --git a/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c b/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c
index c29c0c6..844b9d8 100644
--- a/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c
+++ b/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c
@@ -319,7 +319,7 @@ evas_image_load_file_close_bmp(void *loader_data)
319 319
320static Eina_Bool 320static Eina_Bool
321evas_image_load_file_head_bmp(void *loader_data, 321evas_image_load_file_head_bmp(void *loader_data,
322 Evas_Image_Property *prop, 322 Emile_Image_Property *prop,
323 int *error) 323 int *error)
324{ 324{
325 Evas_Loader_Internal *loader; 325 Evas_Loader_Internal *loader;
@@ -454,7 +454,7 @@ evas_image_load_file_head_bmp(void *loader_data,
454 454
455static Eina_Bool 455static Eina_Bool
456evas_image_load_file_data_bmp(void *loader_data, 456evas_image_load_file_data_bmp(void *loader_data,
457 Evas_Image_Property *prop, 457 Emile_Image_Property *prop,
458 void *pixels, 458 void *pixels,
459 int *error) 459 int *error)
460{ 460{
@@ -1432,8 +1432,9 @@ static Evas_Image_Load_Func evas_image_load_bmp_func =
1432 EVAS_IMAGE_LOAD_VERSION, 1432 EVAS_IMAGE_LOAD_VERSION,
1433 evas_image_load_file_open_bmp, 1433 evas_image_load_file_open_bmp,
1434 evas_image_load_file_close_bmp, 1434 evas_image_load_file_close_bmp,
1435 evas_image_load_file_head_bmp, 1435 (void*) evas_image_load_file_head_bmp,
1436 evas_image_load_file_data_bmp, 1436 NULL,
1437 (void*) evas_image_load_file_data_bmp,
1437 NULL, 1438 NULL,
1438 EINA_TRUE, 1439 EINA_TRUE,
1439 EINA_FALSE 1440 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/dds/evas_image_load_dds.c b/src/modules/evas/image_loaders/dds/evas_image_load_dds.c
index 705ed3f..e77c3e9 100644
--- a/src/modules/evas/image_loaders/dds/evas_image_load_dds.c
+++ b/src/modules/evas/image_loaders/dds/evas_image_load_dds.c
@@ -161,7 +161,7 @@ _dword_read(const char **m)
161 161
162static Eina_Bool 162static Eina_Bool
163evas_image_load_file_head_dds(void *loader_data, 163evas_image_load_file_head_dds(void *loader_data,
164 Evas_Image_Property *prop, 164 Emile_Image_Property *prop,
165 int *error) 165 int *error)
166{ 166{
167 static const unsigned int base_flags = /* 0x1007 */ 167 static const unsigned int base_flags = /* 0x1007 */
@@ -313,7 +313,7 @@ on_error:
313} 313}
314 314
315static Eina_Bool 315static Eina_Bool
316_dds_data_load(Evas_Loader_Internal *loader, Evas_Image_Property *prop, 316_dds_data_load(Evas_Loader_Internal *loader, Emile_Image_Property *prop,
317 unsigned char *map, void *pixels, int *error) 317 unsigned char *map, void *pixels, int *error)
318{ 318{
319 const unsigned char *src; 319 const unsigned char *src;
@@ -442,7 +442,7 @@ on_error:
442 442
443Eina_Bool 443Eina_Bool
444evas_image_load_file_data_dds(void *loader_data, 444evas_image_load_file_data_dds(void *loader_data,
445 Evas_Image_Property *prop, 445 Emile_Image_Property *prop,
446 void *pixels, 446 void *pixels,
447 int *error) 447 int *error)
448{ 448{
@@ -532,8 +532,9 @@ Evas_Image_Load_Func evas_image_load_dds_func =
532 EVAS_IMAGE_LOAD_VERSION, 532 EVAS_IMAGE_LOAD_VERSION,
533 evas_image_load_file_open_dds, 533 evas_image_load_file_open_dds,
534 evas_image_load_file_close_dds, 534 evas_image_load_file_close_dds,
535 evas_image_load_file_head_dds, 535 (void*) evas_image_load_file_head_dds,
536 evas_image_load_file_data_dds, 536 NULL,
537 (void*) evas_image_load_file_data_dds,
537 NULL, 538 NULL,
538 EINA_TRUE, 539 EINA_TRUE,
539 EINA_FALSE 540 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/eet/evas_image_load_eet.c b/src/modules/evas/image_loaders/eet/evas_image_load_eet.c
index 4ff2089..4760ecc 100644
--- a/src/modules/evas/image_loaders/eet/evas_image_load_eet.c
+++ b/src/modules/evas/image_loaders/eet/evas_image_load_eet.c
@@ -95,7 +95,7 @@ static const Evas_Colorspace cspaces_etc2_rgba[] = {
95 95
96static Eina_Bool 96static Eina_Bool
97evas_image_load_file_head_eet(void *loader_data, 97evas_image_load_file_head_eet(void *loader_data,
98 Evas_Image_Property *prop, 98 Emile_Image_Property *prop,
99 int *error) 99 int *error)
100{ 100{
101 Evas_Loader_Internal *loader = loader_data; 101 Evas_Loader_Internal *loader = loader_data;
@@ -163,7 +163,7 @@ evas_image_load_file_head_eet(void *loader_data,
163 163
164Eina_Bool 164Eina_Bool
165evas_image_load_file_data_eet(void *loader_data, 165evas_image_load_file_data_eet(void *loader_data,
166 Evas_Image_Property *prop, 166 Emile_Image_Property *prop,
167 void *pixels, 167 void *pixels,
168 int *error) 168 int *error)
169{ 169{
@@ -227,8 +227,9 @@ Evas_Image_Load_Func evas_image_load_eet_func =
227 EVAS_IMAGE_LOAD_VERSION, 227 EVAS_IMAGE_LOAD_VERSION,
228 evas_image_load_file_open_eet, 228 evas_image_load_file_open_eet,
229 evas_image_load_file_close_eet, 229 evas_image_load_file_close_eet,
230 evas_image_load_file_head_eet, 230 (void*) evas_image_load_file_head_eet,
231 evas_image_load_file_data_eet, 231 NULL,
232 (void*) evas_image_load_file_data_eet,
232 NULL, 233 NULL,
233 EINA_TRUE, 234 EINA_TRUE,
234 EINA_FALSE 235 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/generic/evas_image_load_generic.c b/src/modules/evas/image_loaders/generic/evas_image_load_generic.c
index 4bd8528..7d0c8e3 100644
--- a/src/modules/evas/image_loaders/generic/evas_image_load_generic.c
+++ b/src/modules/evas/image_loaders/generic/evas_image_load_generic.c
@@ -101,7 +101,7 @@ dotcat(char *dest, const char *src)
101 101
102static Eina_Bool 102static Eina_Bool
103_load(Eina_File *ef, const char *key, 103_load(Eina_File *ef, const char *key,
104 Evas_Image_Property *prop, 104 Emile_Image_Property *prop,
105 Evas_Image_Load_Opts *opts, 105 Evas_Image_Load_Opts *opts,
106 void *pixels, 106 void *pixels,
107 int *error, Eina_Bool get_data) 107 int *error, Eina_Bool get_data)
@@ -422,7 +422,7 @@ evas_image_load_file_close_generic(void *loader_data)
422 422
423static Eina_Bool 423static Eina_Bool
424evas_image_load_file_head_generic(void *loader_data, 424evas_image_load_file_head_generic(void *loader_data,
425 Evas_Image_Property *prop, 425 Emile_Image_Property *prop,
426 int *error) 426 int *error)
427{ 427{
428 Evas_Loader_Internal *loader = loader_data; 428 Evas_Loader_Internal *loader = loader_data;
@@ -432,7 +432,7 @@ evas_image_load_file_head_generic(void *loader_data,
432 432
433static Eina_Bool 433static Eina_Bool
434evas_image_load_file_data_generic(void *loader_data, 434evas_image_load_file_data_generic(void *loader_data,
435 Evas_Image_Property *prop, 435 Emile_Image_Property *prop,
436 void *pixels, 436 void *pixels,
437 int *error) 437 int *error)
438{ 438{
@@ -446,8 +446,9 @@ Evas_Image_Load_Func evas_image_load_generic_func =
446 EVAS_IMAGE_LOAD_VERSION, 446 EVAS_IMAGE_LOAD_VERSION,
447 evas_image_load_file_open_generic, 447 evas_image_load_file_open_generic,
448 evas_image_load_file_close_generic, 448 evas_image_load_file_close_generic,
449 evas_image_load_file_head_generic, 449 (void*) evas_image_load_file_head_generic,
450 evas_image_load_file_data_generic, 450 NULL,
451 (void*) evas_image_load_file_data_generic,
451 NULL, 452 NULL,
452 EINA_TRUE, 453 EINA_TRUE,
453 EINA_FALSE 454 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/gif/evas_image_load_gif.c b/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
index 2928ff7..308f909 100644
--- a/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
+++ b/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
@@ -399,7 +399,7 @@ _file_read(GifFileType *gft, GifByteType *buf, int len)
399 399
400static Eina_Bool 400static Eina_Bool
401evas_image_load_file_head_gif2(void *loader_data, 401evas_image_load_file_head_gif2(void *loader_data,
402 Evas_Image_Property *prop, 402 Emile_Image_Property *prop,
403 int *error) 403 int *error)
404{ 404{
405 Loader_Info *loader = loader_data; 405 Loader_Info *loader = loader_data;
@@ -569,7 +569,7 @@ on_error: // jump here on any errors to clean up
569 569
570static Eina_Bool 570static Eina_Bool
571evas_image_load_file_data_gif2(void *loader_data, 571evas_image_load_file_data_gif2(void *loader_data,
572 Evas_Image_Property *prop, 572 Emile_Image_Property *prop,
573 void *pixels, 573 void *pixels,
574 int *error) 574 int *error)
575{ 575{
@@ -908,8 +908,9 @@ static Evas_Image_Load_Func evas_image_load_gif_func =
908 EVAS_IMAGE_LOAD_VERSION, 908 EVAS_IMAGE_LOAD_VERSION,
909 evas_image_load_file_open_gif2, 909 evas_image_load_file_open_gif2,
910 evas_image_load_file_close_gif2, 910 evas_image_load_file_close_gif2,
911 evas_image_load_file_head_gif2, 911 (void*) evas_image_load_file_head_gif2,
912 evas_image_load_file_data_gif2, 912 NULL,
913 (void*) evas_image_load_file_data_gif2,
913 evas_image_load_frame_duration_gif2, 914 evas_image_load_frame_duration_gif2,
914 EINA_TRUE, 915 EINA_TRUE,
915 EINA_FALSE 916 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/ico/evas_image_load_ico.c b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c
index efdad46..fea7877 100644
--- a/src/modules/evas/image_loaders/ico/evas_image_load_ico.c
+++ b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c
@@ -111,7 +111,7 @@ evas_image_load_file_close_ico(void *loader_data)
111 111
112static Eina_Bool 112static Eina_Bool
113evas_image_load_file_head_ico(void *loader_data, 113evas_image_load_file_head_ico(void *loader_data,
114 Evas_Image_Property *prop, 114 Emile_Image_Property *prop,
115 int *error) 115 int *error)
116{ 116{
117 Evas_Loader_Internal *loader = loader_data; 117 Evas_Loader_Internal *loader = loader_data;
@@ -340,7 +340,7 @@ evas_image_load_file_head_ico(void *loader_data,
340 340
341static Eina_Bool 341static Eina_Bool
342evas_image_load_file_data_ico(void *loader_data, 342evas_image_load_file_data_ico(void *loader_data,
343 Evas_Image_Property *prop, 343 Emile_Image_Property *prop,
344 void *pixels, 344 void *pixels,
345 int *error) 345 int *error)
346{ 346{
@@ -795,8 +795,9 @@ static Evas_Image_Load_Func evas_image_load_ico_func =
795 EVAS_IMAGE_LOAD_VERSION, 795 EVAS_IMAGE_LOAD_VERSION,
796 evas_image_load_file_open_ico, 796 evas_image_load_file_open_ico,
797 evas_image_load_file_close_ico, 797 evas_image_load_file_close_ico,
798 evas_image_load_file_head_ico, 798 (void*) evas_image_load_file_head_ico,
799 evas_image_load_file_data_ico, 799 NULL,
800 (void*) evas_image_load_file_data_ico,
800 NULL, 801 NULL,
801 EINA_TRUE, 802 EINA_TRUE,
802 EINA_FALSE 803 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c b/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c
index 50ab355..bf39927 100644
--- a/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c
+++ b/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c
@@ -403,7 +403,7 @@ evas_image_load_file_close_jp2k(void *loader_data)
403 403
404static Eina_Bool 404static Eina_Bool
405evas_image_load_file_head_jp2k(void *loader_data, 405evas_image_load_file_head_jp2k(void *loader_data,
406 Evas_Image_Property *prop, 406 Emile_Image_Property *prop,
407 int *error) 407 int *error)
408{ 408{
409 Evas_Loader_Internal *loader = loader_data; 409 Evas_Loader_Internal *loader = loader_data;
@@ -432,7 +432,7 @@ evas_image_load_file_head_jp2k(void *loader_data,
432 432
433static Eina_Bool 433static Eina_Bool
434evas_image_load_file_data_jp2k(void *loader_data, 434evas_image_load_file_data_jp2k(void *loader_data,
435 Evas_Image_Property *prop EINA_UNUSED, 435 Emile_Image_Property *prop EINA_UNUSED,
436 void *pixels, 436 void *pixels,
437 int *error) 437 int *error)
438{ 438{
@@ -465,8 +465,9 @@ static Evas_Image_Load_Func evas_image_load_jp2k_func =
465 EVAS_IMAGE_LOAD_VERSION, 465 EVAS_IMAGE_LOAD_VERSION,
466 evas_image_load_file_open_jp2k, 466 evas_image_load_file_open_jp2k,
467 evas_image_load_file_close_jp2k, 467 evas_image_load_file_close_jp2k,
468 evas_image_load_file_head_jp2k, 468 (void*) evas_image_load_file_head_jp2k,
469 evas_image_load_file_data_jp2k, 469 NULL,
470 (void*) evas_image_load_file_data_jp2k,
470 NULL, 471 NULL,
471 EINA_TRUE, 472 EINA_TRUE,
472 EINA_TRUE 473 EINA_TRUE
diff --git a/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c b/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c
index ca71256..1cb55c0 100644
--- a/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c
+++ b/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c
@@ -70,7 +70,7 @@ evas_image_load_file_close_jpeg(void *loader_data)
70 70
71static Eina_Bool 71static Eina_Bool
72evas_image_load_file_head_jpeg(void *loader_data, 72evas_image_load_file_head_jpeg(void *loader_data,
73 Evas_Image_Property *prop, 73 Emile_Image_Property *prop,
74 int *error) 74 int *error)
75{ 75{
76 Evas_Loader_Internal *loader = loader_data; 76 Evas_Loader_Internal *loader = loader_data;
@@ -95,7 +95,7 @@ _evas_image_load_jpeg_cancelled(void *data EINA_UNUSED,
95 95
96Eina_Bool 96Eina_Bool
97evas_image_load_file_data_jpeg(void *loader_data, 97evas_image_load_file_data_jpeg(void *loader_data,
98 Evas_Image_Property *prop, 98 Emile_Image_Property *prop,
99 void *pixels, 99 void *pixels,
100 int *error) 100 int *error)
101{ 101{
@@ -119,8 +119,9 @@ Evas_Image_Load_Func evas_image_load_jpeg_func =
119 EVAS_IMAGE_LOAD_VERSION, 119 EVAS_IMAGE_LOAD_VERSION,
120 evas_image_load_file_open_jpeg, 120 evas_image_load_file_open_jpeg,
121 evas_image_load_file_close_jpeg, 121 evas_image_load_file_close_jpeg,
122 evas_image_load_file_head_jpeg, 122 (void*) evas_image_load_file_head_jpeg,
123 evas_image_load_file_data_jpeg, 123 NULL,
124 (void*) evas_image_load_file_data_jpeg,
124 NULL, 125 NULL,
125 EINA_TRUE, 126 EINA_TRUE,
126 EINA_TRUE 127 EINA_TRUE
diff --git a/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c b/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c
index 66deda1..a541e4d 100644
--- a/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c
+++ b/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c
@@ -67,7 +67,7 @@ evas_image_load_file_close_pmaps(void *loader_data EINA_UNUSED)
67 67
68static Eina_Bool 68static Eina_Bool
69evas_image_load_file_head_pmaps(void *loader_data, 69evas_image_load_file_head_pmaps(void *loader_data,
70 Evas_Image_Property *prop, 70 Emile_Image_Property *prop,
71 int *error) 71 int *error)
72{ 72{
73 Eina_File *f = loader_data; 73 Eina_File *f = loader_data;
@@ -95,7 +95,7 @@ evas_image_load_file_head_pmaps(void *loader_data,
95 95
96static Eina_Bool 96static Eina_Bool
97evas_image_load_file_data_pmaps(void *loader_data, 97evas_image_load_file_data_pmaps(void *loader_data,
98 Evas_Image_Property *prop, 98 Emile_Image_Property *prop,
99 void *pixels, 99 void *pixels,
100 int *error) 100 int *error)
101{ 101{
@@ -554,8 +554,9 @@ Evas_Image_Load_Func evas_image_load_pmaps_func = {
554 EVAS_IMAGE_LOAD_VERSION, 554 EVAS_IMAGE_LOAD_VERSION,
555 evas_image_load_file_open_pmaps, 555 evas_image_load_file_open_pmaps,
556 evas_image_load_file_close_pmaps, 556 evas_image_load_file_close_pmaps,
557 evas_image_load_file_head_pmaps, 557 (void*) evas_image_load_file_head_pmaps,
558 evas_image_load_file_data_pmaps, 558 NULL,
559 (void*) evas_image_load_file_data_pmaps,
559 NULL, 560 NULL,
560 EINA_TRUE, 561 EINA_TRUE,
561 EINA_FALSE 562 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/png/evas_image_load_png.c b/src/modules/evas/image_loaders/png/evas_image_load_png.c
index 80f7744..1460cc7 100644
--- a/src/modules/evas/image_loaders/png/evas_image_load_png.c
+++ b/src/modules/evas/image_loaders/png/evas_image_load_png.c
@@ -77,7 +77,7 @@ evas_image_load_file_close_png(void *loader_data)
77 77
78static Eina_Bool 78static Eina_Bool
79evas_image_load_file_head_png(void *loader_data, 79evas_image_load_file_head_png(void *loader_data,
80 Evas_Image_Property *prop, 80 Emile_Image_Property *prop,
81 int *error) 81 int *error)
82{ 82{
83 Evas_Loader_Internal *loader = loader_data; 83 Evas_Loader_Internal *loader = loader_data;
@@ -217,7 +217,7 @@ evas_image_load_file_head_png(void *loader_data,
217 217
218static Eina_Bool 218static Eina_Bool
219evas_image_load_file_data_png(void *loader_data, 219evas_image_load_file_data_png(void *loader_data,
220 Evas_Image_Property *prop, 220 Emile_Image_Property *prop,
221 void *pixels, 221 void *pixels,
222 int *error) 222 int *error)
223{ 223{
@@ -559,8 +559,9 @@ static Evas_Image_Load_Func evas_image_load_png_func =
559 EVAS_IMAGE_LOAD_VERSION, 559 EVAS_IMAGE_LOAD_VERSION,
560 evas_image_load_file_open_png, 560 evas_image_load_file_open_png,
561 evas_image_load_file_close_png, 561 evas_image_load_file_close_png,
562 evas_image_load_file_head_png, 562 (void*) evas_image_load_file_head_png,
563 evas_image_load_file_data_png, 563 NULL,
564 (void*) evas_image_load_file_data_png,
564 NULL, 565 NULL,
565 EINA_TRUE, 566 EINA_TRUE,
566 EINA_FALSE 567 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/psd/evas_image_load_psd.c b/src/modules/evas/image_loaders/psd/evas_image_load_psd.c
index afd54b5..c8abd1b 100644
--- a/src/modules/evas/image_loaders/psd/evas_image_load_psd.c
+++ b/src/modules/evas/image_loaders/psd/evas_image_load_psd.c
@@ -147,7 +147,7 @@ evas_image_load_file_close_psd(void *loader_data EINA_UNUSED)
147 147
148static Eina_Bool 148static Eina_Bool
149evas_image_load_file_head_psd(void *loader_data, 149evas_image_load_file_head_psd(void *loader_data,
150 Evas_Image_Property *prop, 150 Emile_Image_Property *prop,
151 int *error) 151 int *error)
152{ 152{
153 Eina_File *f = loader_data; 153 Eina_File *f = loader_data;
@@ -691,7 +691,7 @@ read_psd_rgb(void *pixels, PSD_Header *head, const unsigned char *map, size_t le
691} 691}
692 692
693Eina_Bool 693Eina_Bool
694read_psd_cmyk(Evas_Image_Property *prop, void *pixels, PSD_Header *head, const unsigned char *map, size_t length, size_t *position, int *error) 694read_psd_cmyk(Emile_Image_Property *prop, void *pixels, PSD_Header *head, const unsigned char *map, size_t length, size_t *position, int *error)
695{ 695{
696 unsigned int color_mode, resource_size, misc_info, size, j, data_size; 696 unsigned int color_mode, resource_size, misc_info, size, j, data_size;
697 unsigned short compressed; 697 unsigned short compressed;
@@ -797,7 +797,7 @@ read_psd_cmyk(Evas_Image_Property *prop, void *pixels, PSD_Header *head, const u
797 797
798static Eina_Bool 798static Eina_Bool
799evas_image_load_file_data_psd(void *loader_data, 799evas_image_load_file_data_psd(void *loader_data,
800 Evas_Image_Property *prop, 800 Emile_Image_Property *prop,
801 void *pixels, 801 void *pixels,
802 int *error) 802 int *error)
803{ 803{
@@ -885,8 +885,9 @@ static const Evas_Image_Load_Func evas_image_load_psd_func = {
885 EVAS_IMAGE_LOAD_VERSION, 885 EVAS_IMAGE_LOAD_VERSION,
886 evas_image_load_file_open_psd, 886 evas_image_load_file_open_psd,
887 evas_image_load_file_close_psd, 887 evas_image_load_file_close_psd,
888 evas_image_load_file_head_psd, 888 (void*) evas_image_load_file_head_psd,
889 evas_image_load_file_data_psd, 889 NULL,
890 (void*) evas_image_load_file_data_psd,
890 NULL, 891 NULL,
891 EINA_TRUE, 892 EINA_TRUE,
892 EINA_FALSE 893 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/tga/evas_image_load_tga.c b/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
index 4efb673..d8ef67f 100644
--- a/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
+++ b/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
@@ -68,7 +68,7 @@ evas_image_load_file_close_tga(void *loader_data EINA_UNUSED)
68 68
69static Eina_Bool 69static Eina_Bool
70evas_image_load_file_head_tga(void *loader_data, 70evas_image_load_file_head_tga(void *loader_data,
71 Evas_Image_Property *prop, 71 Emile_Image_Property *prop,
72 int *error) 72 int *error)
73{ 73{
74 Eina_File *f = loader_data; 74 Eina_File *f = loader_data;
@@ -164,7 +164,7 @@ close_file:
164 164
165static Eina_Bool 165static Eina_Bool
166evas_image_load_file_data_tga(void *loader_data, 166evas_image_load_file_data_tga(void *loader_data,
167 Evas_Image_Property *prop, 167 Emile_Image_Property *prop,
168 void *pixels, 168 void *pixels,
169 int *error) 169 int *error)
170{ 170{
@@ -566,8 +566,9 @@ static Evas_Image_Load_Func evas_image_load_tga_func =
566 EVAS_IMAGE_LOAD_VERSION, 566 EVAS_IMAGE_LOAD_VERSION,
567 evas_image_load_file_open_tga, 567 evas_image_load_file_open_tga,
568 evas_image_load_file_close_tga, 568 evas_image_load_file_close_tga,
569 evas_image_load_file_head_tga, 569 (void*) evas_image_load_file_head_tga,
570 evas_image_load_file_data_tga, 570 NULL,
571 (void*) evas_image_load_file_data_tga,
571 NULL, 572 NULL,
572 EINA_TRUE, 573 EINA_TRUE,
573 EINA_FALSE 574 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/tgv/evas_image_load_tgv.c b/src/modules/evas/image_loaders/tgv/evas_image_load_tgv.c
index e71773d..ad90605 100644
--- a/src/modules/evas/image_loaders/tgv/evas_image_load_tgv.c
+++ b/src/modules/evas/image_loaders/tgv/evas_image_load_tgv.c
@@ -70,7 +70,7 @@ evas_image_load_file_close_tgv(void *loader_data)
70 70
71static Eina_Bool 71static Eina_Bool
72evas_image_load_file_head_tgv(void *loader_data, 72evas_image_load_file_head_tgv(void *loader_data,
73 Evas_Image_Property *prop, 73 Emile_Image_Property *prop,
74 int *error) 74 int *error)
75{ 75{
76 Evas_Loader_Internal *loader = loader_data; 76 Evas_Loader_Internal *loader = loader_data;
@@ -87,7 +87,7 @@ evas_image_load_file_head_tgv(void *loader_data,
87 87
88Eina_Bool 88Eina_Bool
89evas_image_load_file_data_tgv(void *loader_data, 89evas_image_load_file_data_tgv(void *loader_data,
90 Evas_Image_Property *prop, 90 Emile_Image_Property *prop,
91 void *pixels, 91 void *pixels,
92 int *error) 92 int *error)
93{ 93{
@@ -108,8 +108,9 @@ Evas_Image_Load_Func evas_image_load_tgv_func =
108 EVAS_IMAGE_LOAD_VERSION, 108 EVAS_IMAGE_LOAD_VERSION,
109 evas_image_load_file_open_tgv, 109 evas_image_load_file_open_tgv,
110 evas_image_load_file_close_tgv, 110 evas_image_load_file_close_tgv,
111 evas_image_load_file_head_tgv, 111 (void*) evas_image_load_file_head_tgv,
112 evas_image_load_file_data_tgv, 112 NULL,
113 (void*) evas_image_load_file_data_tgv,
113 NULL, 114 NULL,
114 EINA_TRUE, 115 EINA_TRUE,
115 EINA_FALSE 116 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
index 2603221..6f1cf61 100644
--- a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
+++ b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
@@ -103,7 +103,7 @@ evas_image_load_file_close_tiff(void *loader_data EINA_UNUSED)
103 103
104static Eina_Bool 104static Eina_Bool
105evas_image_load_file_head_tiff(void *loader_data, 105evas_image_load_file_head_tiff(void *loader_data,
106 Evas_Image_Property *prop, 106 Emile_Image_Property *prop,
107 int *error) 107 int *error)
108{ 108{
109 Eina_File *f = loader_data; 109 Eina_File *f = loader_data;
@@ -186,7 +186,7 @@ evas_image_load_file_head_tiff(void *loader_data,
186 186
187static Eina_Bool 187static Eina_Bool
188evas_image_load_file_data_tiff(void *loader_data, 188evas_image_load_file_data_tiff(void *loader_data,
189 Evas_Image_Property *prop, 189 Emile_Image_Property *prop,
190 void *pixels, 190 void *pixels,
191 int *error) 191 int *error)
192{ 192{
@@ -335,8 +335,9 @@ static Evas_Image_Load_Func evas_image_load_tiff_func =
335 EVAS_IMAGE_LOAD_VERSION, 335 EVAS_IMAGE_LOAD_VERSION,
336 evas_image_load_file_open_tiff, 336 evas_image_load_file_open_tiff,
337 evas_image_load_file_close_tiff, 337 evas_image_load_file_close_tiff,
338 evas_image_load_file_head_tiff, 338 (void*) evas_image_load_file_head_tiff,
339 evas_image_load_file_data_tiff, 339 NULL,
340 (void*) evas_image_load_file_data_tiff,
340 NULL, 341 NULL,
341 EINA_TRUE, 342 EINA_TRUE,
342 EINA_FALSE 343 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c b/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c
index e14f5a4..b601901 100644
--- a/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c
+++ b/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c
@@ -41,7 +41,7 @@ evas_image_load_file_close_wbmp(void *loader_data EINA_UNUSED)
41 41
42static Eina_Bool 42static Eina_Bool
43evas_image_load_file_head_wbmp(void *loader_data, 43evas_image_load_file_head_wbmp(void *loader_data,
44 Evas_Image_Property *prop, 44 Emile_Image_Property *prop,
45 int *error) 45 int *error)
46{ 46{
47 Eina_File *f = loader_data; 47 Eina_File *f = loader_data;
@@ -98,7 +98,7 @@ evas_image_load_file_head_wbmp(void *loader_data,
98 98
99static Eina_Bool 99static Eina_Bool
100evas_image_load_file_data_wbmp(void *loader_data, 100evas_image_load_file_data_wbmp(void *loader_data,
101 Evas_Image_Property *prop, 101 Emile_Image_Property *prop,
102 void *pixels, 102 void *pixels,
103 int *error) 103 int *error)
104{ 104{
@@ -184,8 +184,9 @@ static Evas_Image_Load_Func evas_image_load_wbmp_func =
184 EVAS_IMAGE_LOAD_VERSION, 184 EVAS_IMAGE_LOAD_VERSION,
185 evas_image_load_file_open_wbmp, 185 evas_image_load_file_open_wbmp,
186 evas_image_load_file_close_wbmp, 186 evas_image_load_file_close_wbmp,
187 evas_image_load_file_head_wbmp, 187 (void*) evas_image_load_file_head_wbmp,
188 evas_image_load_file_data_wbmp, 188 NULL,
189 (void*) evas_image_load_file_data_wbmp,
189 NULL, 190 NULL,
190 EINA_TRUE, 191 EINA_TRUE,
191 EINA_FALSE 192 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/webp/evas_image_load_webp.c b/src/modules/evas/image_loaders/webp/evas_image_load_webp.c
index 9d39b22..bd08245 100644
--- a/src/modules/evas/image_loaders/webp/evas_image_load_webp.c
+++ b/src/modules/evas/image_loaders/webp/evas_image_load_webp.c
@@ -52,7 +52,7 @@ evas_image_load_file_close_webp(void *loader_data EINA_UNUSED)
52 52
53static Eina_Bool 53static Eina_Bool
54evas_image_load_file_head_webp(void *loader_data, 54evas_image_load_file_head_webp(void *loader_data,
55 Evas_Image_Property *prop, 55 Emile_Image_Property *prop,
56 int *error) 56 int *error)
57{ 57{
58 Eina_File *f = loader_data; 58 Eina_File *f = loader_data;
@@ -73,7 +73,7 @@ evas_image_load_file_head_webp(void *loader_data,
73 73
74static Eina_Bool 74static Eina_Bool
75evas_image_load_file_data_webp(void *loader_data, 75evas_image_load_file_data_webp(void *loader_data,
76 Evas_Image_Property *prop, 76 Emile_Image_Property *prop,
77 void *pixels, 77 void *pixels,
78 int *error) 78 int *error)
79{ 79{
@@ -115,8 +115,9 @@ static Evas_Image_Load_Func evas_image_load_webp_func =
115 EVAS_IMAGE_LOAD_VERSION, 115 EVAS_IMAGE_LOAD_VERSION,
116 evas_image_load_file_open_webp, 116 evas_image_load_file_open_webp,
117 evas_image_load_file_close_webp, 117 evas_image_load_file_close_webp,
118 evas_image_load_file_head_webp, 118 (void*) evas_image_load_file_head_webp,
119 evas_image_load_file_data_webp, 119 NULL,
120 (void*) evas_image_load_file_data_webp,
120 NULL, 121 NULL,
121 EINA_TRUE, 122 EINA_TRUE,
122 EINA_FALSE 123 EINA_FALSE
diff --git a/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c b/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c
index 3b5e682..d7aa25d 100644
--- a/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c
+++ b/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c
@@ -1688,7 +1688,7 @@ _cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length EINA_UNUSE
1688 1688
1689/** FIXME: clean this up and make more efficient **/ 1689/** FIXME: clean this up and make more efficient **/
1690static Eina_Bool 1690static Eina_Bool
1691evas_image_load_file_xpm(Eina_File *f, Evas_Image_Property *prop, void *pixels, int load_data, int *error) 1691evas_image_load_file_xpm(Eina_File *f, Emile_Image_Property *prop, void *pixels, int load_data, int *error)
1692{ 1692{
1693 DATA32 *ptr, *end, *head = NULL; 1693 DATA32 *ptr, *end, *head = NULL;
1694 const char *map = NULL; 1694 const char *map = NULL;
@@ -2193,7 +2193,7 @@ evas_image_load_file_close_xpm(void *loader_data EINA_UNUSED)
2193 2193
2194static Eina_Bool 2194static Eina_Bool
2195evas_image_load_file_head_xpm(void *loader_data, 2195evas_image_load_file_head_xpm(void *loader_data,
2196 Evas_Image_Property *prop, 2196 Emile_Image_Property *prop,
2197 int *error) 2197 int *error)
2198{ 2198{
2199 Eina_File *f = loader_data; 2199 Eina_File *f = loader_data;
@@ -2203,7 +2203,7 @@ evas_image_load_file_head_xpm(void *loader_data,
2203 2203
2204static Eina_Bool 2204static Eina_Bool
2205evas_image_load_file_data_xpm(void *loader_data, 2205evas_image_load_file_data_xpm(void *loader_data,
2206 Evas_Image_Property *prop, 2206 Emile_Image_Property *prop,
2207 void *pixels, 2207 void *pixels,
2208 int *error) 2208 int *error)
2209{ 2209{
@@ -2217,8 +2217,9 @@ static Evas_Image_Load_Func evas_image_load_xpm_func =
2217 EVAS_IMAGE_LOAD_VERSION, 2217 EVAS_IMAGE_LOAD_VERSION,
2218 evas_image_load_file_open_xpm, 2218 evas_image_load_file_open_xpm,
2219 evas_image_load_file_close_xpm, 2219 evas_image_load_file_close_xpm,
2220 evas_image_load_file_head_xpm, 2220 (void*) evas_image_load_file_head_xpm,
2221 evas_image_load_file_data_xpm, 2221 NULL,
2222 (void*) evas_image_load_file_data_xpm,
2222 NULL, 2223 NULL,
2223 EINA_FALSE, 2224 EINA_FALSE,
2224 EINA_FALSE 2225 EINA_FALSE