summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-02-08 12:15:35 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-02-08 12:15:35 +0900
commit078099d63d59c24e839bf967b761335ce1c4cb47 (patch)
treeaa13dac94235a3517ef10dc6d5d6884620f90952 /src
parent3fe36441ef4eebb1ba9556ee117d902c3423501d (diff)
fix warnings in evas filter plus a memleak in _vflip_cpu()
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/filters/evas_filter.c3
-rw-r--r--src/lib/evas/filters/evas_filter_parser.c2
-rw-r--r--src/lib/evas/filters/evas_filter_transform.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c
index fc3f462cbe..ee510daa25 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -803,7 +803,7 @@ evas_filter_command_blur_add(Evas_Filter_Context *ctx, void *drawctx,
803 int inbuf, int outbuf, Evas_Filter_Blur_Type type, 803 int inbuf, int outbuf, Evas_Filter_Blur_Type type,
804 int dx, int dy, int ox, int oy) 804 int dx, int dy, int ox, int oy)
805{ 805{
806 Evas_Filter_Command *cmd; 806 Evas_Filter_Command *cmd = NULL;
807 Evas_Filter_Buffer *in = NULL, *out = NULL, *tmp = NULL, *in_dy = NULL; 807 Evas_Filter_Buffer *in = NULL, *out = NULL, *tmp = NULL, *in_dy = NULL;
808 Evas_Filter_Buffer *out_dy = NULL, *out_dx = NULL; 808 Evas_Filter_Buffer *out_dy = NULL, *out_dx = NULL;
809 Evas_Filter_Buffer *copybuf = NULL, *blur_out = NULL; 809 Evas_Filter_Buffer *copybuf = NULL, *blur_out = NULL;
@@ -951,6 +951,7 @@ evas_filter_command_blur_add(Evas_Filter_Context *ctx, void *drawctx,
951 951
952 if (copy_back) 952 if (copy_back)
953 { 953 {
954 if (!cmd) goto fail;
954 INF("Add copy %d -> %d", copybuf->id, blur_out->id); 955 INF("Add copy %d -> %d", copybuf->id, blur_out->id);
955 cmd->ENFN->context_color_set(cmd->ENDT, drawctx, 0, 0, 0, 255); 956 cmd->ENFN->context_color_set(cmd->ENDT, drawctx, 0, 0, 0, 255);
956 id = evas_filter_command_blend_add(ctx, drawctx, copybuf->id, blur_out->id, ox, oy, EVAS_FILTER_FILL_MODE_NONE); 957 id = evas_filter_command_blend_add(ctx, drawctx, copybuf->id, blur_out->id, ox, oy, EVAS_FILTER_FILL_MODE_NONE);
diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c
index e24dfbc3b4..58021671b1 100644
--- a/src/lib/evas/filters/evas_filter_parser.c
+++ b/src/lib/evas/filters/evas_filter_parser.c
@@ -1683,7 +1683,7 @@ _instr2cmd_curve(Evas_Filter_Context *ctx, Evas_Filter_Program *pgm,
1683 const char *src, *dst, *points_str, *interpolation, *channel_name; 1683 const char *src, *dst, *points_str, *interpolation, *channel_name;
1684 DATA8 values[256] = {0}, points[512]; 1684 DATA8 values[256] = {0}, points[512];
1685 int cmdid, point_count = 0; 1685 int cmdid, point_count = 0;
1686 char *token, *copy, *saveptr; 1686 char *token, *copy = NULL, *saveptr;
1687 Buffer *in, *out; 1687 Buffer *in, *out;
1688 Eina_Bool parse_ok = EINA_FALSE; 1688 Eina_Bool parse_ok = EINA_FALSE;
1689 1689
diff --git a/src/lib/evas/filters/evas_filter_transform.c b/src/lib/evas/filters/evas_filter_transform.c
index bc9f65d914..eaf1289a29 100644
--- a/src/lib/evas/filters/evas_filter_transform.c
+++ b/src/lib/evas/filters/evas_filter_transform.c
@@ -4,7 +4,7 @@ static Eina_Bool
4_vflip_cpu(Evas_Filter_Command *cmd) 4_vflip_cpu(Evas_Filter_Command *cmd)
5{ 5{
6 size_t datasize, stride; 6 size_t datasize, stride;
7 DATA8 *in, *out, *span; 7 DATA8 *in, *out, *span = NULL;
8 int w, h, sy, dy, oy, center, t, b, objh; 8 int w, h, sy, dy, oy, center, t, b, objh;
9 int s0, s1, d0, d1; 9 int s0, s1, d0, d1;
10 10
@@ -66,7 +66,7 @@ _vflip_cpu(Evas_Filter_Command *cmd)
66 else 66 else
67 memcpy(dst, src, stride); 67 memcpy(dst, src, stride);
68 } 68 }
69 69 free(span);
70 return EINA_TRUE; 70 return EINA_TRUE;
71} 71}
72 72