Commit d898ab90 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Fix decoding of 2/4 bpp Tiff samples.

parent f863cdef
...@@ -294,8 +294,8 @@ static int init_image(TiffContext *s) ...@@ -294,8 +294,8 @@ static int init_image(TiffContext *s)
} else { } else {
/* make default grayscale pal */ /* make default grayscale pal */
pal = (uint32_t *) s->picture.data[1]; pal = (uint32_t *) s->picture.data[1];
for (i = 0; i < 256; i++) for (i = 0; i < 1<<s->bpp; i++)
pal[i] = i * 0x010101; pal[i] = i * 255 / ((1<<s->bpp) - 1) * 0x010101;
} }
} }
return 0; return 0;
...@@ -615,7 +615,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -615,7 +615,7 @@ static int decode_frame(AVCodecContext *avctx,
src = s->picture.data[0]; src = s->picture.data[0];
for(j = 0; j < s->height; j++){ for(j = 0; j < s->height; j++){
for(i = 0; i < s->picture.linesize[0]; i++) for(i = 0; i < s->picture.linesize[0]; i++)
src[i] = 255 - src[i]; src[i] = (s->avctx->pix_fmt == PIX_FMT_PAL8 ? (1<<s->bpp) - 1 : 255) - src[i];
src += s->picture.linesize[0]; src += s->picture.linesize[0];
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment