X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gdk-pixbuf%2Fgdk-pixbuf.h;h=9a30131fb1dcecfc7ebc899d92e84edff23b784a;hb=f2527e8d07a1a3bb255e219c0830474c2863c561;hp=027a8fdeee9b6483270e05da77dde155785aabad;hpb=ece5ac121a0acfa50725cdae19979b80a02ae170;p=~andy%2Fgtk

diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h
index 027a8fdee..9a30131fb 100644
--- a/gdk-pixbuf/gdk-pixbuf.h
+++ b/gdk-pixbuf/gdk-pixbuf.h
@@ -5,18 +5,19 @@
  * Authors: Mark Crichton <crichton@gimp.org>
  *          Miguel de Icaza <miguel@gnu.org>
  *          Federico Mena-Quintero <federico@gimp.org>
+ *          Havoc Pennington <hp@redhat.com>
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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.
@@ -25,105 +26,20 @@
 #ifndef GDK_PIXBUF_H
 #define GDK_PIXBUF_H
 
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_pixbuf.h>
-#include <gdk/gdk.h>
+#define GDK_PIXBUF_H_INSIDE
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif
+#include <glib.h>
+#include <gdk-pixbuf/gdk-pixbuf-features.h>
+#include <glib-object.h>
 
-
+#include <gdk-pixbuf/gdk-pixbuf-core.h>
+#include <gdk-pixbuf/gdk-pixbuf-transform.h>
+#include <gdk-pixbuf/gdk-pixbuf-animation.h>
+#include <gdk-pixbuf/gdk-pixbuf-simple-anim.h>
+#include <gdk-pixbuf/gdk-pixbuf-io.h>
+#include <gdk-pixbuf/gdk-pixbuf-loader.h>
+#include <gdk-pixbuf/gdk-pixbuf-enum-types.h>
 
-/* GdkPixbuf structure */
+#undef GDK_PIXBUF_H_INSIDE
 
-typedef struct _GdkPixbuf GdkPixbuf;
-
-struct _GdkPixbuf {
-	/* Reference count */
-	int ref_count;
-
-	/* Libart pixbuf */
-	ArtPixBuf *art_pixbuf;
-};
-
-
-
-/* Convenience functions */
-
-ArtPixFormat gdk_pixbuf_get_format          (GdkPixbuf *pixbuf);
-int          gdk_pixbuf_get_n_channels      (GdkPixbuf *pixbuf);
-int          gdk_pixbuf_get_has_alpha       (GdkPixbuf *pixbuf);
-int          gdk_pixbuf_get_bits_per_sample (GdkPixbuf *pixbuf);
-guchar      *gdk_pixbuf_get_pixels          (GdkPixbuf *pixbuf);
-int          gdk_pixbuf_get_width           (GdkPixbuf *pixbuf);
-int          gdk_pixbuf_get_height          (GdkPixbuf *pixbuf);
-int          gdk_pixbuf_get_rowstride       (GdkPixbuf *pixbuf);
-
-/* Reference counting */
-
-void gdk_pixbuf_ref (GdkPixbuf *pixbuf);
-void gdk_pixbuf_unref (GdkPixbuf *pixbuf);
-
-/* Constructors */
-/* Wrap a libart pixbuf */
-
-GdkPixbuf *gdk_pixbuf_new_from_art_pixbuf (ArtPixBuf *art_pixbuf);
-
-/* Create a blank pixbuf with an optimal rowstride and a new buffer */
-
-GdkPixbuf *gdk_pixbuf_new (ArtPixFormat format, gboolean has_alpha, int bits_per_sample,
-			   int width, int height);
-
-/* Simple loading */
-
-GdkPixbuf *gdk_pixbuf_new_from_file (const char *filename);
-GdkPixbuf *gdk_pixbuf_new_from_data (guchar *data, ArtPixFormat format, gboolean has_alpha,
-				     int width, int height, int rowstride,
-				     ArtDestroyNotify dfunc, gpointer dfunc_data);
-GdkPixbuf *gdk_pixbuf_new_from_xpm_data (const gchar **data);
-
-/* Rendering to a drawable */
-
-typedef enum {
-	GDK_PIXBUF_ALPHA_BILEVEL,
-	GDK_PIXBUF_ALPHA_FULL
-} GdkPixbufAlphaMode;
-
-void gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf, GdkBitmap *bitmap,
-					int src_x, int src_y,
-					int dest_x, int dest_y,
-					int width, int height,
-					int alpha_threshold);
-
-void gdk_pixbuf_render_to_drawable (GdkPixbuf *pixbuf,
-				    GdkDrawable *drawable, GdkGC *gc,
-				    int src_x, int src_y,
-				    int dest_x, int dest_y,
-				    int width, int height,
-				    GdkRgbDither dither,
-				    int x_dither, int y_dither);
-
-void gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf *pixbuf, GdkDrawable *drawable,
-					  int src_x, int src_y,
-					  int dest_x, int dest_y,
-					  int width, int height,
-					  GdkPixbufAlphaMode alpha_mode,
-					  int alpha_threshold,
-					  GdkRgbDither dither,
-					  int x_dither, int y_dither);
-
-/* Transformations */
-#if 0
-GdkPixbuf *gdk_pixbuf_scale (const GdkPixbuf *pixbuf, gint w, gint h);
-GdkPixbuf *gdk_pixbuf_rotate (GdkPixbuf *pixbuf, gdouble angle);
-#endif
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#endif  /* GDK_PIXBUF_H */