summaryrefslogtreecommitdiff
path: root/libdocument
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-06-25 12:46:50 +0200
committerStefano Karapetsas <[email protected]>2014-06-25 12:46:50 +0200
commit4e796748f1079ac71fc0496da49e3ee219b98d2e (patch)
tree8a656711f5c56d4b913938f226c585dc4a50b133 /libdocument
parentff8c5fca03211db8f58368ecf35c3ab63ed876fd (diff)
parentbc94b296158e036be054c5ed061af83c893f1ea9 (diff)
downloadatril-4e796748f1079ac71fc0496da49e3ee219b98d2e.tar.bz2
atril-4e796748f1079ac71fc0496da49e3ee219b98d2e.tar.xz
Merge pull request #77 from NiceandGently/master
create_thumbnail_frame should return NULL when source_pixbuf is NULL and width and height are not positive.
Diffstat (limited to 'libdocument')
-rw-r--r--libdocument/ev-document-misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c
index d597127f..6099b7fa 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,