Merged the federico-filename-entry branch, to fix bug #136541. Combined

[~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 3110a623805242f0a53e40992758e740f4fc1d30..f7abfd0c7f3576e502c2c5e9bcac2f60ae67bccf 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-core.h
+++ b/gdk-pixbuf/gdk-pixbuf-core.h
@@ -73,7 +73,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,12 +116,24 @@ 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,
                                             int         width, 
                                             int         height,
                                             GError    **error);
+GdkPixbuf *gdk_pixbuf_new_from_file_at_scale (const char *filename,
+                                             int         width, 
+                                             int         height,
+                                             gboolean    preserve_aspect_ratio,
+                                             GError    **error);
 
 GdkPixbuf *gdk_pixbuf_new_from_data (const guchar *data,
                                     GdkColorspace colorspace,
@@ -144,11 +156,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, 
@@ -169,7 +187,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,
@@ -186,7 +204,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,