Use g_printf instead of system printf. (#99327)

[~andy/gtk] / gdk-pixbuf / gdk-pixbuf.h

diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h
index 2a32c2fa2b6c0bab0cd0f17290964103c79e7812..ebace727406727f327035cc4aafa45d71b5fdcdd 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.h
+++ b/gdk-pixbuf/gdk-pixbuf.h
@@ -30,9 +30,7 @@
 #include <gdk-pixbuf/gdk-pixbuf-features.h>
 #include <glib-object.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 \f
 
@@ -55,7 +53,6 @@ typedef enum {
 typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GdkPixbufAnimation GdkPixbufAnimation;
 typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter;
-typedef struct _GdkPixbufFrame GdkPixbufFrame;
 
 #define GDK_TYPE_PIXBUF              (gdk_pixbuf_get_type ())
 #define GDK_PIXBUF(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXBUF, GdkPixbuf))
@@ -75,18 +72,12 @@ typedef void (* GdkPixbufDestroyNotify) (guchar *pixels, gpointer data);
 #define GDK_PIXBUF_ERROR gdk_pixbuf_error_quark ()
 
 typedef enum {
-        /* stream header corrupt */
-       GDK_PIXBUF_ERROR_HEADER_CORRUPT,
-        /* stream pixel data corrupt */
-       GDK_PIXBUF_ERROR_PIXEL_CORRUPT,
-        /* stream header corrupt */
-       GDK_PIXBUF_ERROR_UNKNOWN_FORMAT,
         /* image data hosed */
         GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
         /* no mem to load image */
         GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-        /* bad option value passed to save routine */
-        GDK_PIXBUF_ERROR_BAD_OPTION_VALUE,
+        /* bad option passed to save routine */
+        GDK_PIXBUF_ERROR_BAD_OPTION,
         /* unsupported image type (sort of an ENOSYS) */
         GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
         /* unsupported operation (load, save) for image type */
@@ -102,8 +93,10 @@ GType gdk_pixbuf_get_type (void) G_GNUC_CONST;
 
 /* Reference counting */
 
+#ifndef GDK_PIXBUF_DISABLE_DEPRECATED
 GdkPixbuf *gdk_pixbuf_ref      (GdkPixbuf *pixbuf);
 void       gdk_pixbuf_unref    (GdkPixbuf *pixbuf);
+#endif
 
 /* GdkPixbuf accessors */
 
@@ -148,8 +141,8 @@ GdkPixbuf *gdk_pixbuf_new_from_data (const guchar *data,
                                     gpointer destroy_fn_data);
 
 GdkPixbuf *gdk_pixbuf_new_from_xpm_data (const char **data);
-GdkPixbuf* gdk_pixbuf_new_from_stream  (gint          stream_length,
-                                        const guint8 *stream,
+GdkPixbuf* gdk_pixbuf_new_from_inline  (gint          data_length,
+                                        const guint8 *data,
                                         gboolean      copy_pixels,
                                         GError      **error);
        
@@ -268,8 +261,10 @@ GType               gdk_pixbuf_animation_get_type        (void) G_GNUC_CONST;
 GdkPixbufAnimation *gdk_pixbuf_animation_new_from_file   (const char         *filename,
                                                           GError            **error);
 
+#ifndef GDK_PIXBUF_DISABLE_DEPRECATED
 GdkPixbufAnimation *gdk_pixbuf_animation_ref             (GdkPixbufAnimation *animation);
 void                gdk_pixbuf_animation_unref           (GdkPixbufAnimation *animation);
+#endif
 
 int                 gdk_pixbuf_animation_get_width       (GdkPixbufAnimation *animation);
 int                 gdk_pixbuf_animation_get_height      (GdkPixbufAnimation *animation);
@@ -286,13 +281,27 @@ gboolean                gdk_pixbuf_animation_iter_advance                    (Gd
                                                                               const GTimeVal         *current_time);
 
 
+\f
+
+G_CONST_RETURN gchar * gdk_pixbuf_get_option (GdkPixbuf   *pixbuf,
+                                              const gchar *key);
+
+\f
+
+typedef struct _GdkPixbufFormat GdkPixbufFormat;
  
+GSList    *gdk_pixbuf_get_formats (void);
+gchar     *gdk_pixbuf_format_get_name        (GdkPixbufFormat *format);
+gchar     *gdk_pixbuf_format_get_description (GdkPixbufFormat *format);
+gchar    **gdk_pixbuf_format_get_mime_types  (GdkPixbufFormat *format);
+gchar    **gdk_pixbuf_format_get_extensions  (GdkPixbufFormat *format);
+gboolean   gdk_pixbuf_format_is_writable     (GdkPixbufFormat *format);
+
+G_END_DECLS
+
 #include <gdk-pixbuf/gdk-pixbuf-loader.h>
+#include <gdk-pixbuf/gdk-pixbuf-enum-types.h>
 
 \f
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif