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

avoid direct use of tif_clientdata

Browse Source
This commit is contained in:
Frank Warmerdam 2005-12-21 16:09:21 +00:00
parent bc4b088d40
commit 59e0f5cb33
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/addtiffo/tif_overview.c
View File

@ -696,9 +696,9 @@ void TIFFBuildOverviews( TIFF *hTIFF, int nOverviews, int * panOvList,
{ {
TIFFOvrCache **papoRawBIs; TIFFOvrCache **papoRawBIs;
uint32 nXSize, nYSize, nBlockXSize, nBlockYSize; uint32 nXSize, nYSize, nBlockXSize, nBlockYSize;
uint16 nBitsPerPixel, nPhotometric, nCompressFlag, nSamples, uint16 nBitsPerPixel, nPhotometric, nCompressFlag, nSamples,
nPlanarConfig, nSampleFormat; nPlanarConfig, nSampleFormat;
int bSubsampled; int bSubsampled;
uint16 nHorSubsampling, nVerSubsampling; uint16 nHorSubsampling, nVerSubsampling;
int bTiled, nSXOff, nSYOff, i; int bTiled, nSXOff, nSYOff, i;
@ -713,7 +713,7 @@ void TIFFBuildOverviews( TIFF *hTIFF, int nOverviews, int * panOvList,
TIFFGetField( hTIFF, TIFFTAG_IMAGELENGTH, &nYSize ); TIFFGetField( hTIFF, TIFFTAG_IMAGELENGTH, &nYSize );
TIFFGetField( hTIFF, TIFFTAG_BITSPERSAMPLE, &nBitsPerPixel ); TIFFGetField( hTIFF, TIFFTAG_BITSPERSAMPLE, &nBitsPerPixel );
/* TODO: nBitsPerPixel seems misnomer and may need renaming to nBitsPerSample */ /* TODO: nBitsPerPixel seems misnomer and may need renaming to nBitsPerSample */
TIFFGetField( hTIFF, TIFFTAG_SAMPLESPERPIXEL, &nSamples ); TIFFGetField( hTIFF, TIFFTAG_SAMPLESPERPIXEL, &nSamples );
TIFFGetFieldDefaulted( hTIFF, TIFFTAG_PLANARCONFIG, &nPlanarConfig ); TIFFGetFieldDefaulted( hTIFF, TIFFTAG_PLANARCONFIG, &nPlanarConfig );
@ -724,13 +724,13 @@ void TIFFBuildOverviews( TIFF *hTIFF, int nOverviews, int * panOvList,
if( nPhotometric == PHOTOMETRIC_YCBCR || nPhotometric == PHOTOMETRIC_ITULAB ) if( nPhotometric == PHOTOMETRIC_YCBCR || nPhotometric == PHOTOMETRIC_ITULAB )
{ {
if( nBitsPerPixel != 8 || nSamples != 3 || nPlanarConfig != PLANARCONFIG_CONTIG || if( nBitsPerPixel != 8 || nSamples != 3 || nPlanarConfig != PLANARCONFIG_CONTIG ||
nSampleFormat != SAMPLEFORMAT_UINT) nSampleFormat != SAMPLEFORMAT_UINT)
{ {
/* TODO: use of TIFFError is inconsistent with use of fprintf in addtiffo.c, sort out */ /* TODO: use of TIFFError is inconsistent with use of fprintf in addtiffo.c, sort out */
TIFFErrorExt( hTIFF->tif_clientdata, "TIFFBuildOverviews", TIFFErrorExt( TIFFClientdata(hTIFF), "TIFFBuildOverviews",
"File `%s' has an unsupported subsampling configuration.\n", "File `%s' has an unsupported subsampling configuration.\n",
TIFFFileName(hTIFF) ); TIFFFileName(hTIFF) );
/* If you need support for this particular flavor, please contact either /* If you need support for this particular flavor, please contact either
* Frank Warmerdam warmerdam@pobox.com * Frank Warmerdam warmerdam@pobox.com
* Joris Van Damme info@awaresystems.be * Joris Van Damme info@awaresystems.be
*/ */
@ -738,17 +738,17 @@ void TIFFBuildOverviews( TIFF *hTIFF, int nOverviews, int * panOvList,
} }
bSubsampled = 1; bSubsampled = 1;
TIFFGetField( hTIFF, TIFFTAG_YCBCRSUBSAMPLING, &nHorSubsampling, &nVerSubsampling ); TIFFGetField( hTIFF, TIFFTAG_YCBCRSUBSAMPLING, &nHorSubsampling, &nVerSubsampling );
/* TODO: find out if maybe TIFFGetFieldDefaulted is better choice for YCbCrSubsampling tag */ /* TODO: find out if maybe TIFFGetFieldDefaulted is better choice for YCbCrSubsampling tag */
} }
else else
{ {
if( nBitsPerPixel < 8 ) if( nBitsPerPixel < 8 )
{ {
/* TODO: use of TIFFError is inconsistent with use of fprintf in addtiffo.c, sort out */ /* TODO: use of TIFFError is inconsistent with use of fprintf in addtiffo.c, sort out */
TIFFErrorExt( hTIFF->tif_clientdata, "TIFFBuildOverviews", TIFFErrorExt( TIFFClientdata(hTIFF), "TIFFBuildOverviews",
"File `%s' has samples of %d bits per sample. Sample\n" "File `%s' has samples of %d bits per sample. Sample\n"
"sizes of less than 8 bits per sample are not supported.\n", "sizes of less than 8 bits per sample are not supported.\n",
TIFFFileName(hTIFF), nBitsPerPixel ); TIFFFileName(hTIFF), nBitsPerPixel );
return; return;
} }
bSubsampled = 0; bSubsampled = 0;