diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-08-14 05:32:58 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-08-14 05:32:58 +0000 |
| commit | c10ff07d8c0add98574aaa12587e3fa665b72503 (patch) | |
| tree | 5b917d081a3a17a83722571a0c9e23430e2dd1ef /gdk-pixbuf | |
| parent | 81aa21a8340ca22369eefc2495c068c6ecbe0350 (diff) | |
| download | gdk-pixbuf-c10ff07d8c0add98574aaa12587e3fa665b72503.tar.gz | |
Exclude CR2 files in the tiff loader.
svn path=/trunk/; revision=21115
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 7 | ||||
| -rw-r--r-- | gdk-pixbuf/io-tiff.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 29cead3c3..ee9fd0f79 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,10 @@ +2008-08-13 Matthias Clasen <mclasen@redhat.com> + + Bug 532644 – TIFF loader need to exclude CR2 files + + * io-tiff.c: Add a pattern to exclude CR2 files. + Noticed by Hubert Figuire + 2008-08-13 Michael Natterer <mitch@imendio.com> * gdk-pixbuf-marshal.list: reorder marshalers for no reason apart diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c index 90a4ef817..2f62f38d6 100644 --- a/gdk-pixbuf/io-tiff.c +++ b/gdk-pixbuf/io-tiff.c @@ -797,6 +797,7 @@ MODULE_ENTRY (fill_info) (GdkPixbufFormat *info) static GdkPixbufModulePattern signature[] = { { "MM \x2a", " z ", 100 }, { "II\x2a ", " z", 100 }, + { "II* \020 CR\002 ", " z zzz z", 0 }, { NULL, NULL, 0 } }; static gchar * mime_types[] = { |