From 53796b7f1fe0d85fcac8fde8f24eef7290706afd Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 26 Jun 2010 16:48:06 -0400
Subject: [PATCH] Add an accessor for GdkImage->mem

See bug # 522756
---
 docs/reference/gdk/gdk3-sections.txt |  1 +
 gdk/gdk.symbols                      |  1 +
 gdk/gdkimage.c                       | 18 ++++++++++++++++++
 gdk/gdkimage.h                       |  1 +
 4 files changed, 21 insertions(+)

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index e63d92d5e9..e09e887dd3 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -295,6 +295,7 @@ gdk_image_get_height
 gdk_image_get_image_type
 gdk_image_get_visual
 gdk_image_get_width
+gdk_image_get_pixels
 
 <SUBSECTION>
 gdk_image_put_pixel
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 5dc69280f3..15e328a5da 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -851,6 +851,7 @@ gdk_image_get_height
 gdk_image_get_image_type
 gdk_image_get_visual
 gdk_image_get_width
+gdk_image_get_pixels
 gdk_image_set_colormap
 gdk_image_new
 #endif
diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c
index 7b04925ffb..1ef49c996d 100644
--- a/gdk/gdkimage.c
+++ b/gdk/gdkimage.c
@@ -243,6 +243,24 @@ gdk_image_get_bits_per_pixel (GdkImage *image)
   return image->bits_per_pixel;
 }
 
+/**
+ * gdk_image_get_pixels:
+ * @image: a #GdkImage
+ *
+ * Returns a pointer to the pixel data of the image.
+ *
+ * Returns: the pixel data of the image
+ *
+ * Since: 2.22
+ */
+gpointer
+gdk_image_get_pixels (GdkImage *image)
+{
+  g_return_val_if_fail (GDK_IS_IMAGE (image), NULL);
+
+  return image->mem;
+}
+
 /* We have N_REGION GDK_SCRATCH_IMAGE_WIDTH x GDK_SCRATCH_IMAGE_HEIGHT regions divided
  * up between n_images different images. possible_n_images gives
  * various divisors of N_REGIONS. The reason for allowing this
diff --git a/gdk/gdkimage.h b/gdk/gdkimage.h
index 8106f0b296..52008018e0 100644
--- a/gdk/gdkimage.h
+++ b/gdk/gdkimage.h
@@ -118,6 +118,7 @@ guint16       gdk_image_get_depth          (GdkImage *image);
 guint16       gdk_image_get_bytes_per_pixel(GdkImage *image);
 guint16       gdk_image_get_bytes_per_line (GdkImage *image);
 guint16       gdk_image_get_bits_per_pixel (GdkImage *image);
+gpointer      gdk_image_get_pixels         (GdkImage *image);
 
 
 G_END_DECLS