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

Warnings fixed as per bug

Browse Source 
http://bugzilla.remotesensing.org/show_bug.cgi?id=357
This commit is contained in:
Andrey Kiselev 2003-12-19 18:29:49 +00:00
parent dd9a7f6407
commit e39da25e00
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtiff/tif_dirinfo.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dirinfo.c,v 1.23 2003-11-18 17:54:09 dron Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dirinfo.c,v 1.24 2003-12-19 18:29:49 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -459,7 +459,7 @@ _TIFFCreateAnonFieldInfo(TIFF *tif, ttag_t tag, TIFFDataType field_type)
{ {
TIFFFieldInfo *fld; TIFFFieldInfo *fld;
fld = _TIFFmalloc(sizeof (TIFFFieldInfo)); fld = (TIFFFieldInfo *) _TIFFmalloc(sizeof (TIFFFieldInfo));
_TIFFmemset( fld, 0, sizeof(TIFFFieldInfo) ); _TIFFmemset( fld, 0, sizeof(TIFFFieldInfo) );
fld->field_tag = tag; fld->field_tag = tag;

6
libtiff/tif_extension.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_extension.c,v 1.2 2003-07-08 16:40:46 warmerda Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_extension.c,v 1.3 2003-12-19 18:29:49 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -99,9 +99,9 @@ void TIFFSetClientInfo( TIFF *tif, void *data, const char *name )
** Create a new link. ** Create a new link.
*/ */
link = _TIFFmalloc(sizeof(TIFFClientInfoLink)); link = (TIFFClientInfoLink *) _TIFFmalloc(sizeof(TIFFClientInfoLink));
link->next = tif->tif_clientinfo; link->next = tif->tif_clientinfo;
link->name = _TIFFmalloc(strlen(name)+1); link->name = (char *) _TIFFmalloc(strlen(name)+1);
strcpy(link->name, name); strcpy(link->name, name);
link->data = data; link->data = data;

42
libtiff/tiff.h
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiff.h,v 1.17 2003-12-04 07:52:07 dron Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiff.h,v 1.18 2003-12-19 18:29:49 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -102,26 +102,6 @@ typedef struct {
uint32 tiff_diroff; /* byte offset to first directory */ uint32 tiff_diroff; /* byte offset to first directory */
} TIFFHeader; } TIFFHeader;
/*
* TIFF Image File Directories are comprised of
* a table of field descriptors of the form shown
* below. The table is sorted in ascending order
* by tag. The values associated with each entry
* are disjoint and may appear anywhere in the file
* (so long as they are placed on a word boundary).
*
* If the value is 4 bytes or less, then it is placed
* in the offset field to save space. If the value
* is less than 4 bytes, it is left-justified in the
* offset field.
*/
typedef struct {
uint16 tdir_tag; /* see below */
uint16 tdir_type; /* data type; see below */
uint32 tdir_count; /* number of items; length in spec */
uint32 tdir_offset; /* byte offset to field data */
} TIFFDirEntry;
/* /*
* NB: In the comments below, * NB: In the comments below,
* - items marked with a + are obsoleted by revision 5.0, * - items marked with a + are obsoleted by revision 5.0,
@ -152,6 +132,26 @@ typedef enum {
TIFF_IFD = 13 /* %32-bit unsigned integer (offset) */ TIFF_IFD = 13 /* %32-bit unsigned integer (offset) */
} TIFFDataType; } TIFFDataType;
/*
* TIFF Image File Directories are comprised of
* a table of field descriptors of the form shown
* below. The table is sorted in ascending order
* by tag. The values associated with each entry
* are disjoint and may appear anywhere in the file
* (so long as they are placed on a word boundary).
*
* If the value is 4 bytes or less, then it is placed
* in the offset field to save space. If the value
* is less than 4 bytes, it is left-justified in the
* offset field.
*/
typedef struct {
uint16 tdir_tag; /* see below */
TIFFDataType tdir_type; /* data type; see below */
uint32 tdir_count; /* number of items; length in spec */
uint32 tdir_offset; /* byte offset to field data */
} TIFFDirEntry;
/* /*
* TIFF Tag Definitions. * TIFF Tag Definitions.
*/ */