summaryrefslogtreecommitdiff
path: root/src/bin/evas/evas_cserve2_cache.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/evas/evas_cserve2_cache.c')
-rw-r--r--src/bin/evas/evas_cserve2_cache.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/bin/evas/evas_cserve2_cache.c b/src/bin/evas/evas_cserve2_cache.c
index e86643df54..d0589dd4b8 100644
--- a/src/bin/evas/evas_cserve2_cache.c
+++ b/src/bin/evas/evas_cserve2_cache.c
@@ -508,6 +508,7 @@ _image_loaded_msg_create(Image_Entry *ientry, Image_Data *idata, int *size)
508 msg->alpha_sparse = idata->alpha_sparse; 508 msg->alpha_sparse = idata->alpha_sparse;
509 msg->image.w = idata->w; 509 msg->image.w = idata->w;
510 msg->image.h = idata->h; 510 msg->image.h = idata->h;
511 msg->alpha = idata->alpha;
511 512
512 if (idata->shm_id) 513 if (idata->shm_id)
513 { 514 {
@@ -806,18 +807,8 @@ _scaling_do(Shm_Handle *scale_shm, Image_Data *idata, Image_Entry *original)
806{ 807{
807 char *scale_map, *orig_map; 808 char *scale_map, *orig_map;
808 void *src_data, *dst_data; 809 void *src_data, *dst_data;
809 File_Data *fd;
810 Image_Data *orig_idata; 810 Image_Data *orig_idata;
811 811
812#warning FIXME Remove this call, add alpha flag to Image_Data
813 fd = _file_data_find(idata->file_id);
814 if (!fd)
815 {
816 ERR("Could not find file data %u for image %u",
817 idata->file_id, idata->id);
818 return -1;
819 }
820
821 orig_idata = _image_data_find(original->base.id); 812 orig_idata = _image_data_find(original->base.id);
822 if (!orig_idata) 813 if (!orig_idata)
823 { 814 {
@@ -858,7 +849,7 @@ _scaling_do(Shm_Handle *scale_shm, Image_Data *idata, Image_Entry *original)
858 idata->opts.scale_load.src_w, idata->opts.scale_load.src_h, 849 idata->opts.scale_load.src_w, idata->opts.scale_load.src_h,
859 0, 0, 850 0, 0,
860 idata->opts.scale_load.dst_w, idata->opts.scale_load.dst_h, 851 idata->opts.scale_load.dst_w, idata->opts.scale_load.dst_h,
861 fd->alpha, idata->opts.scale_load.smooth); 852 idata->alpha, idata->opts.scale_load.smooth);
862 853
863 cserve2_shm_unmap(original->shm); 854 cserve2_shm_unmap(original->shm);
864 cserve2_shm_unmap(scale_shm); 855 cserve2_shm_unmap(scale_shm);
@@ -906,6 +897,7 @@ _load_request_response(Image_Entry *ientry,
906 _entry_load_finish(ASENTRY(ientry)); 897 _entry_load_finish(ASENTRY(ientry));
907 ASENTRY(ientry)->request = NULL; 898 ASENTRY(ientry)->request = NULL;
908 899
900 idata->alpha = resp->alpha;
909 idata->alpha_sparse = resp->alpha_sparse; 901 idata->alpha_sparse = resp->alpha_sparse;
910 if (!idata->doload) 902 if (!idata->doload)
911 DBG("Entry %d loaded by speculative preload.", idata->id); 903 DBG("Entry %d loaded by speculative preload.", idata->id);