mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-24 03:39:45 +00:00
Correctly detect 4-component images
Originally committed as revision 7002 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
ffa0a3d6fe
commit
ec8a152b6f
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user