diff options
| author | Piotr Bandurski <ami_stuff@o2.pl> | 2012-12-08 22:36:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 01:00:54 +0100 |
| commit | 7f01247572987ba7e657c081601bba0b4855e936 (patch) | |
| tree | d358923ec36d1485d89f674ab091c4780cadb385 /libavcodec/tiff.c | |
| parent | f494647206c2f6bd4ee5330685a0c6a9643b6e5c (diff) | |
| download | ffmpeg-7f01247572987ba7e657c081601bba0b4855e936.tar.gz | |
tiff: support zlib with invertedFillOrder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 64e4e41ca3..286cbc26a1 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -405,18 +405,31 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride, #if CONFIG_ZLIB if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE) { - uint8_t *zbuf; + uint8_t *src2 = NULL, *zbuf; unsigned long outlen; - int ret; + int i, ret; outlen = width * lines; zbuf = av_malloc(outlen); if (!zbuf) 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); if (ret != Z_OK) { av_log(s->avctx, AV_LOG_ERROR, "Uncompressing failed (%lu of %lu) with error %d\n", outlen, (unsigned long)width * lines, ret); + av_free(src2); av_free(zbuf); return -1; } @@ -430,6 +443,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride, dst += stride; src += width; } + av_free(src2); av_free(zbuf); return 0; } |