Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas/src/modules/engines/software_generic


Modified Files:
        evas_engine.c 


Log Message:


fix segv added in

===================================================================
RCS file: 
/cvs/e/e17/libs/evas/src/modules/engines/software_generic/evas_engine.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- evas_engine.c       17 Dec 2006 15:48:51 -0000      1.13
+++ evas_engine.c       17 Dec 2006 16:46:30 -0000      1.14
@@ -334,6 +334,7 @@
 {
    RGBA_Image *im;
 
+   if (!image) return 1;
    im = image;
    switch (im->cs.space)
      {
@@ -350,6 +351,7 @@
 {
     RGBA_Image *im;
 
+   if (!image) return EVAS_COLORSPACE_ARGB8888;
    im = image;
    return im->cs.space;
 }
@@ -646,7 +648,7 @@
 static void *
 eng_image_data_put(void *data, void *image, DATA32 *image_data)
 {
-   RGBA_Image *im;
+   RGBA_Image *im, *im2;
 
    im = image;
    switch (im->cs.space)
@@ -658,10 +660,11 @@
             
             w = im->image->w;
             h = im->image->h;
+            im2 = eng_image_new_from_data(data, w, h, image_data, 
+                                          eng_image_alpha_get(data, image),
+                                          eng_image_colorspace_get(data, 
image));
             evas_common_image_unref(im);
-            return eng_image_new_from_data(data, w, h, image_data, 
-                                           eng_image_alpha_get(data, image),
-                                           eng_image_colorspace_get(data, 
image));
+            im = im2;
          }
        break;
       case EVAS_COLORSPACE_YCBCR422P601_PL:



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to