RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Finally distinguish TIFF_CCITT_RLE and TIFF_G3 1-D case, so both of them 

will be decoded correctly.
This fixes issue 1423.

Originally committed as revision 20065 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2009-09-28 05:17:20 +00:00
parent 7c6f5238c6
commit 8da5d3dc37
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/faxcompr.c
View File

@ -269,7 +269,7 @@ static int find_group3_syncmarker(GetBitContext *gb, int srcsize)
int ff_ccitt_unpack(AVCodecContext *avctx,
const uint8_t *src, int srcsize,
uint8_t *dst, int height, int stride, enum TiffCompr compr)
uint8_t *dst, int height, int stride, enum TiffCompr compr, int opts)
{
int j;
GetBitContext gb;
@ -293,9 +293,10 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
return -1;
}
}else{
int g3d1 = (compr == TIFF_G3) && !(opts & 1);
if(compr!=TIFF_CCITT_RLE && find_group3_syncmarker(&gb, srcsize*8) < 0)
break;
if(compr==TIFF_CCITT_RLE || get_bits1(&gb))
if(compr==TIFF_CCITT_RLE || g3d1 || get_bits1(&gb))
ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend);
else
ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref);

2
libavcodec/faxcompr.h
View File

@ -40,6 +40,6 @@ void ff_ccitt_unpack_init(void);
*/
int ff_ccitt_unpack(AVCodecContext *avctx,
const uint8_t *src, int srcsize,
uint8_t *dst, int height, int stride, enum TiffCompr compr);
uint8_t *dst, int height, int stride, enum TiffCompr compr, int opts);
#endif /* AVCODEC_FAXCOMPR_H */

4
libavcodec/tiff.c
View File

@ -146,13 +146,11 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin
src2[i] = ff_reverse[src[i]];
}
memset(src2+size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
if(s->compr == TIFF_G3 && !(s->fax_opts & 1))
s->compr = TIFF_CCITT_RLE;
switch(s->compr){
case TIFF_CCITT_RLE:
case TIFF_G3:
case TIFF_G4:
ret = ff_ccitt_unpack(s->avctx, src2, size, dst, lines, stride, s->compr);
ret = ff_ccitt_unpack(s->avctx, src2, size, dst, lines, stride, s->compr, s->fax_opts);
break;
}
av_free(src2);