summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2020-06-20 09:54:26 +0000
committerStefan Schmidt <s.schmidt@samsung.com>2020-06-23 10:31:36 +0200
commit47b71d898ea522e60ca83567d7b68fbc0b9aaf82 (patch)
tree462c07e3b767c96d23edfc91465d00b5b82a46c8 /src/modules
parentc7da405ae74dd1229a679f535e703c951bdaaac3 (diff)
Get rid of trailing whitespaces (13 / 14)
Remove trailing whitespaces Differential Revision: https://phab.enlightenment.org/D12012
Diffstat (limited to '')
-rw-r--r--src/modules/ecore_evas/engines/extn/ecore_evas_extn.c2
-rw-r--r--src/modules/ecore_evas/engines/extn/ecore_evas_extn_buf.c2
-rw-r--r--src/modules/ecore_imf/wayland/wayland_imcontext.c36
-rw-r--r--src/modules/ecore_imf/wayland/wayland_module.c4
-rw-r--r--src/modules/eina/mp/chained_pool/eina_chained_mempool.c2
-rw-r--r--src/modules/eina/mp/one_big/eina_one_big.c4
-rw-r--r--src/modules/emotion/gstreamer1/emotion_sink.c2
-rw-r--r--src/modules/ethumb/emotion/emotion.c4
-rw-r--r--src/modules/evas/engines/buffer/evas_outbuf.c8
-rw-r--r--src/modules/evas/engines/drm/evas_outbuf.c16
-rw-r--r--src/modules/evas/engines/fb/evas_fb_main.c52
-rw-r--r--src/modules/evas/engines/fb/evas_outbuf.c4
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c8
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_core_private.h2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_font.c2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_image.c10
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c4
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_texture.c6
-rw-r--r--src/modules/evas/engines/gl_drm/evas_engine.h4
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c4
-rw-r--r--src/modules/evas/engines/gl_x11/evas_x_main.c2
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c2
-rw-r--r--src/modules/evas/engines/software_x11/Evas_Engine_Software_X11.h2
-rw-r--r--src/modules/evas/engines/software_x11/evas_engine.h10
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.h2
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_wl_main.c28
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.c2
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.h2
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_outbuf.c32
-rw-r--r--src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c6
-rw-r--r--src/modules/evas/image_loaders/gif/evas_image_load_gif.c28
-rw-r--r--src/modules/evas/image_loaders/ico/evas_image_load_ico.c2
-rw-r--r--src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c4
-rw-r--r--src/modules/evas/image_loaders/psd/evas_image_load_psd.c2
-rw-r--r--src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c2
-rw-r--r--src/modules/evas/image_savers/png/evas_image_save_png.c2
-rw-r--r--src/modules/evas/image_savers/tiff/evas_image_save_tiff.c2
-rw-r--r--src/modules/evas/vg_loaders/svg/evas_vg_load_svg.c2
38 files changed, 154 insertions, 154 deletions
diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
index 28f743ae71..e7d3e298a9 100644
--- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
+++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
@@ -1030,7 +1030,7 @@ _ipc_server_data(void *data, int type EINA_UNUSED, void *event)
1030 Ipc_Data_Update *ipc; 1030 Ipc_Data_Update *ipc;
1031 int n = e->response; 1031 int n = e->response;
1032 1032
1033 /* b->lockfd is not enough to ensure the size is same 1033 /* b->lockfd is not enough to ensure the size is same
1034 * between what server knows, and client knows. 1034 * between what server knows, and client knows.
1035 * So should check file lock also. */ 1035 * So should check file lock also. */
1036 if ((n >= 0) && (n < NBUF)) 1036 if ((n >= 0) && (n < NBUF))
diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn_buf.c b/src/modules/ecore_evas/engines/extn/ecore_evas_extn_buf.c
index 986dde06ff..055e744c6f 100644
--- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn_buf.c
+++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn_buf.c
@@ -86,7 +86,7 @@ _extnbuf_free(Extnbuf *b)
86 if (b->file) shm_unlink(b->file); 86 if (b->file) shm_unlink(b->file);
87 if (b->lock) unlink(b->lock); 87 if (b->lock) unlink(b->lock);
88 } 88 }
89 89
90 if (b->addr != MAP_FAILED) munmap(b->addr, b->size); 90 if (b->addr != MAP_FAILED) munmap(b->addr, b->size);
91 if (b->fd >= 0) close(b->fd); 91 if (b->fd >= 0) close(b->fd);
92 if (b->lockfd >= 0) close(b->lockfd); 92 if (b->lockfd >= 0) close(b->lockfd);
diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index 70781fb93e..404c413fcb 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -134,7 +134,7 @@ update_state(WaylandIMContext *imcontext)
134 ecore_evas_geometry_get(ee, &canvas_x, &canvas_y, NULL, NULL); 134 ecore_evas_geometry_get(ee, &canvas_x, &canvas_y, NULL, NULL);
135 } 135 }
136 136
137 EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "canvas (x: %d, y: %d)", 137 EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "canvas (x: %d, y: %d)",
138 canvas_x, canvas_y); 138 canvas_x, canvas_y);
139 139
140 if (imcontext->text_input) 140 if (imcontext->text_input)
@@ -217,7 +217,7 @@ check_serial(WaylandIMContext *imcontext, uint32_t serial)
217{ 217{
218 Ecore_IMF_Preedit_Attr *attr; 218 Ecore_IMF_Preedit_Attr *attr;
219 219
220 if ((imcontext->serial - serial) > 220 if ((imcontext->serial - serial) >
221 (imcontext->serial - imcontext->reset_serial)) 221 (imcontext->serial - imcontext->reset_serial))
222 { 222 {
223 EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, 223 EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom,
@@ -288,7 +288,7 @@ text_input_commit_string(void *data,
288 text, 288 text,
289 imcontext->preedit_text ? imcontext->preedit_text : ""); 289 imcontext->preedit_text ? imcontext->preedit_text : "");
290 290
291 old_preedit = 291 old_preedit =
292 imcontext->preedit_text && strlen(imcontext->preedit_text) > 0; 292 imcontext->preedit_text && strlen(imcontext->preedit_text) > 0;
293 293
294 if (!imcontext->ctx) 294 if (!imcontext->ctx)
@@ -299,7 +299,7 @@ text_input_commit_string(void *data,
299 299
300 if (old_preedit) 300 if (old_preedit)
301 { 301 {
302 ecore_imf_context_event_callback_call(imcontext->ctx, 302 ecore_imf_context_event_callback_call(imcontext->ctx,
303 ECORE_IMF_CALLBACK_PREEDIT_END, 303 ECORE_IMF_CALLBACK_PREEDIT_END,
304 NULL); 304 NULL);
305 } 305 }
@@ -309,7 +309,7 @@ text_input_commit_string(void *data,
309 if (imcontext->pending_commit.delete_length > 0) 309 if (imcontext->pending_commit.delete_length > 0)
310 { 310 {
311 /* cursor_pos is a byte index */ 311 /* cursor_pos is a byte index */
312 if (ecore_imf_context_surrounding_get(imcontext->ctx, &surrounding, 312 if (ecore_imf_context_surrounding_get(imcontext->ctx, &surrounding,
313 &cursor_pos)) 313 &cursor_pos))
314 { 314 {
315 ev.ctx = imcontext->ctx; 315 ev.ctx = imcontext->ctx;
@@ -358,8 +358,8 @@ commit_preedit(WaylandIMContext *imcontext)
358 ecore_imf_context_event_callback_call(imcontext->ctx, 358 ecore_imf_context_event_callback_call(imcontext->ctx,
359 ECORE_IMF_CALLBACK_PREEDIT_END, NULL); 359 ECORE_IMF_CALLBACK_PREEDIT_END, NULL);
360 360
361 ecore_imf_context_event_callback_call(imcontext->ctx, 361 ecore_imf_context_event_callback_call(imcontext->ctx,
362 ECORE_IMF_CALLBACK_COMMIT, 362 ECORE_IMF_CALLBACK_COMMIT,
363 (void *)imcontext->preedit_commit); 363 (void *)imcontext->preedit_commit);
364} 364}
365 365
@@ -436,14 +436,14 @@ text_input_preedit_string(void *data,
436 if (!check_serial(imcontext, serial)) 436 if (!check_serial(imcontext, serial))
437 return; 437 return;
438 438
439 old_preedit = 439 old_preedit =
440 imcontext->preedit_text && strlen(imcontext->preedit_text) > 0; 440 imcontext->preedit_text && strlen(imcontext->preedit_text) > 0;
441 441
442 clear_preedit(imcontext); 442 clear_preedit(imcontext);
443 443
444 imcontext->preedit_text = strdup(text); 444 imcontext->preedit_text = strdup(text);
445 imcontext->preedit_commit = strdup(commit); 445 imcontext->preedit_commit = strdup(commit);
446 imcontext->preedit_cursor = 446 imcontext->preedit_cursor =
447 utf8_offset_to_characters(text, imcontext->pending_preedit.cursor); 447 utf8_offset_to_characters(text, imcontext->pending_preedit.cursor);
448 imcontext->preedit_attrs = imcontext->pending_preedit.attrs; 448 imcontext->preedit_attrs = imcontext->pending_preedit.attrs;
449 449
@@ -451,19 +451,19 @@ text_input_preedit_string(void *data,
451 451
452 if (!old_preedit) 452 if (!old_preedit)
453 { 453 {
454 ecore_imf_context_event_callback_call(imcontext->ctx, 454 ecore_imf_context_event_callback_call(imcontext->ctx,
455 ECORE_IMF_CALLBACK_PREEDIT_START, 455 ECORE_IMF_CALLBACK_PREEDIT_START,
456 NULL); 456 NULL);
457 } 457 }
458 458
459 ecore_imf_context_event_callback_call(imcontext->ctx, 459 ecore_imf_context_event_callback_call(imcontext->ctx,
460 ECORE_IMF_CALLBACK_PREEDIT_CHANGED, 460 ECORE_IMF_CALLBACK_PREEDIT_CHANGED,
461 NULL); 461 NULL);
462 462
463 if (imcontext->preedit_text && strlen(imcontext->preedit_text) == 0) 463 if (imcontext->preedit_text && strlen(imcontext->preedit_text) == 0)
464 { 464 {
465 ecore_imf_context_event_callback_call(imcontext->ctx, 465 ecore_imf_context_event_callback_call(imcontext->ctx,
466 ECORE_IMF_CALLBACK_PREEDIT_END, 466 ECORE_IMF_CALLBACK_PREEDIT_END,
467 NULL); 467 NULL);
468 } 468 }
469} 469}
@@ -530,7 +530,7 @@ text_input_preedit_styling(void *data,
530 attr->start_index = index; 530 attr->start_index = index;
531 attr->end_index = index + length; 531 attr->end_index = index + length;
532 532
533 imcontext->pending_preedit.attrs = 533 imcontext->pending_preedit.attrs =
534 eina_list_append(imcontext->pending_preedit.attrs, attr); 534 eina_list_append(imcontext->pending_preedit.attrs, attr);
535} 535}
536 536
@@ -737,10 +737,10 @@ wayland_im_context_add(Ecore_IMF_Context *ctx)
737 737
738 imcontext->ctx = ctx; 738 imcontext->ctx = ctx;
739 739
740 imcontext->text_input = 740 imcontext->text_input =
741 zwp_text_input_manager_v1_create_text_input(imcontext->text_input_manager); 741 zwp_text_input_manager_v1_create_text_input(imcontext->text_input_manager);
742 if (imcontext->text_input) 742 if (imcontext->text_input)
743 zwp_text_input_v1_add_listener(imcontext->text_input, 743 zwp_text_input_v1_add_listener(imcontext->text_input,
744 &text_input_listener, imcontext); 744 &text_input_listener, imcontext);
745} 745}
746 746
diff --git a/src/modules/ecore_imf/wayland/wayland_module.c b/src/modules/ecore_imf/wayland/wayland_module.c
index 1f3d21a8a2..6cc3779ae0 100644
--- a/src/modules/ecore_imf/wayland/wayland_module.c
+++ b/src/modules/ecore_imf/wayland/wayland_module.c
@@ -153,7 +153,7 @@ im_module_init(void)
153{ 153{
154 const char *s; 154 const char *s;
155 155
156 _ecore_imf_wayland_log_dom = 156 _ecore_imf_wayland_log_dom =
157 eina_log_domain_register("ecore_imf_wayland", EINA_COLOR_YELLOW); 157 eina_log_domain_register("ecore_imf_wayland", EINA_COLOR_YELLOW);
158 158
159 if (!getenv("WAYLAND_DISPLAY")) return EINA_FALSE; 159 if (!getenv("WAYLAND_DISPLAY")) return EINA_FALSE;
@@ -168,7 +168,7 @@ im_module_init(void)
168 ewd = ecore_wl2_display_connect(NULL); 168 ewd = ecore_wl2_display_connect(NULL);
169 if (!ewd) goto err; 169 if (!ewd) goto err;
170 170
171 ecore_imf_module_register(&wayland_im_info, im_module_create, 171 ecore_imf_module_register(&wayland_im_info, im_module_create,
172 im_module_exit); 172 im_module_exit);
173 EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module initialized"); 173 EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module initialized");
174 174
diff --git a/src/modules/eina/mp/chained_pool/eina_chained_mempool.c b/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
index 853457b684..e9f8b8d326 100644
--- a/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
+++ b/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
@@ -220,7 +220,7 @@ _eina_chained_mempool_free_in(Chained_Mempool *pool, Chained_Pool *p, void *ptr)
220{ 220{
221#ifdef DEBUG 221#ifdef DEBUG
222 void *pmem; 222 void *pmem;
223 223
224 // pool mem base 224 // pool mem base
225 pmem = (void *)(((unsigned char *)p) + sizeof(Chained_Pool)); 225 pmem = (void *)(((unsigned char *)p) + sizeof(Chained_Pool));
226 226
diff --git a/src/modules/eina/mp/one_big/eina_one_big.c b/src/modules/eina/mp/one_big/eina_one_big.c
index 50edfaab7b..936f23b4d1 100644
--- a/src/modules/eina/mp/one_big/eina_one_big.c
+++ b/src/modules/eina/mp/one_big/eina_one_big.c
@@ -411,7 +411,7 @@ eina_one_big_shutdown(void *data)
411// mempool is cleaning up the mess created. be quiet for now as we were before 411// mempool is cleaning up the mess created. be quiet for now as we were before
412// but edje seems to be a big offender at the moment! bad cedric! :) 412// but edje seems to be a big offender at the moment! bad cedric! :)
413// WRN( 413// WRN(
414// "Pool [%s] over by %i. cleaning up for you", 414// "Pool [%s] over by %i. cleaning up for you",
415// pool->name, pool->over); 415// pool->name, pool->over);
416 while (pool->over_list) 416 while (pool->over_list)
417 { 417 {
@@ -425,7 +425,7 @@ eina_one_big_shutdown(void *data)
425 if (pool->over > 0) 425 if (pool->over > 0)
426 { 426 {
427 WRN( 427 WRN(
428 "Pool [%s] still over by %i\n", 428 "Pool [%s] still over by %i\n",
429 pool->name, pool->over); 429 pool->name, pool->over);
430 } 430 }
431 431
diff --git a/src/modules/emotion/gstreamer1/emotion_sink.c b/src/modules/emotion/gstreamer1/emotion_sink.c
index 2bd91359ac..30f9afc4d5 100644
--- a/src/modules/emotion/gstreamer1/emotion_sink.c
+++ b/src/modules/emotion/gstreamer1/emotion_sink.c
@@ -6,7 +6,7 @@
6 6
7static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE("sink", 7static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE("sink",
8 GST_PAD_SINK, GST_PAD_ALWAYS, 8 GST_PAD_SINK, GST_PAD_ALWAYS,
9 GST_STATIC_CAPS(GST_VIDEO_CAPS_MAKE("{ I420, YV12, YUY2, NV12, BGRx, BGR, BGRA }"))); 9 GST_STATIC_CAPS(GST_VIDEO_CAPS_MAKE("{ I420, YV12, YUY2, NV12, BGRx, BGR, BGRA }")));
10 10
11GST_DEBUG_CATEGORY_STATIC(emotion_video_sink_debug); 11GST_DEBUG_CATEGORY_STATIC(emotion_video_sink_debug);
12#define GST_CAT_DEFAULT emotion_video_sink_debug 12#define GST_CAT_DEFAULT emotion_video_sink_debug
diff --git a/src/modules/ethumb/emotion/emotion.c b/src/modules/ethumb/emotion/emotion.c
index bc343df802..ccad1c9074 100644
--- a/src/modules/ethumb/emotion/emotion.c
+++ b/src/modules/ethumb/emotion/emotion.c
@@ -122,10 +122,10 @@ _video_pos_set(struct _emotion_plugin *_plugin)
122 _plugin->first = EINA_TRUE; 122 _plugin->first = EINA_TRUE;
123 123
124 if ((pos <= 0) || (pos >= 1)) 124 if ((pos <= 0) || (pos >= 1))
125 _plugin->pi = (0.1 * _plugin->len) + 125 _plugin->pi = (0.1 * _plugin->len) +
126 (_plugin->pcount * _plugin->len * interval); 126 (_plugin->pcount * _plugin->len * interval);
127 else 127 else
128 _plugin->pi = (pos * _plugin->len) + 128 _plugin->pi = (pos * _plugin->len) +
129 (_plugin->pcount * _plugin->len * interval); 129 (_plugin->pcount * _plugin->len * interval);
130 130
131 emotion_object_position_set(_plugin->video, _plugin->pi); 131 emotion_object_position_set(_plugin->video, _plugin->pi);
diff --git a/src/modules/evas/engines/buffer/evas_outbuf.c b/src/modules/evas/engines/buffer/evas_outbuf.c
index a8dd3d0efe..545ff096ed 100644
--- a/src/modules/evas/engines/buffer/evas_outbuf.c
+++ b/src/modules/evas/engines/buffer/evas_outbuf.c
@@ -296,7 +296,7 @@ evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int
296 if (!buf->priv.back_buf) 296 if (!buf->priv.back_buf)
297 { 297 {
298 Gfx_Func_Copy func; 298 Gfx_Func_Copy func;
299 299
300 func = evas_common_draw_func_copy_get(w, 0); 300 func = evas_common_draw_func_copy_get(w, 0);
301 if (func) 301 if (func)
302 { 302 {
@@ -306,7 +306,7 @@ evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int
306 dst = (DATA32 *)((DATA8 *)(buf->dest) + ((y + yy) * row_bytes)); 306 dst = (DATA32 *)((DATA8 *)(buf->dest) + ((y + yy) * row_bytes));
307 func(src, dst, w); 307 func(src, dst, w);
308 } 308 }
309 309
310 } 310 }
311 } 311 }
312 if (buf->func.free_update_region) 312 if (buf->func.free_update_region)
@@ -320,7 +320,7 @@ evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int
320 DATA32 *src, *dst; 320 DATA32 *src, *dst;
321 DATA8 *dest; 321 DATA8 *dest;
322 int xx, yy, row_bytes; 322 int xx, yy, row_bytes;
323 323
324 row_bytes = buf->dest_row_bytes; 324 row_bytes = buf->dest_row_bytes;
325 dest = (DATA8 *)(buf->dest) + (y * row_bytes) + (x * 4); 325 dest = (DATA8 *)(buf->dest) + (y * row_bytes) + (x * 4);
326 if (buf->func.new_update_region) 326 if (buf->func.new_update_region)
@@ -351,7 +351,7 @@ evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int
351 DATA32 *src, *dst; 351 DATA32 *src, *dst;
352 DATA8 *dest; 352 DATA8 *dest;
353 int xx, yy, row_bytes; 353 int xx, yy, row_bytes;
354 354
355 row_bytes = buf->dest_row_bytes; 355 row_bytes = buf->dest_row_bytes;
356 dest = (DATA8 *)(buf->dest) + (y * row_bytes) + (x * 4); 356 dest = (DATA8 *)(buf->dest) + (y * row_bytes) + (x * 4);
357 if (buf->func.new_update_region) 357 if (buf->func.new_update_region)
diff --git a/src/modules/evas/engines/drm/evas_outbuf.c b/src/modules/evas/engines/drm/evas_outbuf.c
index 1f22ae7faa..055275758f 100644
--- a/src/modules/evas/engines/drm/evas_outbuf.c
+++ b/src/modules/evas/engines/drm/evas_outbuf.c
@@ -369,15 +369,15 @@ _outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w,
369 369
370 if ((ob->rotation == 0) || (ob->rotation == 180)) 370 if ((ob->rotation == 0) || (ob->rotation == 180))
371 { 371 {
372 func = 372 func =
373 evas_common_convert_func_get(0, w, h, ob->bpp, 373 evas_common_convert_func_get(0, w, h, ob->bpp,
374 RED_MASK, GREEN_MASK, BLUE_MASK, 374 RED_MASK, GREEN_MASK, BLUE_MASK,
375 PAL_MODE_NONE, ob->rotation); 375 PAL_MODE_NONE, ob->rotation);
376 } 376 }
377 else if ((ob->rotation == 90) || (ob->rotation == 270)) 377 else if ((ob->rotation == 90) || (ob->rotation == 270))
378 { 378 {
379 func = 379 func =
380 evas_common_convert_func_get(0, h, w, ob->bpp, 380 evas_common_convert_func_get(0, h, w, ob->bpp,
381 RED_MASK, GREEN_MASK, BLUE_MASK, 381 RED_MASK, GREEN_MASK, BLUE_MASK,
382 PAL_MODE_NONE, ob->rotation); 382 PAL_MODE_NONE, ob->rotation);
383 } 383 }
@@ -429,7 +429,7 @@ _outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w,
429 429
430 if (ob->rotation == 0) 430 if (ob->rotation == 0)
431 { 431 {
432 RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, 432 RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h,
433 0, 0, bw, bh); 433 0, 0, bw, bh);
434 dst += (bpl * rect.y) + (rect.x * bpp); 434 dst += (bpl * rect.y) + (rect.x * bpp);
435 w -= rx; 435 w -= rx;
@@ -437,7 +437,7 @@ _outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w,
437 else if (ob->rotation == 180) 437 else if (ob->rotation == 180)
438 { 438 {
439 pr = rect; 439 pr = rect;
440 RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, 440 RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h,
441 0, 0, bw, bh); 441 0, 0, bw, bh);
442 rx = pr.w - rect.w; 442 rx = pr.w - rect.w;
443 ry = pr.h - rect.h; 443 ry = pr.h - rect.h;
@@ -447,7 +447,7 @@ _outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w,
447 else if (ob->rotation == 90) 447 else if (ob->rotation == 90)
448 { 448 {
449 pr = rect; 449 pr = rect;
450 RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, 450 RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h,
451 0, 0, bw, bh); 451 0, 0, bw, bh);
452 rx = pr.w - rect.w; ry = pr.h - rect.h; 452 rx = pr.w - rect.w; ry = pr.h - rect.h;
453 src += ry; 453 src += ry;
@@ -456,7 +456,7 @@ _outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w,
456 else if (ob->rotation == 270) 456 else if (ob->rotation == 270)
457 { 457 {
458 pr = rect; 458 pr = rect;
459 RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, 459 RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h,
460 0, 0, bw, bh); 460 0, 0, bw, bh);
461 rx = pr.w - rect.w; ry = pr.h - rect.h; 461 rx = pr.w - rect.w; ry = pr.h - rect.h;
462 src += (update->cache_entry.w * rx); 462 src += (update->cache_entry.w * rx);
diff --git a/src/modules/evas/engines/fb/evas_fb_main.c b/src/modules/evas/engines/fb/evas_fb_main.c
index 5690c83801..5cbec46616 100644
--- a/src/modules/evas/engines/fb/evas_fb_main.c
+++ b/src/modules/evas/engines/fb/evas_fb_main.c
@@ -268,15 +268,15 @@ static void
268fb_init_palette_332(FB_Mode *mode) 268fb_init_palette_332(FB_Mode *mode)
269{ 269{
270 int r, g, b, i; 270 int r, g, b, i;
271 271
272 if (mode->fb_var.bits_per_pixel != 8) 272 if (mode->fb_var.bits_per_pixel != 8)
273 return; 273 return;
274 i = 0; 274 i = 0;
275 275
276 if (ioctl(fb, FBIOGETCMAP, &cmap) == -1) 276 if (ioctl(fb, FBIOGETCMAP, &cmap) == -1)
277 ERR("could not get colormap: ioctl(%d, FBIOGETCMAP) = %s", 277 ERR("could not get colormap: ioctl(%d, FBIOGETCMAP) = %s",
278 fb, strerror(errno)); 278 fb, strerror(errno));
279 279
280 /* generate the palette */ 280 /* generate the palette */
281 for (r = 0; r < 8; r++) 281 for (r = 0; r < 8; r++)
282 { 282 {
@@ -285,7 +285,7 @@ fb_init_palette_332(FB_Mode *mode)
285 for (b = 0; b < 4; b++) 285 for (b = 0; b < 4; b++)
286 { 286 {
287 int val; 287 int val;
288 288
289 val = (r << 5) | (r << 2) | (r >> 1); 289 val = (r << 5) | (r << 2) | (r >> 1);
290 red[i] = (val << 8) | val; 290 red[i] = (val << 8) | val;
291 val = (g << 5) | (g << 2) | (g >> 1); 291 val = (g << 5) | (g << 2) | (g >> 1);
@@ -296,7 +296,7 @@ fb_init_palette_332(FB_Mode *mode)
296 } 296 }
297 } 297 }
298 } 298 }
299 299
300 /* set colormap */ 300 /* set colormap */
301 if (ioctl(fb, FBIOPUTCMAP, &cmap) == -1) 301 if (ioctl(fb, FBIOPUTCMAP, &cmap) == -1)
302 { 302 {
@@ -312,14 +312,14 @@ static void
312fb_init_palette_linear(FB_Mode *mode) 312fb_init_palette_linear(FB_Mode *mode)
313{ 313{
314 int i; 314 int i;
315 315
316 if (mode->fb_var.bits_per_pixel != 8) 316 if (mode->fb_var.bits_per_pixel != 8)
317 return; 317 return;
318 318
319 if (ioctl(fb, FBIOGETCMAP, &cmap) == -1) 319 if (ioctl(fb, FBIOGETCMAP, &cmap) == -1)
320 ERR("could not get colormap: ioctl(%d, FBIOGETCMAP) = %s", 320 ERR("could not get colormap: ioctl(%d, FBIOGETCMAP) = %s",
321 fb, strerror(errno)); 321 fb, strerror(errno));
322 322
323 /* generate the palette */ 323 /* generate the palette */
324 for (i = 0; i < 256; i++) 324 for (i = 0; i < 256; i++)
325 red[i] = (i << 8) | i; 325 red[i] = (i << 8) | i;
@@ -327,7 +327,7 @@ fb_init_palette_linear(FB_Mode *mode)
327 green[i] = (i << 8) | i; 327 green[i] = (i << 8) | i;
328 for (i = 0; i < 256; i++) 328 for (i = 0; i < 256; i++)
329 blue[i] = (i << 8) | i; 329 blue[i] = (i << 8) | i;
330 330
331 /* set colormap */ 331 /* set colormap */
332 if (ioctl(fb, FBIOPUTCMAP, &cmap) == -1) 332 if (ioctl(fb, FBIOPUTCMAP, &cmap) == -1)
333 perror("ioctl FBIOPUTCMAP"); 333 perror("ioctl FBIOPUTCMAP");
@@ -343,7 +343,7 @@ fb_list_modes(unsigned int *num_return)
343 char line[256], label[256], value[256]; 343 char line[256], label[256], value[256];
344 FB_Mode *modes = NULL, *temp; 344 FB_Mode *modes = NULL, *temp;
345 int num; 345 int num;
346 346
347 num = 0; 347 num = 0;
348 f = fopen("/etc/fb.modes","rb"); 348 f = fopen("/etc/fb.modes","rb");
349 if (!f) 349 if (!f)
@@ -356,14 +356,14 @@ fb_list_modes(unsigned int *num_return)
356 if (sscanf(line, "mode \"%250[^\"]\"", label) == 1) 356 if (sscanf(line, "mode \"%250[^\"]\"", label) == 1)
357 { 357 {
358 char f1[32], f2[32], f3[32], f4[32]; 358 char f1[32], f2[32], f3[32], f4[32];
359 359
360 f1[0] = 0; f2[0] = 0; f3[0] = 0; f4[0] = 0; 360 f1[0] = 0; f2[0] = 0; f3[0] = 0; f4[0] = 0;
361 sscanf(label, "%30[^x]x%30[^-]-%30[^-]-%30s", f1, f2, f3, f4); 361 sscanf(label, "%30[^x]x%30[^-]-%30[^-]-%30s", f1, f2, f3, f4);
362 if ((f1[0]) && (f2[0])) 362 if ((f1[0]) && (f2[0]))
363 { 363 {
364 int geometry = 0; 364 int geometry = 0;
365 int timings = 0; 365 int timings = 0;
366 366
367 num++; 367 num++;
368 temp = modes; 368 temp = modes;
369 modes = realloc(modes, num * sizeof(FB_Mode)); 369 modes = realloc(modes, num * sizeof(FB_Mode));
@@ -385,7 +385,7 @@ fb_list_modes(unsigned int *num_return)
385 while ((fgets(line, sizeof(line) - 1, f)) && 385 while ((fgets(line, sizeof(line) - 1, f)) &&
386 (!strstr(line, "endmode"))) 386 (!strstr(line, "endmode")))
387 { 387 {
388 388
389 if (sscanf(line," geometry %i %i %i %i %i", 389 if (sscanf(line," geometry %i %i %i %i %i",
390 &modes[num - 1].fb_var.xres, 390 &modes[num - 1].fb_var.xres,
391 &modes[num - 1].fb_var.yres, 391 &modes[num - 1].fb_var.yres,
@@ -468,7 +468,7 @@ fb_setmode(unsigned int width, unsigned int height, unsigned int pdepth, unsigne
468{ 468{
469 FB_Mode *modes; 469 FB_Mode *modes;
470 unsigned int i, num_modes; 470 unsigned int i, num_modes;
471 471
472 modes = fb_list_modes(&num_modes); 472 modes = fb_list_modes(&num_modes);
473 DBG("want %ux%u, bitdepth=%u, refresh=%u, modes=%p, num_modes=%u", 473 DBG("want %ux%u, bitdepth=%u, refresh=%u, modes=%p, num_modes=%u",
474 width, height, pdepth, refresh, modes, num_modes); 474 width, height, pdepth, refresh, modes, num_modes);
@@ -521,7 +521,7 @@ fb_changeres(FB_Mode *cur_mode, unsigned int width, unsigned int height, unsigne
521{ 521{
522 FB_Mode *modes; 522 FB_Mode *modes;
523 unsigned int i, num_modes; 523 unsigned int i, num_modes;
524 524
525 modes = fb_list_modes(&num_modes); 525 modes = fb_list_modes(&num_modes);
526 DBG("want %ux%u, bitdepth=%u, refresh=%u, modes=%p, num_modes=%u", 526 DBG("want %ux%u, bitdepth=%u, refresh=%u, modes=%p, num_modes=%u",
527 width, height, cur_mode->depth, refresh, modes, num_modes); 527 width, height, cur_mode->depth, refresh, modes, num_modes);
@@ -567,7 +567,7 @@ fb_changemode(FB_Mode *cur_mode, unsigned int width, unsigned int height, unsign
567{ 567{
568 FB_Mode *modes; 568 FB_Mode *modes;
569 unsigned int i, num_modes; 569 unsigned int i, num_modes;
570 570
571 modes = fb_list_modes(&num_modes); 571 modes = fb_list_modes(&num_modes);
572 DBG("want %ux%u, bitdepth=%u, refresh=%u, modes=%p, num_modes=%u", 572 DBG("want %ux%u, bitdepth=%u, refresh=%u, modes=%p, num_modes=%u",
573 width, height, pdepth, refresh, modes, num_modes); 573 width, height, pdepth, refresh, modes, num_modes);
@@ -614,10 +614,10 @@ fb_getmode(void)
614{ 614{
615 FB_Mode *mode = NULL; 615 FB_Mode *mode = NULL;
616 int hpix, lines, clockrate; 616 int hpix, lines, clockrate;
617 617
618 mode = malloc(sizeof(FB_Mode)); 618 mode = malloc(sizeof(FB_Mode));
619 /* look what we have now ... */ 619 /* look what we have now ... */
620 620
621 if (ioctl(fb, FBIOGET_VSCREENINFO, &mode->fb_var) == -1) 621 if (ioctl(fb, FBIOGET_VSCREENINFO, &mode->fb_var) == -1)
622 { 622 {
623 ERR("could not get screeninfo: ioctl(%d, FBIOGET_VSCREENINFO) = %s", 623 ERR("could not get screeninfo: ioctl(%d, FBIOGET_VSCREENINFO) = %s",
@@ -711,7 +711,7 @@ fb_setvt(int vtno)
711 struct vt_stat vts; 711 struct vt_stat vts;
712 char vtname[32]; 712 char vtname[32];
713 int vtfd; 713 int vtfd;
714 714
715 if (vtno < 0) 715 if (vtno < 0)
716 { 716 {
717 if ((ioctl(tty,VT_OPENQRY, &vtno) == -1)) 717 if ((ioctl(tty,VT_OPENQRY, &vtno) == -1))
@@ -737,14 +737,14 @@ fb_setvt(int vtno)
737 return; 737 return;
738 } 738 }
739 vtfd = open(vtname,O_RDWR); 739 vtfd = open(vtname,O_RDWR);
740 740
741 if (ioctl(tty, VT_GETSTATE, &vts) == -1) 741 if (ioctl(tty, VT_GETSTATE, &vts) == -1)
742 { 742 {
743 perror("ioctl VT_GETSTATE"); 743 perror("ioctl VT_GETSTATE");
744 close(vtfd); 744 close(vtfd);
745 return; 745 return;
746 } 746 }
747 747
748 orig_vt_no = vts.v_active; 748 orig_vt_no = vts.v_active;
749 close(vtfd); 749 close(vtfd);
750#if 0 750#if 0
@@ -799,7 +799,7 @@ fb_init(int vt EINA_UNUSED, int device)
799 return; 799 return;
800 } 800 }
801 DBG("opened fb=%d (%s)", fb, dev); 801 DBG("opened fb=%d (%s)", fb, dev);
802 802
803 if (ioctl(fb, FBIOGET_VSCREENINFO, &fb_ovar) == -1) 803 if (ioctl(fb, FBIOGET_VSCREENINFO, &fb_ovar) == -1)
804 { 804 {
805 ERR("could not get screeninfo: ioctl(%d, FBIOGET_VSCREENINFO) = %s", 805 ERR("could not get screeninfo: ioctl(%d, FBIOGET_VSCREENINFO) = %s",
@@ -878,7 +878,7 @@ fb_postinit(FB_Mode *mode)
878 fb_cleanup(); 878 fb_cleanup();
879 return -1; 879 return -1;
880 } 880 }
881 881
882 if (fb_fix.type != FB_TYPE_PACKED_PIXELS) 882 if (fb_fix.type != FB_TYPE_PACKED_PIXELS)
883 { 883 {
884 CRI("can handle only packed pixel frame buffers (want %#x, got %#x)", 884 CRI("can handle only packed pixel frame buffers (want %#x, got %#x)",
@@ -919,7 +919,7 @@ fb_postinit(FB_Mode *mode)
919 { 919 {
920 mode->fb_var.xoffset = 0; 920 mode->fb_var.xoffset = 0;
921 mode->fb_var.yoffset = 0; 921 mode->fb_var.yoffset = 0;
922 922
923 if (ioctl(fb, FBIOPAN_DISPLAY, &(mode->fb_var)) == -1) 923 if (ioctl(fb, FBIOPAN_DISPLAY, &(mode->fb_var)) == -1)
924 { 924 {
925 const char *errmsg = strerror(errno); 925 const char *errmsg = strerror(errno);
@@ -998,11 +998,11 @@ fb_cleanup(void)
998 "mode=%hhd, waitv=%hhd, relsig=%hd, acqsig=%hd, frsig=%hd}) = %s", 998 "mode=%hhd, waitv=%hhd, relsig=%hd, acqsig=%hd, frsig=%hd}) = %s",
999 tty, vt_omode.mode, vt_omode.waitv, vt_omode.relsig, 999 tty, vt_omode.mode, vt_omode.waitv, vt_omode.relsig,
1000 vt_omode.acqsig, vt_omode.frsig, strerror(errno)); 1000 vt_omode.acqsig, vt_omode.frsig, strerror(errno));
1001#if 0 1001#if 0
1002 if ((ioctl(tty, VT_ACTIVATE, orig_vt_no) == -1) && (orig_vt_no)) 1002 if ((ioctl(tty, VT_ACTIVATE, orig_vt_no) == -1) && (orig_vt_no))
1003 ERR("could not activate: ioctl(%d, VT_ACTIVATE, %d) = %s", 1003 ERR("could not activate: ioctl(%d, VT_ACTIVATE, %d) = %s",
1004 tty, orig_vt_no, strerror(errno)); 1004 tty, orig_vt_no, strerror(errno));
1005#endif 1005#endif
1006 if (tty > 0) /* don't close if got from isatty(0) */ 1006 if (tty > 0) /* don't close if got from isatty(0) */
1007 close(tty); 1007 close(tty);
1008 } 1008 }
diff --git a/src/modules/evas/engines/fb/evas_outbuf.c b/src/modules/evas/engines/fb/evas_outbuf.c
index 77274289db..77f37b94b3 100644
--- a/src/modules/evas/engines/fb/evas_outbuf.c
+++ b/src/modules/evas/engines/fb/evas_outbuf.c
@@ -300,11 +300,11 @@ evas_fb_outbuf_fb_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, in
300 buf->priv.mask.b, PAL_MODE_NONE, 300 buf->priv.mask.b, PAL_MODE_NONE,
301 buf->rot); 301 buf->rot);
302 } 302 }
303 else if (buf->rot == 180) 303 else if (buf->rot == 180)
304 { 304 {
305 data = (DATA8 *)buf->priv.fb.fb->mem + 305 data = (DATA8 *)buf->priv.fb.fb->mem +
306 buf->priv.fb.fb->mem_offset + 306 buf->priv.fb.fb->mem_offset +
307 buf->priv.fb.fb->bpp * 307 buf->priv.fb.fb->bpp *
308 (buf->w - x - w + ((buf->h - y - h) * buf->priv.fb.fb->stride)); 308 (buf->w - x - w + ((buf->h - y - h) * buf->priv.fb.fb->stride));
309 conv_func = evas_common_convert_func_get(data, w, h, 309 conv_func = evas_common_convert_func_get(data, w, h,
310 buf->priv.fb.fb->fb_var.bits_per_pixel, 310 buf->priv.fb.fb->fb_var.bits_per_pixel,
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 0012065dc1..5b40037560 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -319,7 +319,7 @@ evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn)
319 FINDSYM(glsym_glStartTiling, "glActivateTileQCOM", NULL, glsym_func_void); 319 FINDSYM(glsym_glStartTiling, "glActivateTileQCOM", NULL, glsym_func_void);
320 FINDSYM(glsym_glEndTiling, "glEndTilingQCOM", "GL_QCOM_tiled_rendering", glsym_func_void); 320 FINDSYM(glsym_glEndTiling, "glEndTilingQCOM", "GL_QCOM_tiled_rendering", glsym_func_void);
321 FINDSYM(glsym_glEndTiling, "glEndTiling", NULL, glsym_func_void); 321 FINDSYM(glsym_glEndTiling, "glEndTiling", NULL, glsym_func_void);
322 322
323 if (!getenv("EVAS_GL_MAPBUFFER_DISABLE")) 323 if (!getenv("EVAS_GL_MAPBUFFER_DISABLE"))
324 { 324 {
325 // Not sure there's an EXT variant. (probably no KHR variant) 325 // Not sure there's an EXT variant. (probably no KHR variant)
@@ -2289,7 +2289,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2289 (tex->im->orient == EVAS_IMAGE_ORIENT_90)) 2289 (tex->im->orient == EVAS_IMAGE_ORIENT_90))
2290 { 2290 {
2291 double tmp; 2291 double tmp;
2292 2292
2293 SWAP(&sw, &sh, tmp); 2293 SWAP(&sw, &sh, tmp);
2294 SWAP(&sx, &sy, tmp); 2294 SWAP(&sx, &sy, tmp);
2295 2295
@@ -2333,7 +2333,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2333 2333
2334 SWAP(&sw, &sh, tmp); 2334 SWAP(&sw, &sh, tmp);
2335 SWAP(&sx, &sy, tmp); 2335 SWAP(&sx, &sy, tmp);
2336 2336
2337 sx = tex->im->w - sw - sx; 2337 sx = tex->im->w - sw - sx;
2338 sy = tex->im->h - sh - sy; 2338 sy = tex->im->h - sh - sy;
2339 } 2339 }
@@ -2424,7 +2424,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2424 } 2424 }
2425 2425
2426 PUSH_MASK(pn, mtex, mx, my, mw, mh, masksam); 2426 PUSH_MASK(pn, mtex, mx, my, mw, mh, masksam);
2427 2427
2428 if (!nomul) 2428 if (!nomul)
2429 PUSH_6_COLORS(pn, r, g, b, a); 2429 PUSH_6_COLORS(pn, r, g, b, a);
2430} 2430}
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core_private.h b/src/modules/evas/engines/gl_common/evas_gl_core_private.h
index e6afff639c..a131f9679a 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core_private.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_core_private.h
@@ -342,7 +342,7 @@ struct _EVGL_Engine
342 Eina_List *surfaces; 342 Eina_List *surfaces;
343 Eina_List *contexts; 343 Eina_List *contexts;
344 344
345 //void *engine_data; 345 //void *engine_data;
346 Eina_Hash *safe_extensions; 346 Eina_Hash *safe_extensions;
347}; 347};
348 348
diff --git a/src/modules/evas/engines/gl_common/evas_gl_font.c b/src/modules/evas/engines/gl_common/evas_gl_font.c
index 52e4d4e4a9..53260d971d 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_font.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_font.c
@@ -20,7 +20,7 @@ evas_gl_font_texture_new(void *context, RGBA_Font_Glyph *fg)
20 20
21 // expand to 32bit (4 byte) aligned rows for texture upload 21 // expand to 32bit (4 byte) aligned rows for texture upload
22 nw = ((w + 3) / 4) * 4; 22 nw = ((w + 3) / 4) * 4;
23 // if image already (4 byte) aligned rows then assign old image data to new data(ndata) to 23 // if image already (4 byte) aligned rows then assign old image data to new data(ndata) to
24 if(nw == w){ 24 if(nw == w){
25 ndata = data; 25 ndata = data;
26 } else { 26 } else {
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c b/src/modules/evas/engines/gl_common/evas_gl_image.c
index 41806c1ea6..2d9383305a 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -332,7 +332,7 @@ evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, u
332 if (((int)w > gc->shared->info.max_texture_size) || 332 if (((int)w > gc->shared->info.max_texture_size) ||
333 ((int)h > gc->shared->info.max_texture_size)) 333 ((int)h > gc->shared->info.max_texture_size))
334 return NULL; 334 return NULL;
335 335
336 if (data) 336 if (data)
337 { 337 {
338 EINA_LIST_FOREACH(gc->shared->images, l, im) 338 EINA_LIST_FOREACH(gc->shared->images, l, im)
@@ -399,7 +399,7 @@ evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, unsigned i
399 if (((int)w > gc->shared->info.max_texture_size) || 399 if (((int)w > gc->shared->info.max_texture_size) ||
400 ((int)h > gc->shared->info.max_texture_size)) 400 ((int)h > gc->shared->info.max_texture_size))
401 return NULL; 401 return NULL;
402 402
403 im = calloc(1, sizeof(Evas_GL_Image)); 403 im = calloc(1, sizeof(Evas_GL_Image));
404 if (!im) return NULL; 404 if (!im) return NULL;
405 im->references = 1; 405 im->references = 1;
@@ -453,7 +453,7 @@ evas_gl_common_image_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned in
453 if (((int)w > gc->shared->info.max_texture_size) || 453 if (((int)w > gc->shared->info.max_texture_size) ||
454 ((int)h > gc->shared->info.max_texture_size)) 454 ((int)h > gc->shared->info.max_texture_size))
455 return NULL; 455 return NULL;
456 456
457 im = calloc(1, sizeof(Evas_GL_Image)); 457 im = calloc(1, sizeof(Evas_GL_Image));
458 if (!im) return NULL; 458 if (!im) return NULL;
459 im->references = 1; 459 im->references = 1;
@@ -735,7 +735,7 @@ evas_gl_common_image_surface_new(Evas_Engine_GL_Context *gc, unsigned int w, uns
735 if (((int)w > gc->shared->info.max_texture_size) || 735 if (((int)w > gc->shared->info.max_texture_size) ||
736 ((int)h > gc->shared->info.max_texture_size)) 736 ((int)h > gc->shared->info.max_texture_size))
737 return NULL; 737 return NULL;
738 738
739 im = calloc(1, sizeof(Evas_GL_Image)); 739 im = calloc(1, sizeof(Evas_GL_Image));
740 if (!im) return NULL; 740 if (!im) return NULL;
741 im->references = 1; 741 im->references = 1;
@@ -1352,7 +1352,7 @@ evas_gl_common_image_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im,
1352 } 1352 }
1353 1353
1354 if ((sw == dw) && (sh == dh)) smooth = 0; 1354 if ((sw == dw) && (sh == dh)) smooth = 0;
1355 1355
1356 im->tex->im = im; 1356 im->tex->im = im;
1357 if ((!gc->dc->cutout.rects) || 1357 if ((!gc->dc->cutout.rects) ||
1358 ((gc->shared->info.tune.cutout.max > 0) && 1358 ((gc->shared->info.tune.cutout.max > 0) &&
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index 666f944d82..df5a4be924 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -98,7 +98,7 @@ _evas_gl_preload_main_loop_wakeup(void)
98 { 98 {
99 async->tex->was_preloaded = EINA_TRUE; 99 async->tex->was_preloaded = EINA_TRUE;
100 100
101 async->tex->ptt->allocations = 101 async->tex->ptt->allocations =
102 eina_list_remove(async->tex->ptt->allocations, 102 eina_list_remove(async->tex->ptt->allocations,
103 async->tex->aptt); 103 async->tex->aptt);
104 eina_rectangle_pool_release(async->tex->aptt); 104 eina_rectangle_pool_release(async->tex->aptt);
@@ -135,7 +135,7 @@ _evas_gl_preload_lock(void)
135 eina_condition_signal(&async_loader_cond); 135 eina_condition_signal(&async_loader_cond);
136 136
137 eina_condition_wait(&async_loader_cond); 137 eina_condition_wait(&async_loader_cond);
138 if (async_loader_exit) 138 if (async_loader_exit)
139 { 139 {
140 eina_lock_release(&async_loader_lock); 140 eina_lock_release(&async_loader_lock);
141 return EINA_FALSE; 141 return EINA_FALSE;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index 2c1d1e28cf..1aa9d3ccb0 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -337,7 +337,7 @@ _tex_2d(Evas_Engine_GL_Context *gc, int intfmt, int w, int h, int fmt, int type)
337#ifdef GL_TEXTURE_INTERNAL_FORMAT 337#ifdef GL_TEXTURE_INTERNAL_FORMAT
338# ifdef GL_GLES 338# ifdef GL_GLES
339# else 339# else
340// this is not in opengles!!! hrrrm 340// this is not in opengles!!! hrrrm
341// if (glGetTexLevelParameteriv) // in case of weak symbols? 341// if (glGetTexLevelParameteriv) // in case of weak symbols?
342 { 342 {
343 int intfmtret = -1; 343 int intfmtret = -1;
@@ -1605,7 +1605,7 @@ evas_gl_common_texture_free(Evas_GL_Texture *tex, Eina_Bool force)
1605 tex->ptv2 = NULL; 1605 tex->ptv2 = NULL;
1606 tex->ptuv = NULL; 1606 tex->ptuv = NULL;
1607 1607
1608 if (tex->im) 1608 if (tex->im)
1609 { 1609 {
1610 tex->im->tex = NULL; 1610 tex->im->tex = NULL;
1611 if (tex->im->im) tex->im->im->cache_entry.flags.textured = 0; 1611 if (tex->im->im) tex->im->im->cache_entry.flags.textured = 0;
@@ -1974,7 +1974,7 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned i
1974 else if (rows[0] && rows[h]) 1974 else if (rows[0] && rows[h])
1975 { 1975 {
1976 unsigned int y; 1976 unsigned int y;
1977 1977
1978 glPixelStorei(GL_UNPACK_ALIGNMENT, 1); 1978 glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
1979 glBindTexture(GL_TEXTURE_2D, tex->pt->texture); 1979 glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
1980 if (!_tex_2d(tex->gc, tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat)) 1980 if (!_tex_2d(tex->gc, tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat))
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.h b/src/modules/evas/engines/gl_drm/evas_engine.h
index 705d565d4f..9530cde17c 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.h
+++ b/src/modules/evas/engines/gl_drm/evas_engine.h
@@ -98,7 +98,7 @@ struct _Outbuf
98 98
99 struct gbm_surface *surface; 99 struct gbm_surface *surface;
100 100
101 struct 101 struct
102 { 102 {
103 EGLContext context; 103 EGLContext context;
104 EGLSurface surface; 104 EGLSurface surface;
@@ -106,7 +106,7 @@ struct _Outbuf
106 EGLDisplay disp; 106 EGLDisplay disp;
107 } egl; 107 } egl;
108 108
109 struct 109 struct
110 { 110 {
111 Ecore_Drm2_Output *output; 111 Ecore_Drm2_Output *output;
112 Ecore_Drm2_Plane *plane; 112 Ecore_Drm2_Plane *plane;
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 8b9ef94d1b..0fc241643d 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -307,7 +307,7 @@ eng_image_data_direct_get(void *engine EINA_UNUSED, void *image, int plane,
307 307
308 if (!slice || !im) return ret; 308 if (!slice || !im) return ret;
309 309
310 /* If content hint is DYNAMIC, the im->im could be NULL. If the im->im does 310 /* If content hint is DYNAMIC, the im->im could be NULL. If the im->im does
311 not exist, eng_image_data_direct_get needs to return copied dyn.data to 311 not exist, eng_image_data_direct_get needs to return copied dyn.data to
312 make functions including efl_file_save work. */ 312 make functions including efl_file_save work. */
313 if ((im->content_hint == EVAS_IMAGE_CONTENT_HINT_DYNAMIC) && 313 if ((im->content_hint == EVAS_IMAGE_CONTENT_HINT_DYNAMIC) &&
@@ -2172,7 +2172,7 @@ eng_image_animated_frame_set(void *engine EINA_UNUSED, void *image, int frame_in
2172 return EINA_TRUE; 2172 return EINA_TRUE;
2173} 2173}
2174 2174
2175static int 2175static int
2176eng_image_animated_frame_get(void *engine EINA_UNUSED, void *image) 2176eng_image_animated_frame_get(void *engine EINA_UNUSED, void *image)
2177{ 2177{
2178 Evas_GL_Image *gim = image; 2178 Evas_GL_Image *gim = image;
diff --git a/src/modules/evas/engines/gl_x11/evas_x_main.c b/src/modules/evas/engines/gl_x11/evas_x_main.c
index 4e578efa94..33f3568bf7 100644
--- a/src/modules/evas/engines/gl_x11/evas_x_main.c
+++ b/src/modules/evas/engines/gl_x11/evas_x_main.c
@@ -331,7 +331,7 @@ try_gles2:
331 } 331 }
332 if (context == EGL_NO_CONTEXT) 332 if (context == EGL_NO_CONTEXT)
333 _tls_context_set(gw->egl_context); 333 _tls_context_set(gw->egl_context);
334 334
335 SET_RESTORE_CONTEXT(); 335 SET_RESTORE_CONTEXT();
336 if (evas_eglMakeCurrent(gw->egl_disp, 336 if (evas_eglMakeCurrent(gw->egl_disp,
337 gw->egl_surface, 337 gw->egl_surface,
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 19b60f6621..a942a96f02 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -2915,7 +2915,7 @@ eng_image_animated_frame_set(void *data EINA_UNUSED, void *image, int frame_inde
2915 return EINA_TRUE; 2915 return EINA_TRUE;
2916} 2916}
2917 2917
2918static int 2918static int
2919eng_image_animated_frame_get(void *data EINA_UNUSED, void *image) 2919eng_image_animated_frame_get(void *data EINA_UNUSED, void *image)
2920{ 2920{
2921 Image_Entry *im; 2921 Image_Entry *im;
diff --git a/src/modules/evas/engines/software_x11/Evas_Engine_Software_X11.h b/src/modules/evas/engines/software_x11/Evas_Engine_Software_X11.h
index 08e2543592..dab373cd35 100644
--- a/src/modules/evas/engines/software_x11/Evas_Engine_Software_X11.h
+++ b/src/modules/evas/engines/software_x11/Evas_Engine_Software_X11.h
@@ -15,7 +15,7 @@ struct _Evas_Engine_Info_Software_X11
15 Evas_Engine_Info magic; 15 Evas_Engine_Info magic;
16 16
17 /* engine specific data & parameters it needs to set up */ 17 /* engine specific data & parameters it needs to set up */
18 struct 18 struct
19 { 19 {
20 Evas_Engine_Info_Software_X11_Backend backend; 20 Evas_Engine_Info_Software_X11_Backend backend;
21 21
diff --git a/src/modules/evas/engines/software_x11/evas_engine.h b/src/modules/evas/engines/software_x11/evas_engine.h
index d5e4c7cfd5..2fa57f1dda 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.h
+++ b/src/modules/evas/engines/software_x11/evas_engine.h
@@ -47,12 +47,12 @@ struct _Outbuf
47 int rot; 47 int rot;
48 int onebuf; 48 int onebuf;
49 49
50 struct 50 struct
51 { 51 {
52 Convert_Pal *pal; 52 Convert_Pal *pal;
53 union 53 union
54 { 54 {
55 struct 55 struct
56 { 56 {
57 Display *disp; 57 Display *disp;
58 Window win; 58 Window win;
@@ -65,7 +65,7 @@ struct _Outbuf
65 unsigned char bit_swap : 1; 65 unsigned char bit_swap : 1;
66 } xlib; 66 } xlib;
67 } x11; 67 } x11;
68 struct 68 struct
69 { 69 {
70 DATA32 r, g, b; 70 DATA32 r, g, b;
71 } mask; 71 } mask;
@@ -73,7 +73,7 @@ struct _Outbuf
73 /* 1 big buffer for updates - flush on idle_flush */ 73 /* 1 big buffer for updates - flush on idle_flush */
74 RGBA_Image *onebuf; 74 RGBA_Image *onebuf;
75 Eina_Array onebuf_regions; 75 Eina_Array onebuf_regions;
76 76
77 void *swapper; 77 void *swapper;
78 78
79 /* a list of pending regions to write to the target */ 79 /* a list of pending regions to write to the target */
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.h b/src/modules/evas/engines/wayland_egl/evas_engine.h
index f1d81fbd4e..3171632583 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.h
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.h
@@ -142,7 +142,7 @@ void eng_gl_context_use(Context_3D *context);
142 142
143void eng_gl_symbols(EGLDisplay disp); 143void eng_gl_symbols(EGLDisplay disp);
144 144
145static inline int 145static inline int
146_re_wincheck(Outbuf *ob) 146_re_wincheck(Outbuf *ob)
147{ 147{
148 if (ob->surf) return 1; 148 if (ob->surf) return 1;
diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
index cad83434fc..58406f95c2 100644
--- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
+++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
@@ -238,7 +238,7 @@ eng_window_free(Outbuf *gw)
238 glsym_evas_gl_common_context_free(gw->gl_context); 238 glsym_evas_gl_common_context_free(gw->gl_context);
239 } 239 }
240 240
241 eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, 241 eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE,
242 EGL_NO_SURFACE, EGL_NO_CONTEXT); 242 EGL_NO_SURFACE, EGL_NO_CONTEXT);
243 243
244 if (gw->egl_context != context) 244 if (gw->egl_context != context)
@@ -260,7 +260,7 @@ eng_window_free(Outbuf *gw)
260 free(gw); 260 free(gw);
261} 261}
262 262
263void 263void
264eng_window_use(Outbuf *gw) 264eng_window_use(Outbuf *gw)
265{ 265{
266 Eina_Bool force = EINA_FALSE; 266 Eina_Bool force = EINA_FALSE;
@@ -303,7 +303,7 @@ eng_window_use(Outbuf *gw)
303 } 303 }
304} 304}
305 305
306void 306void
307eng_window_unsurf(Outbuf *gw) 307eng_window_unsurf(Outbuf *gw)
308{ 308{
309 if (!gw->surf) return; 309 if (!gw->surf) return;
@@ -315,7 +315,7 @@ eng_window_unsurf(Outbuf *gw)
315 315
316 if (_evas_gl_wl_window == gw) 316 if (_evas_gl_wl_window == gw)
317 { 317 {
318 eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, 318 eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE,
319 EGL_NO_SURFACE, EGL_NO_CONTEXT); 319 EGL_NO_SURFACE, EGL_NO_CONTEXT);
320 if (gw->egl_surface != EGL_NO_SURFACE) 320 if (gw->egl_surface != EGL_NO_SURFACE)
321 eglDestroySurface(gw->egl_disp, gw->egl_surface); 321 eglDestroySurface(gw->egl_disp, gw->egl_surface);
@@ -327,7 +327,7 @@ eng_window_unsurf(Outbuf *gw)
327 gw->surf = EINA_FALSE; 327 gw->surf = EINA_FALSE;
328} 328}
329 329
330void 330void
331eng_window_resurf(Outbuf *gw) 331eng_window_resurf(Outbuf *gw)
332{ 332{
333 struct wl_surface *wls; 333 struct wl_surface *wls;
@@ -366,7 +366,7 @@ eng_window_resurf(Outbuf *gw)
366 gw->surf = EINA_TRUE; 366 gw->surf = EINA_TRUE;
367} 367}
368 368
369void 369void
370eng_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth EINA_UNUSED) 370eng_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth EINA_UNUSED)
371{ 371{
372 ob->w = w; 372 ob->w = w;
@@ -387,7 +387,7 @@ eng_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth EIN
387 } 387 }
388} 388}
389 389
390int 390int
391eng_outbuf_rotation_get(Outbuf *ob) 391eng_outbuf_rotation_get(Outbuf *ob)
392{ 392{
393 return ob->rot; 393 return ob->rot;
@@ -433,7 +433,7 @@ eng_outbuf_swap_mode_get(Outbuf *ob)
433 return ob->swap_mode; 433 return ob->swap_mode;
434} 434}
435 435
436Eina_Bool 436Eina_Bool
437eng_outbuf_region_first_rect(Outbuf *ob) 437eng_outbuf_region_first_rect(Outbuf *ob)
438{ 438{
439 glsym_evas_gl_preload_render_lock(eng_preload_make_current, ob); 439 glsym_evas_gl_preload_render_lock(eng_preload_make_current, ob);
@@ -522,7 +522,7 @@ eng_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx EIN
522 return ob->gl_context->def_surface; 522 return ob->gl_context->def_surface;
523} 523}
524 524
525void 525void
526eng_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED) 526eng_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
527{ 527{
528 if (!_re_wincheck(ob)) return; 528 if (!_re_wincheck(ob)) return;
@@ -530,7 +530,7 @@ eng_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update EINA_UNUSED, int x
530 glsym_evas_gl_common_context_flush(ob->gl_context); 530 glsym_evas_gl_common_context_flush(ob->gl_context);
531} 531}
532 532
533void 533void
534eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_damage EINA_UNUSED, Evas_Render_Mode render_mode) 534eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_damage EINA_UNUSED, Evas_Render_Mode render_mode)
535{ 535{
536 if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) goto end; 536 if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) goto end;
@@ -604,7 +604,7 @@ eng_gl_context_new(Outbuf *ob)
604 604
605 if (!(ctx = calloc(1, sizeof(Context_3D)))) return NULL; 605 if (!(ctx = calloc(1, sizeof(Context_3D)))) return NULL;
606 606
607 ctx->context = 607 ctx->context =
608 eglCreateContext(ob->egl_disp, ob->egl_config, ob->egl_context, attrs); 608 eglCreateContext(ob->egl_disp, ob->egl_config, ob->egl_context, attrs);
609 if (!ctx->context) 609 if (!ctx->context)
610 { 610 {
@@ -622,17 +622,17 @@ err:
622 return NULL; 622 return NULL;
623} 623}
624 624
625void 625void
626eng_gl_context_free(Context_3D *ctx) 626eng_gl_context_free(Context_3D *ctx)
627{ 627{
628 eglDestroyContext(ctx->display, ctx->context); 628 eglDestroyContext(ctx->display, ctx->context);
629 free(ctx); 629 free(ctx);
630} 630}
631 631
632void 632void
633eng_gl_context_use(Context_3D *ctx) 633eng_gl_context_use(Context_3D *ctx)
634{ 634{
635 if (eglMakeCurrent(ctx->display, ctx->surface, 635 if (eglMakeCurrent(ctx->display, ctx->surface,
636 ctx->surface, ctx->context) == EGL_FALSE) 636 ctx->surface, ctx->context) == EGL_FALSE)
637 { 637 {
638 ERR("eglMakeCurrent Failed: %#x", eglGetError()); 638 ERR("eglMakeCurrent Failed: %#x", eglGetError());
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c
index de6f5d1c66..3a3623a567 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -345,7 +345,7 @@ module_close(Evas_Module *em EINA_UNUSED)
345 } 345 }
346} 346}
347 347
348static Evas_Module_Api evas_modapi = 348static Evas_Module_Api evas_modapi =
349{ 349{
350 EVAS_MODULE_API_VERSION, "wayland_shm", "none", {module_open, module_close} 350 EVAS_MODULE_API_VERSION, "wayland_shm", "none", {module_open, module_close}
351}; 351};
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h
index 3b59553337..9f5350fb29 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.h
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.h
@@ -82,7 +82,7 @@ struct _Outbuf
82 82
83 Ecore_Wl2_Surface *surface; 83 Ecore_Wl2_Surface *surface;
84 84
85 struct 85 struct
86 { 86 {
87 /* one big buffer for updates. flushed on idle_flush */ 87 /* one big buffer for updates. flushed on idle_flush */
88 RGBA_Image *onebuf; 88 RGBA_Image *onebuf;
diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
index 8638e0d593..64d36d453a 100644
--- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
@@ -38,7 +38,7 @@ surf_err:
38 return NULL; 38 return NULL;
39} 39}
40 40
41void 41void
42_evas_outbuf_free(Outbuf *ob) 42_evas_outbuf_free(Outbuf *ob)
43{ 43{
44 LOGFN; 44 LOGFN;
@@ -49,7 +49,7 @@ _evas_outbuf_free(Outbuf *ob)
49 Eina_Rectangle *rect; 49 Eina_Rectangle *rect;
50 50
51 img = ob->priv.pending_writes->data; 51 img = ob->priv.pending_writes->data;
52 ob->priv.pending_writes = 52 ob->priv.pending_writes =
53 eina_list_remove_list(ob->priv.pending_writes, ob->priv.pending_writes); 53 eina_list_remove_list(ob->priv.pending_writes, ob->priv.pending_writes);
54 54
55 rect = img->extended_info; 55 rect = img->extended_info;
@@ -69,7 +69,7 @@ _evas_outbuf_free(Outbuf *ob)
69 free(ob); 69 free(ob);
70} 70}
71 71
72void 72void
73_evas_outbuf_idle_flush(Outbuf *ob) 73_evas_outbuf_idle_flush(Outbuf *ob)
74{ 74{
75 RGBA_Image *img; 75 RGBA_Image *img;
@@ -90,8 +90,8 @@ _evas_outbuf_idle_flush(Outbuf *ob)
90 while (ob->priv.prev_pending_writes) 90 while (ob->priv.prev_pending_writes)
91 { 91 {
92 img = ob->priv.prev_pending_writes->data; 92 img = ob->priv.prev_pending_writes->data;
93 ob->priv.prev_pending_writes = 93 ob->priv.prev_pending_writes =
94 eina_list_remove_list(ob->priv.prev_pending_writes, 94 eina_list_remove_list(ob->priv.prev_pending_writes,
95 ob->priv.prev_pending_writes); 95 ob->priv.prev_pending_writes);
96 rect = img->extended_info; 96 rect = img->extended_info;
97 evas_cache_image_drop(&img->cache_entry); 97 evas_cache_image_drop(&img->cache_entry);
@@ -101,7 +101,7 @@ _evas_outbuf_idle_flush(Outbuf *ob)
101 } 101 }
102} 102}
103 103
104void 104void
105_evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage EINA_UNUSED, Tilebuf_Rect *buffer_damage EINA_UNUSED, Evas_Render_Mode render_mode) 105_evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage EINA_UNUSED, Tilebuf_Rect *buffer_damage EINA_UNUSED, Evas_Render_Mode render_mode)
106{ 106{
107 Eina_Rectangle *result; 107 Eina_Rectangle *result;
@@ -225,7 +225,7 @@ _evas_outbuf_swap_mode_get(Outbuf *ob)
225 return MODE_FULL; 225 return MODE_FULL;
226} 226}
227 227
228int 228int
229_evas_outbuf_rotation_get(Outbuf *ob) 229_evas_outbuf_rotation_get(Outbuf *ob)
230{ 230{
231 LOGFN; 231 LOGFN;
@@ -233,17 +233,17 @@ _evas_outbuf_rotation_get(Outbuf *ob)
233 return ob->rotation; 233 return ob->rotation;
234} 234}
235 235
236void 236void
237_evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, Eina_Bool alpha, Eina_Bool resize) 237_evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, Eina_Bool alpha, Eina_Bool resize)
238{ 238{
239 LOGFN; 239 LOGFN;
240 240
241 if ((depth == OUTBUF_DEPTH_NONE) || 241 if ((depth == OUTBUF_DEPTH_NONE) ||
242 (depth == OUTBUF_DEPTH_INHERIT)) 242 (depth == OUTBUF_DEPTH_INHERIT))
243 depth = ob->depth; 243 depth = ob->depth;
244 244
245 if ((ob->w == w) && (ob->h == h) && 245 if ((ob->w == w) && (ob->h == h) &&
246 (ob->rotation == rot) && (ob->depth == depth) && 246 (ob->rotation == rot) && (ob->depth == depth) &&
247 (ob->priv.destination_alpha == alpha)) 247 (ob->priv.destination_alpha == alpha))
248 return; 248 return;
249 249
@@ -340,7 +340,7 @@ _evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx,
340 340
341 img->extended_info = rect; 341 img->extended_info = rect;
342 342
343 ob->priv.pending_writes = 343 ob->priv.pending_writes =
344 eina_list_append(ob->priv.pending_writes, img); 344 eina_list_append(ob->priv.pending_writes, img);
345 345
346 if (cx) *cx = 0; 346 if (cx) *cx = 0;
@@ -353,7 +353,7 @@ _evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx,
353 return NULL; 353 return NULL;
354} 354}
355 355
356void 356void
357_evas_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w, int h) 357_evas_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w, int h)
358{ 358{
359 Gfx_Func_Convert func = NULL; 359 Gfx_Func_Convert func = NULL;
@@ -374,15 +374,15 @@ _evas_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, in
374 374
375 if ((ob->rotation == 0) || (ob->rotation == 180)) 375 if ((ob->rotation == 0) || (ob->rotation == 180))
376 { 376 {
377 func = 377 func =
378 evas_common_convert_func_get(0, w, h, depth, 378 evas_common_convert_func_get(0, w, h, depth,
379 RED_MASK, GREEN_MASK, BLUE_MASK, 379 RED_MASK, GREEN_MASK, BLUE_MASK,
380 PAL_MODE_NONE, ob->rotation); 380 PAL_MODE_NONE, ob->rotation);
381 } 381 }
382 else if ((ob->rotation == 90) || (ob->rotation == 270)) 382 else if ((ob->rotation == 90) || (ob->rotation == 270))
383 { 383 {
384 func = 384 func =
385 evas_common_convert_func_get(0, h, w, depth, 385 evas_common_convert_func_get(0, h, w, depth,
386 RED_MASK, GREEN_MASK, BLUE_MASK, 386 RED_MASK, GREEN_MASK, BLUE_MASK,
387 PAL_MODE_NONE, ob->rotation); 387 PAL_MODE_NONE, ob->rotation);
388 } 388 }
diff --git a/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c b/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c
index 844b9d8f08..aab48fb380 100644
--- a/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c
+++ b/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c
@@ -377,7 +377,7 @@ evas_image_load_file_head_bmp(void *loader_data,
377 header.height = load_opts->emile.region.h; 377 header.height = load_opts->emile.region.h;
378 } 378 }
379 379
380 /* It is not bad idea that bmp loader support scale down decoding 380 /* It is not bad idea that bmp loader support scale down decoding
381 * because of memory issue in mobile world.*/ 381 * because of memory issue in mobile world.*/
382 if (load_opts->emile.scale_down_by > 1) 382 if (load_opts->emile.scale_down_by > 1)
383 { 383 {
@@ -530,7 +530,7 @@ evas_image_load_file_data_bmp(void *loader_data,
530 header.width = opts->emile.region.w; 530 header.width = opts->emile.region.w;
531 header.height = opts->emile.region.h; 531 header.height = opts->emile.region.h;
532 } 532 }
533 /* It is not bad idea that bmp loader support scale down decoding 533 /* It is not bad idea that bmp loader support scale down decoding
534 * because of memory issue in mobile world. */ 534 * because of memory issue in mobile world. */
535 if (opts->emile.scale_down_by > 1) 535 if (opts->emile.scale_down_by > 1)
536 scale_ratio = opts->emile.scale_down_by; 536 scale_ratio = opts->emile.scale_down_by;
@@ -1314,7 +1314,7 @@ evas_image_load_file_data_bmp(void *loader_data,
1314 } 1314 }
1315 } 1315 }
1316 } 1316 }
1317 else if ((header.bit_count == 16) && 1317 else if ((header.bit_count == 16) &&
1318 (header.rmask == 0x7c00) && (header.gmask == 0x03e0) && (header.bmask == 0x001f) 1318 (header.rmask == 0x7c00) && (header.gmask == 0x03e0) && (header.bmask == 0x001f)
1319 ) 1319 )
1320 { 1320 {
diff --git a/src/modules/evas/image_loaders/gif/evas_image_load_gif.c b/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
index 02412a280d..5a55035c5a 100644
--- a/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
+++ b/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
@@ -32,7 +32,7 @@ struct _Frame_Info
32{ 32{
33 int x, y, w, h; 33 int x, y, w, h;
34 unsigned short delay; // delay time in 1/100ths of a sec 34 unsigned short delay; // delay time in 1/100ths of a sec
35 short transparent : 10; // -1 == not, anything else == index 35 short transparent : 10; // -1 == not, anything else == index
36 short dispose : 6; // 0, 1, 2, 3 (others invalid) 36 short dispose : 6; // 0, 1, 2, 3 (others invalid)
37 Eina_Bool interlace : 1; // interlaced or not 37 Eina_Bool interlace : 1; // interlaced or not
38}; 38};
@@ -69,7 +69,7 @@ _fill_image(DATA32 *data, int rowpix, DATA32 val, int x, int y, int w, int h)
69{ 69{
70 int xx, yy; 70 int xx, yy;
71 DATA32 *p; 71 DATA32 *p;
72 72
73 for (yy = 0; yy < h; yy++) 73 for (yy = 0; yy < h; yy++)
74 { 74 {
75 p = data + ((y + yy) * rowpix) + x; 75 p = data + ((y + yy) * rowpix) + x;
@@ -384,14 +384,14 @@ _flush_older_frames(Evas_Image_Animated *animated,
384 if (!l) l = animated->frames; 384 if (!l) l = animated->frames;
385 } 385 }
386} 386}
387 387
388static int 388static int
389_file_read(GifFileType *gft, GifByteType *buf, int len) 389_file_read(GifFileType *gft, GifByteType *buf, int len)
390{ 390{
391 File_Info *fi = gft->UserData; 391 File_Info *fi = gft->UserData;
392 392
393 if (fi->pos >= fi->len) return 0; // if at or past end - no 393 if (fi->pos >= fi->len) return 0; // if at or past end - no
394 if ((fi->pos + len) >= fi->len) len = fi->len - fi->pos; 394 if ((fi->pos + len) >= fi->len) len = fi->len - fi->pos;
395 memcpy(buf, fi->map + fi->pos, len); 395 memcpy(buf, fi->map + fi->pos, len);
396 fi->pos += len; 396 fi->pos += len;
397 return len; 397 return len;
@@ -587,7 +587,7 @@ evas_image_load_file_data_gif2(void *loader_data,
587 // so we have to load multiple times to animate. what if the 587 // so we have to load multiple times to animate. what if the
588 // same image is shared/loaded in 2 ore more places AND animated 588 // same image is shared/loaded in 2 ore more places AND animated
589 // there? 589 // there?
590 590
591 // use index stored in image (XXX: yuk!) 591 // use index stored in image (XXX: yuk!)
592 index = animated->cur_frame; 592 index = animated->cur_frame;
593 // if index is invalid for animated image - error out 593 // if index is invalid for animated image - error out
@@ -665,7 +665,7 @@ open_file:
665 { 665 {
666 int ext_code; 666 int ext_code;
667 GifByteType *ext; 667 GifByteType *ext;
668 668
669 ext = NULL; 669 ext = NULL;
670 DGifGetExtension(gif, &ext_code, &ext); 670 DGifGetExtension(gif, &ext_code, &ext);
671 while (ext) 671 while (ext)
@@ -727,7 +727,7 @@ open_file:
727 else if (finfo->dispose == 3) // GIF_DISPOSE_RESTORE 727 else if (finfo->dispose == 3) // GIF_DISPOSE_RESTORE
728 { 728 {
729 Image_Entry_Frame *prevframe2; 729 Image_Entry_Frame *prevframe2;
730 730
731 // we need to copy data from one frame back 731 // we need to copy data from one frame back
732 // from the prev frame into the current frame 732 // from the prev frame into the current frame
733 // (copy the whole image - at least the sample 733 // (copy the whole image - at least the sample
@@ -757,7 +757,7 @@ open_file:
757 } 757 }
758 // if we hve a frame BUT the image is not animated... different 758 // if we hve a frame BUT the image is not animated... different
759 // path 759 // path
760 else if ((thisframe) && (!thisframe->data) && 760 else if ((thisframe) && (!thisframe->data) &&
761 (!animated->animated)) 761 (!animated->animated))
762 { 762 {
763 // if we don't have the data decoded yet - decode it 763 // if we don't have the data decoded yet - decode it
@@ -815,18 +815,18 @@ open_file:
815 loader->fi.map = NULL; 815 loader->fi.map = NULL;
816 loader->imgnum = 0; 816 loader->imgnum = 0;
817 } 817 }
818 818
819on_ok: 819on_ok:
820 // no errors in header scan etc. so set err and return value 820 // no errors in header scan etc. so set err and return value
821 *error = EVAS_LOAD_ERROR_NONE; 821 *error = EVAS_LOAD_ERROR_NONE;
822 ret = EINA_TRUE; 822 ret = EINA_TRUE;
823 823
824 // if it was an animated image we need to copy the data to the 824 // if it was an animated image we need to copy the data to the
825 // pixels for the image from the frame holding the data 825 // pixels for the image from the frame holding the data
826 if (animated->animated && frame->data) 826 if (animated->animated && frame->data)
827 memcpy(pixels, frame->data, prop->w * prop->h * sizeof(DATA32)); 827 memcpy(pixels, frame->data, prop->w * prop->h * sizeof(DATA32));
828 prop->premul = EINA_TRUE; 828 prop->premul = EINA_TRUE;
829 829
830on_error: // jump here on any errors to clean up 830on_error: // jump here on any errors to clean up
831 return ret; 831 return ret;
832} 832}
@@ -846,13 +846,13 @@ evas_image_load_frame_duration_gif2(void *loader_data,
846 if (!animated->animated) return -1.0; 846 if (!animated->animated) return -1.0;
847 if ((start_frame + frame_num) > animated->frame_count) return -1.0; 847 if ((start_frame + frame_num) > animated->frame_count) return -1.0;
848 if (frame_num < 0) return -1.0; 848 if (frame_num < 0) return -1.0;
849 849
850 if (frame_num < 1) frame_num = 1; 850 if (frame_num < 1) frame_num = 1;
851 // walk frames from start frame though and total up delays 851 // walk frames from start frame though and total up delays
852 for (i = start_frame; i < (start_frame + frame_num); i++) 852 for (i = start_frame; i < (start_frame + frame_num); i++)
853 { 853 {
854 Frame_Info *finfo; 854 Frame_Info *finfo;
855 855
856 // find the frame 856 // find the frame
857 frame = _find_frame(animated, i); 857 frame = _find_frame(animated, i);
858 // no frame? barf - bad file or i/o? 858 // no frame? barf - bad file or i/o?
diff --git a/src/modules/evas/image_loaders/ico/evas_image_load_ico.c b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c
index fea7877502..835db90030 100644
--- a/src/modules/evas/image_loaders/ico/evas_image_load_ico.c
+++ b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c
@@ -386,7 +386,7 @@ evas_image_load_file_data_ico(void *loader_data,
386 // NULL == highest res 386 // NULL == highest res
387 // biggest == highest res 387 // biggest == highest res
388 // smallest == lowest res 388 // smallest == lowest res
389 // 389 //
390 // smaller == next size SMALLER than load opts WxH (if possible) 390 // smaller == next size SMALLER than load opts WxH (if possible)
391 // bigger == next size BIGGER than load opts WxH (if possible) 391 // bigger == next size BIGGER than load opts WxH (if possible)
392 // more ? 392 // more ?
diff --git a/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c b/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c
index 0f63f2cc9f..0992e5e1f1 100644
--- a/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c
+++ b/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c
@@ -398,7 +398,7 @@ pmaps_buffer_plain_int_get(Pmaps_Buffer *b, int *val)
398 DATA8 lastc; 398 DATA8 lastc;
399 399
400 /* first skip all white space 400 /* first skip all white space
401 * Note: we are skipping here actually every character than is not 401 * Note: we are skipping here actually every character than is not
402 * a digit */ 402 * a digit */
403 while (!isdigit(*b->current)) 403 while (!isdigit(*b->current))
404 { 404 {
@@ -523,7 +523,7 @@ static int
523pmaps_buffer_plain_bw_get(Pmaps_Buffer *b, DATA32 *val) 523pmaps_buffer_plain_bw_get(Pmaps_Buffer *b, DATA32 *val)
524{ 524{
525 /* first skip all white space 525 /* first skip all white space
526 * Note: we are skipping here actually every character than is not 526 * Note: we are skipping here actually every character than is not
527 * a digit */ 527 * a digit */
528 while (!isdigit(*b->current)) 528 while (!isdigit(*b->current))
529 { 529 {
diff --git a/src/modules/evas/image_loaders/psd/evas_image_load_psd.c b/src/modules/evas/image_loaders/psd/evas_image_load_psd.c
index c8abd1b893..5dcf31039b 100644
--- a/src/modules/evas/image_loaders/psd/evas_image_load_psd.c
+++ b/src/modules/evas/image_loaders/psd/evas_image_load_psd.c
@@ -190,7 +190,7 @@ evas_image_load_file_head_psd(void *loader_data,
190 190
191static unsigned int 191static unsigned int
192read_compressed_channel(const unsigned char *map, size_t length, size_t *position, 192read_compressed_channel(const unsigned char *map, size_t length, size_t *position,
193 const unsigned int channel_length EINA_UNUSED, 193 const unsigned int channel_length EINA_UNUSED,
194 unsigned int size, 194 unsigned int size,
195 unsigned char* channel) 195 unsigned char* channel)
196{ 196{
diff --git a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
index 6f1cf61e14..297c8175b0 100644
--- a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
+++ b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
@@ -287,7 +287,7 @@ evas_image_load_file_data_tiff(void *loader_data,
287 uint32 *ps, pixel; 287 uint32 *ps, pixel;
288 unsigned int a, r, g, b; 288 unsigned int a, r, g, b;
289 unsigned int nas = 0; 289 unsigned int nas = 0;
290 290
291 pix = pixels; 291 pix = pixels;
292 pd = pix + ((prop->h - y - 1) * prop->w); 292 pd = pix + ((prop->h - y - 1) * prop->w);
293 ps = rast + (y * prop->w); 293 ps = rast + (y * prop->w);
diff --git a/src/modules/evas/image_savers/png/evas_image_save_png.c b/src/modules/evas/image_savers/png/evas_image_save_png.c
index 1aeec12c8a..95693ccc83 100644
--- a/src/modules/evas/image_savers/png/evas_image_save_png.c
+++ b/src/modules/evas/image_savers/png/evas_image_save_png.c
@@ -184,7 +184,7 @@ save_image_png(RGBA_Image *im, const char *file, int do_compress, int interlace)
184 return 0; 184 return 0;
185} 185}
186 186
187static int 187static int
188evas_image_save_file_png(RGBA_Image *im, const char *file, const char *key EINA_UNUSED, 188evas_image_save_file_png(RGBA_Image *im, const char *file, const char *key EINA_UNUSED,
189 int quality EINA_UNUSED, int do_compress, const char *encoding EINA_UNUSED) 189 int quality EINA_UNUSED, int do_compress, const char *encoding EINA_UNUSED)
190{ 190{
diff --git a/src/modules/evas/image_savers/tiff/evas_image_save_tiff.c b/src/modules/evas/image_savers/tiff/evas_image_save_tiff.c
index c6dbda8ebe..3e06b112b0 100644
--- a/src/modules/evas/image_savers/tiff/evas_image_save_tiff.c
+++ b/src/modules/evas/image_savers/tiff/evas_image_save_tiff.c
@@ -45,7 +45,7 @@ save_image_tiff(RGBA_Image *im, const char *file, int compress EINA_UNUSED, int
45 /* By default uses patent-free use COMPRESSION_DEFLATE, 45 /* By default uses patent-free use COMPRESSION_DEFLATE,
46 * another lossless compression technique */ 46 * another lossless compression technique */
47 TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_DEFLATE); 47 TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_DEFLATE);
48 48
49 if (has_alpha) 49 if (has_alpha)
50 { 50 {
51 uint16 extras[] = { EXTRASAMPLE_ASSOCALPHA }; 51 uint16 extras[] = { EXTRASAMPLE_ASSOCALPHA };
diff --git a/src/modules/evas/vg_loaders/svg/evas_vg_load_svg.c b/src/modules/evas/vg_loaders/svg/evas_vg_load_svg.c
index 9151e05c15..ece54ca455 100644
--- a/src/modules/evas/vg_loaders/svg/evas_vg_load_svg.c
+++ b/src/modules/evas/vg_loaders/svg/evas_vg_load_svg.c
@@ -2279,7 +2279,7 @@ _inherit_style(Svg_Style_Property *child, Svg_Style_Property *parent)
2279{ 2279{
2280 if (parent == NULL) 2280 if (parent == NULL)
2281 return; 2281 return;
2282 // inherit the property of parent if not present in child. 2282 // inherit the property of parent if not present in child.
2283 // fill 2283 // fill
2284 if (!(child->fill.flags & SVG_FILL_FLAGS_PAINT)) 2284 if (!(child->fill.flags & SVG_FILL_FLAGS_PAINT))
2285 { 2285 {