diff options
author | Elyes HAOUAS <ehaouas@noos.fr> | 2020-06-20 09:52:54 +0000 |
---|---|---|
committer | Stefan Schmidt <s.schmidt@samsung.com> | 2020-06-23 10:31:22 +0200 |
commit | c7da405ae74dd1229a679f535e703c951bdaaac3 (patch) | |
tree | 9dd65f0cb9e57df776a72f828df49a4cc4fa537e | |
parent | 727167ced6e2c75a6c927b4652ea5eaa3fe5c594 (diff) |
Get rid of trailing whitespaces (12 / 14)
Remove trailing whitespaces
Differential Revision: https://phab.enlightenment.org/D12011
46 files changed, 193 insertions, 193 deletions
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index b8fd3d09ed..57394dd2eb 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h | |||
@@ -5402,7 +5402,7 @@ EAPI int evas_object_image_load_scale_down_get(const Evas_Object *obj); | |||
5402 | 5402 | ||
5403 | /** | 5403 | /** |
5404 | * @brief Set a load option to skip initial header load and defer to preload | 5404 | * @brief Set a load option to skip initial header load and defer to preload |
5405 | * | 5405 | * |
5406 | * This is meant to be used in conjunction with evas_object_image_file_set() | 5406 | * This is meant to be used in conjunction with evas_object_image_file_set() |
5407 | * and evas_object_image_preload() by deferring any header loading until | 5407 | * and evas_object_image_preload() by deferring any header loading until |
5408 | * a evas_object_image_preload() is issued making the file file set simply | 5408 | * a evas_object_image_preload() is issued making the file file set simply |
@@ -5411,17 +5411,17 @@ EAPI int evas_object_image_load_scale_down_get(const Evas_Object *obj); | |||
5411 | * channel flags etc. All of this will then be done as part of the preload | 5411 | * channel flags etc. All of this will then be done as part of the preload |
5412 | * stage. | 5412 | * stage. |
5413 | * @param[in] obj The object | 5413 | * @param[in] obj The object |
5414 | * | 5414 | * |
5415 | * @since 1.19 | 5415 | * @since 1.19 |
5416 | */ | 5416 | */ |
5417 | EAPI void evas_object_image_load_head_skip_set(Evas_Object *obj, Eina_Bool skip); | 5417 | EAPI void evas_object_image_load_head_skip_set(Evas_Object *obj, Eina_Bool skip); |
5418 | 5418 | ||
5419 | /** | 5419 | /** |
5420 | * @brief Get the load option to skip header loads before preload | 5420 | * @brief Get the load option to skip header loads before preload |
5421 | * | 5421 | * |
5422 | * This gets the head skip value set by evas_object_image_load_head_skip_set() | 5422 | * This gets the head skip value set by evas_object_image_load_head_skip_set() |
5423 | * @param[in] obj The object | 5423 | * @param[in] obj The object |
5424 | * | 5424 | * |
5425 | * @see evas_object_image_load_head_skip_set | 5425 | * @see evas_object_image_load_head_skip_set |
5426 | * @since 1.19 | 5426 | * @since 1.19 |
5427 | */ | 5427 | */ |
@@ -7100,7 +7100,7 @@ EAPI void evas_object_smart_move_children_relative(Evas_Object *obj, Evas_Coord | |||
7100 | * | 7100 | * |
7101 | * @{ | 7101 | * @{ |
7102 | */ | 7102 | */ |
7103 | 7103 | ||
7104 | /** | 7104 | /** |
7105 | * Add a new box object on the provided canvas. | 7105 | * Add a new box object on the provided canvas. |
7106 | * | 7106 | * |
@@ -8376,7 +8376,7 @@ EAPI Eina_Bool evas_object_map_enable_get(const Evas_Object *obj); | |||
8376 | * | 8376 | * |
8377 | * Note: the preferred method for filters is to edit EDC styles, rather than | 8377 | * Note: the preferred method for filters is to edit EDC styles, rather than |
8378 | * calling this API directly. | 8378 | * calling this API directly. |
8379 | * | 8379 | * |
8380 | * @since 1.18 | 8380 | * @since 1.18 |
8381 | */ | 8381 | */ |
8382 | EAPI void evas_object_text_filter_program_set(Evas_Object *obj, const char *code) EINA_DEPRECATED; | 8382 | EAPI void evas_object_text_filter_program_set(Evas_Object *obj, const char *code) EINA_DEPRECATED; |
diff --git a/src/lib/evas/Evas_Loader.h b/src/lib/evas/Evas_Loader.h index cbb8effae8..2d998ba3c0 100644 --- a/src/lib/evas/Evas_Loader.h +++ b/src/lib/evas/Evas_Loader.h | |||
@@ -9,11 +9,11 @@ | |||
9 | * | 9 | * |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | 16 | * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
17 | * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | 17 | * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND |
18 | * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE | 18 | * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE |
19 | * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, | 19 | * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
diff --git a/src/lib/evas/cache/evas_cache_image.c b/src/lib/evas/cache/evas_cache_image.c index d412fe4110..32cc83db8b 100644 --- a/src/lib/evas/cache/evas_cache_image.c +++ b/src/lib/evas/cache/evas_cache_image.c | |||
@@ -850,7 +850,7 @@ evas_cache_image_mmap_request(Evas_Cache_Image *cache, | |||
850 | 850 | ||
851 | 851 | ||
852 | EAPI Image_Entry * | 852 | EAPI Image_Entry * |
853 | evas_cache_image_request(Evas_Cache_Image *cache, const char *file, | 853 | evas_cache_image_request(Evas_Cache_Image *cache, const char *file, |
854 | const char *key, Evas_Image_Load_Opts *lo, int *error) | 854 | const char *key, Evas_Image_Load_Opts *lo, int *error) |
855 | { | 855 | { |
856 | const char *ckey = "(null)"; | 856 | const char *ckey = "(null)"; |
@@ -1132,9 +1132,9 @@ evas_cache_image_alone(Image_Entry *im) | |||
1132 | } | 1132 | } |
1133 | else | 1133 | else |
1134 | { | 1134 | { |
1135 | im_dirty = evas_cache_image_copied_data(cache, im->w, im->h, | 1135 | im_dirty = evas_cache_image_copied_data(cache, im->w, im->h, |
1136 | evas_cache_image_pixels(im), | 1136 | evas_cache_image_pixels(im), |
1137 | im->flags.alpha, | 1137 | im->flags.alpha, |
1138 | im->space); | 1138 | im->space); |
1139 | if (!im_dirty) goto on_error; | 1139 | if (!im_dirty) goto on_error; |
1140 | if (cache->func.debug) cache->func.debug("dirty-src", im); | 1140 | if (cache->func.debug) cache->func.debug("dirty-src", im); |
@@ -1151,8 +1151,8 @@ on_error: | |||
1151 | } | 1151 | } |
1152 | 1152 | ||
1153 | EAPI Image_Entry * | 1153 | EAPI Image_Entry * |
1154 | evas_cache_image_copied_data(Evas_Cache_Image *cache, | 1154 | evas_cache_image_copied_data(Evas_Cache_Image *cache, |
1155 | unsigned int w, unsigned int h, | 1155 | unsigned int w, unsigned int h, |
1156 | DATA32 *image_data, int alpha, | 1156 | DATA32 *image_data, int alpha, |
1157 | Evas_Colorspace cspace) | 1157 | Evas_Colorspace cspace) |
1158 | { | 1158 | { |
@@ -1364,7 +1364,7 @@ evas_cache_image_unload_data(Image_Entry *im) | |||
1364 | } | 1364 | } |
1365 | 1365 | ||
1366 | SLKL(im->lock_cancel); | 1366 | SLKL(im->lock_cancel); |
1367 | if ((!im->flags.loaded) || (!im->file && !im->f) || (!im->info.module) || | 1367 | if ((!im->flags.loaded) || (!im->file && !im->f) || (!im->info.module) || |
1368 | (im->flags.dirty)) | 1368 | (im->flags.dirty)) |
1369 | { | 1369 | { |
1370 | SLKU(im->lock_cancel); | 1370 | SLKU(im->lock_cancel); |
@@ -1516,7 +1516,7 @@ evas_cache_image_flush(Evas_Cache_Image *cache) | |||
1516 | if (!cache) return 0; | 1516 | if (!cache) return 0; |
1517 | #ifdef CACHEDUMP | 1517 | #ifdef CACHEDUMP |
1518 | _dump_cache(cache); | 1518 | _dump_cache(cache); |
1519 | #endif | 1519 | #endif |
1520 | if (cache->limit == (unsigned int)-1) return -1; | 1520 | if (cache->limit == (unsigned int)-1) return -1; |
1521 | 1521 | ||
1522 | SLKL(engine_lock); | 1522 | SLKL(engine_lock); |
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c b/src/lib/evas/canvas/efl_canvas_vg_object.c index f2cd687b8f..f0a9702c30 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_object.c +++ b/src/lib/evas/canvas/efl_canvas_vg_object.c | |||
@@ -400,7 +400,7 @@ _efl_canvas_vg_object_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Object_Data *pd | |||
400 | Evas *e = evas_object_evas_get(obj); | 400 | Evas *e = evas_object_evas_get(obj); |
401 | 401 | ||
402 | /* Container must have a set parent after construction. | 402 | /* Container must have a set parent after construction. |
403 | efl_add_ref() with a parent won't work this case | 403 | efl_add_ref() with a parent won't work this case |
404 | because container needs some jobs in overriding parent_set() | 404 | because container needs some jobs in overriding parent_set() |
405 | after proper intialization. */ | 405 | after proper intialization. */ |
406 | efl_parent_set(pd->root, obj); | 406 | efl_parent_set(pd->root, obj); |
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c index 10e98fef44..783c222eb1 100644 --- a/src/lib/evas/canvas/evas_device.c +++ b/src/lib/evas/canvas/evas_device.c | |||
@@ -471,7 +471,7 @@ Evas_Device * | |||
471 | _evas_device_top_get(const Evas *eo_e) | 471 | _evas_device_top_get(const Evas *eo_e) |
472 | { | 472 | { |
473 | int num; | 473 | int num; |
474 | 474 | ||
475 | Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); | 475 | Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); |
476 | if (!e->cur_device) return NULL; | 476 | if (!e->cur_device) return NULL; |
477 | num = eina_array_count(e->cur_device); | 477 | num = eina_array_count(e->cur_device); |
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c index 4901c3aeb5..4ff80f44e2 100644 --- a/src/lib/evas/canvas/evas_image_legacy.c +++ b/src/lib/evas/canvas/evas_image_legacy.c | |||
@@ -226,7 +226,7 @@ evas_object_image_save(const Evas_Object *obj, const char *file, const char *key | |||
226 | Eina_Error ret; | 226 | Eina_Error ret; |
227 | 227 | ||
228 | EVAS_IMAGE_API(obj, EINA_FALSE); | 228 | EVAS_IMAGE_API(obj, EINA_FALSE); |
229 | 229 | ||
230 | if (flags) | 230 | if (flags) |
231 | { | 231 | { |
232 | char *p, *pp; | 232 | char *p, *pp; |
diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c index 5c8969ccb4..8ff29be943 100644 --- a/src/lib/evas/canvas/evas_key_grab.c +++ b/src/lib/evas/canvas/evas_key_grab.c | |||
@@ -106,7 +106,7 @@ evas_object_grabs_cleanup(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected | |||
106 | while (obj->grabs) | 106 | while (obj->grabs) |
107 | { | 107 | { |
108 | Evas_Key_Grab *g = obj->grabs->data; | 108 | Evas_Key_Grab *g = obj->grabs->data; |
109 | obj->layer->evas->grabs = | 109 | obj->layer->evas->grabs = |
110 | eina_list_remove(obj->layer->evas->grabs, g); | 110 | eina_list_remove(obj->layer->evas->grabs, g); |
111 | obj->grabs = eina_list_remove(obj->grabs, g); | 111 | obj->grabs = eina_list_remove(obj->grabs, g); |
112 | if (g->keyname) free(g->keyname); | 112 | if (g->keyname) free(g->keyname); |
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index b6eab9f411..6a84b0c59b 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c | |||
@@ -51,7 +51,7 @@ const char *efl_gfx_image_load_error_msgs[] = { | |||
51 | "Reading operation has been cancelled during decoding" , | 51 | "Reading operation has been cancelled during decoding" , |
52 | "(Edje only) The file pointed to is incompatible, i.e., it doesn't match the library's current version's format." , | 52 | "(Edje only) The file pointed to is incompatible, i.e., it doesn't match the library's current version's format." , |
53 | "(Edje only) The group/collection set to load from was not found in the file" , | 53 | "(Edje only) The group/collection set to load from was not found in the file" , |
54 | "(Edje only) The group/collection set to load from had recursive references on its components" | 54 | "(Edje only) The group/collection set to load from had recursive references on its components" |
55 | }; | 55 | }; |
56 | 56 | ||
57 | static void | 57 | static void |
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c index 0ac75c7a07..48782b2a21 100644 --- a/src/lib/evas/canvas/evas_map.c +++ b/src/lib/evas/canvas/evas_map.c | |||
@@ -38,7 +38,7 @@ _evas_map_calc_map_geometry(Evas_Object *eo_obj) | |||
38 | if (obj->map->prev.map->count == obj->map->cur.map->count) | 38 | if (obj->map->prev.map->count == obj->map->cur.map->count) |
39 | { | 39 | { |
40 | const Evas_Map_Point *p2; | 40 | const Evas_Map_Point *p2; |
41 | 41 | ||
42 | p = obj->map->cur.map->points; | 42 | p = obj->map->cur.map->points; |
43 | p2 = obj->map->prev.map->points; | 43 | p2 = obj->map->prev.map->points; |
44 | if (memcmp(p, p2, sizeof(Evas_Map_Point) * | 44 | if (memcmp(p, p2, sizeof(Evas_Map_Point) * |
@@ -48,7 +48,7 @@ _evas_map_calc_map_geometry(Evas_Object *eo_obj) | |||
48 | { | 48 | { |
49 | EINA_COW_WRITE_BEGIN(evas_object_map_cow, obj->map, Evas_Object_Map_Data, map_write) | 49 | EINA_COW_WRITE_BEGIN(evas_object_map_cow, obj->map, Evas_Object_Map_Data, map_write) |
50 | { | 50 | { |
51 | if (map_write->cache_map) evas_map_free(map_write->cache_map); | 51 | if (map_write->cache_map) evas_map_free(map_write->cache_map); |
52 | map_write->cache_map = map_write->cur.map; | 52 | map_write->cache_map = map_write->cur.map; |
53 | map_write->cur.map = map_write->prev.map; | 53 | map_write->cur.map = map_write->prev.map; |
54 | } | 54 | } |
@@ -61,7 +61,7 @@ _evas_map_calc_map_geometry(Evas_Object *eo_obj) | |||
61 | } | 61 | } |
62 | else | 62 | else |
63 | ch = EINA_TRUE; | 63 | ch = EINA_TRUE; |
64 | 64 | ||
65 | p = obj->map->cur.map->points; | 65 | p = obj->map->cur.map->points; |
66 | p_end = p + obj->map->cur.map->count; | 66 | p_end = p + obj->map->cur.map->count; |
67 | x1 = x2 = lround(p->x); | 67 | x1 = x2 = lround(p->x); |
@@ -70,7 +70,7 @@ _evas_map_calc_map_geometry(Evas_Object *eo_obj) | |||
70 | for (; p < p_end; p++) | 70 | for (; p < p_end; p++) |
71 | { | 71 | { |
72 | Evas_Coord x, y; | 72 | Evas_Coord x, y; |
73 | 73 | ||
74 | x = lround(p->x); | 74 | x = lround(p->x); |
75 | y = lround(p->y); | 75 | y = lround(p->y); |
76 | if (x < x1) x1 = x; | 76 | if (x < x1) x1 = x; |
@@ -78,7 +78,7 @@ _evas_map_calc_map_geometry(Evas_Object *eo_obj) | |||
78 | if (y < yy1) yy1 = y; | 78 | if (y < yy1) yy1 = y; |
79 | if (y > yy2) yy2 = y; | 79 | if (y > yy2) yy2 = y; |
80 | } | 80 | } |
81 | // this causes clip-out bugs now mapped objs canbe opaque!!! | 81 | // this causes clip-out bugs now mapped objs canbe opaque!!! |
82 | // // add 1 pixel of fuzz around the map region to ensure updates are correct | 82 | // // add 1 pixel of fuzz around the map region to ensure updates are correct |
83 | // x1 -= 1; yy1 -= 1; | 83 | // x1 -= 1; yy1 -= 1; |
84 | // x2 += 1; yy2 += 1; | 84 | // x2 += 1; yy2 += 1; |
@@ -238,7 +238,7 @@ _evas_map_free(Evas_Object *eo_obj, Evas_Map *m) | |||
238 | map_write->spans = NULL; | 238 | map_write->spans = NULL; |
239 | } | 239 | } |
240 | EINA_COW_WRITE_END(evas_object_map_cow, obj->map, map_write); | 240 | EINA_COW_WRITE_END(evas_object_map_cow, obj->map, map_write); |
241 | } | 241 | } |
242 | } | 242 | } |
243 | m->magic = 0; | 243 | m->magic = 0; |
244 | free(m); | 244 | free(m); |
@@ -552,7 +552,7 @@ evas_object_map_set(Evas_Object *eo_obj, const Evas_Map *map) | |||
552 | return; | 552 | return; |
553 | } | 553 | } |
554 | /* changed_pchange means map's change. | 554 | /* changed_pchange means map's change. |
555 | * This flag will be used to decide whether to redraw the map surface. | 555 | * This flag will be used to decide whether to redraw the map surface. |
556 | * And value of flag would be EINA_FALSE after rendering. */ | 556 | * And value of flag would be EINA_FALSE after rendering. */ |
557 | obj->changed_pchange = EINA_TRUE; | 557 | obj->changed_pchange = EINA_TRUE; |
558 | 558 | ||
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index e591bae0e5..ac14eaf2b2 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c | |||
@@ -334,7 +334,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi | |||
334 | return new_opt; | 334 | return new_opt; |
335 | } | 335 | } |
336 | } | 336 | } |
337 | return NULL; | 337 | return NULL; |
338 | } | 338 | } |
339 | 339 | ||
340 | EOLIAN static Evas_Object * | 340 | EOLIAN static Evas_Object * |
@@ -390,7 +390,7 @@ _evas_box_efl_canvas_group_group_add(Eo *eo_obj, Evas_Object_Box_Data *priv) | |||
390 | Evas_Object_Smart_Clipped_Data *cso; | 390 | Evas_Object_Smart_Clipped_Data *cso; |
391 | 391 | ||
392 | efl_canvas_group_add(efl_super(eo_obj, MY_CLASS)); | 392 | efl_canvas_group_add(efl_super(eo_obj, MY_CLASS)); |
393 | 393 | ||
394 | evas_object_event_callback_add | 394 | evas_object_event_callback_add |
395 | (eo_obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_hints_changed, eo_obj); | 395 | (eo_obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_hints_changed, eo_obj); |
396 | priv->children = NULL; | 396 | priv->children = NULL; |
@@ -1880,7 +1880,7 @@ EOLIAN static Eina_Iterator* | |||
1880 | _evas_box_iterator_new(const Eo *o, Evas_Object_Box_Data *priv) | 1880 | _evas_box_iterator_new(const Eo *o, Evas_Object_Box_Data *priv) |
1881 | { | 1881 | { |
1882 | Evas_Object_Box_Iterator *it; | 1882 | Evas_Object_Box_Iterator *it; |
1883 | 1883 | ||
1884 | if (!priv->children) return NULL; | 1884 | if (!priv->children) return NULL; |
1885 | 1885 | ||
1886 | it = calloc(1, sizeof(Evas_Object_Box_Iterator)); | 1886 | it = calloc(1, sizeof(Evas_Object_Box_Iterator)); |
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index 9d261bcd84..95580b8588 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c | |||
@@ -1082,7 +1082,7 @@ _evas_table_pack_get(const Eo *o EINA_UNUSED, Evas_Table_Data *_pd EINA_UNUSED, | |||
1082 | if (row) *row = opt->row; | 1082 | if (row) *row = opt->row; |
1083 | if (colspan) *colspan = opt->colspan; | 1083 | if (colspan) *colspan = opt->colspan; |
1084 | if (rowspan) *rowspan = opt->rowspan; | 1084 | if (rowspan) *rowspan = opt->rowspan; |
1085 | 1085 | ||
1086 | return EINA_TRUE; | 1086 | return EINA_TRUE; |
1087 | } | 1087 | } |
1088 | 1088 | ||
@@ -1121,7 +1121,7 @@ _evas_table_pack(Eo *o, Evas_Table_Data *priv, Evas_Object *child, unsigned shor | |||
1121 | { | 1121 | { |
1122 | WRN("row + rowspan getting rather large (>32767)"); | 1122 | WRN("row + rowspan getting rather large (>32767)"); |
1123 | } | 1123 | } |
1124 | 1124 | ||
1125 | opt = _evas_object_table_option_get(child); | 1125 | opt = _evas_object_table_option_get(child); |
1126 | if (opt) | 1126 | if (opt) |
1127 | { | 1127 | { |
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 7c18f8c175..6531c16f12 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c | |||
@@ -2992,7 +2992,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch | |||
2992 | { | 2992 | { |
2993 | _format_command_unified_only(o, fmt, cmd, param, len); | 2993 | _format_command_unified_only(o, fmt, cmd, param, len); |
2994 | } | 2994 | } |
2995 | 2995 | ||
2996 | } | 2996 | } |
2997 | } | 2997 | } |
2998 | 2998 | ||
@@ -3158,7 +3158,7 @@ _default_format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, | |||
3158 | 3158 | ||
3159 | part1 = alloca(len + 1); | 3159 | part1 = alloca(len + 1); |
3160 | *part1 = 0; | 3160 | *part1 = 0; |
3161 | 3161 | ||
3162 | part2 = alloca(len + 1); | 3162 | part2 = alloca(len + 1); |
3163 | *part2 = 0; | 3163 | *part2 = 0; |
3164 | 3164 | ||
@@ -3179,7 +3179,7 @@ _default_format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, | |||
3179 | return changed; | 3179 | return changed; |
3180 | } | 3180 | } |
3181 | 3181 | ||
3182 | /* | 3182 | /* |
3183 | * @internal | 3183 | * @internal |
3184 | * just to create a constant without using marco | 3184 | * just to create a constant without using marco |
3185 | * 2 cacheline is enough for the string we parse | 3185 | * 2 cacheline is enough for the string we parse |
@@ -3188,12 +3188,12 @@ _default_format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, | |||
3188 | */ | 3188 | */ |
3189 | enum _Internal{ ALLOCATOR_SIZE = 120 }; | 3189 | enum _Internal{ ALLOCATOR_SIZE = 120 }; |
3190 | 3190 | ||
3191 | /* | 3191 | /* |
3192 | * @internal | 3192 | * @internal |
3193 | * A simple stack allocator which first | 3193 | * A simple stack allocator which first |
3194 | * tries to create a string in the stack (buffer | 3194 | * tries to create a string in the stack (buffer |
3195 | * it holds). if the string size is bigger than its | 3195 | * it holds). if the string size is bigger than its |
3196 | * buffer capacity it will fall back to creating the | 3196 | * buffer capacity it will fall back to creating the |
3197 | * string on heap. | 3197 | * string on heap. |
3198 | * USAGE : | 3198 | * USAGE : |
3199 | * Allocator a; | 3199 | * Allocator a; |
@@ -4461,7 +4461,7 @@ _layout_format_value_handle(Ctxt *c, Evas_Object_Textblock_Format *fmt, const ch | |||
4461 | { | 4461 | { |
4462 | const char *key = NULL; | 4462 | const char *key = NULL; |
4463 | char *val = NULL; | 4463 | char *val = NULL; |
4464 | 4464 | ||
4465 | Allocator allocator; | 4465 | Allocator allocator; |
4466 | _allocator_init(&allocator); | 4466 | _allocator_init(&allocator); |
4467 | 4467 | ||
@@ -8225,7 +8225,7 @@ _textblock_style_generic_set(Evas_Object *eo_obj, Evas_Textblock_Style *ts, | |||
8225 | } | 8225 | } |
8226 | } | 8226 | } |
8227 | 8227 | ||
8228 | // Verify nothing has changed | 8228 | // Verify nothing has changed |
8229 | if (ts == old_ts) return; | 8229 | if (ts == old_ts) return; |
8230 | 8230 | ||
8231 | if ((ts) && (ts->delete_me)) return; | 8231 | if ((ts) && (ts->delete_me)) return; |
@@ -8491,7 +8491,7 @@ _escaped_is_eq_and_advance(const char *s, const char *s_end, | |||
8491 | * @internal | 8491 | * @internal |
8492 | * | 8492 | * |
8493 | * @param s the escape string to search for its index | 8493 | * @param s the escape string to search for its index |
8494 | * @param s_len length of s string | 8494 | * @param s_len length of s string |
8495 | * @param escape_values array of Escape_Value to look inside, Sorted by Escape | 8495 | * @param escape_values array of Escape_Value to look inside, Sorted by Escape |
8496 | * @param escape_values_len is the len of Escape_Value array | 8496 | * @param escape_values_len is the len of Escape_Value array |
8497 | */ | 8497 | */ |
@@ -8564,9 +8564,9 @@ _escaped_char_match(const char *s, int *adv) | |||
8564 | if (n_ret != -1) | 8564 | if (n_ret != -1) |
8565 | { | 8565 | { |
8566 | *adv = (int) escape_values_v_common_sorted[n_ret].value_len; | 8566 | *adv = (int) escape_values_v_common_sorted[n_ret].value_len; |
8567 | return escape_values_v_common_sorted[n_ret].escape; | 8567 | return escape_values_v_common_sorted[n_ret].escape; |
8568 | } | 8568 | } |
8569 | else | 8569 | else |
8570 | { | 8570 | { |
8571 | static const size_t escape_size = sizeof(escape_values_v_sorted) / sizeof(Escape_Value); | 8571 | static const size_t escape_size = sizeof(escape_values_v_sorted) / sizeof(Escape_Value); |
8572 | n_ret = _escaped_value_search(s, escape_values_v_sorted, escape_size); | 8572 | n_ret = _escaped_value_search(s, escape_values_v_sorted, escape_size); |
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c index 35ea97d579..43bad0dd42 100644 --- a/src/lib/evas/canvas/evas_out.c +++ b/src/lib/evas/canvas/evas_out.c | |||
@@ -157,7 +157,7 @@ efl_canvas_output_engine_info_set(Efl_Canvas_Output *output, | |||
157 | else | 157 | else |
158 | { | 158 | { |
159 | setup: | 159 | setup: |
160 | output->output = | 160 | output->output = |
161 | e->engine.func->output_setup(_evas_engine_context(e), info, | 161 | e->engine.func->output_setup(_evas_engine_context(e), info, |
162 | output->geometry.w, output->geometry.h); | 162 | output->geometry.w, output->geometry.h); |
163 | } | 163 | } |
diff --git a/src/lib/evas/common/evas_blit_main.c b/src/lib/evas/common/evas_blit_main.c index afeea86f8b..dc38638518 100644 --- a/src/lib/evas/common/evas_blit_main.c +++ b/src/lib/evas/common/evas_blit_main.c | |||
@@ -254,10 +254,10 @@ evas_common_copy_pixels_mmx(DATA32 *src, DATA32 *dst, int len) | |||
254 | #ifdef ALIGN_FIX | 254 | #ifdef ALIGN_FIX |
255 | intptr_t src_align; | 255 | intptr_t src_align; |
256 | intptr_t dst_align; | 256 | intptr_t dst_align; |
257 | 257 | ||
258 | src_align = (intptr_t)src & 0x3f; /* 64 byte alignment */ | 258 | src_align = (intptr_t)src & 0x3f; /* 64 byte alignment */ |
259 | dst_align = (intptr_t)dst & 0x3f; /* 64 byte alignment */ | 259 | dst_align = (intptr_t)dst & 0x3f; /* 64 byte alignment */ |
260 | 260 | ||
261 | if ((src_align != dst_align) || | 261 | if ((src_align != dst_align) || |
262 | ((src_align & 0x3) != 0)) | 262 | ((src_align & 0x3) != 0)) |
263 | { | 263 | { |
diff --git a/src/lib/evas/common/evas_common_generic_cache.c b/src/lib/evas/common/evas_common_generic_cache.c index 4fc5a8bbac..87c040e8ee 100644 --- a/src/lib/evas/common/evas_common_generic_cache.c +++ b/src/lib/evas/common/evas_common_generic_cache.c | |||
@@ -23,7 +23,7 @@ generic_cache_destroy(Generic_Cache *cache) | |||
23 | } | 23 | } |
24 | 24 | ||
25 | eina_hash_free(cache->hash); | 25 | eina_hash_free(cache->hash); |
26 | free(cache); | 26 | free(cache); |
27 | } | 27 | } |
28 | } | 28 | } |
29 | 29 | ||
diff --git a/src/lib/evas/common/evas_convert_grypal_6.c b/src/lib/evas/common/evas_convert_grypal_6.c index 920fcfdf26..b3cf705f80 100644 --- a/src/lib/evas/common/evas_convert_grypal_6.c +++ b/src/lib/evas/common/evas_convert_grypal_6.c | |||
@@ -12,8 +12,8 @@ void evas_common_convert_rgba_to_8bpp_pal_gray64(DATA32 *src, DATA8 *dst, int sr | |||
12 | CONVERT_LOOP_START_ROT_0(); | 12 | CONVERT_LOOP_START_ROT_0(); |
13 | 13 | ||
14 | /* RGB -> YUV conversion */ | 14 | /* RGB -> YUV conversion */ |
15 | Y = ((R_VAL(src_ptr) * 76) + | 15 | Y = ((R_VAL(src_ptr) * 76) + |
16 | (G_VAL(src_ptr) * 151) + | 16 | (G_VAL(src_ptr) * 151) + |
17 | (B_VAL(src_ptr) * 29)) >> 10; | 17 | (B_VAL(src_ptr) * 29)) >> 10; |
18 | *dst_ptr = pal[Y]; | 18 | *dst_ptr = pal[Y]; |
19 | 19 | ||
diff --git a/src/lib/evas/common/evas_convert_rgb_16.c b/src/lib/evas/common/evas_convert_rgb_16.c index 1a98d7d52e..167ea5e86a 100644 --- a/src/lib/evas/common/evas_convert_rgb_16.c +++ b/src/lib/evas/common/evas_convert_rgb_16.c | |||
@@ -79,7 +79,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int sr | |||
79 | for (x = 0; x < w; x++) | 79 | for (x = 0; x < w; x++) |
80 | { | 80 | { |
81 | DATA32 p = *src++, q = *src++; | 81 | DATA32 p = *src++, q = *src++; |
82 | 82 | ||
83 | dith = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK]; | 83 | dith = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK]; |
84 | dith2 = dith >> DM_SHF(6); | 84 | dith2 = dith >> DM_SHF(6); |
85 | dith >>= DM_SHF(5); | 85 | dith >>= DM_SHF(5); |
@@ -89,7 +89,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int sr | |||
89 | if ((r1 < 0x1f) && ((((p & 0xff0000) >> 16) - (r1 << 3)) >= dith )) r1++; | 89 | if ((r1 < 0x1f) && ((((p & 0xff0000) >> 16) - (r1 << 3)) >= dith )) r1++; |
90 | if ((g1 < 0x3f) && ((((p & 0xff00) >> 8) - (g1 << 2)) >= dith2)) g1++; | 90 | if ((g1 < 0x3f) && ((((p & 0xff00) >> 8) - (g1 << 2)) >= dith2)) g1++; |
91 | if ((b1 < 0x1f) && (((p & 0xff) - (b1 << 3)) >= dith )) b1++; | 91 | if ((b1 < 0x1f) && (((p & 0xff) - (b1 << 3)) >= dith )) b1++; |
92 | 92 | ||
93 | x++; | 93 | x++; |
94 | dith = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK]; | 94 | dith = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK]; |
95 | dith2 = dith >> DM_SHF(6); | 95 | dith2 = dith >> DM_SHF(6); |
@@ -100,7 +100,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int sr | |||
100 | if ((r2 < 0x1f) && ((((q & 0xff0000) >> 16) - (r2 << 3)) >= dith )) r2++; | 100 | if ((r2 < 0x1f) && ((((q & 0xff0000) >> 16) - (r2 << 3)) >= dith )) r2++; |
101 | if ((g2 < 0x3f) && ((((q & 0xff00) >> 8) - (g2 << 2)) >= dith2)) g2++; | 101 | if ((g2 < 0x3f) && ((((q & 0xff00) >> 8) - (g2 << 2)) >= dith2)) g2++; |
102 | if ((b2 < 0x1f) && (((q & 0xff) - (b2 << 3)) >= dith )) b2++; | 102 | if ((b2 < 0x1f) && (((q & 0xff) - (b2 << 3)) >= dith )) b2++; |
103 | 103 | ||
104 | #ifndef WORDS_BIGENDIAN | 104 | #ifndef WORDS_BIGENDIAN |
105 | *((DATA32 *)d) = (r2 << 27) | (g2 << 21) | (b2 << 16) | | 105 | *((DATA32 *)d) = (r2 << 27) | (g2 << 21) | (b2 << 16) | |
106 | (r1 << 11) | (g1 << 5) | (b1); | 106 | (r1 << 11) | (g1 << 5) | (b1); |
@@ -113,7 +113,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int sr | |||
113 | src += src_jump; | 113 | src += src_jump; |
114 | d += dst_jump; | 114 | d += dst_jump; |
115 | } | 115 | } |
116 | #endif | 116 | #endif |
117 | #else | 117 | #else |
118 | DATA16 *d = (DATA16 *)dst; | 118 | DATA16 *d = (DATA16 *)dst; |
119 | int w0 = w; | 119 | int w0 = w; |
@@ -159,7 +159,7 @@ evas_common_convert_rgba_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src | |||
159 | for (x = 0; x < w; x++) | 159 | for (x = 0; x < w; x++) |
160 | { | 160 | { |
161 | DATA32 p = *src++; | 161 | DATA32 p = *src++; |
162 | 162 | ||
163 | r = (p & 0xff0000) >> 19; | 163 | r = (p & 0xff0000) >> 19; |
164 | if (r > 0x1f) r = 0x1f; | 164 | if (r > 0x1f) r = 0x1f; |
165 | g = (p & 0xff00) >> 10; | 165 | g = (p & 0xff00) >> 10; |
@@ -182,13 +182,13 @@ evas_common_convert_rgba_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src | |||
182 | src += src_jump; | 182 | src += src_jump; |
183 | d += dst_jump; | 183 | d += dst_jump; |
184 | } | 184 | } |
185 | #else | 185 | #else |
186 | for (y = 0; y < h; y++) | 186 | for (y = 0; y < h; y++) |
187 | { | 187 | { |
188 | for (x = 0; x < w; x++) | 188 | for (x = 0; x < w; x++) |
189 | { | 189 | { |
190 | DATA32 p = *src++; | 190 | DATA32 p = *src++; |
191 | 191 | ||
192 | dith = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK]; | 192 | dith = DM_TABLE[(x + dith_x) & DM_MSK][(y + dith_y) & DM_MSK]; |
193 | dith2 = dith >> DM_SHF(6); | 193 | dith2 = dith >> DM_SHF(6); |
194 | dith >>= DM_SHF(5); | 194 | dith >>= DM_SHF(5); |
@@ -198,13 +198,13 @@ evas_common_convert_rgba_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src | |||
198 | if ((r < 0x1f) && ((((p & 0xff0000) >> 16) - (r << 3)) >= dith )) r++; | 198 | if ((r < 0x1f) && ((((p & 0xff0000) >> 16) - (r << 3)) >= dith )) r++; |
199 | if ((g < 0x3f) && ((((p & 0xff00) >> 8) - (g << 2)) >= dith2)) g++; | 199 | if ((g < 0x3f) && ((((p & 0xff00) >> 8) - (g << 2)) >= dith2)) g++; |
200 | if ((b < 0x1f) && (((p & 0xff) - (b << 3)) >= dith )) b++; | 200 | if ((b < 0x1f) && (((p & 0xff) - (b << 3)) >= dith )) b++; |
201 | 201 | ||
202 | *d++ = (r << 11) | (g << 5) | b; | 202 | *d++ = (r << 11) | (g << 5) | b; |
203 | } | 203 | } |
204 | src += src_jump; | 204 | src += src_jump; |
205 | d += dst_jump; | 205 | d += dst_jump; |
206 | } | 206 | } |
207 | #endif | 207 | #endif |
208 | #else | 208 | #else |
209 | DATA16 *d = (DATA16 *)dst; | 209 | DATA16 *d = (DATA16 *)dst; |
210 | int w0 = w; | 210 | int w0 = w; |
diff --git a/src/lib/evas/common/evas_convert_rgb_24.c b/src/lib/evas/common/evas_convert_rgb_24.c index 8849354cdd..b5abbcb6d0 100644 --- a/src/lib/evas/common/evas_convert_rgb_24.c +++ b/src/lib/evas/common/evas_convert_rgb_24.c | |||
@@ -43,7 +43,7 @@ evas_common_convert_rgba_to_24bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, | |||
43 | { | 43 | { |
44 | for (x = 0; x < w; x++) | 44 | for (x = 0; x < w; x++) |
45 | { | 45 | { |
46 | scratch = | 46 | scratch = |
47 | (((R_VAL(src_ptr) << 12) | (B_VAL(src_ptr) >> 2)) & 0x03f03f) | | 47 | (((R_VAL(src_ptr) << 12) | (B_VAL(src_ptr) >> 2)) & 0x03f03f) | |
48 | ((G_VAL(src_ptr) << 4) & 0x000fc0); | 48 | ((G_VAL(src_ptr) << 4) & 0x000fc0); |
49 | dst_ptr[0] = scratch_ptr[1]; | 49 | dst_ptr[0] = scratch_ptr[1]; |
diff --git a/src/lib/evas/common/evas_convert_rgb_24.h b/src/lib/evas/common/evas_convert_rgb_24.h index bc114cad9d..27bd71917a 100644 --- a/src/lib/evas/common/evas_convert_rgb_24.h +++ b/src/lib/evas/common/evas_convert_rgb_24.h | |||
@@ -6,5 +6,5 @@ void evas_common_convert_rgba_to_24bpp_rgb_888 (DATA32 *src, DAT | |||
6 | void evas_common_convert_rgba_to_24bpp_bgr_888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); | 6 | void evas_common_convert_rgba_to_24bpp_bgr_888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); |
7 | 7 | ||
8 | void evas_common_convert_rgba_to_24bpp_rgb_666 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); | 8 | void evas_common_convert_rgba_to_24bpp_rgb_666 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); |
9 | 9 | ||
10 | #endif /* _EVAS_CONVERT_RGB_24_H */ | 10 | #endif /* _EVAS_CONVERT_RGB_24_H */ |
diff --git a/src/lib/evas/common/evas_draw_main.c b/src/lib/evas/common/evas_draw_main.c index 518bfb2ac7..3b19fe1956 100644 --- a/src/lib/evas/common/evas_draw_main.c +++ b/src/lib/evas/common/evas_draw_main.c | |||
@@ -266,16 +266,16 @@ evas_common_draw_context_set_color(RGBA_Draw_Context *dc, int r, int g, int b, i | |||
266 | #if defined(PIXMAN_FONT) || defined(PIXMAN_RECT) || defined(PIXMAN_LINE) || defined(PIXMAN_POLY) | 266 | #if defined(PIXMAN_FONT) || defined(PIXMAN_RECT) || defined(PIXMAN_LINE) || defined(PIXMAN_POLY) |
267 | if (dc->col.pixman_color_image) | 267 | if (dc->col.pixman_color_image) |
268 | pixman_image_unref(dc->col.pixman_color_image); | 268 | pixman_image_unref(dc->col.pixman_color_image); |
269 | 269 | ||
270 | pixman_color_t pixman_color; | 270 | pixman_color_t pixman_color; |
271 | 271 | ||
272 | pixman_color.alpha = (dc->col.col & 0xff000000) >> 16; | 272 | pixman_color.alpha = (dc->col.col & 0xff000000) >> 16; |
273 | pixman_color.red = (dc->col.col & 0x00ff0000) >> 8; | 273 | pixman_color.red = (dc->col.col & 0x00ff0000) >> 8; |
274 | pixman_color.green = (dc->col.col & 0x0000ff00); | 274 | pixman_color.green = (dc->col.col & 0x0000ff00); |
275 | pixman_color.blue = (dc->col.col & 0x000000ff) << 8; | 275 | pixman_color.blue = (dc->col.col & 0x000000ff) << 8; |
276 | 276 | ||
277 | dc->col.pixman_color_image = pixman_image_create_solid_fill(&pixman_color); | 277 | dc->col.pixman_color_image = pixman_image_create_solid_fill(&pixman_color); |
278 | #endif | 278 | #endif |
279 | #endif | 279 | #endif |
280 | 280 | ||
281 | } | 281 | } |
diff --git a/src/lib/evas/common/evas_font_main.c b/src/lib/evas/common/evas_font_main.c index dfd7ef991b..548ce4d01c 100644 --- a/src/lib/evas/common/evas_font_main.c +++ b/src/lib/evas/common/evas_font_main.c | |||
@@ -890,7 +890,7 @@ evas_common_font_int_cache_glyph_render(RGBA_Font_Glyph *fg) | |||
890 | fg->glyph_out->bitmap.width = dst.cache_entry.w; | 890 | fg->glyph_out->bitmap.width = dst.cache_entry.w; |
891 | fg->glyph_out->bitmap.buffer = (unsigned char *) dst.image.data; | 891 | fg->glyph_out->bitmap.buffer = (unsigned char *) dst.image.data; |
892 | fg->glyph_out->bitmap.pitch = dst.cache_entry.w * 4; | 892 | fg->glyph_out->bitmap.pitch = dst.cache_entry.w * 4; |
893 | 893 | ||
894 | fg->glyph_out->rle = NULL; | 894 | fg->glyph_out->rle = NULL; |
895 | fg->glyph_out->bitmap.rle_alloc = EINA_TRUE; | 895 | fg->glyph_out->bitmap.rle_alloc = EINA_TRUE; |
896 | // this may be technically incorrect as we go and free a bitmap buffer | 896 | // this may be technically incorrect as we go and free a bitmap buffer |
diff --git a/src/lib/evas/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c index a969153528..1d28253c7e 100644 --- a/src/lib/evas/common/evas_image_load.c +++ b/src/lib/evas/common/evas_image_load.c | |||
@@ -23,43 +23,43 @@ struct ext_loader_s | |||
23 | static const struct ext_loader_s loaders[] = | 23 | static const struct ext_loader_s loaders[] = |
24 | { /* map extensions to loaders to use for good first-guess tries */ | 24 | { /* map extensions to loaders to use for good first-guess tries */ |
25 | MATCHING(".png", "png"), | 25 | MATCHING(".png", "png"), |
26 | 26 | ||
27 | MATCHING(".jpg", "jpeg"), | 27 | MATCHING(".jpg", "jpeg"), |
28 | MATCHING(".jpeg", "jpeg"), | 28 | MATCHING(".jpeg", "jpeg"), |
29 | MATCHING(".jfif", "jpeg"), | 29 | MATCHING(".jfif", "jpeg"), |
30 | 30 | ||
31 | MATCHING(".j2k", "jp2k"), | 31 | MATCHING(".j2k", "jp2k"), |
32 | MATCHING(".jp2", "jp2k"), | 32 | MATCHING(".jp2", "jp2k"), |
33 | MATCHING(".jpx", "jp2k"), | 33 | MATCHING(".jpx", "jp2k"), |
34 | MATCHING(".jpf", "jp2k"), | 34 | MATCHING(".jpf", "jp2k"), |
35 | 35 | ||
36 | MATCHING(".eet", "eet"), | 36 | MATCHING(".eet", "eet"), |
37 | MATCHING(".edj", "eet"), | 37 | MATCHING(".edj", "eet"), |
38 | MATCHING(".eap", "eet"), | 38 | MATCHING(".eap", "eet"), |
39 | 39 | ||
40 | MATCHING(".xpm", "xpm"), | 40 | MATCHING(".xpm", "xpm"), |
41 | 41 | ||
42 | MATCHING(".tiff", "tiff"), | 42 | MATCHING(".tiff", "tiff"), |
43 | MATCHING(".tif", "tiff"), | 43 | MATCHING(".tif", "tiff"), |
44 | 44 | ||
45 | MATCHING(".gif", "gif"), | 45 | MATCHING(".gif", "gif"), |
46 | 46 | ||
47 | MATCHING(".pbm", "pmaps"), | 47 | MATCHING(".pbm", "pmaps"), |
48 | MATCHING(".pgm", "pmaps"), | 48 | MATCHING(".pgm", "pmaps"), |
49 | MATCHING(".ppm", "pmaps"), | 49 | MATCHING(".ppm", "pmaps"), |
50 | MATCHING(".pnm", "pmaps"), | 50 | MATCHING(".pnm", "pmaps"), |
51 | 51 | ||
52 | MATCHING(".bmp", "bmp"), | 52 | MATCHING(".bmp", "bmp"), |
53 | 53 | ||
54 | MATCHING(".tga", "tga"), | 54 | MATCHING(".tga", "tga"), |
55 | 55 | ||
56 | MATCHING(".wbmp", "wbmp"), | 56 | MATCHING(".wbmp", "wbmp"), |
57 | 57 | ||
58 | MATCHING(".webp", "webp"), | 58 | MATCHING(".webp", "webp"), |
59 | 59 | ||
60 | MATCHING(".ico", "ico"), | 60 | MATCHING(".ico", "ico"), |
61 | MATCHING(".cur", "ico"), | 61 | MATCHING(".cur", "ico"), |
62 | 62 | ||
63 | MATCHING(".psd", "psd"), | 63 | MATCHING(".psd", "psd"), |
64 | 64 | ||
65 | MATCHING(".tgv", "tgv"), | 65 | MATCHING(".tgv", "tgv"), |
diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c index 65cb9a3c21..c38c6ca462 100644 --- a/src/lib/evas/common/evas_image_scalecache.c +++ b/src/lib/evas/common/evas_image_scalecache.c | |||
@@ -455,7 +455,7 @@ evas_common_rgba_image_scalecache_size_set(unsigned int size) | |||
455 | _cache_prune(NULL, 1); | 455 | _cache_prune(NULL, 1); |
456 | } | 456 | } |
457 | SLKU(cache_lock); | 457 | SLKU(cache_lock); |
458 | #endif | 458 | #endif |
459 | } | 459 | } |
460 | 460 | ||
461 | EAPI unsigned int | 461 | EAPI unsigned int |
@@ -469,7 +469,7 @@ evas_common_rgba_image_scalecache_size_get(void) | |||
469 | return t; | 469 | return t; |
470 | #else | 470 | #else |
471 | return 0; | 471 | return 0; |
472 | #endif | 472 | #endif |
473 | } | 473 | } |
474 | 474 | ||
475 | EAPI void | 475 | EAPI void |
@@ -493,7 +493,7 @@ evas_common_rgba_image_scalecache_dump(void) | |||
493 | _cache_prune(NULL, 0); | 493 | _cache_prune(NULL, 0); |
494 | max_cache_size = t; | 494 | max_cache_size = t; |
495 | SLKU(cache_lock); | 495 | SLKU(cache_lock); |
496 | #endif | 496 | #endif |
497 | } | 497 | } |
498 | 498 | ||
499 | EAPI void | 499 | EAPI void |
@@ -507,7 +507,7 @@ evas_common_rgba_image_scalecache_flush(void) | |||
507 | _cache_prune(NULL, 1); | 507 | _cache_prune(NULL, 1); |
508 | max_cache_size = t; | 508 | max_cache_size = t; |
509 | SLKU(cache_lock); | 509 | SLKU(cache_lock); |
510 | #endif | 510 | #endif |
511 | } | 511 | } |
512 | 512 | ||
513 | EAPI Eina_Bool | 513 | EAPI Eina_Bool |
@@ -534,7 +534,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst EINA_ | |||
534 | if (ret == EINA_FALSE) /* can't get image lock */ | 534 | if (ret == EINA_FALSE) /* can't get image lock */ |
535 | { | 535 | { |
536 | useconds_t slp = 1, slpt = 0; | 536 | useconds_t slp = 1, slpt = 0; |
537 | 537 | ||
538 | while (slpt < 500000) | 538 | while (slpt < 500000) |
539 | { | 539 | { |
540 | #ifdef _WIN32 | 540 | #ifdef _WIN32 |
@@ -567,7 +567,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst EINA_ | |||
567 | printf("WARNING: DEADLOCK on image %p (%s)\n", im, ie->file); | 567 | printf("WARNING: DEADLOCK on image %p (%s)\n", im, ie->file); |
568 | } | 568 | } |
569 | else locked = 1; | 569 | else locked = 1; |
570 | #endif | 570 | #endif |
571 | if (!locked) { SLKL(im->cache.lock); locked = 1; } | 571 | if (!locked) { SLKL(im->cache.lock); locked = 1; } |
572 | use_counter++; | 572 | use_counter++; |
573 | if ((src_region_w == dst_region_w) && (src_region_h == dst_region_h)) | 573 | if ((src_region_w == dst_region_w) && (src_region_h == dst_region_h)) |
@@ -588,8 +588,8 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst EINA_ | |||
588 | return EINA_FALSE; | 588 | return EINA_FALSE; |
589 | } | 589 | } |
590 | SLKL(cache_lock); | 590 | SLKL(cache_lock); |
591 | sci = _sci_find(im, dc, smooth, | 591 | sci = _sci_find(im, dc, smooth, |
592 | src_region_x, src_region_y, src_region_w, src_region_h, | 592 | src_region_x, src_region_y, src_region_w, src_region_h, |
593 | dst_region_w, dst_region_h); | 593 | dst_region_w, dst_region_h); |
594 | if (!sci) | 594 | if (!sci) |
595 | { | 595 | { |
@@ -609,7 +609,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst EINA_ | |||
609 | { | 609 | { |
610 | if (!sci->im) | 610 | if (!sci->im) |
611 | { | 611 | { |
612 | if ((sci->key.dst_w < max_dimension) && | 612 | if ((sci->key.dst_w < max_dimension) && |
613 | (sci->key.dst_h < max_dimension)) | 613 | (sci->key.dst_h < max_dimension)) |
614 | { | 614 | { |
615 | if (sci->flop <= max_flop_count) | 615 | if (sci->flop <= max_flop_count) |
@@ -623,12 +623,12 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst EINA_ | |||
623 | sci->usage++; | 623 | sci->usage++; |
624 | sci->usage_count = use_counter; | 624 | sci->usage_count = use_counter; |
625 | SLKU(cache_lock); | 625 | SLKU(cache_lock); |
626 | if (sci->usage > im->cache.newest_usage) | 626 | if (sci->usage > im->cache.newest_usage) |
627 | im->cache.newest_usage = sci->usage; | 627 | im->cache.newest_usage = sci->usage; |
628 | // INF("newset? %p %i > %i", im, | 628 | // INF("newset? %p %i > %i", im, |
629 | // (int)sci->usage, | 629 | // (int)sci->usage, |
630 | // (int)im->cache.newest_usage); | 630 | // (int)im->cache.newest_usage); |
631 | if (sci->usage_count > im->cache.newest_usage_count) | 631 | if (sci->usage_count > im->cache.newest_usage_count) |
632 | im->cache.newest_usage_count = sci->usage_count; | 632 | im->cache.newest_usage_count = sci->usage_count; |
633 | // INF(" -------------- used %8i#, %8i@", (int)sci->usage, (int)sci->usage_count); | 633 | // INF(" -------------- used %8i#, %8i@", (int)sci->usage, (int)sci->usage_count); |
634 | if (locked) SLKU(im->cache.lock); | 634 | if (locked) SLKU(im->cache.lock); |
diff --git a/src/lib/evas/common/evas_line_main.c b/src/lib/evas/common/evas_line_main.c index 21dd74277d..a6970761e3 100644 --- a/src/lib/evas/common/evas_line_main.c +++ b/src/lib/evas/common/evas_line_main.c | |||
@@ -37,17 +37,17 @@ _evas_draw_point(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y) | |||
37 | if ((dc->clip.use) && (!IN_RECT(x, y, dc->clip.x, dc->clip.y, dc->clip.w, dc->clip.h))) | 37 | if ((dc->clip.use) && (!IN_RECT(x, y, dc->clip.x, dc->clip.y, dc->clip.w, dc->clip.h))) |
38 | return; | 38 | return; |
39 | #ifdef HAVE_PIXMAN | 39 | #ifdef HAVE_PIXMAN |
40 | # ifdef PIXMAN_LINE | 40 | # ifdef PIXMAN_LINE |
41 | pixman_op_t op = PIXMAN_OP_SRC; | 41 | pixman_op_t op = PIXMAN_OP_SRC; |
42 | 42 | ||
43 | if (dc->render_op == _EVAS_RENDER_BLEND) | 43 | if (dc->render_op == _EVAS_RENDER_BLEND) |
44 | op = PIXMAN_OP_OVER; | 44 | op = PIXMAN_OP_OVER; |
45 | 45 | ||
46 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) | 46 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) |
47 | pixman_image_composite(op, dc->col.pixman_color_image, NULL, | 47 | pixman_image_composite(op, dc->col.pixman_color_image, NULL, |
48 | dst->pixman.im, x, y, 0, 0, x, y, 1, 1); | 48 | dst->pixman.im, x, y, 0, 0, x, y, 1, 1); |
49 | else | 49 | else |
50 | # endif | 50 | # endif |
51 | #endif | 51 | #endif |
52 | { | 52 | { |
53 | if (dc->clip.mask) | 53 | if (dc->clip.mask) |
@@ -166,7 +166,7 @@ _evas_draw_simple_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, i | |||
166 | len = x1 - x0 + 1; | 166 | len = x1 - x0 + 1; |
167 | p = dst->image.data + (dstw * y0) + x0; | 167 | p = dst->image.data + (dstw * y0) + x0; |
168 | #ifdef HAVE_PIXMAN | 168 | #ifdef HAVE_PIXMAN |
169 | # ifdef PIXMAN_LINE | 169 | # ifdef PIXMAN_LINE |
170 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) | 170 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) |
171 | pixman_image_composite(op, dc->col.pixman_color_image, | 171 | pixman_image_composite(op, dc->col.pixman_color_image, |
172 | NULL, dst->pixman.im, | 172 | NULL, dst->pixman.im, |
@@ -211,7 +211,7 @@ _evas_draw_simple_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, i | |||
211 | len = y1 - y0 + 1; | 211 | len = y1 - y0 + 1; |
212 | p = dst->image.data + (dstw * y0) + x0; | 212 | p = dst->image.data + (dstw * y0) + x0; |
213 | #ifdef HAVE_PIXMAN | 213 | #ifdef HAVE_PIXMAN |
214 | # ifdef PIXMAN_LINE | 214 | # ifdef PIXMAN_LINE |
215 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) | 215 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) |
216 | pixman_image_composite(op, dc->col.pixman_color_image, | 216 | pixman_image_composite(op, dc->col.pixman_color_image, |
217 | NULL, dst->pixman.im, | 217 | NULL, dst->pixman.im, |
@@ -343,7 +343,7 @@ _evas_draw_simple_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, i | |||
343 | } | 343 | } |
344 | } | 344 | } |
345 | #ifdef HAVE_PIXMAN | 345 | #ifdef HAVE_PIXMAN |
346 | # ifdef PIXMAN_LINE | 346 | # ifdef PIXMAN_LINE |
347 | int pixman_x_position = x0; | 347 | int pixman_x_position = x0; |
348 | int pixman_y_position = y0; | 348 | int pixman_y_position = y0; |
349 | int x_unit = dstw - dst->cache_entry.w; | 349 | int x_unit = dstw - dst->cache_entry.w; |
@@ -352,7 +352,7 @@ _evas_draw_simple_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, i | |||
352 | while (len--) | 352 | while (len--) |
353 | { | 353 | { |
354 | #ifdef HAVE_PIXMAN | 354 | #ifdef HAVE_PIXMAN |
355 | # ifdef PIXMAN_LINE | 355 | # ifdef PIXMAN_LINE |
356 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) | 356 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) |
357 | pixman_image_composite(op, dc->col.pixman_color_image, | 357 | pixman_image_composite(op, dc->col.pixman_color_image, |
358 | NULL, dst->pixman.im, | 358 | NULL, dst->pixman.im, |
@@ -373,7 +373,7 @@ _evas_draw_simple_line(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, i | |||
373 | pfunc(0, 255, color, p); | 373 | pfunc(0, 255, color, p); |
374 | } | 374 | } |
375 | #ifdef HAVE_PIXMAN | 375 | #ifdef HAVE_PIXMAN |
376 | # ifdef PIXMAN_LINE | 376 | # ifdef PIXMAN_LINE |
377 | pixman_x_position += x_unit; | 377 | pixman_x_position += x_unit; |
378 | pixman_y_position += 1; | 378 | pixman_y_position += 1; |
379 | # endif | 379 | # endif |
@@ -1050,14 +1050,14 @@ next_x: | |||
1050 | if (IN_RANGE(px, py, clw, clh)) | 1050 | if (IN_RANGE(px, py, clw, clh)) |
1051 | { | 1051 | { |
1052 | #ifdef HAVE_PIXMAN | 1052 | #ifdef HAVE_PIXMAN |
1053 | # ifdef PIXMAN_LINE | 1053 | # ifdef PIXMAN_LINE |
1054 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) | 1054 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) |
1055 | pixman_image_composite(op, dc->col.pixman_color_image, | 1055 | pixman_image_composite(op, dc->col.pixman_color_image, |
1056 | NULL, dst->pixman.im, | 1056 | NULL, dst->pixman.im, |
1057 | pix_x, pix_y, 0, 0, | 1057 | pix_x, pix_y, 0, 0, |
1058 | pix_x, pix_y, 1, 1); | 1058 | pix_x, pix_y, 1, 1); |
1059 | else | 1059 | else |
1060 | # endif | 1060 | # endif |
1061 | #endif | 1061 | #endif |
1062 | { | 1062 | { |
1063 | if (mask) pfunc(0, *mask, color, p); | 1063 | if (mask) pfunc(0, *mask, color, p); |
@@ -1070,9 +1070,9 @@ next_y: | |||
1070 | p += dstw; | 1070 | p += dstw; |
1071 | if (mask) mask += mask_w; | 1071 | if (mask) mask += mask_w; |
1072 | #ifdef HAVE_PIXMAN | 1072 | #ifdef HAVE_PIXMAN |
1073 | # ifdef PIXMAN_LINE | 1073 | # ifdef PIXMAN_LINE |
1074 | pix_y += pix_y_unit; | 1074 | pix_y += pix_y_unit; |
1075 | # endif | 1075 | # endif |
1076 | #endif | 1076 | #endif |
1077 | } | 1077 | } |
1078 | } | 1078 | } |
@@ -1249,7 +1249,7 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x | |||
1249 | dy = y1 - y0; | 1249 | dy = y1 - y0; |
1250 | 1250 | ||
1251 | #ifdef HAVE_PIXMAN | 1251 | #ifdef HAVE_PIXMAN |
1252 | # ifdef PIXMAN_LINE | 1252 | # ifdef PIXMAN_LINE |
1253 | int pix_x; | 1253 | int pix_x; |
1254 | int pix_y; | 1254 | int pix_y; |
1255 | int pix_x_unit; | 1255 | int pix_x_unit; |
@@ -1257,7 +1257,7 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x | |||
1257 | 1257 | ||
1258 | pixman_image_t *aa_mask_image; | 1258 | pixman_image_t *aa_mask_image; |
1259 | int alpha_data_buffer; | 1259 | int alpha_data_buffer; |
1260 | 1260 | ||
1261 | pixman_op_t op = PIXMAN_OP_SRC; // _EVAS_RENDER_COPY | 1261 | pixman_op_t op = PIXMAN_OP_SRC; // _EVAS_RENDER_COPY |
1262 | if (dc->render_op == _EVAS_RENDER_BLEND) | 1262 | if (dc->render_op == _EVAS_RENDER_BLEND) |
1263 | op = PIXMAN_OP_OVER; | 1263 | op = PIXMAN_OP_OVER; |
@@ -1331,9 +1331,9 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x | |||
1331 | if (mask) mask += mask_w; | 1331 | if (mask) mask += mask_w; |
1332 | py += dely; | 1332 | py += dely; |
1333 | #ifdef HAVE_PIXMAN | 1333 | #ifdef HAVE_PIXMAN |
1334 | # ifdef PIXMAN_LINE | 1334 | # ifdef PIXMAN_LINE |
1335 | pix_y += pix_y_unit; | 1335 | pix_y += pix_y_unit; |
1336 | # endif | 1336 | # endif |
1337 | #endif | 1337 | #endif |
1338 | } | 1338 | } |
1339 | if (!p1_in) | 1339 | if (!p1_in) |
@@ -1351,11 +1351,11 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x | |||
1351 | if ((py) < clh) | 1351 | if ((py) < clh) |
1352 | { | 1352 | { |
1353 | #ifdef HAVE_PIXMAN | 1353 | #ifdef HAVE_PIXMAN |
1354 | # ifdef PIXMAN_LINE | 1354 | # ifdef PIXMAN_LINE |
1355 | alpha_data_buffer = 255 - aa; | 1355 | alpha_data_buffer = 255 - aa; |
1356 | aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, | 1356 | aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, |
1357 | (uint32_t *)&alpha_data_buffer, 4); | 1357 | (uint32_t *)&alpha_data_buffer, 4); |
1358 | 1358 | ||
1359 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) | 1359 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) |
1360 | pixman_image_composite(op, dc->col.pixman_color_image, | 1360 | pixman_image_composite(op, dc->col.pixman_color_image, |
1361 | aa_mask_image, dst->pixman.im, | 1361 | aa_mask_image, dst->pixman.im, |
@@ -1369,7 +1369,7 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x | |||
1369 | else pfunc(0, 255 - aa, color, p); | 1369 | else pfunc(0, 255 - aa, color, p); |
1370 | } | 1370 | } |
1371 | #ifdef HAVE_PIXMAN | 1371 | #ifdef HAVE_PIXMAN |
1372 | # ifdef PIXMAN_LINE | 1372 | # ifdef PIXMAN_LINE |
1373 | pixman_image_unref(aa_mask_image); | 1373 | pixman_image_unref(aa_mask_image); |
1374 | # endif | 1374 | # endif |
1375 | #endif | 1375 | #endif |
@@ -1377,11 +1377,11 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x | |||
1377 | if ((py + 1) < clh) | 1377 | if ((py + 1) < clh) |
1378 | { | 1378 | { |
1379 | #ifdef HAVE_PIXMAN | 1379 | #ifdef HAVE_PIXMAN |
1380 | # ifdef PIXMAN_LINE | 1380 | # ifdef PIXMAN_LINE |
1381 | alpha_data_buffer = aa; | 1381 | alpha_data_buffer = aa; |
1382 | aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, | 1382 | aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, |
1383 | (uint32_t *)&alpha_data_buffer, 4); | 1383 | (uint32_t *)&alpha_data_buffer, 4); |
1384 | 1384 | ||
1385 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) | 1385 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) |
1386 | pixman_image_composite(op, dc->col.pixman_color_image, | 1386 | pixman_image_composite(op, dc->col.pixman_color_image, |
1387 | aa_mask_image, dst->pixman.im, | 1387 | aa_mask_image, dst->pixman.im, |
@@ -1395,27 +1395,27 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x | |||
1395 | else pfunc(0, aa, color, p + dstw); | 1395 | else pfunc(0, aa, color, p + dstw); |
1396 | } | 1396 | } |
1397 | #ifdef HAVE_PIXMAN | 1397 | #ifdef HAVE_PIXMAN |
1398 | # ifdef PIXMAN_LINE | 1398 | # ifdef PIXMAN_LINE |
1399 | pixman_image_unref(aa_mask_image); | 1399 | pixman_image_unref(aa_mask_image); |
1400 | # endif | 1400 | # endif |
1401 | #endif | 1401 | #endif |
1402 | } | 1402 | } |
1403 | } | 1403 | } |
1404 | 1404 | ||
1405 | next_x: | 1405 | next_x: |
1406 | yy += dyy; | 1406 | yy += dyy; |
1407 | px++; | 1407 | px++; |
1408 | p++; | 1408 | p++; |
1409 | if (mask) mask++; | 1409 | if (mask) mask++; |
1410 | #ifdef HAVE_PIXMAN | 1410 | #ifdef HAVE_PIXMAN |
1411 | # ifdef PIXMAN_LINE | 1411 | # ifdef PIXMAN_LINE |
1412 | pix_x += pix_x_unit; | 1412 | pix_x += pix_x_unit; |
1413 | # endif | 1413 | # endif |
1414 | #endif | 1414 | #endif |
1415 | } | 1415 | } |
1416 | return; | 1416 | return; |
1417 | } | 1417 | } |
1418 | 1418 | ||
1419 | /* steep: y-parametric */ | 1419 | /* steep: y-parametric */ |
1420 | SETUP_LINE_STEEP; | 1420 | SETUP_LINE_STEEP; |
1421 | if (mask) mask += (py * mask_w) + px; | 1421 | if (mask) mask += (py * mask_w) + px; |
@@ -1423,7 +1423,7 @@ next_x: | |||
1423 | while (py < by) | 1423 | while (py < by) |
1424 | { | 1424 | { |
1425 | DATA8 aa; | 1425 | DATA8 aa; |
1426 | 1426 | ||
1427 | x = (xx >> 16); | 1427 | x = (xx >> 16); |
1428 | if (prev_x != x) | 1428 | if (prev_x != x) |
1429 | { | 1429 | { |
@@ -1455,7 +1455,7 @@ next_x: | |||
1455 | # ifdef PIXMAN_LINE | 1455 | # ifdef PIXMAN_LINE |
1456 | alpha_data_buffer = 255 - aa; | 1456 | alpha_data_buffer = 255 - aa; |
1457 | aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, (uint32_t *)&alpha_data_buffer, 4); | 1457 | aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, (uint32_t *)&alpha_data_buffer, 4); |
1458 | 1458 | ||
1459 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) | 1459 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) |
1460 | pixman_image_composite(op, dc->col.pixman_color_image, | 1460 | pixman_image_composite(op, dc->col.pixman_color_image, |
1461 | aa_mask_image, dst->pixman.im, | 1461 | aa_mask_image, dst->pixman.im, |
@@ -1473,14 +1473,14 @@ next_x: | |||
1473 | pixman_image_unref(aa_mask_image); | 1473 | pixman_image_unref(aa_mask_image); |
1474 | # endif | 1474 | # endif |
1475 | #endif | 1475 | #endif |
1476 | 1476 | ||
1477 | } | 1477 | } |
1478 | if ((px + 1) < clw) | 1478 | if ((px + 1) < clw) |
1479 | { | 1479 | { |
1480 | #ifdef HAVE_PIXMAN | 1480 | #ifdef HAVE_PIXMAN |
1481 | # ifdef PIXMAN_LINE | 1481 | # ifdef PIXMAN_LINE |
1482 | alpha_data_buffer = aa; | 1482 | alpha_data_buffer = aa; |
1483 | aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, | 1483 | aa_mask_image = pixman_image_create_bits(PIXMAN_a8, 1, 1, |
1484 | (uint32_t *)&alpha_data_buffer, 4); | 1484 | (uint32_t *)&alpha_data_buffer, 4); |
1485 | 1485 | ||
1486 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) | 1486 | if ((dst->pixman.im) && (dc->col.pixman_color_image)) |
diff --git a/src/lib/evas/common/evas_map_image.c b/src/lib/evas/common/evas_map_image.c index 115e77cafd..24f070eb47 100644 --- a/src/lib/evas/common/evas_map_image.c +++ b/src/lib/evas/common/evas_map_image.c | |||
@@ -188,43 +188,43 @@ _calc_spans(RGBA_Map_Point *p, Line *spans, int ystart, int yend, int cx, int cy | |||
188 | 188 | ||
189 | x = p[e1].x + temp; // intersected x point | 189 | x = p[e1].x + temp; // intersected x point |
190 | 190 | ||
191 | /* | 191 | /* |
192 | // FIXME: 3d accuracy here | 192 | // FIXME: 3d accuracy here |
193 | // XXX t needs adjusting. above its a linear interp point | 193 | // XXX t needs adjusting. above its a linear interp point |
194 | // only. | 194 | // only. |
195 | // | 195 | // |
196 | // // FIXME: do in fixed pt. reduce divides | 196 | // // FIXME: do in fixed pt. reduce divides |
197 | evas_common_cpu_end_opt(); | 197 | evas_common_cpu_end_opt(); |
198 | // | 198 | // |
199 | int foc = 512, z0 = 0, px = 320, py = 240; // FIXME: need from map points | 199 | int foc = 512, z0 = 0, px = 320, py = 240; // FIXME: need from map points |
200 | // | 200 | // |
201 | float focf, hf; | 201 | float focf, hf; |
202 | float z1, z2, y1, y2, dz, dy, zt, dydz, yt; | 202 | float z1, z2, y1, y2, dz, dy, zt, dydz, yt; |
203 | 203 | ||
204 | focf = foc; | 204 | focf = foc; |
205 | hf = h; | 205 | hf = h; |
206 | 206 | ||
207 | // adjust for fixed point and focal length and z0 for map | 207 | // adjust for fixed point and focal length and z0 for map |
208 | z1 = (p[e1].z >> FP) - z0 + foc; | 208 | z1 = (p[e1].z >> FP) - z0 + foc; |
209 | z2 = (p[e2].z >> FP) - z0 + foc; | 209 | z2 = (p[e2].z >> FP) - z0 + foc; |
210 | // deltas | 210 | // deltas |
211 | dz = z1 - z2; | 211 | dz = z1 - z2; |
212 | 212 | ||
213 | if (dz != 0) | 213 | if (dz != 0) |
214 | { | 214 | { |
215 | int pt; | 215 | int pt; |
216 | 216 | ||
217 | // adjust for perspective point (being 0 0) | 217 | // adjust for perspective point (being 0 0) |
218 | y1 = (p[e1].y >> FP) - py; | 218 | y1 = (p[e1].y >> FP) - py; |
219 | y2 = (p[e2].y >> FP) - py; | 219 | y2 = (p[e2].y >> FP) - py; |
220 | 220 | ||
221 | // correct for x &y not being in world coords - screen coords | 221 | // correct for x &y not being in world coords - screen coords |
222 | y1 = (y1 * z1) / focf; | 222 | y1 = (y1 * z1) / focf; |
223 | y2 = (y2 * z2) / focf; | 223 | y2 = (y2 * z2) / focf; |
224 | 224 | ||
225 | // deltas | 225 | // deltas |
226 | dy = y1 - y2; | 226 | dy = y1 - y2; |
227 | 227 | ||
228 | yt = y - py; | 228 | yt = y - py; |
229 | dydz = dy / dz; | 229 | dydz = dy / dz; |
230 | 230 | ||
@@ -506,14 +506,14 @@ _evas_common_map_rgba_span(RGBA_Map_Spans *span, | |||
506 | { | 506 | { |
507 | if (p[i].y > ybottom) ybottom = p[i].y; | 507 | if (p[i].y > ybottom) ybottom = p[i].y; |
508 | } | 508 | } |
509 | 509 | ||
510 | // convert to screen space from fixed point | 510 | // convert to screen space from fixed point |
511 | ytop = ytop >> FP; | 511 | ytop = ytop >> FP; |
512 | ybottom = ybottom >> FP; | 512 | ybottom = ybottom >> FP; |
513 | 513 | ||
514 | // if its outside the clip vertical bounds - don't bother | 514 | // if its outside the clip vertical bounds - don't bother |
515 | if ((ytop >= (cy + ch)) || (ybottom < cy)) return; | 515 | if ((ytop >= (cy + ch)) || (ybottom < cy)) return; |
516 | 516 | ||
517 | // limit to the clip vertical bounds | 517 | // limit to the clip vertical bounds |
518 | if (ytop < cy) span->ystart = cy; | 518 | if (ytop < cy) span->ystart = cy; |
519 | else span->ystart = ytop; | 519 | else span->ystart = ytop; |
@@ -529,12 +529,12 @@ _evas_common_map_rgba_span(RGBA_Map_Spans *span, | |||
529 | if (p[i].u < 0) p[i].u = 0; | 529 | if (p[i].u < 0) p[i].u = 0; |
530 | else if (p[i].u > (int)(sw << FP)) | 530 | else if (p[i].u > (int)(sw << FP)) |
531 | p[i].u = src->cache_entry.w << FP; | 531 | p[i].u = src->cache_entry.w << FP; |
532 | 532 | ||
533 | if (p[i].v < 0) p[i].v = 0; | 533 | if (p[i].v < 0) p[i].v = 0; |
534 | else if (p[i].v > (int)(sw << FP)) | 534 | else if (p[i].v > (int)(sw << FP)) |
535 | p[i].v = src->cache_entry.h << FP; | 535 | p[i].v = src->cache_entry.h << FP; |
536 | } | 536 | } |
537 | 537 | ||
538 | // allocate some spans to hold out span list | 538 | // allocate some spans to hold out span list |
539 | if (span->size < (span->yend - span->ystart + 1)) | 539 | if (span->size < (span->yend - span->ystart + 1)) |
540 | { | 540 | { |
@@ -950,7 +950,7 @@ evas_common_map_rgba_do(const Eina_Rectangle *clip, | |||
950 | 950 | ||
951 | #ifdef BUILD_MMX | 951 | #ifdef BUILD_MMX |
952 | evas_common_cpu_can_do(&mmx, &sse, &sse2); | 952 | evas_common_cpu_can_do(&mmx, &sse, &sse2); |
953 | #endif | 953 | #endif |
954 | 954 | ||
955 | spans = m->engine_data; | 955 | spans = m->engine_data; |
956 | rects = spans->rects; | 956 | rects = spans->rects; |
diff --git a/src/lib/evas/common/evas_map_image_core.c b/src/lib/evas/common/evas_map_image_core.c index 14c46aa141..5e20fe7851 100644 --- a/src/lib/evas/common/evas_map_image_core.c +++ b/src/lib/evas/common/evas_map_image_core.c | |||
@@ -76,7 +76,7 @@ | |||
76 | c2 = span->col[1]; // col | 76 | c2 = span->col[1]; // col |
77 | cv = 0; // col | 77 | cv = 0; // col |
78 | cd = (255 << 16) / w; // col | 78 | cd = (255 << 16) / w; // col |
79 | 79 | ||
80 | if (c1 == c2) | 80 | if (c1 == c2) |
81 | { | 81 | { |
82 | if (c1 == 0xffffffff) | 82 | if (c1 == 0xffffffff) |
diff --git a/src/lib/evas/common/evas_map_image_internal_high.c b/src/lib/evas/common/evas_map_image_internal_high.c index 0b52eeace4..ecd08026d2 100644 --- a/src/lib/evas/common/evas_map_image_internal_high.c +++ b/src/lib/evas/common/evas_map_image_internal_high.c | |||
@@ -87,7 +87,7 @@ _map_aa_edge_calc_internal(AALine *spans, int eidx, int ystart, int yend) | |||
87 | { | 87 | { |
88 | int y = 0; | 88 | int y = 0; |
89 | Evas_Coord_Point p_edge = {-1, -1}; //previous edge point | 89 | Evas_Coord_Point p_edge = {-1, -1}; //previous edge point |
90 | Evas_Coord_Point edge_diff = {0, 0}; //temporary used for point distance | 90 | Evas_Coord_Point edge_diff = {0, 0}; //temporary used for point distance |
91 | 91 | ||
92 | /* store bigger to tx[0] between prev and current edge's x positions. */ | 92 | /* store bigger to tx[0] between prev and current edge's x positions. */ |
93 | int tx[2] = {0, 0}; | 93 | int tx[2] = {0, 0}; |
@@ -763,7 +763,7 @@ _evas_common_map_rgba_internal_high(RGBA_Image *src, RGBA_Image *dst, | |||
763 | DATA32 c[4]; | 763 | DATA32 c[4]; |
764 | RGBA_Gfx_Func func = NULL; | 764 | RGBA_Gfx_Func func = NULL; |
765 | RGBA_Gfx_Func func2 = NULL; | 765 | RGBA_Gfx_Func func2 = NULL; |
766 | DATA32 *tbuf = NULL; //Temporarily used span buffer | 766 | DATA32 *tbuf = NULL; //Temporarily used span buffer |
767 | Eina_Bool have_alpha = EINA_FALSE; | 767 | Eina_Bool have_alpha = EINA_FALSE; |
768 | Eina_Bool src_alpha = src->cache_entry.flags.alpha; | 768 | Eina_Bool src_alpha = src->cache_entry.flags.alpha; |
769 | Eina_Bool ssrc_alpha = src->cache_entry.flags.alpha_sparse; | 769 | Eina_Bool ssrc_alpha = src->cache_entry.flags.alpha_sparse; |
@@ -773,8 +773,8 @@ _evas_common_map_rgba_internal_high(RGBA_Image *src, RGBA_Image *dst, | |||
773 | //FIXME: we cannot apply anti_aliasing per polygons. | 773 | //FIXME: we cannot apply anti_aliasing per polygons. |
774 | anti_alias = EINA_FALSE; | 774 | anti_alias = EINA_FALSE; |
775 | 775 | ||
776 | /* Prepare points data. | 776 | /* Prepare points data. |
777 | Convert to float, | 777 | Convert to float, |
778 | shift XY coordinates to match the sub-pixeling technique. | 778 | shift XY coordinates to match the sub-pixeling technique. |
779 | Check alpha transparency. */ | 779 | Check alpha transparency. */ |
780 | for (int i = 0; i < 4; i++) | 780 | for (int i = 0; i < 4; i++) |
@@ -844,7 +844,7 @@ _evas_common_map_rgba_internal_high(RGBA_Image *src, RGBA_Image *dst, | |||
844 | } | 844 | } |
845 | #endif | 845 | #endif |
846 | 846 | ||
847 | /* | 847 | /* |
848 | 1 polygon is consisted of 2 triangles, 4 polygons constructs 1 mesh. | 848 | 1 polygon is consisted of 2 triangles, 4 polygons constructs 1 mesh. |
849 | below figure illustrates vert[9] index info. | 849 | below figure illustrates vert[9] index info. |
850 | If you need better quality, please divide a mesh by more number of triangles. | 850 | If you need better quality, please divide a mesh by more number of triangles. |
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c index 576220db2d..2879637157 100644 --- a/src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c | |||
@@ -174,7 +174,7 @@ init_blend_mask_color_span_funcs_sse3(void) | |||
174 | op_blend_span_funcs[SP_N][SM_AS][SC_AN][DP][CPU_SSE3] = _op_blend_mas_can_dp_sse3; | 174 | op_blend_span_funcs[SP_N][SM_AS][SC_AN][DP][CPU_SSE3] = _op_blend_mas_can_dp_sse3; |
175 | op_blend_span_funcs[SP_N][SM_AS][SC_AA][DP][CPU_SSE3] = _op_blend_mas_caa_dp_sse3; | 175 | op_blend_span_funcs[SP_N][SM_AS][SC_AA][DP][CPU_SSE3] = _op_blend_mas_caa_dp_sse3; |
176 | 176 | ||
177 | // FIXME: BUGGY BUGGY Core i5 2500 (64bit), gcc version 4.5.2 (Ubuntu/Linaro 4.5.2-8ubuntu4), ello (text) | 177 | // FIXME: BUGGY BUGGY Core i5 2500 (64bit), gcc version 4.5.2 (Ubuntu/Linaro 4.5.2-8ubuntu4), ello (text) |
178 | // op_blend_span_funcs[SP_N][SM_AS][SC][DP_AN][CPU_SSE3] = _op_blend_mas_c_dpan_sse3; | 178 | // op_blend_span_funcs[SP_N][SM_AS][SC][DP_AN][CPU_SSE3] = _op_blend_mas_c_dpan_sse3; |
179 | op_blend_span_funcs[SP_N][SM_AS][SC_N][DP_AN][CPU_SSE3] = _op_blend_mas_cn_dpan_sse3; | 179 | op_blend_span_funcs[SP_N][SM_AS][SC_N][DP_AN][CPU_SSE3] = _op_blend_mas_cn_dpan_sse3; |
180 | op_blend_span_funcs[SP_N][SM_AS][SC_AN][DP_AN][CPU_SSE3] = _op_blend_mas_can_dpan_sse3; | 180 | op_blend_span_funcs[SP_N][SM_AS][SC_AN][DP_AN][CPU_SSE3] = _op_blend_mas_can_dpan_sse3; |
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c index 6065054c15..d265a79b10 100644 --- a/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c | |||
@@ -47,7 +47,7 @@ evas_common_op_blend_init_sse3(void) | |||
47 | init_blend_pixel_mask_pt_funcs_sse3(); | 47 | init_blend_pixel_mask_pt_funcs_sse3(); |
48 | init_blend_color_pt_funcs_sse3(); | 48 | init_blend_color_pt_funcs_sse3(); |
49 | init_blend_mask_color_pt_funcs_sse3(); | 49 | init_blend_mask_color_pt_funcs_sse3(); |
50 | #endif | 50 | #endif |
51 | } | 51 | } |
52 | 52 | ||
53 | void | 53 | void |
@@ -65,7 +65,7 @@ evas_common_op_blend_rel_init_sse3(void) | |||
65 | init_blend_rel_pixel_mask_pt_funcs_sse3(); | 65 | init_blend_rel_pixel_mask_pt_funcs_sse3(); |
66 | init_blend_rel_color_pt_funcs_sse3(); | 66 | init_blend_rel_color_pt_funcs_sse3(); |
67 | init_blend_rel_mask_color_pt_funcs_sse3(); | 67 | init_blend_rel_mask_color_pt_funcs_sse3(); |
68 | #endif | 68 | #endif |
69 | } | 69 | } |
70 | 70 | ||
71 | //#pragma GCC push_options | 71 | //#pragma GCC push_options |
@@ -75,10 +75,10 @@ evas_common_op_sse3_test(void) | |||
75 | { | 75 | { |
76 | #ifdef BUILD_SSE3 | 76 | #ifdef BUILD_SSE3 |
77 | DATA32 s[64] = {0x11883399}, d[64] = {0xff88cc33}; | 77 | DATA32 s[64] = {0x11883399}, d[64] = {0xff88cc33}; |
78 | 78 | ||
79 | s[0] = rand(); d[1] = rand(); | 79 | s[0] = rand(); d[1] = rand(); |
80 | _op_blend_pas_dp_sse3(s, NULL, 0, d, 64); | 80 | _op_blend_pas_dp_sse3(s, NULL, 0, d, 64); |
81 | evas_common_cpu_end_opt(); | 81 | evas_common_cpu_end_opt(); |
82 | #endif | 82 | #endif |
83 | } | 83 | } |
84 | //#pragma GCC pop_options | 84 | //#pragma GCC pop_options |
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_pixel_i386.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_i386.c index 66771668cf..9e054d010b 100644 --- a/src/lib/evas/common/evas_op_blend/op_blend_pixel_i386.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_i386.c | |||
@@ -26,7 +26,7 @@ static void | |||
26 | _op_blend_pas_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { | 26 | _op_blend_pas_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) { |
27 | _op_blend_p_dp_mmx(s, m, c, d, l); | 27 | _op_blend_p_dp_mmx(s, m, c, d, l); |
28 | return; | 28 | return; |
29 | /* | 29 | /* |
30 | DATA32 *e = d + l; | 30 | DATA32 *e = d + l; |
31 | pxor_r2r(mm0, mm0); | 31 | pxor_r2r(mm0, mm0); |
32 | MOV_A2R(ALPHA_256, mm6) | 32 | MOV_A2R(ALPHA_256, mm6) |
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_pixel_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_neon.c index af0a893510..31ad6b21ba 100644 --- a/src/lib/evas/common/evas_op_blend/op_blend_pixel_neon.c +++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_neon.c | |||
@@ -245,7 +245,7 @@ _op_blend_p_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA3 | |||
245 | "vldm %[s]!, {d0,d1,d2,d3) \n\t" | 245 | "vldm %[s]!, {d0,d1,d2,d3) \n\t" |
246 | "vldm %[d], {d4,d5,d6,d7} \n\t" | 246 | "vldm %[d], {d4,d5,d6,d7} \n\t" |
247 | "pld [%[s], #64] \n\t" | 247 | "pld [%[s], #64] \n\t" |
248 | 248 | ||
249 | 249 | ||
250 | // Copy s.a into q2 (>> 24) & subtract from 255 | 250 | // Copy s.a into q2 (>> 24) & subtract from 255 |
251 | "vmvn.u8 q4, q0 \n\t" | 251 | "vmvn.u8 q4, q0 \n\t" |
@@ -302,7 +302,7 @@ _op_blend_p_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA3 | |||
302 | "sub %[tmp],%[e],$0x7 \n\t" | 302 | "sub %[tmp],%[e],$0x7 \n\t" |
303 | AP "dualloop2int: \n\t" | 303 | AP "dualloop2int: \n\t" |
304 | //** Trailing double | 304 | //** Trailing double |
305 | 305 | ||
306 | "vldm %[s]!, {d0} \n\t" | 306 | "vldm %[s]!, {d0} \n\t" |
307 | "vldm %[d], {d4} \n\t" | 307 | "vldm %[d], {d4} \n\t" |
308 | 308 | ||
diff --git a/src/lib/evas/common/evas_op_blend_main_.c b/src/lib/evas/common/evas_op_blend_main_.c index 035f4018fa..c7b629346d 100644 --- a/src/lib/evas/common/evas_op_blend_main_.c +++ b/src/lib/evas/common/evas_op_blend_main_.c | |||
@@ -112,7 +112,7 @@ op_blend_init(void) | |||
112 | init_blend_pixel_mask_span_funcs_mmx(); // FIXME | 112 | init_blend_pixel_mask_span_funcs_mmx(); // FIXME |
113 | init_blend_color_span_funcs_mmx(); | 113 | init_blend_color_span_funcs_mmx(); |
114 | init_blend_mask_color_span_funcs_mmx(); | 114 | init_blend_mask_color_span_funcs_mmx(); |
115 | 115 | ||
116 | init_blend_pixel_pt_funcs_mmx(); | 116 | init_blend_pixel_pt_funcs_mmx(); |
117 | init_blend_pixel_color_pt_funcs_mmx(); | 117 | init_blend_pixel_color_pt_funcs_mmx(); |
118 | init_blend_pixel_mask_pt_funcs_mmx(); | 118 | init_blend_pixel_mask_pt_funcs_mmx(); |
@@ -128,7 +128,7 @@ op_blend_init(void) | |||
128 | init_blend_pixel_mask_span_funcs_neon(); // FIXME | 128 | init_blend_pixel_mask_span_funcs_neon(); // FIXME |
129 | init_blend_color_span_funcs_neon(); | 129 | init_blend_color_span_funcs_neon(); |
130 | init_blend_mask_color_span_funcs_neon(); | 130 | init_blend_mask_color_span_funcs_neon(); |
131 | 131 | ||
132 | init_blend_pixel_pt_funcs_neon(); | 132 | init_blend_pixel_pt_funcs_neon(); |
133 | init_blend_pixel_color_pt_funcs_neon(); | 133 | init_blend_pixel_color_pt_funcs_neon(); |
134 | init_blend_pixel_mask_pt_funcs_neon(); | 134 | init_blend_pixel_mask_pt_funcs_neon(); |
diff --git a/src/lib/evas/common/evas_op_copy/op_copy_color_.c b/src/lib/evas/common/evas_op_copy/op_copy_color_.c index 3dc5582f6e..c8e46ae792 100644 --- a/src/lib/evas/common/evas_op_copy/op_copy_color_.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_color_.c | |||
@@ -32,7 +32,7 @@ init_copy_color_span_funcs_c(void) | |||
32 | op_copy_span_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_copy_can_dpan; | 32 | op_copy_span_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_copy_can_dpan; |
33 | op_copy_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_caa_dpan; | 33 | op_copy_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_caa_dpan; |
34 | } | 34 | } |
35 | 35 | ||
36 | static void | 36 | static void |
37 | _op_copy_pt_c_dp(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { | 37 | _op_copy_pt_c_dp(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) { |
38 | *d = c; | 38 | *d = c; |
diff --git a/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c index 5a861b2590..12c2dace3a 100644 --- a/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* copy pixel x mask --> dst */ | 1 | /* copy pixel x mask --> dst */ |
2 | 2 | ||
3 | static void | 3 | static void |
4 | _op_copy_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { | 4 | _op_copy_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { |
5 | DATA32 *e; | 5 | DATA32 *e; |
6 | int color; | 6 | int color; |
diff --git a/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c index a10289d4d8..ae30339233 100644 --- a/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c | |||
@@ -86,7 +86,7 @@ init_copy_pixel_mask_pt_funcs_mmx(void) | |||
86 | /* copy_rel pixel x mask --> dst */ | 86 | /* copy_rel pixel x mask --> dst */ |
87 | 87 | ||
88 | #ifdef BUILD_MMX | 88 | #ifdef BUILD_MMX |
89 | static void | 89 | static void |
90 | _op_copy_rel_p_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { | 90 | _op_copy_rel_p_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { |
91 | DATA32 *e = d + l; | 91 | DATA32 *e = d + l; |
92 | pxor_r2r(mm0, mm0); | 92 | pxor_r2r(mm0, mm0); |
@@ -139,7 +139,7 @@ init_copy_rel_pixel_mask_span_funcs_mmx(void) | |||
139 | #endif | 139 | #endif |
140 | 140 | ||
141 | #ifdef BUILD_MMX | 141 | #ifdef BUILD_MMX |
142 | static void | 142 | static void |
143 | _op_copy_rel_pt_p_mas_dp_mmx(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) { | 143 | _op_copy_rel_pt_p_mas_dp_mmx(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) { |
144 | c = m + 1; | 144 | c = m + 1; |
145 | pxor_r2r(mm0, mm0); | 145 | pxor_r2r(mm0, mm0); |
diff --git a/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c index f6a9528a3c..c3b35ee8c8 100644 --- a/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c | |||
@@ -76,7 +76,7 @@ init_copy_pixel_mask_pt_funcs_neon(void) | |||
76 | /* copy_rel pixel x mask --> dst */ | 76 | /* copy_rel pixel x mask --> dst */ |
77 | 77 | ||
78 | #ifdef BUILD_NEON | 78 | #ifdef BUILD_NEON |
79 | static void | 79 | static void |
80 | _op_copy_rel_p_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { | 80 | _op_copy_rel_p_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { |
81 | // FIXME: neon-it | 81 | // FIXME: neon-it |
82 | DATA32 *e; | 82 | DATA32 *e; |
@@ -122,7 +122,7 @@ init_copy_rel_pixel_mask_span_funcs_neon(void) | |||
122 | #endif | 122 | #endif |
123 | 123 | ||
124 | #ifdef BUILD_NEON | 124 | #ifdef BUILD_NEON |
125 | static void | 125 | static void |
126 | _op_copy_rel_pt_p_mas_dp_neon(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) { | 126 | _op_copy_rel_pt_p_mas_dp_neon(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) { |
127 | c = MUL_SYM(*d >> 24, s); | 127 | c = MUL_SYM(*d >> 24, s); |
128 | *d = INTERP_256(m + 1, c, *d); | 128 | *d = INTERP_256(m + 1, c, *d); |
diff --git a/src/lib/evas/common/evas_op_copy/op_copy_pixel_neon.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_neon.c index c2eb12dae2..d2703c19d5 100644 --- a/src/lib/evas/common/evas_op_copy/op_copy_pixel_neon.c +++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_neon.c | |||
@@ -13,8 +13,8 @@ _op_copy_p_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 | |||
13 | if (e > d) | 13 | if (e > d) |
14 | { | 14 | { |
15 | int dl; | 15 | int dl; |
16 | 16 | ||
17 | asm volatile | 17 | asm volatile |
18 | (".fpu neon \n\t" | 18 | (".fpu neon \n\t" |
19 | "_op_copy_p_dp_neon_asmloop: \n\t" | 19 | "_op_copy_p_dp_neon_asmloop: \n\t" |
20 | "pld [%[s], #192] \n\t" // preload 256 bytes ahead | 20 | "pld [%[s], #192] \n\t" // preload 256 bytes ahead |
@@ -31,12 +31,12 @@ _op_copy_p_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 | |||
31 | : /*in */ [s] "r" (s), [e] "r" (e), [d] "r" (d) | 31 | : /*in */ [s] "r" (s), [e] "r" (e), [d] "r" (d) |
32 | : /*clobber*/ | 32 | : /*clobber*/ |
33 | "q0", "q1", "q2","q3", "q4", "q5", "q6", | 33 | "q0", "q1", "q2","q3", "q4", "q5", "q6", |
34 | "d0", "d1", "d2", "d3", | 34 | "d0", "d1", "d2", "d3", |
35 | "d4", "d5", "d6", "d7", | 35 | "d4", "d5", "d6", "d7", |
36 | "d8", "d9", "d10", "d11", | 36 | "d8", "d9", "d10", "d11", |
37 | "memory" // clobbered | 37 | "memory" // clobbered |
38 | ); | 38 | ); |
39 | dl = l % 24; // dl is how many pixels at end that is not a multiple of 24 | 39 | dl = l % 24; // dl is how many pixels at end that is not a multiple of 24 |
40 | l = l - dl; // jump to there at the end of the run? | 40 | l = l - dl; // jump to there at the end of the run? |
41 | s = s + l; | 41 | s = s + l; |
42 | d = d + l; | 42 | d = d + l; |
diff --git a/src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c index c6f08a98e5..10e8b8a705 100644 --- a/src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c +++ b/src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* mask pixel x mask --> dst */ | 1 | /* mask pixel x mask --> dst */ |
2 | 2 | ||
3 | static void | 3 | static void |
4 | _op_mask_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { | 4 | _op_mask_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) { |
5 | DATA32 *e = d + l; | 5 | DATA32 *e = d + l; |
6 | while (d < e) { | 6 | while (d < e) { |
@@ -36,7 +36,7 @@ init_mask_pixel_mask_span_funcs_c(void) | |||
36 | op_mask_span_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_mask_pas_mas_dpan; | 36 | op_mask_span_funcs[SP_AS][SM_AS][SC_N][DP_AN][CPU_C] = _op_mask_pas_mas_dpan; |
37 | } | 37 | } |
38 | 38 | ||
39 | static void | 39 | static void |
40 | _op_mask_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c EINA_UNUSED, DATA32 *d) { | 40 | _op_mask_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c EINA_UNUSED, DATA32 *d) { |
41 | s = 256 - (((256 - (s >> 24)) * m) >> 8); | 41 | s = 256 - (((256 - (s >> 24)) * m) >> 8); |
42 | *d = MUL_256(s, *d); | 42 | *d = MUL_256(s, *d); |
diff --git a/src/lib/evas/common/evas_pipe.c b/src/lib/evas/common/evas_pipe.c index 55e551ba50..9cb62f4bce 100644 --- a/src/lib/evas/common/evas_pipe.c +++ b/src/lib/evas/common/evas_pipe.c | |||
@@ -621,7 +621,7 @@ static Eina_Bool | |||
621 | evas_common_pipe_map_draw_prepare(void *data EINA_UNUSED, RGBA_Image *dst, RGBA_Pipe_Op *op) | 621 | evas_common_pipe_map_draw_prepare(void *data EINA_UNUSED, RGBA_Image *dst, RGBA_Pipe_Op *op) |
622 | { | 622 | { |
623 | RGBA_Draw_Context context; | 623 | RGBA_Draw_Context context; |
624 | Eina_Bool r; | 624 | Eina_Bool r; |
625 | 625 | ||
626 | memcpy(&(context), &(op->context), sizeof(RGBA_Draw_Context)); | 626 | memcpy(&(context), &(op->context), sizeof(RGBA_Draw_Context)); |
627 | r = evas_common_map_rgba_prepare(op->op.map.src, dst, | 627 | r = evas_common_map_rgba_prepare(op->op.map.src, dst, |
@@ -641,10 +641,10 @@ evas_common_pipe_map_draw(RGBA_Image *src, RGBA_Image *dst, | |||
641 | /* pts_copy = malloc(sizeof (RGBA_Map_Point) * 4); */ | 641 | /* pts_copy = malloc(sizeof (RGBA_Map_Point) * 4); */ |
642 | /* if (!pts_copy) return; */ | 642 | /* if (!pts_copy) return; */ |
643 | dst->cache_entry.pipe = evas_common_pipe_add(dst->cache_entry.pipe, &op); | 643 | dst->cache_entry.pipe = evas_common_pipe_add(dst->cache_entry.pipe, &op); |
644 | if (!dst->cache_entry.pipe) | 644 | if (!dst->cache_entry.pipe) |
645 | { | 645 | { |
646 | /* free(pts_copy); */ | 646 | /* free(pts_copy); */ |
647 | return; | 647 | return; |
648 | } | 648 | } |
649 | 649 | ||
650 | /* for (i = 0; i < 4; ++i) */ | 650 | /* for (i = 0; i < 4; ++i) */ |
diff --git a/src/lib/evas/common/evas_polygon_main.c b/src/lib/evas/common/evas_polygon_main.c index 3b8690427a..232a13c7ab 100644 --- a/src/lib/evas/common/evas_polygon_main.c +++ b/src/lib/evas/common/evas_polygon_main.c | |||
@@ -143,7 +143,7 @@ evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po | |||
143 | pixman_op_t op = PIXMAN_OP_SRC; // _EVAS_RENDER_COPY | 143 | pixman_op_t op = PIXMAN_OP_SRC; // _EVAS_RENDER_COPY |
144 | if (dc->render_op == _EVAS_RENDER_BLEND) | 144 | if (dc->render_op == _EVAS_RENDER_BLEND) |
145 | op = PIXMAN_OP_OVER; | 145 | op = PIXMAN_OP_OVER; |
146 | # endif | 146 | # endif |
147 | #endif | 147 | #endif |
148 | 148 | ||
149 | ext_x = 0; | 149 | ext_x = 0; |
diff --git a/src/lib/evas/common/evas_text_utils.c b/src/lib/evas/common/evas_text_utils.c index acf7cf8fb7..fc291a9536 100644 --- a/src/lib/evas/common/evas_text_utils.c +++ b/src/lib/evas/common/evas_text_utils.c | |||
@@ -1430,7 +1430,7 @@ evas_common_format_color_parse(const char *str, int slen, | |||
1430 | 1430 | ||
1431 | if ((strncmp(color_name,"rgb(",4) == 0) && color_name[slen-1] == ')'&& slen >= 10 && slen <=16) /* rgb() */ | 1431 | if ((strncmp(color_name,"rgb(",4) == 0) && color_name[slen-1] == ')'&& slen >= 10 && slen <=16) /* rgb() */ |
1432 | { | 1432 | { |
1433 | char * p_color = &color_name[3]; | 1433 | char * p_color = &color_name[3]; |
1434 | 1434 | ||
1435 | if ( | 1435 | if ( |
1436 | (!read_byte_color_component(++p_color,&p_color,r) || !p_color || *p_color != ',') || | 1436 | (!read_byte_color_component(++p_color,&p_color,r) || !p_color || *p_color != ',') || |
@@ -1448,7 +1448,7 @@ evas_common_format_color_parse(const char *str, int slen, | |||
1448 | } | 1448 | } |
1449 | else if ((strncmp(color_name,"rgba(",4) == 0) && color_name[slen-1] == ')'&& slen >= 13 && slen <=21) /* rgba() */ | 1449 | else if ((strncmp(color_name,"rgba(",4) == 0) && color_name[slen-1] == ')'&& slen >= 13 && slen <=21) /* rgba() */ |
1450 | { | 1450 | { |
1451 | char * p_color = &color_name[4]; | 1451 | char * p_color = &color_name[4]; |
1452 | 1452 | ||
1453 | if ( | 1453 | if ( |
1454 | (!read_byte_color_component(++p_color,&p_color,r) || !p_color || *p_color != ',') || | 1454 | (!read_byte_color_component(++p_color,&p_color,r) || !p_color || *p_color != ',') || |
diff --git a/src/lib/evas/common/evas_tiler.c b/src/lib/evas/common/evas_tiler.c index 8105ec6f1d..0157446d39 100644 --- a/src/lib/evas/common/evas_tiler.c +++ b/src/lib/evas/common/evas_tiler.c | |||
@@ -311,7 +311,7 @@ static inline list_node_t * | |||
311 | rect_list_unlink_next(list_t *rects, list_node_t *parent_node) | 311 | rect_list_unlink_next(list_t *rects, list_node_t *parent_node) |
312 | { | 312 | { |
313 | list_node_t *node; | 313 | list_node_t *node; |
314 | 314 | ||
315 | if (parent_node) | 315 | if (parent_node) |
316 | { | 316 | { |
317 | node = parent_node->next; | 317 | node = parent_node->next; |
@@ -341,7 +341,7 @@ rect_list_clear(list_t *rects) | |||
341 | while (node) | 341 | while (node) |
342 | { | 342 | { |
343 | list_node_t *aux; | 343 | list_node_t *aux; |
344 | 344 | ||
345 | aux = node->next; | 345 | aux = node->next; |
346 | rect_list_node_pool_put(node); | 346 | rect_list_node_pool_put(node); |
347 | node = aux; | 347 | node = aux; |
@@ -485,7 +485,7 @@ _calc_intra_outer_rect_area(const rect_t a, const rect_t b, | |||
485 | { | 485 | { |
486 | int min_left, max_left, min_right, max_right; | 486 | int min_left, max_left, min_right, max_right; |
487 | int min_top, max_top, min_bottom, max_bottom; | 487 | int min_top, max_top, min_bottom, max_bottom; |
488 | 488 | ||
489 | if (a.left < b.left) | 489 | if (a.left < b.left) |
490 | { | 490 | { |
491 | max_left = b.left; | 491 | max_left = b.left; |
@@ -911,7 +911,7 @@ evas_common_tilebuf_add_redraw(Tilebuf *tb, int x, int y, int w, int h) | |||
911 | RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, tb->outbuf_w, tb->outbuf_h); | 911 | RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, tb->outbuf_w, tb->outbuf_h); |
912 | if ((w <= 0) || (h <= 0)) return 0; | 912 | if ((w <= 0) || (h <= 0)) return 0; |
913 | // optimize a common case -> adding the exact same rect 2x in a row | 913 | // optimize a common case -> adding the exact same rect 2x in a row |
914 | if ((tb->prev_add.x == x) && (tb->prev_add.y == y) && | 914 | if ((tb->prev_add.x == x) && (tb->prev_add.y == y) && |
915 | (tb->prev_add.w == w) && (tb->prev_add.h == h)) return 1; | 915 | (tb->prev_add.w == w) && (tb->prev_add.h == h)) return 1; |
916 | tb->prev_add.x = x; tb->prev_add.y = y; | 916 | tb->prev_add.x = x; tb->prev_add.y = y; |
917 | tb->prev_add.w = w; tb->prev_add.h = h; | 917 | tb->prev_add.w = w; tb->prev_add.h = h; |
@@ -929,7 +929,7 @@ evas_common_tilebuf_del_redraw(Tilebuf *tb, int x, int y, int w, int h) | |||
929 | RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, tb->outbuf_w, tb->outbuf_h); | 929 | RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, tb->outbuf_w, tb->outbuf_h); |
930 | if ((w <= 0) || (h <= 0)) return 0; | 930 | if ((w <= 0) || (h <= 0)) return 0; |
931 | // optimize a common case -> deleting the exact same rect 2x in a row | 931 | // optimize a common case -> deleting the exact same rect 2x in a row |
932 | if ((tb->prev_del.x == x) && (tb->prev_del.y == y) && | 932 | if ((tb->prev_del.x == x) && (tb->prev_del.y == y) && |
933 | (tb->prev_del.w == w) && (tb->prev_del.h == h)) return 1; | 933 | (tb->prev_del.w == w) && (tb->prev_del.h == h)) return 1; |
934 | tb->prev_del.x = x; tb->prev_del.y = y; | 934 | tb->prev_del.x = x; tb->prev_del.y = y; |
935 | tb->prev_del.w = w; tb->prev_del.h = h; | 935 | tb->prev_del.w = w; tb->prev_del.h = h; |
@@ -1018,7 +1018,7 @@ evas_common_tilebuf_get_render_rects(Tilebuf *tb) | |||
1018 | if (x1 < bx1) bx1 = x1; | 1018 | if (x1 < bx1) bx1 = x1; |
1019 | x2 = x1 + ((rect_node_t *)n)->rect.width; | 1019 | x2 = x1 + ((rect_node_t *)n)->rect.width; |
1020 | if (x2 > bx2) bx2 = x2; | 1020 | if (x2 > bx2) bx2 = x2; |
1021 | 1021 | ||
1022 | y1 = ((rect_node_t *)n)->rect.top; | 1022 | y1 = ((rect_node_t *)n)->rect.top; |
1023 | if (y1 < by1) by1 = y1; | 1023 | if (y1 < by1) by1 = y1; |
1024 | y2 = y1 + ((rect_node_t *)n)->rect.height; | 1024 | y2 = y1 + ((rect_node_t *)n)->rect.height; |
@@ -1028,7 +1028,7 @@ evas_common_tilebuf_get_render_rects(Tilebuf *tb) | |||
1028 | } | 1028 | } |
1029 | else | 1029 | else |
1030 | return NULL; | 1030 | return NULL; |
1031 | 1031 | ||
1032 | /* magic number - if we have > MAXREG regions to update, take bounding */ | 1032 | /* magic number - if we have > MAXREG regions to update, take bounding */ |
1033 | if (num > MAXREG) | 1033 | if (num > MAXREG) |
1034 | { | 1034 | { |
diff --git a/src/lib/evas/common/region.c b/src/lib/evas/common/region.c index 73c118d407..195644f7bb 100644 --- a/src/lib/evas/common/region.c +++ b/src/lib/evas/common/region.c | |||
@@ -21,20 +21,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
21 | Except as contained in this notice, the name of The Open Group shall not be | 21 | Except as contained in this notice, the name of The Open Group shall not be |
22 | used in advertising or otherwise to promote the sale, use or other dealings | 22 | used in advertising or otherwise to promote the sale, use or other dealings |
23 | in this Software without prior written authorization from The Open Group. | 23 | in this Software without prior written authorization from The Open Group. |
24 | |||
25 | 24 | ||
26 | Copyright 1987, 1988, 1989 by | 25 | |
27 | Digital Equipment Corporation, Maynard, Massachusetts. | 26 | Copyright 1987, 1988, 1989 by |
27 | Digital Equipment Corporation, Maynard, Massachusetts. | ||
28 | 28 | ||
29 | All Rights Reserved | 29 | All Rights Reserved |
30 | 30 | ||
31 | Permission to use, copy, modify, and distribute this software and its | 31 | Permission to use, copy, modify, and distribute this software and its |
32 | documentation for any purpose and without fee is hereby granted, | 32 | documentation for any purpose and without fee is hereby granted, |
33 | provided that the above copyright notice appear in all copies and that | 33 | provided that the above copyright notice appear in all copies and that |
34 | both that copyright notice and this permission notice appear in | 34 | both that copyright notice and this permission notice appear in |
35 | supporting documentation, and that the name of Digital not be | 35 | supporting documentation, and that the name of Digital not be |
36 | used in advertising or publicity pertaining to distribution of the | 36 | used in advertising or publicity pertaining to distribution of the |
37 | software without specific, written prior permission. | 37 | software without specific, written prior permission. |
38 | 38 | ||
39 | DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING | 39 | DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING |
40 | ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL | 40 | ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL |
@@ -1252,7 +1252,7 @@ region_rect_inside(Region *region, Box *bx) | |||
1252 | return REGION_STATE_PARTIAL; | 1252 | return REGION_STATE_PARTIAL; |
1253 | } | 1253 | } |
1254 | 1254 | ||
1255 | // (x,y) starts at upper left of rect, moving to the right and down | 1255 | // (x,y) starts at upper left of rect, moving to the right and down |
1256 | x = bx->x1; | 1256 | x = bx->x1; |
1257 | y = bx->y1; | 1257 | y = bx->y1; |
1258 | 1258 | ||
diff --git a/src/lib/evas/common/region.h b/src/lib/evas/common/region.h index 0cdaffd842..cacdb1060b 100644 --- a/src/lib/evas/common/region.h +++ b/src/lib/evas/common/region.h | |||
@@ -30,13 +30,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. | |||
30 | 30 | ||
31 | All Rights Reserved | 31 | All Rights Reserved |
32 | 32 | ||
33 | Permission to use, copy, modify, and distribute this software and its | 33 | Permission to use, copy, modify, and distribute this software and its |
34 | documentation for any purpose and without fee is hereby granted, | 34 | documentation for any purpose and without fee is hereby granted, |
35 | provided that the above copyright notice appear in all copies and that | 35 | provided that the above copyright notice appear in all copies and that |
36 | both that copyright notice and this permission notice appear in | 36 | both that copyright notice and this permission notice appear in |
37 | supporting documentation, and that the name of Digital not be | 37 | supporting documentation, and that the name of Digital not be |
38 | used in advertising or publicity pertaining to distribution of the | 38 | used in advertising or publicity pertaining to distribution of the |
39 | software without specific, written prior permission. | 39 | software without specific, written prior permission. |
40 | 40 | ||
41 | DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING | 41 | DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING |
42 | ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL | 42 | ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL |
diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c index 7249e01cec..19de8249b2 100644 --- a/src/lib/evas/filters/evas_filter_parser.c +++ b/src/lib/evas/filters/evas_filter_parser.c | |||
@@ -1414,7 +1414,7 @@ _curve_instruction_prepare(Evas_Filter_Program *pgm, Evas_Filter_Instruction *in | |||
1414 | param->allow_any_string = EINA_TRUE; | 1414 | param->allow_any_string = EINA_TRUE; |
1415 | } | 1415 | } |
1416 | } | 1416 | } |
1417 | 1417 | ||
1418 | _instruction_param_seq_add(instr, "interpolation", VT_STRING, "linear"); | 1418 | _instruction_param_seq_add(instr, "interpolation", VT_STRING, "linear"); |
1419 | _instruction_param_seq_add(instr, "channel", VT_STRING, "rgb"); | 1419 | _instruction_param_seq_add(instr, "channel", VT_STRING, "rgb"); |
1420 | _instruction_param_name_add(instr, "src", VT_BUFFER, _buffer_get(pgm, "input")); | 1420 | _instruction_param_name_add(instr, "src", VT_BUFFER, _buffer_get(pgm, "input")); |
diff --git a/src/lib/evas/include/evas_blend_ops.h b/src/lib/evas/include/evas_blend_ops.h index e66d571da1..45cd3744cd 100644 --- a/src/lib/evas/include/evas_blend_ops.h +++ b/src/lib/evas/include/evas_blend_ops.h | |||
@@ -198,7 +198,7 @@ extern const DATA32 ALPHA_256; | |||
198 | 198 | ||
199 | /* copy 32bit value to lower bits of register reg */ | 199 | /* copy 32bit value to lower bits of register reg */ |
200 | #define VMOV_M2R_NEON(reg, value) \ | 200 | #define VMOV_M2R_NEON(reg, value) \ |
201 | __asm__ __volatile__("vmov.32 " #reg "[0], %[val] \n\t" :: [val] "r" (value) : #reg); | 201 | __asm__ __volatile__("vmov.32 " #reg "[0], %[val] \n\t" :: [val] "r" (value) : #reg); |
202 | 202 | ||
203 | /* save 32bit value from lower 64 bits of register regq to memory location */ | 203 | /* save 32bit value from lower 64 bits of register regq to memory location */ |
204 | /* pointed to by pointer, using 64bit register regd as temporary location */ | 204 | /* pointed to by pointer, using 64bit register regd as temporary location */ |
@@ -212,7 +212,7 @@ extern const DATA32 ALPHA_256; | |||
212 | 212 | ||
213 | /* spread value in register reg */ | 213 | /* spread value in register reg */ |
214 | #define VDUP_NEON(reg, value) \ | 214 | #define VDUP_NEON(reg, value) \ |
215 | __asm__ __volatile__("vdup.16 " #reg ", %[val] \n\t" :: [val] "r" (value) : #reg); | 215 | __asm__ __volatile__("vdup.16 " #reg ", %[val] \n\t" :: [val] "r" (value) : #reg); |
216 | 216 | ||
217 | /* interleave contents of reg1 and reg2 */ | 217 | /* interleave contents of reg1 and reg2 */ |
218 | #define VZIP_NEON(reg1, reg2) \ | 218 | #define VZIP_NEON(reg1, reg2) \ |