diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-09-12 04:28:21 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-09-12 04:28:21 +0000 |
| commit | a47f91655394c0841185e3f1428e20a09a3b6c3e (patch) | |
| tree | 5a4b9d1572601becb5a646ddc4c5344f6afc55e4 | |
| parent | 273e09a0c8fb39c6e375814e28ac0adf6c198eb7 (diff) | |
| download | gtk+-a47f91655394c0841185e3f1428e20a09a3b6c3e.tar.gz | |
Bug 532644 - TIFF loader need to exclude CR2 files
* io-tiff.c: Add a pattern to exclude CR2 files.
Noticed by Hubert Figuire
svn path=/branches/gtk-2-12/; revision=21370
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 9 | ||||
| -rw-r--r-- | gdk-pixbuf/io-tiff.c | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 135ebdffc7..f5eaa22791 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -2,6 +2,15 @@ Merged from trunk: + Bug 532644 - TIFF loader need to exclude CR2 files + + * io-tiff.c: Add a pattern to exclude CR2 files. + Noticed by Hubert Figuire + +2008-09-12 Matthias Clasen <mclasen@redhat.com> + + Merged from trunk: + * gdk-pixbuf-utils.c (gdk_pixbuf_saturate_and_pixelate): Use gdk_pixbuf_copy_area() to copy between pixbufs. Reported by Andrey Tsyvarev diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c index 215c130b38..37fc7397fe 100644 --- a/gdk-pixbuf/io-tiff.c +++ b/gdk-pixbuf/io-tiff.c @@ -799,6 +799,7 @@ MODULE_ENTRY (tiff, 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[] = { |