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) Ipc_Data_Update *ipc; int n = e->response; - /* b->lockfd is not enough to ensure the size is same + /* b->lockfd is not enough to ensure the size is same * between what server knows, and client knows. * So should check file lock also. */ 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) if (b->file) shm_unlink(b->file); if (b->lock) unlink(b->lock); } - + if (b->addr != MAP_FAILED) munmap(b->addr, b->size); if (b->fd >= 0) close(b->fd); 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) ecore_evas_geometry_get(ee, &canvas_x, &canvas_y, NULL, NULL); } - EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "canvas (x: %d, y: %d)", + EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "canvas (x: %d, y: %d)", canvas_x, canvas_y); if (imcontext->text_input) @@ -217,7 +217,7 @@ check_serial(WaylandIMContext *imcontext, uint32_t serial) { Ecore_IMF_Preedit_Attr *attr; - if ((imcontext->serial - serial) > + if ((imcontext->serial - serial) > (imcontext->serial - imcontext->reset_serial)) { EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, @@ -288,7 +288,7 @@ text_input_commit_string(void *data, text, imcontext->preedit_text ? imcontext->preedit_text : ""); - old_preedit = + old_preedit = imcontext->preedit_text && strlen(imcontext->preedit_text) > 0; if (!imcontext->ctx) @@ -299,7 +299,7 @@ text_input_commit_string(void *data, if (old_preedit) { - ecore_imf_context_event_callback_call(imcontext->ctx, + ecore_imf_context_event_callback_call(imcontext->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL); } @@ -309,7 +309,7 @@ text_input_commit_string(void *data, if (imcontext->pending_commit.delete_length > 0) { /* cursor_pos is a byte index */ - if (ecore_imf_context_surrounding_get(imcontext->ctx, &surrounding, + if (ecore_imf_context_surrounding_get(imcontext->ctx, &surrounding, &cursor_pos)) { ev.ctx = imcontext->ctx; @@ -358,8 +358,8 @@ commit_preedit(WaylandIMContext *imcontext) ecore_imf_context_event_callback_call(imcontext->ctx, ECORE_IMF_CALLBACK_PREEDIT_END, NULL); - ecore_imf_context_event_callback_call(imcontext->ctx, - ECORE_IMF_CALLBACK_COMMIT, + ecore_imf_context_event_callback_call(imcontext->ctx, + ECORE_IMF_CALLBACK_COMMIT, (void *)imcontext->preedit_commit); } @@ -436,14 +436,14 @@ text_input_preedit_string(void *data, if (!check_serial(imcontext, serial)) return; - old_preedit = + old_preedit = imcontext->preedit_text && strlen(imcontext->preedit_text) > 0; clear_preedit(imcontext); imcontext->preedit_text = strdup(text); imcontext->preedit_commit = strdup(commit); - imcontext->preedit_cursor = + imcontext->preedit_cursor = utf8_offset_to_characters(text, imcontext->pending_preedit.cursor); imcontext->preedit_attrs = imcontext->pending_preedit.attrs; @@ -451,19 +451,19 @@ text_input_preedit_string(void *data, if (!old_preedit) { - ecore_imf_context_event_callback_call(imcontext->ctx, - ECORE_IMF_CALLBACK_PREEDIT_START, + ecore_imf_context_event_callback_call(imcontext->ctx, + ECORE_IMF_CALLBACK_PREEDIT_START, NULL); } - ecore_imf_context_event_callback_call(imcontext->ctx, - ECORE_IMF_CALLBACK_PREEDIT_CHANGED, + ecore_imf_context_event_callback_call(imcontext->ctx, + ECORE_IMF_CALLBACK_PREEDIT_CHANGED, NULL); if (imcontext->preedit_text && strlen(imcontext->preedit_text) == 0) { - ecore_imf_context_event_callback_call(imcontext->ctx, - ECORE_IMF_CALLBACK_PREEDIT_END, + ecore_imf_context_event_callback_call(imcontext->ctx, + ECORE_IMF_CALLBACK_PREEDIT_END, NULL); } } @@ -530,7 +530,7 @@ text_input_preedit_styling(void *data, attr->start_index = index; attr->end_index = index + length; - imcontext->pending_preedit.attrs = + imcontext->pending_preedit.attrs = eina_list_append(imcontext->pending_preedit.attrs, attr); } @@ -737,10 +737,10 @@ wayland_im_context_add(Ecore_IMF_Context *ctx) imcontext->ctx = ctx; - imcontext->text_input = + imcontext->text_input = zwp_text_input_manager_v1_create_text_input(imcontext->text_input_manager); if (imcontext->text_input) - zwp_text_input_v1_add_listener(imcontext->text_input, + zwp_text_input_v1_add_listener(imcontext->text_input, &text_input_listener, imcontext); } 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) { const char *s; - _ecore_imf_wayland_log_dom = + _ecore_imf_wayland_log_dom = eina_log_domain_register("ecore_imf_wayland", EINA_COLOR_YELLOW); if (!getenv("WAYLAND_DISPLAY")) return EINA_FALSE; @@ -168,7 +168,7 @@ im_module_init(void) ewd = ecore_wl2_display_connect(NULL); if (!ewd) goto err; - ecore_imf_module_register(&wayland_im_info, im_module_create, + ecore_imf_module_register(&wayland_im_info, im_module_create, im_module_exit); EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module initialized"); 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) { #ifdef DEBUG void *pmem; - + // pool mem base pmem = (void *)(((unsigned char *)p) + sizeof(Chained_Pool)); 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) // mempool is cleaning up the mess created. be quiet for now as we were before // but edje seems to be a big offender at the moment! bad cedric! :) // WRN( -// "Pool [%s] over by %i. cleaning up for you", +// "Pool [%s] over by %i. cleaning up for you", // pool->name, pool->over); while (pool->over_list) { @@ -425,7 +425,7 @@ eina_one_big_shutdown(void *data) if (pool->over > 0) { WRN( - "Pool [%s] still over by %i\n", + "Pool [%s] still over by %i\n", pool->name, pool->over); } 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 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS(GST_VIDEO_CAPS_MAKE("{ I420, YV12, YUY2, NV12, BGRx, BGR, BGRA }"))); + GST_STATIC_CAPS(GST_VIDEO_CAPS_MAKE("{ I420, YV12, YUY2, NV12, BGRx, BGR, BGRA }"))); GST_DEBUG_CATEGORY_STATIC(emotion_video_sink_debug); #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) _plugin->first = EINA_TRUE; if ((pos <= 0) || (pos >= 1)) - _plugin->pi = (0.1 * _plugin->len) + + _plugin->pi = (0.1 * _plugin->len) + (_plugin->pcount * _plugin->len * interval); else - _plugin->pi = (pos * _plugin->len) + + _plugin->pi = (pos * _plugin->len) + (_plugin->pcount * _plugin->len * interval); 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 if (!buf->priv.back_buf) { Gfx_Func_Copy func; - + func = evas_common_draw_func_copy_get(w, 0); if (func) { @@ -306,7 +306,7 @@ evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int dst = (DATA32 *)((DATA8 *)(buf->dest) + ((y + yy) * row_bytes)); func(src, dst, w); } - + } } if (buf->func.free_update_region) @@ -320,7 +320,7 @@ evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int DATA32 *src, *dst; DATA8 *dest; int xx, yy, row_bytes; - + row_bytes = buf->dest_row_bytes; dest = (DATA8 *)(buf->dest) + (y * row_bytes) + (x * 4); if (buf->func.new_update_region) @@ -351,7 +351,7 @@ evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int DATA32 *src, *dst; DATA8 *dest; int xx, yy, row_bytes; - + row_bytes = buf->dest_row_bytes; dest = (DATA8 *)(buf->dest) + (y * row_bytes) + (x * 4); 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, if ((ob->rotation == 0) || (ob->rotation == 180)) { - func = - evas_common_convert_func_get(0, w, h, ob->bpp, + func = + evas_common_convert_func_get(0, w, h, ob->bpp, RED_MASK, GREEN_MASK, BLUE_MASK, PAL_MODE_NONE, ob->rotation); } else if ((ob->rotation == 90) || (ob->rotation == 270)) { - func = - evas_common_convert_func_get(0, h, w, ob->bpp, + func = + evas_common_convert_func_get(0, h, w, ob->bpp, RED_MASK, GREEN_MASK, BLUE_MASK, PAL_MODE_NONE, ob->rotation); } @@ -429,7 +429,7 @@ _outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w, if (ob->rotation == 0) { - RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, + RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, 0, 0, bw, bh); dst += (bpl * rect.y) + (rect.x * bpp); w -= rx; @@ -437,7 +437,7 @@ _outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w, else if (ob->rotation == 180) { pr = rect; - RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, + RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, 0, 0, bw, bh); rx = pr.w - rect.w; ry = pr.h - rect.h; @@ -447,7 +447,7 @@ _outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w, else if (ob->rotation == 90) { pr = rect; - RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, + RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, 0, 0, bw, bh); rx = pr.w - rect.w; ry = pr.h - rect.h; src += ry; @@ -456,7 +456,7 @@ _outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w, else if (ob->rotation == 270) { pr = rect; - RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, + RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, 0, 0, bw, bh); rx = pr.w - rect.w; ry = pr.h - rect.h; 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 fb_init_palette_332(FB_Mode *mode) { int r, g, b, i; - + if (mode->fb_var.bits_per_pixel != 8) return; i = 0; - + if (ioctl(fb, FBIOGETCMAP, &cmap) == -1) ERR("could not get colormap: ioctl(%d, FBIOGETCMAP) = %s", fb, strerror(errno)); - + /* generate the palette */ for (r = 0; r < 8; r++) { @@ -285,7 +285,7 @@ fb_init_palette_332(FB_Mode *mode) for (b = 0; b < 4; b++) { int val; - + val = (r << 5) | (r << 2) | (r >> 1); red[i] = (val << 8) | val; val = (g << 5) | (g << 2) | (g >> 1); @@ -296,7 +296,7 @@ fb_init_palette_332(FB_Mode *mode) } } } - + /* set colormap */ if (ioctl(fb, FBIOPUTCMAP, &cmap) == -1) { @@ -312,14 +312,14 @@ static void fb_init_palette_linear(FB_Mode *mode) { int i; - + if (mode->fb_var.bits_per_pixel != 8) return; - + if (ioctl(fb, FBIOGETCMAP, &cmap) == -1) ERR("could not get colormap: ioctl(%d, FBIOGETCMAP) = %s", fb, strerror(errno)); - + /* generate the palette */ for (i = 0; i < 256; i++) red[i] = (i << 8) | i; @@ -327,7 +327,7 @@ fb_init_palette_linear(FB_Mode *mode) green[i] = (i << 8) | i; for (i = 0; i < 256; i++) blue[i] = (i << 8) | i; - + /* set colormap */ if (ioctl(fb, FBIOPUTCMAP, &cmap) == -1) perror("ioctl FBIOPUTCMAP"); @@ -343,7 +343,7 @@ fb_list_modes(unsigned int *num_return) char line[256], label[256], value[256]; FB_Mode *modes = NULL, *temp; int num; - + num = 0; f = fopen("/etc/fb.modes","rb"); if (!f) @@ -356,14 +356,14 @@ fb_list_modes(unsigned int *num_return) if (sscanf(line, "mode \"%250[^\"]\"", label) == 1) { char f1[32], f2[32], f3[32], f4[32]; - + f1[0] = 0; f2[0] = 0; f3[0] = 0; f4[0] = 0; sscanf(label, "%30[^x]x%30[^-]-%30[^-]-%30s", f1, f2, f3, f4); if ((f1[0]) && (f2[0])) { int geometry = 0; int timings = 0; - + num++; temp = modes; modes = realloc(modes, num * sizeof(FB_Mode)); @@ -385,7 +385,7 @@ fb_list_modes(unsigned int *num_return) while ((fgets(line, sizeof(line) - 1, f)) && (!strstr(line, "endmode"))) { - + if (sscanf(line," geometry %i %i %i %i %i", &modes[num - 1].fb_var.xres, &modes[num - 1].fb_var.yres, @@ -468,7 +468,7 @@ fb_setmode(unsigned int width, unsigned int height, unsigned int pdepth, unsigne { FB_Mode *modes; unsigned int i, num_modes; - + modes = fb_list_modes(&num_modes); DBG("want %ux%u, bitdepth=%u, refresh=%u, modes=%p, num_modes=%u", width, height, pdepth, refresh, modes, num_modes); @@ -521,7 +521,7 @@ fb_changeres(FB_Mode *cur_mode, unsigned int width, unsigned int height, unsigne { FB_Mode *modes; unsigned int i, num_modes; - + modes = fb_list_modes(&num_modes); DBG("want %ux%u, bitdepth=%u, refresh=%u, modes=%p, num_modes=%u", 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 { FB_Mode *modes; unsigned int i, num_modes; - + modes = fb_list_modes(&num_modes); DBG("want %ux%u, bitdepth=%u, refresh=%u, modes=%p, num_modes=%u", width, height, pdepth, refresh, modes, num_modes); @@ -614,10 +614,10 @@ fb_getmode(void) { FB_Mode *mode = NULL; int hpix, lines, clockrate; - + mode = malloc(sizeof(FB_Mode)); /* look what we have now ... */ - + if (ioctl(fb, FBIOGET_VSCREENINFO, &mode->fb_var) == -1) { ERR("could not get screeninfo: ioctl(%d, FBIOGET_VSCREENINFO) = %s", @@ -711,7 +711,7 @@ fb_setvt(int vtno) struct vt_stat vts; char vtname[32]; int vtfd; - + if (vtno < 0) { if ((ioctl(tty,VT_OPENQRY, &vtno) == -1)) @@ -737,14 +737,14 @@ fb_setvt(int vtno) return; } vtfd = open(vtname,O_RDWR); - + if (ioctl(tty, VT_GETSTATE, &vts) == -1) { perror("ioctl VT_GETSTATE"); close(vtfd); return; } - + orig_vt_no = vts.v_active; close(vtfd); #if 0 @@ -799,7 +799,7 @@ fb_init(int vt EINA_UNUSED, int device) return; } DBG("opened fb=%d (%s)", fb, dev); - + if (ioctl(fb, FBIOGET_VSCREENINFO, &fb_ovar) == -1) { ERR("could not get screeninfo: ioctl(%d, FBIOGET_VSCREENINFO) = %s", @@ -878,7 +878,7 @@ fb_postinit(FB_Mode *mode) fb_cleanup(); return -1; } - + if (fb_fix.type != FB_TYPE_PACKED_PIXELS) { CRI("can handle only packed pixel frame buffers (want %#x, got %#x)", @@ -919,7 +919,7 @@ fb_postinit(FB_Mode *mode) { mode->fb_var.xoffset = 0; mode->fb_var.yoffset = 0; - + if (ioctl(fb, FBIOPAN_DISPLAY, &(mode->fb_var)) == -1) { const char *errmsg = strerror(errno); @@ -998,11 +998,11 @@ fb_cleanup(void) "mode=%hhd, waitv=%hhd, relsig=%hd, acqsig=%hd, frsig=%hd}) = %s", tty, vt_omode.mode, vt_omode.waitv, vt_omode.relsig, vt_omode.acqsig, vt_omode.frsig, strerror(errno)); -#if 0 +#if 0 if ((ioctl(tty, VT_ACTIVATE, orig_vt_no) == -1) && (orig_vt_no)) ERR("could not activate: ioctl(%d, VT_ACTIVATE, %d) = %s", tty, orig_vt_no, strerror(errno)); -#endif +#endif if (tty > 0) /* don't close if got from isatty(0) */ close(tty); } 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 buf->priv.mask.b, PAL_MODE_NONE, buf->rot); } - else if (buf->rot == 180) + else if (buf->rot == 180) { data = (DATA8 *)buf->priv.fb.fb->mem + buf->priv.fb.fb->mem_offset + - buf->priv.fb.fb->bpp * + buf->priv.fb.fb->bpp * (buf->w - x - w + ((buf->h - y - h) * buf->priv.fb.fb->stride)); conv_func = evas_common_convert_func_get(data, w, h, 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) FINDSYM(glsym_glStartTiling, "glActivateTileQCOM", NULL, glsym_func_void); FINDSYM(glsym_glEndTiling, "glEndTilingQCOM", "GL_QCOM_tiled_rendering", glsym_func_void); FINDSYM(glsym_glEndTiling, "glEndTiling", NULL, glsym_func_void); - + if (!getenv("EVAS_GL_MAPBUFFER_DISABLE")) { // 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, (tex->im->orient == EVAS_IMAGE_ORIENT_90)) { double tmp; - + SWAP(&sw, &sh, tmp); SWAP(&sx, &sy, tmp); @@ -2333,7 +2333,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc, SWAP(&sw, &sh, tmp); SWAP(&sx, &sy, tmp); - + sx = tex->im->w - sw - sx; sy = tex->im->h - sh - sy; } @@ -2424,7 +2424,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc, } PUSH_MASK(pn, mtex, mx, my, mw, mh, masksam); - + if (!nomul) PUSH_6_COLORS(pn, r, g, b, a); } 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 Eina_List *surfaces; Eina_List *contexts; - //void *engine_data; + //void *engine_data; Eina_Hash *safe_extensions; }; 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) // expand to 32bit (4 byte) aligned rows for texture upload nw = ((w + 3) / 4) * 4; - // if image already (4 byte) aligned rows then assign old image data to new data(ndata) to + // if image already (4 byte) aligned rows then assign old image data to new data(ndata) to if(nw == w){ ndata = data; } 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 if (((int)w > gc->shared->info.max_texture_size) || ((int)h > gc->shared->info.max_texture_size)) return NULL; - + if (data) { 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 if (((int)w > gc->shared->info.max_texture_size) || ((int)h > gc->shared->info.max_texture_size)) return NULL; - + im = calloc(1, sizeof(Evas_GL_Image)); if (!im) return NULL; im->references = 1; @@ -453,7 +453,7 @@ evas_gl_common_image_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned in if (((int)w > gc->shared->info.max_texture_size) || ((int)h > gc->shared->info.max_texture_size)) return NULL; - + im = calloc(1, sizeof(Evas_GL_Image)); if (!im) return NULL; im->references = 1; @@ -735,7 +735,7 @@ evas_gl_common_image_surface_new(Evas_Engine_GL_Context *gc, unsigned int w, uns if (((int)w > gc->shared->info.max_texture_size) || ((int)h > gc->shared->info.max_texture_size)) return NULL; - + im = calloc(1, sizeof(Evas_GL_Image)); if (!im) return NULL; im->references = 1; @@ -1352,7 +1352,7 @@ evas_gl_common_image_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im, } if ((sw == dw) && (sh == dh)) smooth = 0; - + im->tex->im = im; if ((!gc->dc->cutout.rects) || ((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) { async->tex->was_preloaded = EINA_TRUE; - async->tex->ptt->allocations = + async->tex->ptt->allocations = eina_list_remove(async->tex->ptt->allocations, async->tex->aptt); eina_rectangle_pool_release(async->tex->aptt); @@ -135,7 +135,7 @@ _evas_gl_preload_lock(void) eina_condition_signal(&async_loader_cond); eina_condition_wait(&async_loader_cond); - if (async_loader_exit) + if (async_loader_exit) { eina_lock_release(&async_loader_lock); 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) #ifdef GL_TEXTURE_INTERNAL_FORMAT # ifdef GL_GLES # else -// this is not in opengles!!! hrrrm +// this is not in opengles!!! hrrrm // if (glGetTexLevelParameteriv) // in case of weak symbols? { int intfmtret = -1; @@ -1605,7 +1605,7 @@ evas_gl_common_texture_free(Evas_GL_Texture *tex, Eina_Bool force) tex->ptv2 = NULL; tex->ptuv = NULL; - if (tex->im) + if (tex->im) { tex->im->tex = NULL; 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 else if (rows[0] && rows[h]) { unsigned int y; - + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glBindTexture(GL_TEXTURE_2D, tex->pt->texture); 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 struct gbm_surface *surface; - struct + struct { EGLContext context; EGLSurface surface; @@ -106,7 +106,7 @@ struct _Outbuf EGLDisplay disp; } egl; - struct + struct { Ecore_Drm2_Output *output; 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, if (!slice || !im) return ret; - /* If content hint is DYNAMIC, the im->im could be NULL. If the im->im does + /* If content hint is DYNAMIC, the im->im could be NULL. If the im->im does not exist, eng_image_data_direct_get needs to return copied dyn.data to make functions including efl_file_save work. */ 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 return EINA_TRUE; } -static int +static int eng_image_animated_frame_get(void *engine EINA_UNUSED, void *image) { 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: } if (context == EGL_NO_CONTEXT) _tls_context_set(gw->egl_context); - + SET_RESTORE_CONTEXT(); if (evas_eglMakeCurrent(gw->egl_disp, 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 return EINA_TRUE; } -static int +static int eng_image_animated_frame_get(void *data EINA_UNUSED, void *image) { 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 Evas_Engine_Info magic; /* engine specific data & parameters it needs to set up */ - struct + struct { Evas_Engine_Info_Software_X11_Backend backend; 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 int rot; int onebuf; - struct + struct { Convert_Pal *pal; - union + union { - struct + struct { Display *disp; Window win; @@ -65,7 +65,7 @@ struct _Outbuf unsigned char bit_swap : 1; } xlib; } x11; - struct + struct { DATA32 r, g, b; } mask; @@ -73,7 +73,7 @@ struct _Outbuf /* 1 big buffer for updates - flush on idle_flush */ RGBA_Image *onebuf; Eina_Array onebuf_regions; - + void *swapper; /* 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); void eng_gl_symbols(EGLDisplay disp); -static inline int +static inline int _re_wincheck(Outbuf *ob) { 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) glsym_evas_gl_common_context_free(gw->gl_context); } - eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, + eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); if (gw->egl_context != context) @@ -260,7 +260,7 @@ eng_window_free(Outbuf *gw) free(gw); } -void +void eng_window_use(Outbuf *gw) { Eina_Bool force = EINA_FALSE; @@ -303,7 +303,7 @@ eng_window_use(Outbuf *gw) } } -void +void eng_window_unsurf(Outbuf *gw) { if (!gw->surf) return; @@ -315,7 +315,7 @@ eng_window_unsurf(Outbuf *gw) if (_evas_gl_wl_window == gw) { - eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, + eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); if (gw->egl_surface != EGL_NO_SURFACE) eglDestroySurface(gw->egl_disp, gw->egl_surface); @@ -327,7 +327,7 @@ eng_window_unsurf(Outbuf *gw) gw->surf = EINA_FALSE; } -void +void eng_window_resurf(Outbuf *gw) { struct wl_surface *wls; @@ -366,7 +366,7 @@ eng_window_resurf(Outbuf *gw) gw->surf = EINA_TRUE; } -void +void eng_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth EINA_UNUSED) { ob->w = w; @@ -387,7 +387,7 @@ eng_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth EIN } } -int +int eng_outbuf_rotation_get(Outbuf *ob) { return ob->rot; @@ -433,7 +433,7 @@ eng_outbuf_swap_mode_get(Outbuf *ob) return ob->swap_mode; } -Eina_Bool +Eina_Bool eng_outbuf_region_first_rect(Outbuf *ob) { 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 return ob->gl_context->def_surface; } -void +void eng_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) { if (!_re_wincheck(ob)) return; @@ -530,7 +530,7 @@ eng_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update EINA_UNUSED, int x glsym_evas_gl_common_context_flush(ob->gl_context); } -void +void eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_damage EINA_UNUSED, Evas_Render_Mode render_mode) { if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) goto end; @@ -604,7 +604,7 @@ eng_gl_context_new(Outbuf *ob) if (!(ctx = calloc(1, sizeof(Context_3D)))) return NULL; - ctx->context = + ctx->context = eglCreateContext(ob->egl_disp, ob->egl_config, ob->egl_context, attrs); if (!ctx->context) { @@ -622,17 +622,17 @@ err: return NULL; } -void +void eng_gl_context_free(Context_3D *ctx) { eglDestroyContext(ctx->display, ctx->context); free(ctx); } -void +void eng_gl_context_use(Context_3D *ctx) { - if (eglMakeCurrent(ctx->display, ctx->surface, + if (eglMakeCurrent(ctx->display, ctx->surface, ctx->surface, ctx->context) == EGL_FALSE) { 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) } } -static Evas_Module_Api evas_modapi = +static Evas_Module_Api evas_modapi = { EVAS_MODULE_API_VERSION, "wayland_shm", "none", {module_open, module_close} }; 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 Ecore_Wl2_Surface *surface; - struct + struct { /* one big buffer for updates. flushed on idle_flush */ 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: return NULL; } -void +void _evas_outbuf_free(Outbuf *ob) { LOGFN; @@ -49,7 +49,7 @@ _evas_outbuf_free(Outbuf *ob) Eina_Rectangle *rect; img = ob->priv.pending_writes->data; - ob->priv.pending_writes = + ob->priv.pending_writes = eina_list_remove_list(ob->priv.pending_writes, ob->priv.pending_writes); rect = img->extended_info; @@ -69,7 +69,7 @@ _evas_outbuf_free(Outbuf *ob) free(ob); } -void +void _evas_outbuf_idle_flush(Outbuf *ob) { RGBA_Image *img; @@ -90,8 +90,8 @@ _evas_outbuf_idle_flush(Outbuf *ob) while (ob->priv.prev_pending_writes) { img = ob->priv.prev_pending_writes->data; - ob->priv.prev_pending_writes = - eina_list_remove_list(ob->priv.prev_pending_writes, + ob->priv.prev_pending_writes = + eina_list_remove_list(ob->priv.prev_pending_writes, ob->priv.prev_pending_writes); rect = img->extended_info; evas_cache_image_drop(&img->cache_entry); @@ -101,7 +101,7 @@ _evas_outbuf_idle_flush(Outbuf *ob) } } -void +void _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage EINA_UNUSED, Tilebuf_Rect *buffer_damage EINA_UNUSED, Evas_Render_Mode render_mode) { Eina_Rectangle *result; @@ -225,7 +225,7 @@ _evas_outbuf_swap_mode_get(Outbuf *ob) return MODE_FULL; } -int +int _evas_outbuf_rotation_get(Outbuf *ob) { LOGFN; @@ -233,17 +233,17 @@ _evas_outbuf_rotation_get(Outbuf *ob) return ob->rotation; } -void +void _evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, Eina_Bool alpha, Eina_Bool resize) { LOGFN; - if ((depth == OUTBUF_DEPTH_NONE) || + if ((depth == OUTBUF_DEPTH_NONE) || (depth == OUTBUF_DEPTH_INHERIT)) depth = ob->depth; if ((ob->w == w) && (ob->h == h) && - (ob->rotation == rot) && (ob->depth == depth) && + (ob->rotation == rot) && (ob->depth == depth) && (ob->priv.destination_alpha == alpha)) return; @@ -340,7 +340,7 @@ _evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx, img->extended_info = rect; - ob->priv.pending_writes = + ob->priv.pending_writes = eina_list_append(ob->priv.pending_writes, img); 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, return NULL; } -void +void _evas_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w, int h) { Gfx_Func_Convert func = NULL; @@ -374,15 +374,15 @@ _evas_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, in if ((ob->rotation == 0) || (ob->rotation == 180)) { - func = - evas_common_convert_func_get(0, w, h, depth, + func = + evas_common_convert_func_get(0, w, h, depth, RED_MASK, GREEN_MASK, BLUE_MASK, PAL_MODE_NONE, ob->rotation); } else if ((ob->rotation == 90) || (ob->rotation == 270)) { - func = - evas_common_convert_func_get(0, h, w, depth, + func = + evas_common_convert_func_get(0, h, w, depth, RED_MASK, GREEN_MASK, BLUE_MASK, PAL_MODE_NONE, ob->rotation); } 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, header.height = load_opts->emile.region.h; } - /* It is not bad idea that bmp loader support scale down decoding + /* It is not bad idea that bmp loader support scale down decoding * because of memory issue in mobile world.*/ if (load_opts->emile.scale_down_by > 1) { @@ -530,7 +530,7 @@ evas_image_load_file_data_bmp(void *loader_data, header.width = opts->emile.region.w; header.height = opts->emile.region.h; } - /* It is not bad idea that bmp loader support scale down decoding + /* It is not bad idea that bmp loader support scale down decoding * because of memory issue in mobile world. */ if (opts->emile.scale_down_by > 1) scale_ratio = opts->emile.scale_down_by; @@ -1314,7 +1314,7 @@ evas_image_load_file_data_bmp(void *loader_data, } } } - else if ((header.bit_count == 16) && + else if ((header.bit_count == 16) && (header.rmask == 0x7c00) && (header.gmask == 0x03e0) && (header.bmask == 0x001f) ) { 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 { int x, y, w, h; unsigned short delay; // delay time in 1/100ths of a sec - short transparent : 10; // -1 == not, anything else == index + short transparent : 10; // -1 == not, anything else == index short dispose : 6; // 0, 1, 2, 3 (others invalid) Eina_Bool interlace : 1; // interlaced or not }; @@ -69,7 +69,7 @@ _fill_image(DATA32 *data, int rowpix, DATA32 val, int x, int y, int w, int h) { int xx, yy; DATA32 *p; - + for (yy = 0; yy < h; yy++) { p = data + ((y + yy) * rowpix) + x; @@ -384,14 +384,14 @@ _flush_older_frames(Evas_Image_Animated *animated, if (!l) l = animated->frames; } } - + static int _file_read(GifFileType *gft, GifByteType *buf, int len) { File_Info *fi = gft->UserData; if (fi->pos >= fi->len) return 0; // if at or past end - no - if ((fi->pos + len) >= fi->len) len = fi->len - fi->pos; + if ((fi->pos + len) >= fi->len) len = fi->len - fi->pos; memcpy(buf, fi->map + fi->pos, len); fi->pos += len; return len; @@ -587,7 +587,7 @@ evas_image_load_file_data_gif2(void *loader_data, // so we have to load multiple times to animate. what if the // same image is shared/loaded in 2 ore more places AND animated // there? - + // use index stored in image (XXX: yuk!) index = animated->cur_frame; // if index is invalid for animated image - error out @@ -665,7 +665,7 @@ open_file: { int ext_code; GifByteType *ext; - + ext = NULL; DGifGetExtension(gif, &ext_code, &ext); while (ext) @@ -727,7 +727,7 @@ open_file: else if (finfo->dispose == 3) // GIF_DISPOSE_RESTORE { Image_Entry_Frame *prevframe2; - + // we need to copy data from one frame back // from the prev frame into the current frame // (copy the whole image - at least the sample @@ -757,7 +757,7 @@ open_file: } // if we hve a frame BUT the image is not animated... different // path - else if ((thisframe) && (!thisframe->data) && + else if ((thisframe) && (!thisframe->data) && (!animated->animated)) { // if we don't have the data decoded yet - decode it @@ -815,18 +815,18 @@ open_file: loader->fi.map = NULL; loader->imgnum = 0; } - -on_ok: + +on_ok: // no errors in header scan etc. so set err and return value *error = EVAS_LOAD_ERROR_NONE; ret = EINA_TRUE; - + // if it was an animated image we need to copy the data to the // pixels for the image from the frame holding the data if (animated->animated && frame->data) memcpy(pixels, frame->data, prop->w * prop->h * sizeof(DATA32)); prop->premul = EINA_TRUE; - + on_error: // jump here on any errors to clean up return ret; } @@ -846,13 +846,13 @@ evas_image_load_frame_duration_gif2(void *loader_data, if (!animated->animated) return -1.0; if ((start_frame + frame_num) > animated->frame_count) return -1.0; if (frame_num < 0) return -1.0; - + if (frame_num < 1) frame_num = 1; // walk frames from start frame though and total up delays for (i = start_frame; i < (start_frame + frame_num); i++) { Frame_Info *finfo; - + // find the frame frame = _find_frame(animated, i); // 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, // NULL == highest res // biggest == highest res // smallest == lowest res - // + // // smaller == next size SMALLER than load opts WxH (if possible) // bigger == next size BIGGER than load opts WxH (if possible) // 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) DATA8 lastc; /* first skip all white space - * Note: we are skipping here actually every character than is not + * Note: we are skipping here actually every character than is not * a digit */ while (!isdigit(*b->current)) { @@ -523,7 +523,7 @@ static int pmaps_buffer_plain_bw_get(Pmaps_Buffer *b, DATA32 *val) { /* first skip all white space - * Note: we are skipping here actually every character than is not + * Note: we are skipping here actually every character than is not * a digit */ while (!isdigit(*b->current)) { 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, static unsigned int read_compressed_channel(const unsigned char *map, size_t length, size_t *position, - const unsigned int channel_length EINA_UNUSED, + const unsigned int channel_length EINA_UNUSED, unsigned int size, unsigned char* channel) { 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, uint32 *ps, pixel; unsigned int a, r, g, b; unsigned int nas = 0; - + pix = pixels; pd = pix + ((prop->h - y - 1) * prop->w); 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) return 0; } -static int +static int evas_image_save_file_png(RGBA_Image *im, const char *file, const char *key EINA_UNUSED, int quality EINA_UNUSED, int do_compress, const char *encoding EINA_UNUSED) { 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 /* By default uses patent-free use COMPRESSION_DEFLATE, * another lossless compression technique */ TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_DEFLATE); - + if (has_alpha) { 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) { if (parent == NULL) return; - // inherit the property of parent if not present in child. + // inherit the property of parent if not present in child. // fill if (!(child->fill.flags & SVG_FILL_FLAGS_PAINT)) {