From 224ba8586b3cde4ed414e5a99b4edd9f812e8429 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 15 Dec 2016 11:28:17 -0800 Subject: [PATCH] evas: fix use of signed and unsigned type in conditional expression warning. --- src/lib/evas/common/evas_image_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/evas/common/evas_image_main.c b/src/lib/evas/common/evas_image_main.c index d9330f0ad0..11588ad02f 100644 --- a/src/lib/evas/common/evas_image_main.c +++ b/src/lib/evas/common/evas_image_main.c @@ -186,7 +186,7 @@ _evas_common_rgba_image_plane_get(const RGBA_Image *im, int plane, Eina_Slice *s { unsigned char **csdata = NULL; Evas_Colorspace cs; - int w, h; + size_t w, h; if (!im || !slice) return EINA_FALSE; cs = im->cache_entry.space; @@ -251,7 +251,7 @@ _evas_common_rgba_image_plane_get(const RGBA_Image *im, int plane, Eina_Slice *s case EVAS_COLORSPACE_YCBCR422601_PL: if (plane != 0) return EINA_FALSE; slice->mem = csdata[0]; - slice->len = (h > 1) ? ((size_t) (csdata[1] - csdata[0]) * h * 2) : (w * 2); + slice->len = (h > 1) ? ((csdata[1] - csdata[0]) * h * 2) : (w * 2); return EINA_TRUE; // 2 planes @@ -260,13 +260,13 @@ _evas_common_rgba_image_plane_get(const RGBA_Image *im, int plane, Eina_Slice *s if (plane == 0) { slice->mem = csdata[0]; - slice->len = (h > 1) ? ((size_t) (csdata[1] - csdata[0]) * h) : w; + slice->len = (h > 1) ? ((csdata[1] - csdata[0]) * h) : w; return EINA_TRUE; } else if (plane == 1) { slice->mem = csdata[h]; - slice->len = (h > 1) ? ((size_t) (csdata[h+1] - csdata[h]) * h / 2) : w / 2; + slice->len = (h > 1) ? ((csdata[h+1] - csdata[h]) * h / 2) : w / 2; return EINA_TRUE; } return EINA_FALSE; @@ -277,19 +277,19 @@ _evas_common_rgba_image_plane_get(const RGBA_Image *im, int plane, Eina_Slice *s if (plane == 0) { slice->mem = csdata[0]; - slice->len = (h > 1) ? ((size_t) (csdata[1] - csdata[0]) * h) : w; + slice->len = (h > 1) ? ((csdata[1] - csdata[0]) * h) : w; return EINA_TRUE; } else if (plane == 1) { slice->mem = csdata[h]; - slice->len = (h > 1) ? ((size_t) (csdata[h+1] - csdata[h]) * h / 2) : w / 2; + slice->len = (h > 1) ? ((csdata[h+1] - csdata[h]) * h / 2) : w / 2; return EINA_TRUE; } else if (plane == 2) { slice->mem = csdata[h + h / 2]; - slice->len = (h > 1) ? ((size_t) (csdata[h+h/2+1] - csdata[h+h/2]) * h / 2) : w / 2; + slice->len = (h > 1) ? ((csdata[h+h/2+1] - csdata[h+h/2]) * h / 2) : w / 2; return EINA_TRUE; } return EINA_FALSE;