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

Finished last change with regard to ycbcr subsampling. See Bugzilla:

Browse Source 
http://bugzilla.remotesensing.org/show_bug.cgi?id=168
This commit is contained in:
Frank Warmerdam 2002-07-31 21:05:13 +00:00
parent fe7352c450
commit a0605bac6b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libtiff/tif_jpeg.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_jpeg.c,v 1.9 2002-07-31 20:56:15 warmerda Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_jpeg.c,v 1.10 2002-07-31 21:05:13 warmerda Exp $ */
/* /*
* Copyright (c) 1994-1997 Sam Leffler * Copyright (c) 1994-1997 Sam Leffler
@ -1357,6 +1357,10 @@ JPEGVSetField(TIFF* tif, ttag_t tag, va_list ap)
case TIFFTAG_JPEGTABLESMODE: case TIFFTAG_JPEGTABLESMODE:
sp->jpegtablesmode = va_arg(ap, int); sp->jpegtablesmode = va_arg(ap, int);
return (1); /* pseudo tag */ return (1); /* pseudo tag */
case TIFFTAG_YCBCRSUBSAMPLING:
/* mark the fact that we have a real ycbcrsubsampling! */
sp->ycbcrsampling_fetched = 1;
return (*sp->vsetparent)(tif, tag, ap);
default: default:
return (*sp->vsetparent)(tif, tag, ap); return (*sp->vsetparent)(tif, tag, ap);
} }
@ -1386,10 +1390,6 @@ JPEGVSetField(TIFF* tif, ttag_t tag, va_list ap)
* loaded just to get the tags right, even if the imagery is never read. * loaded just to get the tags right, even if the imagery is never read.
* It would be more efficient to just load a bit of the header, and * It would be more efficient to just load a bit of the header, and
* initialize things from that. * initialize things from that.
* o This code doesn't know whether or not the tag actually did occur in
* the file. If it knew this it could skip the hack but this is hard to
* know since we have already set the "field set" bit for the subsampling
* TIFFInitJPEG().
* *
* See the bug in bugzilla for details: * See the bug in bugzilla for details:
* *
@ -1411,7 +1411,8 @@ JPEGFixupTestSubsampling( TIFF * tif )
* jpeg data to get the sampling. * jpeg data to get the sampling.
*/ */
if( !sp->cinfo.comm.is_decompressor if( !sp->cinfo.comm.is_decompressor
|| sp->ycbcrsampling_fetched ) || sp->ycbcrsampling_fetched
|| sp->photometric != PHOTOMETRIC_YCBCR )
return; return;
sp->ycbcrsampling_fetched = 1; sp->ycbcrsampling_fetched = 1;