From ec8a152b6fbe2b06318c83839561191178748e1a Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Mon, 13 Nov 2006 05:28:55 +0000 Subject: [PATCH] Correctly detect 4-component images Originally committed as revision 7002 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/tiff.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 57bdc37..ee2627c 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -242,11 +242,12 @@ static int tiff_decode_tag(TiffContext *s, uint8_t *start, uint8_t *buf, uint8_t else{ switch(type){ case TIFF_BYTE: - s->bpp = (off & 0xFF) + ((off >> 8) & 0xFF) + ((off >> 16) & 0xFF); + s->bpp = (off & 0xFF) + ((off >> 8) & 0xFF) + ((off >> 16) & 0xFF) + ((off >> 24) & 0xFF); break; case TIFF_SHORT: case TIFF_LONG: - s->bpp = tget(&buf, type, s->le) + tget(&buf, type, s->le) + tget(&buf, type, s->le); + s->bpp = 0; + for(i = 0; i < count; i++) s->bpp += tget(&buf, type, s->le); break; default: s->bpp = -1; -- 2.7.4