summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-07-31 10:49:27 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-07-31 10:58:04 +0900
commit6ac4ea20807722a906141a4159579cca22e87160 (patch)
treee685fd14c52ff20a945716ddd3aad987f44e18ab
parent2d4d836018387470b5df2c59119ab6cc81188e94 (diff)
evas cache2 - remove excess file and key checks - only check file
no need for key as no key is handled and no file is handled too. cleaner code. found by PVS studio
-rw-r--r--src/lib/evas/cache2/evas_cache2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/evas/cache2/evas_cache2.c b/src/lib/evas/cache2/evas_cache2.c
index a7bd68c453..996a2a4c5c 100644
--- a/src/lib/evas/cache2/evas_cache2.c
+++ b/src/lib/evas/cache2/evas_cache2.c
@@ -822,7 +822,7 @@ _scaled_image_find(Image_Entry *im, int src_x, int src_y, int src_w,
822 Evas_Image_Load_Opts lo; 822 Evas_Image_Load_Opts lo;
823 Image_Entry *ret; 823 Image_Entry *ret;
824 824
825 if (((!im->file) || ((!im->file) && (!im->key))) || (!im->data1) || 825 if ((!im->file) || (!im->data1) ||
826 ((src_w == dst_w) && (src_h == dst_h)) || 826 ((src_w == dst_w) && (src_h == dst_h)) ||
827 ((!im->flags.alpha) && (!smooth))) return NULL; 827 ((!im->flags.alpha) && (!smooth))) return NULL;
828 828
@@ -902,7 +902,7 @@ evas_cache2_image_scale_load(Image_Entry *im,
902 (im->scale_hint != EVAS_IMAGE_SCALE_HINT_DYNAMIC)) 902 (im->scale_hint != EVAS_IMAGE_SCALE_HINT_DYNAMIC))
903 goto parent_out; 903 goto parent_out;
904 904
905 if (((!im->file) || ((!im->file) && (!im->key))) || 905 if ((!im->file) ||
906 ((src_w == 0) || (src_h == 0) || (dst_w == 0) || (dst_h == 0)) || 906 ((src_w == 0) || (src_h == 0) || (dst_w == 0) || (dst_h == 0)) ||
907 (im->scale_hint == EVAS_IMAGE_SCALE_HINT_DYNAMIC)) goto parent_out; 907 (im->scale_hint == EVAS_IMAGE_SCALE_HINT_DYNAMIC)) goto parent_out;
908 908