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

Calculate line size variable correctly for lower bitdepths and use it for raw data copying

Browse Source 
Originally committed as revision 16265 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2008-12-22 06:39:31 +00:00
parent 4a2f51de34
commit 4386ed6922
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/tiff.c
View File

@ -74,7 +74,7 @@ static int tget(const uint8_t **p, int type, int le){
static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uint8_t *src, int size, int lines){ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uint8_t *src, int size, int lines){
int c, line, pixels, code; int c, line, pixels, code;
const uint8_t *ssrc = src; const uint8_t *ssrc = src;
int width = s->width * (s->bpp / 8); int width = s->width * s->bpp >> 3;
#ifdef CONFIG_ZLIB #ifdef CONFIG_ZLIB
uint8_t *zbuf; unsigned long outlen; uint8_t *zbuf; unsigned long outlen;
@ -109,8 +109,8 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin
} }
switch(s->compr){ switch(s->compr){
case TIFF_RAW: case TIFF_RAW:
memcpy(dst, src, s->width * (s->bpp / 8)); memcpy(dst, src, width);
src += s->width * (s->bpp / 8); src += width;
break; break;
case TIFF_PACKBITS: case TIFF_PACKBITS:
for(pixels = 0; pixels < width;){ for(pixels = 0; pixels < width;){