summaryrefslogtreecommitdiff
path: root/src/lib/evas/filters
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/filters')
-rw-r--r--src/lib/evas/filters/evas_filter.c2
-rw-r--r--src/lib/evas/filters/evas_filter_blend.c8
-rw-r--r--src/lib/evas/filters/evas_filter_blur.c8
-rw-r--r--src/lib/evas/filters/evas_filter_bump.c12
-rw-r--r--src/lib/evas/filters/evas_filter_curve.c8
-rw-r--r--src/lib/evas/filters/evas_filter_displace.c12
-rw-r--r--src/lib/evas/filters/evas_filter_fill.c2
-rw-r--r--src/lib/evas/filters/evas_filter_mask.c24
-rw-r--r--src/lib/evas/filters/evas_filter_parser.c27
-rw-r--r--src/lib/evas/filters/evas_filter_private.h4
-rw-r--r--src/lib/evas/filters/evas_filter_transform.c4
-rw-r--r--src/lib/evas/filters/evas_filter_utils.c4
12 files changed, 49 insertions, 66 deletions
diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c
index 301b25a..fef55f4 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -42,7 +42,7 @@ _evas_image_get(Ector_Buffer *buf)
42 if (!buf) return NULL; 42 if (!buf) return NULL;
43 /* FIXME: This MAY return RGBA_Image because engine_image_set MAY pass an 43 /* FIXME: This MAY return RGBA_Image because engine_image_set MAY pass an
44 * RGBA_Image... Baaaaah */ 44 * RGBA_Image... Baaaaah */
45 eo_do(buf, evas_ector_buffer_engine_image_get(NULL, &image)); 45 evas_ector_buffer_engine_image_get(buf, NULL, &image);
46 return image; 46 return image;
47} 47}
48 48
diff --git a/src/lib/evas/filters/evas_filter_blend.c b/src/lib/evas/filters/evas_filter_blend.c
index 9030e80..a8191e6 100644
--- a/src/lib/evas/filters/evas_filter_blend.c
+++ b/src/lib/evas/filters/evas_filter_blend.c
@@ -185,11 +185,11 @@ _filter_blend_cpu_generic_do(Evas_Filter_Command *cmd, draw_func image_draw)
185 185
186 sx = 0; 186 sx = 0;
187 sy = 0; 187 sy = 0;
188 eo_do(cmd->input->buffer, ector_buffer_size_get(&sw, &sh)); 188 ector_buffer_size_get(cmd->input->buffer, &sw, &sh);
189 189
190 dx = cmd->draw.ox; 190 dx = cmd->draw.ox;
191 dy = cmd->draw.oy; 191 dy = cmd->draw.oy;
192 eo_do(cmd->output->buffer, ector_buffer_size_get(&dw, &dh)); 192 ector_buffer_size_get(cmd->output->buffer, &dw, &dh);
193 193
194 if ((dw <= 0) || (dh <= 0) || (sw <= 0) || (sh <= 0)) 194 if ((dw <= 0) || (dh <= 0) || (sw <= 0) || (sh <= 0))
195 return EINA_TRUE; 195 return EINA_TRUE;
@@ -229,8 +229,8 @@ _filter_blend_cpu_generic_do(Evas_Filter_Command *cmd, draw_func image_draw)
229 sx, sy, sw, sh, dx, dy, dw, dh, image_draw); 229 sx, sy, sw, sh, dx, dy, dw, dh, image_draw);
230 230
231end: 231end:
232 if (src) eo_do(src_fb->buffer, ector_buffer_unmap(src, src_len)); 232 if (src) ector_buffer_unmap(src_fb->buffer, src, src_len);
233 if (dst) eo_do(cmd->output->buffer, ector_buffer_unmap(dst, dst_len)); 233 if (dst) ector_buffer_unmap(cmd->output->buffer, dst, dst_len);
234 return ret; 234 return ret;
235} 235}
236 236
diff --git a/src/lib/evas/filters/evas_filter_blur.c b/src/lib/evas/filters/evas_filter_blur.c
index 3eb59d4..5c2de1a 100644
--- a/src/lib/evas/filters/evas_filter_blur.c
+++ b/src/lib/evas/filters/evas_filter_blur.c
@@ -222,8 +222,8 @@ _box_blur_apply(Evas_Filter_Command *cmd, Eina_Bool vert, Eina_Bool rgba)
222 } 222 }
223 else ret = EINA_FALSE; 223 else ret = EINA_FALSE;
224 224
225 eo_do(cmd->input->buffer, ector_buffer_unmap(src, src_len)); 225 ector_buffer_unmap(cmd->input->buffer, src, src_len);
226 eo_do(cmd->output->buffer, ector_buffer_unmap(dst, dst_len)); 226 ector_buffer_unmap(cmd->output->buffer, dst, dst_len);
227 227
228 return ret; 228 return ret;
229} 229}
@@ -347,8 +347,8 @@ _gaussian_blur_apply(Evas_Filter_Command *cmd, Eina_Bool vert, Eina_Bool rgba)
347 } 347 }
348 else ret = EINA_FALSE; 348 else ret = EINA_FALSE;
349 349
350 eo_do(cmd->input->buffer, ector_buffer_unmap(src, src_len)); 350 ector_buffer_unmap(cmd->input->buffer, src, src_len);
351 eo_do(cmd->output->buffer, ector_buffer_unmap(dst, dst_len)); 351 ector_buffer_unmap(cmd->output->buffer, dst, dst_len);
352 352
353 return ret; 353 return ret;
354} 354}
diff --git a/src/lib/evas/filters/evas_filter_bump.c b/src/lib/evas/filters/evas_filter_bump.c
index f89ec3c..c7f12cb 100644
--- a/src/lib/evas/filters/evas_filter_bump.c
+++ b/src/lib/evas/filters/evas_filter_bump.c
@@ -224,9 +224,9 @@ _bump_map_cpu_alpha_alpha(Evas_Filter_Command *cmd)
224 ret = EINA_TRUE; 224 ret = EINA_TRUE;
225 225
226end: 226end:
227 eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, slen)); 227 ector_buffer_unmap(cmd->input->buffer, src_map, slen);
228 eo_do(cmd->mask->buffer, ector_buffer_unmap(map_map, mlen)); 228 ector_buffer_unmap(cmd->mask->buffer, map_map, mlen);
229 eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dlen)); 229 ector_buffer_unmap(cmd->output->buffer, dst_map, dlen);
230 free(phong); 230 free(phong);
231 return ret; 231 return ret;
232} 232}
@@ -404,8 +404,8 @@ _bump_map_cpu_alpha_rgba(Evas_Filter_Command *cmd)
404 ret = EINA_TRUE; 404 ret = EINA_TRUE;
405 405
406end: 406end:
407 eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, slen)); 407 ector_buffer_unmap(cmd->input->buffer, src_map, slen);
408 eo_do(cmd->mask->buffer, ector_buffer_unmap(map_map, mlen)); 408 ector_buffer_unmap(cmd->mask->buffer, map_map, mlen);
409 eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dlen)); 409 ector_buffer_unmap(cmd->output->buffer, dst_map, dlen);
410 return ret; 410 return ret;
411} 411}
diff --git a/src/lib/evas/filters/evas_filter_curve.c b/src/lib/evas/filters/evas_filter_curve.c
index 9950121..2ab9f70 100644
--- a/src/lib/evas/filters/evas_filter_curve.c
+++ b/src/lib/evas/filters/evas_filter_curve.c
@@ -85,8 +85,8 @@ premul:
85 ret = EINA_TRUE; 85 ret = EINA_TRUE;
86 86
87end: 87end:
88 eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, src_len)); 88 ector_buffer_unmap(cmd->input->buffer, src_map, src_len);
89 eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dst_len)); 89 ector_buffer_unmap(cmd->output->buffer, dst_map, dst_len);
90 return ret; 90 return ret;
91} 91}
92 92
@@ -112,8 +112,8 @@ _filter_curve_cpu_alpha(Evas_Filter_Command *cmd)
112 ret = EINA_TRUE; 112 ret = EINA_TRUE;
113 113
114end: 114end:
115 eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, src_len)); 115 ector_buffer_unmap(cmd->input->buffer, src_map, src_len);
116 eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dst_len)); 116 ector_buffer_unmap(cmd->output->buffer, dst_map, dst_len);
117 return ret; 117 return ret;
118} 118}
119 119
diff --git a/src/lib/evas/filters/evas_filter_displace.c b/src/lib/evas/filters/evas_filter_displace.c
index 5722c7b..01df460 100644
--- a/src/lib/evas/filters/evas_filter_displace.c
+++ b/src/lib/evas/filters/evas_filter_displace.c
@@ -242,9 +242,9 @@ _filter_displace_cpu_alpha(Evas_Filter_Command *cmd)
242 242
243 ret = EINA_TRUE; 243 ret = EINA_TRUE;
244end: 244end:
245 eo_do(cmd->input->buffer, ector_buffer_unmap(src, src_len)); 245 ector_buffer_unmap(cmd->input->buffer, src, src_len);
246 eo_do(cmd->output->buffer, ector_buffer_unmap(dst, dst_len)); 246 ector_buffer_unmap(cmd->output->buffer, dst, dst_len);
247 eo_do(map_fb->buffer, ector_buffer_unmap(map_start, map_len)); 247 ector_buffer_unmap(map_fb->buffer, map_start, map_len);
248 return ret; 248 return ret;
249} 249}
250 250
@@ -303,9 +303,9 @@ _filter_displace_cpu_rgba(Evas_Filter_Command *cmd)
303 303
304 ret = EINA_TRUE; 304 ret = EINA_TRUE;
305end: 305end:
306 eo_do(cmd->input->buffer, ector_buffer_unmap(src, src_len)); 306 ector_buffer_unmap(cmd->input->buffer, src, src_len);
307 eo_do(cmd->output->buffer, ector_buffer_unmap(dst, dst_len)); 307 ector_buffer_unmap(cmd->output->buffer, dst, dst_len);
308 eo_do(map_fb->buffer, ector_buffer_unmap(map_start, map_len)); 308 ector_buffer_unmap(map_fb->buffer, map_start, map_len);
309 return ret; 309 return ret;
310} 310}
311 311
diff --git a/src/lib/evas/filters/evas_filter_fill.c b/src/lib/evas/filters/evas_filter_fill.c
index e7090d9..0958dcf 100644
--- a/src/lib/evas/filters/evas_filter_fill.c
+++ b/src/lib/evas/filters/evas_filter_fill.c
@@ -53,7 +53,7 @@ _fill_cpu(Evas_Filter_Command *cmd)
53 } 53 }
54 } 54 }
55 55
56 eo_do(fb->buffer, ector_buffer_unmap(ptr, len)); 56 ector_buffer_unmap(fb->buffer, ptr, len);
57 return EINA_TRUE; 57 return EINA_TRUE;
58} 58}
59 59
diff --git a/src/lib/evas/filters/evas_filter_mask.c b/src/lib/evas/filters/evas_filter_mask.c
index 9f5b683..c6d08dd 100644
--- a/src/lib/evas/filters/evas_filter_mask.c
+++ b/src/lib/evas/filters/evas_filter_mask.c
@@ -146,9 +146,9 @@ _mask_cpu_alpha_alpha_alpha(Evas_Filter_Command *cmd)
146 ret = EINA_TRUE; 146 ret = EINA_TRUE;
147 147
148end: 148end:
149 eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, src_len)); 149 ector_buffer_unmap(cmd->input->buffer, src_map, src_len);
150 eo_do(msk_fb->buffer, ector_buffer_unmap(msk_map, msk_len)); 150 ector_buffer_unmap(msk_fb->buffer, msk_map, msk_len);
151 eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dst_len)); 151 ector_buffer_unmap(cmd->output->buffer, dst_map, dst_len);
152 return ret; 152 return ret;
153} 153}
154 154
@@ -261,9 +261,9 @@ _mask_cpu_alpha_rgba_rgba(Evas_Filter_Command *cmd)
261 ret = EINA_TRUE; 261 ret = EINA_TRUE;
262 262
263end: 263end:
264 eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, src_len)); 264 ector_buffer_unmap(cmd->input->buffer, src_map, src_len);
265 eo_do(msk_fb->buffer, ector_buffer_unmap(msk_map, msk_len)); 265 ector_buffer_unmap(msk_fb->buffer, msk_map, msk_len);
266 eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dst_len)); 266 ector_buffer_unmap(cmd->output->buffer, dst_map, dst_len);
267 return ret; 267 return ret;
268} 268}
269 269
@@ -351,9 +351,9 @@ _mask_cpu_alpha_alpha_rgba(Evas_Filter_Command *cmd)
351 ret = EINA_TRUE; 351 ret = EINA_TRUE;
352 352
353end: 353end:
354 eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, src_len)); 354 ector_buffer_unmap(cmd->input->buffer, src_map, src_len);
355 eo_do(msk_fb->buffer, ector_buffer_unmap(msk_map, msk_len)); 355 ector_buffer_unmap(msk_fb->buffer, msk_map, msk_len);
356 eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dst_len)); 356 ector_buffer_unmap(cmd->output->buffer, dst_map, dst_len);
357 return ret; 357 return ret;
358} 358}
359 359
@@ -429,8 +429,8 @@ _mask_cpu_rgba_rgba_rgba(Evas_Filter_Command *cmd)
429 ret = EINA_TRUE; 429 ret = EINA_TRUE;
430 430
431end: 431end:
432 eo_do(cmd->input->buffer, ector_buffer_unmap(src_map, src_len)); 432 ector_buffer_unmap(cmd->input->buffer, src_map, src_len);
433 eo_do(msk_fb->buffer, ector_buffer_unmap(msk_map, msk_len)); 433 ector_buffer_unmap(msk_fb->buffer, msk_map, msk_len);
434 eo_do(cmd->output->buffer, ector_buffer_unmap(dst_map, dst_len)); 434 ector_buffer_unmap(cmd->output->buffer, dst_map, dst_len);
435 return ret; 435 return ret;
436} 436}
diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c
index f78c7c0..2b2c4c0 100644
--- a/src/lib/evas/filters/evas_filter_parser.c
+++ b/src/lib/evas/filters/evas_filter_parser.c
@@ -2993,31 +2993,14 @@ evas_filter_program_state_set(Evas_Filter_Program *pgm, Evas_Object *eo_obj,
2993 pgm->state.next.name = next_state; 2993 pgm->state.next.name = next_state;
2994 pgm->state.next.value = next_val; 2994 pgm->state.next.value = next_val;
2995 2995
2996 eo_do(eo_obj, 2996 efl_gfx_color_get(eo_obj, &pgm->state.color.r, &pgm->state.color.g, &pgm->state.color.b, &pgm->state.color.a);
2997 efl_gfx_color_get(&pgm->state.color.r,
2998 &pgm->state.color.g,
2999 &pgm->state.color.b,
3000 &pgm->state.color.a));
3001 2997
3002 if (eo_isa(eo_obj, EVAS_TEXT_CLASS)) 2998 if (eo_isa(eo_obj, EVAS_TEXT_CLASS))
3003 { 2999 {
3004 eo_do(eo_obj, 3000 evas_obj_text_shadow_color_get(eo_obj, &pgm->state.text.shadow.r, &pgm->state.text.shadow.g, &pgm->state.text.shadow.b, &pgm->state.text.shadow.a);
3005 evas_obj_text_shadow_color_get(&pgm->state.text.shadow.r, 3001 evas_obj_text_outline_color_get(eo_obj, &pgm->state.text.outline.r, &pgm->state.text.outline.g, &pgm->state.text.outline.b, &pgm->state.text.outline.a);
3006 &pgm->state.text.shadow.g, 3002 evas_obj_text_glow_color_get(eo_obj, &pgm->state.text.glow.r, &pgm->state.text.glow.g, &pgm->state.text.glow.b, &pgm->state.text.glow.a);
3007 &pgm->state.text.shadow.b, 3003 evas_obj_text_glow2_color_get(eo_obj, &pgm->state.text.glow2.r, &pgm->state.text.glow2.g, &pgm->state.text.glow2.b, &pgm->state.text.glow2.a);
3008 &pgm->state.text.shadow.a),
3009 evas_obj_text_outline_color_get(&pgm->state.text.outline.r,
3010 &pgm->state.text.outline.g,
3011 &pgm->state.text.outline.b,
3012 &pgm->state.text.outline.a),
3013 evas_obj_text_glow_color_get(&pgm->state.text.glow.r,
3014 &pgm->state.text.glow.g,
3015 &pgm->state.text.glow.b,
3016 &pgm->state.text.glow.a),
3017 evas_obj_text_glow2_color_get(&pgm->state.text.glow2.r,
3018 &pgm->state.text.glow2.g,
3019 &pgm->state.text.glow2.b,
3020 &pgm->state.text.glow2.a));
3021 } 3004 }
3022 3005
3023 if (memcmp(&old_state, &pgm->state, sizeof(Evas_Filter_Program_State)) != 0) 3006 if (memcmp(&old_state, &pgm->state, sizeof(Evas_Filter_Program_State)) != 0)
diff --git a/src/lib/evas/filters/evas_filter_private.h b/src/lib/evas/filters/evas_filter_private.h
index e111fb2..c4aee71 100644
--- a/src/lib/evas/filters/evas_filter_private.h
+++ b/src/lib/evas/filters/evas_filter_private.h
@@ -282,8 +282,8 @@ _buffer_map_all(Ector_Buffer *buf, unsigned int *len, Ector_Buffer_Access_Flag m
282 void *ret = NULL; 282 void *ret = NULL;
283 int w, h; 283 int w, h;
284 if (!buf) return NULL; 284 if (!buf) return NULL;
285 eo_do(buf, ector_buffer_size_get(&w, &h); 285 ector_buffer_size_get(buf, &w, &h);
286 ret = ector_buffer_map(len, mode, 0, 0, w, h, cspace, stride)); 286 ret = ector_buffer_map(buf, len, mode, 0, 0, w, h, cspace, stride);
287 return ret; 287 return ret;
288} 288}
289 289
diff --git a/src/lib/evas/filters/evas_filter_transform.c b/src/lib/evas/filters/evas_filter_transform.c
index 704b8e8..0cc3b2d 100644
--- a/src/lib/evas/filters/evas_filter_transform.c
+++ b/src/lib/evas/filters/evas_filter_transform.c
@@ -116,8 +116,8 @@ _vflip_cpu(Evas_Filter_Command *cmd)
116 ret = EINA_TRUE; 116 ret = EINA_TRUE;
117 117
118end: 118end:
119 eo_do(cmd->input->buffer, ector_buffer_unmap(in, src_len)); 119 ector_buffer_unmap(cmd->input->buffer, in, src_len);
120 eo_do(cmd->output->buffer, ector_buffer_unmap(out, dst_len)); 120 ector_buffer_unmap(cmd->output->buffer, out, dst_len);
121 return ret; 121 return ret;
122} 122}
123 123
diff --git a/src/lib/evas/filters/evas_filter_utils.c b/src/lib/evas/filters/evas_filter_utils.c
index ec84301..486532e 100644
--- a/src/lib/evas/filters/evas_filter_utils.c
+++ b/src/lib/evas/filters/evas_filter_utils.c
@@ -62,9 +62,9 @@ evas_filter_buffer_scaled_get(Evas_Filter_Context *ctx,
62 } 62 }
63 63
64end: 64end:
65 if (src_map) eo_do(src->buffer, ector_buffer_unmap(src_map, src_len)); 65 if (src_map) ector_buffer_unmap(src->buffer, src_map, src_len);
66 if ((dst) && (dst_map)) 66 if ((dst) && (dst_map))
67 eo_do(dst->buffer, ector_buffer_unmap(dst_map, dst_len)); 67 ector_buffer_unmap(dst->buffer, dst_map, dst_len);
68 DEBUG_TIME_END(); 68 DEBUG_TIME_END();
69 return dst; 69 return dst;
70} 70}