tiffenc: set bpp table for monow/monob formats

Also makes the bpp_tab non static const, as it needs to be changed in
this case.

Fix encoding of monow/monob images, fix trac issue #193.
This commit is contained in:
Stefano Sabatini 2011-05-13 02:07:09 +02:00
parent ac8d6f120d
commit 4d15f194b4

View File

@ -210,7 +210,7 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
uint32_t *strip_offsets = NULL; uint32_t *strip_offsets = NULL;
int bytes_per_row; int bytes_per_row;
uint32_t res[2] = { 72, 1 }; // image resolution (72/1) uint32_t res[2] = { 72, 1 }; // image resolution (72/1)
static const uint16_t bpp_tab[] = { 8, 8, 8, 8 }; uint16_t bpp_tab[] = { 8, 8, 8, 8 };
int ret = -1; int ret = -1;
int is_yuv = 0; int is_yuv = 0;
uint8_t *yuv_line = NULL; uint8_t *yuv_line = NULL;
@ -258,6 +258,7 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
case PIX_FMT_MONOWHITE: case PIX_FMT_MONOWHITE:
s->bpp = 1; s->bpp = 1;
s->photometric_interpretation = avctx->pix_fmt == PIX_FMT_MONOBLACK; s->photometric_interpretation = avctx->pix_fmt == PIX_FMT_MONOBLACK;
bpp_tab[0] = 1;
break; break;
case PIX_FMT_YUV420P: case PIX_FMT_YUV420P:
case PIX_FMT_YUV422P: case PIX_FMT_YUV422P: