callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 768950 - TIFF private tags should not generate warnings.

Browse Source 
This is a regression from bug 131975. Any unknown tag over 32768 is not
an error. This is a reserved zone where it is allowed to create custom
tags.
The warning indeed changed since libtiff 4.0.0alpha where it has become:
"Unknown field with tag %d (0x%x) encountered"
This explains why it was not recognized anymore.
This commit is contained in:
Jehan
2016-07-23 18:07:58 +02:00
parent 35a0d8ddbb
commit 3cb70e67cc
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plug-ins/file-tiff/file-tiff-io.c
View File

@ -122,6 +122,7 @@ tiff_io_warning (const gchar *module,
{ {
gint tag = 0; gint tag = 0;
/* Before libtiff 4.0.0alpha. */
if (! strcmp (fmt, "%s: unknown field with tag %d (0x%x) encountered")) if (! strcmp (fmt, "%s: unknown field with tag %d (0x%x) encountered"))
{ {
va_list ap_test; va_list ap_test;
@ -133,7 +134,9 @@ tiff_io_warning (const gchar *module,
tag = va_arg (ap_test, int); tag = va_arg (ap_test, int);
} }
/* for older versions of libtiff? */ /* for older versions of libtiff? */
else if (! strcmp (fmt, "unknown field with tag %d (0x%x) ignored")) else if (! strcmp (fmt, "unknown field with tag %d (0x%x) ignored") ||
/* Since libtiff 4.0.0alpha. */
! strcmp (fmt, "Unknown field with tag %d (0x%x) encountered"))
{ {
va_list ap_test; va_list ap_test;