cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed output strip size to account for vertical roundup to sample factor

Browse Source
This commit is contained in:
Frank Warmerdam 2000-10-19 13:23:49 +00:00
parent 91b8b7c26c
commit e1f05487e9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/rgb2ycbcr.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/rgb2ycbcr.c,v 1.3 1999-12-27 17:35:01 mwelles Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/tools/rgb2ycbcr.c,v 1.4 2000-10-19 13:23:49 warmerda Exp $ */
/* /*
* Copyright (c) 1991-1997 Sam Leffler * Copyright (c) 1991-1997 Sam Leffler
@ -241,9 +241,10 @@ cvtRaster(TIFF* tif, uint32* raster, uint32 width, uint32 height)
uint32 rwidth = roundup(width, horizSubSampling); uint32 rwidth = roundup(width, horizSubSampling);
uint32 rheight = roundup(height, vertSubSampling); uint32 rheight = roundup(height, vertSubSampling);
uint32 nrows = (rowsperstrip > rheight ? rheight : rowsperstrip); uint32 nrows = (rowsperstrip > rheight ? rheight : rowsperstrip);
uint32 rnrows = roundup(nrows,vertSubSampling);
cc = nrows*rwidth + cc = rnrows*rwidth +
2*((nrows*rwidth) / (horizSubSampling*vertSubSampling)); 2*((rnrows*rwidth) / (horizSubSampling*vertSubSampling));
buf = (unsigned char*)_TIFFmalloc(cc); buf = (unsigned char*)_TIFFmalloc(cc);
for (y = height; (int32) y > 0; y -= nrows) { for (y = height; (int32) y > 0; y -= nrows) {
uint32 nr = (y > nrows ? nrows : y); uint32 nr = (y > nrows ? nrows : y);