GtkToolItemGroup now has label and label-widget properties.

[~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 b14244b4616e6116f2ad0a13971e2d0d11fc262d..800d64d2a6930a9f2d928d43c0ba3f9c8861b37d 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-data.c
+++ b/gdk-pixbuf/gdk-pixbuf-data.c
@@ -1,49 +1,83 @@
-/*
- * gdk-pixbuf-data.c: Code to load images into GdkPixbufs from constant data
+/* GdkPixbuf library - Image creation from in-memory buffers
  *
- * Author:
- *    Michael Fulbright (drmike@redhat.com)
- *    Copyright (C) 1999 Red Hat, Inc.
+ * Copyright (C) 1999 The Free Software Foundation
+ *
+ * Author: Federico Mena-Quintero <federico@gimp.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
-#include <stdio.h>
-#include <string.h>
-#include <glib.h>
-
+#include "config.h"
 #include "gdk-pixbuf.h"
+#include "gdk-pixbuf-private.h"
+#include "gdk-pixbuf-alias.h"
+#include <stdlib.h>
+#include <string.h>
 
-/* This function does all the work. */
+\f
 
-static GdkPixbuf *
-_pixbuf_create_from_rgb_d(unsigned char *data, int w, int h)
+/**
+ * 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, 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
+ * 
+ * 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.
+ **/
+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)
 {
        GdkPixbuf *pixbuf;
-       ArtPixBuf *art_pixbuf;
-       art_u8 *pixels;
 
-       pixels = art_alloc (w*h*3);
-       if (!pixels) {
-               g_warning ("RGBD: Cannot alloc ArtBuf");
-               return NULL;
-       }
+       /* Only 8-bit/sample RGB buffers are supported for now */
 
-       memcpy (pixels, data, w*h*3);
-
-       art_pixbuf = art_pixbuf_new_rgb (pixels, w, h, (w*3));
-       pixbuf = gdk_pixbuf_new (art_pixbuf, NULL);
+       g_return_val_if_fail (data != NULL, NULL);
+       g_return_val_if_fail (colorspace == GDK_COLORSPACE_RGB, NULL);
+       g_return_val_if_fail (bits_per_sample == 8, NULL);
+       g_return_val_if_fail (width > 0, NULL);
+       g_return_val_if_fail (height > 0, NULL);
 
-       if (!pixbuf)
-               art_free (pixels);
+       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->destroy_fn = destroy_fn;
+       pixbuf->destroy_fn_data = destroy_fn_data;
 
        return pixbuf;
 }
 
-
-GdkPixbuf *
-gdk_pixbuf_load_image_from_rgb_d (unsigned char *data, int rgb_width, int rgb_height)
-{
-       g_return_val_if_fail (data != NULL, NULL);
-
-       return _pixbuf_create_from_rgb_d(data, rgb_width, rgb_height);
-}
+#define __GDK_PIXBUF_DATA_C__
+#include "gdk-pixbuf-aliasdef.c"