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

Call TIFFError() instead of producing warnings when setting custom tags

Browse Source 
by value.
This commit is contained in:
Andrey Kiselev 2004-07-03 10:26:55 +00:00
parent a61b92509b
commit 58b9b9a82e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libtiff/tif_dir.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.c,v 1.33 2004-01-11 15:14:02 dron Exp $ */ /* $Id: tif_dir.c,v 1.34 2004-07-03 10:26:55 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -568,7 +568,9 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
else else
{ {
/* not supporting "pass by value" types yet */ /* not supporting "pass by value" types yet */
TIFFWarning(module, " ... pass by value not implemented."); TIFFError(module,
"%s: Pass by value is not implemented.",
tif->tif_name);
tv->value = _TIFFmalloc(tv_size * tv->count); tv->value = _TIFFmalloc(tv_size * tv->count);
if ( !tv->value ) { if ( !tv->value ) {
@ -965,7 +967,9 @@ _TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap)
} }
else else
{ {
printf( "TIFFVGetField ... pass by value not imp.\n" ); TIFFError("_TIFFVGetField",
"%s: Pass by value is not implemented.",
tif->tif_name);
break; break;
} }
} }
@ -1253,8 +1257,8 @@ TIFFSetDirectory(TIFF* tif, tdir_t dirn)
*/ */
tif->tif_curdir = (dirn - n) - 1; tif->tif_curdir = (dirn - n) - 1;
/* /*
* Reset tif_dirnumber counter nad start new list of seen directories. * Reset tif_dirnumber counter and start new list of seen directories.
* We need this in order to prevent IFD loops. * We need this to prevent IFD loops.
*/ */
tif->tif_dirnumber = 0; tif->tif_dirnumber = 0;
return (TIFFReadDirectory(tif)); return (TIFFReadDirectory(tif));
@ -1271,8 +1275,8 @@ TIFFSetSubDirectory(TIFF* tif, uint32 diroff)
{ {
tif->tif_nextdiroff = diroff; tif->tif_nextdiroff = diroff;
/* /*
* Reset tif_dirnumber counter nad start new list of seen directories. * Reset tif_dirnumber counter and start new list of seen directories.
* We need this in order to prevent IFD loops. * We need this to prevent IFD loops.
*/ */
tif->tif_dirnumber = 0; tif->tif_dirnumber = 0;
return (TIFFReadDirectory(tif)); return (TIFFReadDirectory(tif));