ops, forgot a test in the last commit

[~andy/gtk] / gdk-pixbuf / gdk-pixbuf-data.c

diff --git a/gdk-pixbuf/gdk-pixbuf-data.c b/gdk-pixbuf/gdk-pixbuf-data.c
index 62634d214efeecbf56b6f1e741604f91b9f253be..800d64d2a6930a9f2d928d43c0ba3f9c8861b37d 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-data.c
+++ b/gdk-pixbuf/gdk-pixbuf-data.c
@@ -20,35 +20,37 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "gdk-pixbuf.h"
 #include "gdk-pixbuf-private.h"
+#include "gdk-pixbuf-alias.h"
+#include <stdlib.h>
+#include <string.h>
 
 \f
 
 /**
  * gdk_pixbuf_new_from_data:
- * @data: Image data in 8-bit/sample packed format.
- * @colorspace: Colorspace for the image data.
- * @has_alpha: Whether the data has an opacity channel.
- * @bits_per_sample: Number of bits per sample.
- * @width: Width of the image in pixels.
- * @height: Height of the image in pixels.
- * @rowstride: Distance in bytes between rows.
+ * @data: Image data in 8-bit/sample packed format
+ * @colorspace: Colorspace for the image data
+ * @has_alpha: Whether the data has an opacity channel
+ * @bits_per_sample: Number of bits per sample
+ * @width: Width of the image in pixels, must be > 0
+ * @height: Height of the image in pixels, must be > 0
+ * @rowstride: Distance in bytes between row starts
  * @destroy_fn: Function used to free the data when the pixbuf's reference count
- * drops to zero, or NULL if the data should not be freed.
- * @destroy_fn_data: Closure data to pass to the destroy notification function.
+ * drops to zero, or %NULL if the data should not be freed
+ * @destroy_fn_data: Closure data to pass to the destroy notification function
  * 
  * Creates a new #GdkPixbuf out of in-memory image data.  Currently only RGB
  * images with 8 bits per sample are supported.
  * 
- * Return value: A newly-created #GdkPixbuf structure with a reference count of
- * 1.
+ * Return value: A newly-created #GdkPixbuf structure with a reference count of 1.
  **/
 GdkPixbuf *
 gdk_pixbuf_new_from_data (const guchar *data, GdkColorspace colorspace, gboolean has_alpha,
                          int bits_per_sample, int width, int height, int rowstride,
-                         GdkPixbufDestroyNotify destroy_fn, gpointer destroy_fn_data)
+         GdkPixbufDestroyNotify destroy_fn, gpointer destroy_fn_data)
 {
        GdkPixbuf *pixbuf;
 
@@ -60,18 +62,22 @@ gdk_pixbuf_new_from_data (const guchar *data, GdkColorspace colorspace, gboolean
        g_return_val_if_fail (width > 0, NULL);
        g_return_val_if_fail (height > 0, NULL);
 
-       pixbuf = g_object_new (GDK_TYPE_PIXBUF, NULL);
+       pixbuf = g_object_new (GDK_TYPE_PIXBUF, 
+                              "colorspace", colorspace,
+                              "n-channels", has_alpha ? 4 : 3,
+                              "bits-per-sample", bits_per_sample,
+                              "has-alpha", has_alpha ? TRUE : FALSE,
+                              "width", width,
+                              "height", height,
+                              "rowstride", rowstride,
+                              "pixels", data,
+                              NULL);
         
-       pixbuf->colorspace = colorspace;
-       pixbuf->n_channels = has_alpha ? 4 : 3;
-       pixbuf->bits_per_sample = bits_per_sample;
-       pixbuf->has_alpha = has_alpha ? TRUE : FALSE;
-       pixbuf->width = width;
-       pixbuf->height = height;
-       pixbuf->rowstride = rowstride;
-       pixbuf->pixels = (guchar *) data;
        pixbuf->destroy_fn = destroy_fn;
        pixbuf->destroy_fn_data = destroy_fn_data;
 
        return pixbuf;
 }
+
+#define __GDK_PIXBUF_DATA_C__
+#include "gdk-pixbuf-aliasdef.c"