har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tiffdec: use correct data type for palette entries and set alpha to 0xFF

Browse Source
This commit is contained in:
Justin Ruggles 2013-09-28 12:20:19 -04:00
parent bf2064f046
commit 58bc38a5f2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/tiff.c
View File

@ -321,7 +321,7 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start,
const uint8_t *buf, const uint8_t *end_buf) const uint8_t *buf, const uint8_t *end_buf)
{ {
unsigned tag, type, count, off, value = 0; unsigned tag, type, count, off, value = 0;
int i, j; int i;
uint32_t *pal; uint32_t *pal;
const uint8_t *rp, *gp, *bp; const uint8_t *rp, *gp, *bp;
@ -527,10 +527,11 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start,
bp = buf + count / 3 * off * 2; bp = buf + count / 3 * off * 2;
off = (type_sizes[type] - 1) << 3; off = (type_sizes[type] - 1) << 3;
for (i = 0; i < count / 3; i++) { for (i = 0; i < count / 3; i++) {
j = (tget(&rp, type, s->le) >> off) << 16; uint32_t p = 0xFF000000;
j |= (tget(&gp, type, s->le) >> off) << 8; p |= (tget(&rp, type, s->le) >> off) << 16;
j |= tget(&bp, type, s->le) >> off; p |= (tget(&gp, type, s->le) >> off) << 8;
pal[i] = j; p |= tget(&bp, type, s->le) >> off;
pal[i] = p;
} }
s->palette_is_set = 1; s->palette_is_set = 1;
break; break;