generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tiff: support zlib with invertedFillOrder

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Piotr Bandurski 2012-12-08 22:36:57 +01:00 committed by Michael Niedermayer
parent f494647206
commit 7f01247572
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/tiff.c
View File

@ -405,18 +405,31 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
#if CONFIG_ZLIB #if CONFIG_ZLIB
if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE) { if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE) {
uint8_t *zbuf; uint8_t *src2 = NULL, *zbuf;
unsigned long outlen; unsigned long outlen;
int ret; int i, ret;
outlen = width * lines; outlen = width * lines;
zbuf = av_malloc(outlen); zbuf = av_malloc(outlen);
if (!zbuf) if (!zbuf)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (s->fill_order) {
src2 = av_malloc((unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!src2) {
av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
av_free(zbuf);
return AVERROR(ENOMEM);
}
for (i = 0; i < size; i++)
src2[i] = ff_reverse[src[i]];
memset(src2 + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
src = src2;
}
ret = tiff_uncompress(zbuf, &outlen, src, size); ret = tiff_uncompress(zbuf, &outlen, src, size);
if (ret != Z_OK) { if (ret != Z_OK) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"Uncompressing failed (%lu of %lu) with error %d\n", outlen, "Uncompressing failed (%lu of %lu) with error %d\n", outlen,
(unsigned long)width * lines, ret); (unsigned long)width * lines, ret);
av_free(src2);
av_free(zbuf); av_free(zbuf);
return -1; return -1;
} }
@ -430,6 +443,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
dst += stride; dst += stride;
src += width; src += width;
} }
av_free(src2);
av_free(zbuf); av_free(zbuf);
return 0; return 0;
} }