pixman: Branch 'master'

[Alexander Larsson]

 pixman/pixman-image.c |    6 ++++++
 pixman/pixman.h       |    1 +
 2 files changed, 7 insertions(+)

New commits:
commit 865c37d57421f6888151486ae1a2ec986a7cd9d2
Author: Alexander Larsson <alexl at redhat.com>
Date:   Tue Feb 9 15:57:18 2010 +0100

    Add pixman_image_get_destroy_data()
    
    This way you can get back user data that was set using
    pixman_image_set_destroy_function().

diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index c035eca..6036c56 100644
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -231,6 +231,12 @@ pixman_image_set_destroy_function (pixman_image_t *            image,
     image->common.destroy_data = data;
 }
 
+PIXMAN_EXPORT void *
+pixman_image_get_destroy_data (pixman_image_t *image)
+{
+  return image->common.destroy_data;
+}
+
 void
 _pixman_image_reset_clip_region (pixman_image_t *image)
 {
diff --git a/pixman/pixman.h b/pixman/pixman.h
index 5e35d92..03a233e 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -726,6 +726,7 @@ pixman_bool_t   pixman_image_unref                   (pixman_image_t
 void		pixman_image_set_destroy_function    (pixman_image_t		   *image,
 						      pixman_image_destroy_func_t   function,
 						      void			   *data);
+void *		pixman_image_get_destroy_data        (pixman_image_t		   *image);
 
 /* Set properties */
 pixman_bool_t   pixman_image_set_clip_region         (pixman_image_t               *image,