diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2009-01-07 15:02:33 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2009-01-07 15:02:33 +0000 |
| commit | 54000d0ede49f23529889613f1a04e45fb1f0c13 (patch) | |
| tree | 039efb736c182f45c0d7746714ff351ede805bea | |
| parent | 5a2d0bb0144b36ec73f1e895e41cb73fe85d5ac2 (diff) | |
| download | gtk+-54000d0ede49f23529889613f1a04e45fb1f0c13.tar.gz | |
Bug 566862 – pixbuf_new_from_file does not autodetect format
2009-01-07 Matthias Clasen <mclasen@redhat.com>
Bug 566862 – pixbuf_new_from_file does not autodetect format
* gdk-pixbuf-io.c (_gdk_pixbuf_get_module): Go back to sniffing
without looking at the filename, to avoid breaking expected
functionality.
svn path=/trunk/; revision=22073
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 8 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-io.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 1ebcd21841..d50d57e481 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,11 @@ +2009-01-07 Matthias Clasen <mclasen@redhat.com> + + Bug 566862 – pixbuf_new_from_file does not autodetect format + + * gdk-pixbuf-io.c (_gdk_pixbuf_get_module): Go back to sniffing + without looking at the filename, to avoid breaking expected + functionality. + 2009-01-01 Matthias Clasen <mclasen@redhat.com> * === Released 2.15.0 === diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index c24d456066..641e747513 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -794,7 +794,7 @@ _gdk_pixbuf_get_module (guchar *buffer, guint size, gchar *type; gint j; - mime_type = g_content_type_guess (filename, buffer, size, NULL); + mime_type = g_content_type_guess (NULL, buffer, size, NULL); for (modules = get_file_formats (); modules; modules = g_slist_next (modules)) { GdkPixbufModule *module = (GdkPixbufModule *)modules->data; |