From 53501b361d00b707514a68ce298a6af1d017717a Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sun, 19 Mar 2017 15:39:35 +0000 Subject: Release 10.77.03 git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2922 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/other/pnmtotiffcmyk.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'converter/other/pnmtotiffcmyk.c') diff --git a/converter/other/pnmtotiffcmyk.c b/converter/other/pnmtotiffcmyk.c index 2e6ae935..b7e3228e 100644 --- a/converter/other/pnmtotiffcmyk.c +++ b/converter/other/pnmtotiffcmyk.c @@ -540,7 +540,6 @@ tiffOpen( Out* out, Root *r ) { short samplesperpixel = 4 ; /* cmyk has four values */ uint16 bitspersample = MAXTIFFBITS ; short photometric = PHOTOMETRIC_SEPARATED ; /* ie cmyk */ - int bytesperrow = r->nCols ; t->tiff = TIFFFdOpen( 1, "Standard Output", "w" ) ; if ( ! t->tiff ) { @@ -548,11 +547,6 @@ tiffOpen( Out* out, Root *r ) { return ERR_TIFF ; } - /* from pnmtotiff - default is to have 8kb strips */ - if ( ! t->rowsperstrip ) { - t->rowsperstrip = ( 8 * 1024 ) / bytesperrow ; - } - TIFFSetField( t->tiff, TIFFTAG_DOTRANGE, t->lowdotrange, t->highdotrange ) ; TIFFSetField( t->tiff, TIFFTAG_IMAGEWIDTH, (uint32)r->nCols ) ; TIFFSetField( t->tiff, TIFFTAG_IMAGELENGTH, (uint32)r->nRows ) ; @@ -567,6 +561,9 @@ tiffOpen( Out* out, Root *r ) { TIFFSetField( t->tiff, TIFFTAG_DOCUMENTNAME, r->name ) ; TIFFSetField( t->tiff, TIFFTAG_IMAGEDESCRIPTION, "PNM -> CMYK tiff" ) ; TIFFSetField( t->tiff, TIFFTAG_SAMPLESPERPIXEL, samplesperpixel ) ; + if ( t->rowsperstrip == 0) { + t->rowsperstrip = TIFFDefaultStripSize(t->tiff, 0) ; + } TIFFSetField( t->tiff, TIFFTAG_ROWSPERSTRIP, t->rowsperstrip ) ; TIFFSetField( t->tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG ) ; -- cgit 1.4.1