aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLynne <dev@lynne.ee>2020-09-05 20:07:33 +0100
committerLynne <dev@lynne.ee>2020-09-06 20:10:01 +0100
commit7ad085b2c4d0ac27bc9e425fb81f012c74e5fbca (patch)
tree4f8aab19f08b4cd2746981432b8955e8695d5335
parentbc8662984261f422b49fdfff4cb273adde06917a (diff)
downloadffmpeg-7ad085b2c4d0ac27bc9e425fb81f012c74e5fbca.tar.gz
tiff: remove tiff type check for ICC profiles
Although the ICC specifications say to check for this, libtiff doesn't and neither does any other TIFF implementation, and the TIFF specs say that Photoshop has a different way to encapsulate ICC profiles, and are asking for advice on how to deal with it. So basically, photoshop puts a different type than what's specified, no other implementation checks for this, we do because we tried to follow the specs although its harmless to not, and ran into this bug because we didn't know about it.
-rw-r--r--libavcodec/tiff.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 8a42e677ce..7d0a78cb3c 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -1682,9 +1682,6 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
}
break;
case TIFF_ICC_PROFILE:
- if (type != TIFF_UNDEFINED)
- return AVERROR_INVALIDDATA;
-
gb_temp = s->gb;
bytestream2_seek(&gb_temp, SEEK_SET, off);