summaryrefslogtreecommitdiff
path: root/gdk-pixbuf/io-tiff.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-02-10 19:01:02 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-02-10 19:01:02 +0000
commit82fd3665ff3750edc9b89eaa327ff80510f25485 (patch)
tree60c322dc644f437ba46a4a0499923f2cf575ec61 /gdk-pixbuf/io-tiff.c
parent567eb53e2cf1d7c8ac0a54f0224e4549092f8e78 (diff)
downloadgdk-pixbuf-82fd3665ff3750edc9b89eaa327ff80510f25485.tar.gz
Always check for NULL when using callbacks. (#330563, Benjamin Otte)
2006-02-10 Matthias Clasen <mclasen@redhat.com> * io-jpeg.c: * io-png.c: * io-pnm.c: * io-tiff.c: * io-xbm.c: * io-xpm.c: Always check for NULL when using callbacks. (#330563, Benjamin Otte)
Diffstat (limited to 'gdk-pixbuf/io-tiff.c')
-rw-r--r--gdk-pixbuf/io-tiff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index e874e4d91..4e8136790 100644
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -238,7 +238,7 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error)
return NULL;
}
- if (context)
+ if (context && context->prepare_func)
(* context->prepare_func) (pixbuf, NULL, context->user_data);
#if TIFFLIB_VERSION >= 20031226
@@ -324,7 +324,7 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error)
_TIFFfree (rast);
}
- if (context)
+ if (context && context->update_func)
(* context->update_func) (pixbuf, 0, 0, width, height, context->user_data);
return pixbuf;