summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLeandro Pereira <leandro@profusion.mobi>2012-12-20 18:02:33 +0000
committerLeandro Pereira <leandro@profusion.mobi>2012-12-20 18:02:33 +0000
commitb3c76a8bc27626880ad5784c1ca65b2bf5bd7f56 (patch)
tree9150a07904c9744f2086cba77ad08b612d995e4a /src
parent80bdcca7edbe39a693d6399abaac4293ca576414 (diff)
evas/software_generic: Remove invalid EINA_UNUSED and other cleanups
SVN revision: 81473
Diffstat (limited to 'src')
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 6b8fa8b7a6..b4d1bfc8ce 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -873,7 +873,7 @@ eng_image_colorspace_set(void *data EINA_UNUSED, void *image, int cspace)
873} 873}
874 874
875static void * 875static void *
876eng_image_native_set(void *data EINA_UNUSED, void *image, void *native EINA_UNUSED) 876eng_image_native_set(void *data EINA_UNUSED, void *image, void *native)
877{ 877{
878 //return image; 878 //return image;
879 Evas_Native_Surface *ns = native; 879 Evas_Native_Surface *ns = native;
@@ -881,17 +881,16 @@ eng_image_native_set(void *data EINA_UNUSED, void *image, void *native EINA_UNUS
881 881
882 if (!im || !ns) return im; 882 if (!im || !ns) return im;
883 883
884 if (!ns) return im;
885
886 im2 = evas_cache_image_data(evas_common_image_cache_get(), 884 im2 = evas_cache_image_data(evas_common_image_cache_get(),
887 im->w, im->h, 885 im->w, im->h,
888 ns->data.x11.visual, 1, 886 ns->data.x11.visual, 1,
889 EVAS_COLORSPACE_ARGB8888); 887 EVAS_COLORSPACE_ARGB8888);
890 evas_cache_image_drop(im); 888 if (im->references > 1)
891 im = im2; 889 ERR("Setting native with more than one references for im=%p", im);
892 890
893 return im; 891 evas_cache_image_drop(im);
894 892
893 return im2;
895} 894}
896 895
897static void * 896static void *