Updated German translation.

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

diff --git a/gdk-pixbuf/gdk-pixbuf-core.h b/gdk-pixbuf/gdk-pixbuf-core.h
index a51be74081f192e07a0b44fd414a3ef9a8d8ae22..b2563809ed3845f77b736939d778696e9af464ac 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-core.h
+++ b/gdk-pixbuf/gdk-pixbuf-core.h
@@ -23,11 +23,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
+#endif
+
 #ifndef GDK_PIXBUF_CORE_H
 #define GDK_PIXBUF_CORE_H
 
 #include <glib.h>
 #include <glib-object.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 
@@ -73,7 +78,7 @@ typedef enum {
         GDK_PIXBUF_ERROR_FAILED
 } GdkPixbufError;
 
-GQuark gdk_pixbuf_error_quark (void) G_GNUC_CONST;
+GQuark gdk_pixbuf_error_quark (void);
 
 \f
 
@@ -116,6 +121,13 @@ GdkPixbuf *gdk_pixbuf_new_subpixbuf (GdkPixbuf *src_pixbuf,
 
 /* Simple loading */
 
+#ifdef G_OS_WIN32
+/* DLL ABI stability hack. */
+#define gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file_utf8
+#define gdk_pixbuf_new_from_file_at_size gdk_pixbuf_new_from_file_at_size_utf8
+#define gdk_pixbuf_new_from_file_at_scale gdk_pixbuf_new_from_file_at_scale_utf8
+#endif
+
 GdkPixbuf *gdk_pixbuf_new_from_file (const char *filename,
                                      GError    **error);
 GdkPixbuf *gdk_pixbuf_new_from_file_at_size (const char *filename,
@@ -149,11 +161,17 @@ void       gdk_pixbuf_fill              (GdkPixbuf    *pixbuf,
 
 /* Saving */
 
+#ifdef G_OS_WIN32
+/* DLL ABI stability hack. */
+#define gdk_pixbuf_save gdk_pixbuf_save_utf8
+#define gdk_pixbuf_savev gdk_pixbuf_savev_utf8
+#endif
+
 gboolean gdk_pixbuf_save           (GdkPixbuf  *pixbuf, 
                                     const char *filename, 
                                     const char *type, 
                                     GError    **error,
-                                    ...);
+                                    ...) G_GNUC_NULL_TERMINATED;
 
 gboolean gdk_pixbuf_savev          (GdkPixbuf  *pixbuf, 
                                     const char *filename, 
@@ -174,7 +192,7 @@ gboolean gdk_pixbuf_save_to_callback    (GdkPixbuf  *pixbuf,
                                         gpointer user_data,
                                         const char *type, 
                                         GError    **error,
-                                        ...);
+                                        ...) G_GNUC_NULL_TERMINATED;
 
 gboolean gdk_pixbuf_save_to_callbackv   (GdkPixbuf  *pixbuf, 
                                         GdkPixbufSaveFunc save_func,
@@ -191,7 +209,7 @@ gboolean gdk_pixbuf_save_to_buffer      (GdkPixbuf  *pixbuf,
                                         gsize      *buffer_size,
                                         const char *type, 
                                         GError    **error,
-                                        ...);
+                                        ...) G_GNUC_NULL_TERMINATED;
 
 gboolean gdk_pixbuf_save_to_bufferv     (GdkPixbuf  *pixbuf,
                                         gchar     **buffer,
@@ -201,6 +219,24 @@ gboolean gdk_pixbuf_save_to_bufferv     (GdkPixbuf  *pixbuf,
                                         char      **option_values,
                                         GError    **error);
 
+GdkPixbuf *gdk_pixbuf_new_from_stream   (GInputStream   *stream,
+                                        GCancellable   *cancellable,
+                                         GError        **error);
+
+GdkPixbuf *gdk_pixbuf_new_from_stream_at_scale   (GInputStream   *stream,
+                                                  gint            width,
+                                                  gint            height,
+                                                  gboolean        preserve_aspect_ratio,
+                                                 GCancellable   *cancellable,
+                                                  GError        **error);
+
+gboolean   gdk_pixbuf_save_to_stream    (GdkPixbuf      *pixbuf,
+                                         GOutputStream  *stream,
+                                         const char     *type,
+                                        GCancellable   *cancellable,
+                                         GError        **error,
+                                         ...);
+
 /* Adding an alpha channel */
 GdkPixbuf *gdk_pixbuf_add_alpha (const GdkPixbuf *pixbuf, gboolean substitute_color,
                                 guchar r, guchar g, guchar b);
@@ -218,6 +254,8 @@ void gdk_pixbuf_saturate_and_pixelate (const GdkPixbuf *src,
                                        gfloat           saturation,
                                        gboolean         pixelate);
 
+/* Transform an image to agree with its embedded orientation option / tag */
+GdkPixbuf *gdk_pixbuf_apply_embedded_orientation (GdkPixbuf *src);
 
 G_CONST_RETURN gchar * gdk_pixbuf_get_option (GdkPixbuf   *pixbuf,
                                               const gchar *key);