[evince/gnome-2-32] document: create_thumbnail_frame should return NULL when source_pixbuf is NULL and width and height



commit 0fd1f66767ab3b71bef571bf734ce0038d696f4f
Author: Josà Aliste <jaliste src gnome org>
Date:   Fri Nov 26 11:56:45 2010 -0300

    document: create_thumbnail_frame should return NULL when
    source_pixbuf is NULL and width and height are not positive.
    
    Fixes bug #594408
    (cherry picked from commit 3d8180a605e8c98172e9e0e739e22b7f50ed7bad)

 libdocument/ev-document-misc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c
index d597127..6099b7f 100644
--- a/libdocument/ev-document-misc.c
+++ b/libdocument/ev-document-misc.c
@@ -56,7 +56,7 @@ create_thumbnail_frame (int        width,
 	}
 
 	/* make sure no one is passing us garbage */
-	g_assert (width_r >= 0 && height_r >= 0);
+	g_return_val_if_fail (width_r >= 0 && height_r >= 0, NULL);
 
 	retval = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
 				 TRUE, 8,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]