Most of this patch is based on a patch by Havoc Pennington (hp@redhat.com)

2000-04-11  Federico Mena Quintero  <federico@helixcode.com>

	Most of this patch is based on a patch by Havoc Pennington
	(hp@redhat.com) to make GdkPixbuf's structures opaque and to
	remove the libart dependency.

	* gdk-pixbuf/gdk-pixbuf.h: Removed the public structures.
	(GdkColorspace): New enum that for now only contains
	GDK_COLORSPACE_RGB.
	(GdkPixbufDestroyNotify): New type for the pixbuf's pixels destroy
	notification function.
	(GdkInterpType): New num with interpolation types.

	* *.[ch]: Replace the libart stuff with our own stuff.

	* pixops/*.[ch]: Likewise.

	* gdk-pixbuf/gdk-pixbuf-private.h: New file with the private
	declarations of the GdkPixbuf structures.

	* gdk-pixbuf/gdk-pixbuf.c (gdk_pixbuf_new_from_art_pixbuf):
	Removed function.
	(gdk_pixbuf_get_format): Constify.
	(gdk_pixbuf_get_n_channels): Constify.
	(gdk_pixbuf_get_has_alpha): Constify.
	(gdk_pixbuf_get_bits_per_sample): Constify.
	(gdk_pixbuf_get_pixels): Constify.
	(gdk_pixbuf_get_width): Constify.
	(gdk_pixbuf_get_height): Constify.
	(gdk_pixbuf_get_rowstride): Constify.

	* gdk-pixbuf/gdk-pixbuf.c (gdk_pixbuf_copy): New function to copy
	a pixbuf.

	* gdk-pixbuf/gdk-pixbuf-data.c (gdk_pixbuf_new_from_data): Added a
	bits_per_sample argument; currently only 8 bits per sample are
	supported.

	* gdk-pixbuf/gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_pixbuf):
	New accessor.
	(gdk_pixbuf_frame_get_x_offset): New accessor.
	(gdk_pixbuf_frame_get_y_offset): New accessor.
	(gdk_pixbuf_frame_get_delay_time): New accessor.
	(gdk_pixbuf_frame_get_action): New accessor.

	* gdk-pixbuf/gdk-pixbuf-render.c
	(gdk_pixbuf_render_pixmap_and_mask): Instead of returning a solid
	mask rectangle for pixbufs without an alpha channel, set the
	*mask_return to NULL.

	* gdk-pixbuf/gdk-pixbuf-util.c (gdk_pixbuf_add_alpha): Constify.

	* gdk-pixbuf/gdk-pixbuf-scale.c: Fix includes.

	* gdk-pixbuf/gdk-pixbuf-scale.c (gdk_pixbuf_scale): Added some
	preconditions.  Maybe we should also check for the colorspace,
	bits per pixel, and such.
	(gdk_pixbuf_composite): Likewise.
	(gdk_pixbuf_composite_color): Likewise.
	(gdk_pixbuf_scale_simple): Likewise, and fail gracefully if we
	cannot allocate the new pixbuf.
	(gdk_pixbuf_composite_color_simple): Likewise.

	* gdk-pixbuf/gnome-canvas-pixbuf.c (gnome_canvas_pixbuf_render):
	Use art_rgb_rgba_affine() or art_rgb_affine() since we no longer
	have an ArtPixBuf.

	* gdk-pixbuf/io-bmp.c: Fix includes.

	* gdk-pixbuf/pixops/pixops.c (pixops_scale_nearest): Fixed cast in
	an lvalue.

	* TODO: Populated.

	* configure.in: Removed checks for libart.

	* gdk-pixbuf/Makefile.am: Removed references to libart.
	(noinst_HEADERS): Added gdk-pixbuf-private.h.

	* gdk-pixbuf/Makefile.am (libgdk_pixbuf_la_LDFLAGS): Incremented
	the version number of the libtool library to indicate that this
	definitely is not compatible with the old usage.  I know you love
	me.  I know you do.

	* configure.in: Bumped version number to 0.7.0.

	* README: Updated.

	* gdk-pixbuf-config.in (--libs): We no longer require libart.

	* DEPENDS.libgdk_pixbuf: We no longer depend on libart.

	* gdk-pixbuf.spec.in: Updated, but I don't guarantee anything.

1 files changed, 32 insertions, 26 deletions

diff --git a/demos/testanimation.c b/demos/testanimation.c
index 0663ae2e58..66db245656 100644
--- a/demos/testanimation.c
+++ b/demos/testanimation.c
@@ -19,12 +19,12 @@
  */
 
 #include <config.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
 #include "gdk-pixbuf-loader.h"
 
 typedef struct {
@@ -201,22 +201,17 @@ expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
 
 	pixbuf = (GdkPixbuf *)gtk_object_get_data(GTK_OBJECT(drawing_area), "pixbuf");
 
-	if (!pixbuf->art_pixbuf) {
-		g_warning ("art_pixbuf is NULL in expose_func!!\n");
-		return;
-	}
-
-	if (pixbuf->art_pixbuf->has_alpha) {
+	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
 		gdk_draw_rgb_32_image (drawing_area->window,
 				       drawing_area->style->black_gc,
 				       event->area.x, event->area.y, 
 				       event->area.width, 
 				       event->area.height,
 				       GDK_RGB_DITHER_MAX, 
-				       pixbuf->art_pixbuf->pixels 
-				       + (event->area.y * pixbuf->art_pixbuf->rowstride) 
-				       + (event->area.x * pixbuf->art_pixbuf->n_channels),
-				       pixbuf->art_pixbuf->rowstride);
+				       gdk_pixbuf_get_pixels (pixbuf) 
+				       + (event->area.y * gdk_pixbuf_get_rowstride (pixbuf)) 
+				       + (event->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
+				       gdk_pixbuf_get_rowstride (pixbuf));
 	} else {
 		gdk_draw_rgb_image (drawing_area->window,
 				    drawing_area->style->white_gc,
@@ -224,10 +219,10 @@ expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
 				    event->area.width, 
 				    event->area.height,
 				    GDK_RGB_DITHER_NORMAL,
-				    pixbuf->art_pixbuf->pixels 
-				    + (event->area.y * pixbuf->art_pixbuf->rowstride) 
-				    + (event->area.x * pixbuf->art_pixbuf->n_channels),
-				    pixbuf->art_pixbuf->rowstride);
+				    gdk_pixbuf_get_pixels (pixbuf)
+				    + (event->area.y * gdk_pixbuf_get_rowstride (pixbuf))
+				    + (event->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
+				    gdk_pixbuf_get_rowstride (pixbuf));
 	}
 }
 
@@ -239,8 +234,8 @@ config_func (GtkWidget *drawing_area, GdkEventConfigure *event, gpointer data)
 	pixbuf = (GdkPixbuf *)gtk_object_get_data(GTK_OBJECT(drawing_area), "pixbuf");
 
 #if 0
-	if (((event->width) != (pixbuf->art_pixbuf->width)) ||
-	    ((event->height) != (pixbuf->art_pixbuf->height))) 
+	if (((event->width) != gdk_pixbuf_get_width (pixbuf)) ||
+	    ((event->height) != gdk_pixbuf_get_height (pixbuf)))
 		gdk_pixbuf_scale(pixbuf, event->width, event->height);
 #endif
 }
@@ -255,8 +250,8 @@ new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
 	GtkWidget *drawing_area;
 	gint w, h;
  
-	w = pixbuf->art_pixbuf->width;
-	h = pixbuf->art_pixbuf->height;
+	w = gdk_pixbuf_get_width (pixbuf);
+	h = gdk_pixbuf_get_height (pixbuf);
 
 	window = gtk_widget_new (gtk_window_get_type (),
 				 "GtkObject::user_data", NULL,
@@ -306,6 +301,7 @@ new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
         return window;
 }
 
+#if 0
 
 static gint
 update_timeout(gpointer data)
@@ -367,6 +363,8 @@ progressive_updated_callback(GdkPixbufLoader* loader, guint x, guint y, guint wi
         return;
 }
 
+#endif
+
 static int readlen = 4096;
 
 int
@@ -376,7 +374,6 @@ main (int argc, char **argv)
 	int found_valid = FALSE;
 
 	GdkPixbufAnimation *animation;
-	GdkPixbufLoader *pixbuf_loader;
 
 	gtk_init (&argc, &argv);
 
@@ -414,16 +411,24 @@ main (int argc, char **argv)
 			if (animation) {
 				gint i = 0;
 				GList *listptr;
-				for (listptr = animation->frames; listptr; listptr = listptr->next){
+				for (listptr = gdk_pixbuf_animation_get_frames (animation);
+				     listptr;
+				     listptr = listptr->next) {
+					GdkPixbufFrame *frame;
+					GdkPixbuf *pixbuf;
 					gchar *title;
+
+					frame = listptr->data;
+					pixbuf = gdk_pixbuf_frame_get_pixbuf (frame);
+
 					title = g_strdup_printf ("Frame %d", i);
 					g_print ("Frame %d  x:%d y:%d width:%d height:%d\n",
 						 i,
-						 ((GdkPixbufFrame *)listptr->data)->x_offset,
-						 ((GdkPixbufFrame *)listptr->data)->y_offset,
-						 gdk_pixbuf_get_width (((GdkPixbufFrame *)listptr->data)->pixbuf),
-						 gdk_pixbuf_get_height (((GdkPixbufFrame *)listptr->data)->pixbuf));
-					new_testrgb_window (((GdkPixbufFrame *)listptr->data)->pixbuf, title);
+						 gdk_pixbuf_frame_get_x_offset (frame),
+						 gdk_pixbuf_frame_get_y_offset (frame),
+						 gdk_pixbuf_get_width (pixbuf),
+						 gdk_pixbuf_get_height (pixbuf));
+					new_testrgb_window (pixbuf, title);
 					g_free (title);
 					i++;
 				}
@@ -434,6 +439,7 @@ main (int argc, char **argv)
                 {
                         GtkWidget* rgb_window = NULL;
 			ProgressFileStatus   status;
+			GdkPixbufLoader *pixbuf_loader;
 
                         pixbuf_loader = gdk_pixbuf_loader_new ();
 			status.loader = pixbuf_loader;