[FFmpeg-cvslog] tiff: remove tiff type check for ICC profiles
Lynne
git at videolan.org
Sun Sep 6 22:10:21 EEST 2020
ffmpeg | branch: master | Lynne <dev at lynne.ee> | Sat Sep 5 20:07:33 2020 +0100| [7ad085b2c4d0ac27bc9e425fb81f012c74e5fbca] | committer: Lynne
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.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ad085b2c4d0ac27bc9e425fb81f012c74e5fbca
---
libavcodec/tiff.c | 3 ---
1 file changed, 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);
More information about the ffmpeg-cvslog
mailing list