summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2013-09-24 18:46:17 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2013-10-28 15:47:15 +0900
commitc5ecf6e5d1f0c43cce569898cb477825b3c88b58 (patch)
tree30183bbcc19c3c8d5111b8aec69792b569893c92 /src/bin
parent25d71f823668ecb1865c61f306890fee654b9d32 (diff)
evas/cserve2: Fix scaling options
Be more careful when selecting the original image for scaling. Most load opts must remain the same, only smooth can be toyed with. Also, fix alpha when scaling.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/evas/evas_cserve2_cache.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bin/evas/evas_cserve2_cache.c b/src/bin/evas/evas_cserve2_cache.c
index d0589dd4b8..87ea2d237b 100644
--- a/src/bin/evas/evas_cserve2_cache.c
+++ b/src/bin/evas/evas_cserve2_cache.c
@@ -842,6 +842,7 @@ _scaling_do(Shm_Handle *scale_shm, Image_Data *idata, Image_Entry *original)
842 0, 0, 842 0, 0,
843 idata->opts.scale_load.dst_w, idata->opts.scale_load.dst_h); 843 idata->opts.scale_load.dst_w, idata->opts.scale_load.dst_h);
844 844
845 idata->alpha = orig_idata->alpha;
845 cserve2_rgba_image_scale_do( 846 cserve2_rgba_image_scale_do(
846 src_data, orig_idata->w, orig_idata->h, 847 src_data, orig_idata->w, orig_idata->h,
847 dst_data, 848 dst_data,
@@ -2721,10 +2722,10 @@ try_again:
2721 goto do_scaling; 2722 goto do_scaling;
2722 } 2723 }
2723 2724
2724 if (first_attempt) 2725 if (first_attempt && unscaled.scale_load.smooth)
2725 { 2726 {
2726 first_attempt = EINA_FALSE; 2727 first_attempt = EINA_FALSE;
2727 memset(&unscaled, 0, sizeof(unscaled)); 2728 unscaled.scale_load.smooth = 0;
2728 goto try_again; 2729 goto try_again;
2729 } 2730 }
2730 2731