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

* libtiff/tif_dir.c, libtiff/tif_dirinfo.c, libtiff/tif_compress.c,

Browse Source 
libtiff/tif_jpeg_12.c: suppress warnings about 'no previous
declaration/prototype'
This commit is contained in:
Even Rouault 2015-10-28 19:10:20 +00:00
parent aefadd720c
commit 1874d4e8c8
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2015-10-28 Even Rouault <even.rouault at spatialys.com>
* libtiff/tif_dir.c, libtiff/tif_dirinfo.c, libtiff/tif_compress.c,
libtiff/tif_jpeg_12.c: suppress warnings about 'no previous
declaration/prototype'
2015-10-19 Even Rouault <even.rouault at spatialys.com>
* libtiff/tiffiop.h, libtiff/tif_dirwrite.c: suffix constants by U to fix

4
libtiff/tif_compress.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_compress.c,v 1.22 2010-03-10 18:56:48 bfriesen Exp $ */
/* $Id: tif_compress.c,v 1.23 2015-10-28 19:10:20 erouault Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -85,7 +85,7 @@ TIFFNoDecode(TIFF* tif, const char* method)
return (-1);
}
int
static int
_TIFFNoFixupTags(TIFF* tif)
{
(void) tif;

6
libtiff/tif_dir.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_dir.c,v 1.122 2015-10-17 10:13:14 erouault Exp $ */
/* $Id: tif_dir.c,v 1.123 2015-10-28 19:10:20 erouault Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -57,13 +57,13 @@ void _TIFFsetByteArray(void** vpp, void* vp, uint32 n)
{ setByteArray(vpp, vp, n, 1); }
void _TIFFsetString(char** cpp, char* cp)
{ setByteArray((void**) cpp, (void*) cp, strlen(cp)+1, 1); }
void _TIFFsetNString(char** cpp, char* cp, uint32 n)
static void _TIFFsetNString(char** cpp, char* cp, uint32 n)
{ setByteArray((void**) cpp, (void*) cp, n, 1); }
void _TIFFsetShortArray(uint16** wpp, uint16* wp, uint32 n)
{ setByteArray((void**) wpp, (void*) wp, n, sizeof (uint16)); }
void _TIFFsetLongArray(uint32** lpp, uint32* lp, uint32 n)
{ setByteArray((void**) lpp, (void*) lp, n, sizeof (uint32)); }
void _TIFFsetLong8Array(uint64** lpp, uint64* lp, uint32 n)
static void _TIFFsetLong8Array(uint64** lpp, uint64* lp, uint32 n)
{ setByteArray((void**) lpp, (void*) lp, n, sizeof (uint64)); }
void _TIFFsetFloatArray(float** fpp, float* fp, uint32 n)
{ setByteArray((void**) fpp, (void*) fp, n, sizeof (float)); }

4
libtiff/tif_dirinfo.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_dirinfo.c,v 1.121 2014-05-07 01:58:46 bfriesen Exp $ */
/* $Id: tif_dirinfo.c,v 1.122 2015-10-28 19:10:20 erouault Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -521,7 +521,7 @@ TIFFFindField(TIFF* tif, uint32 tag, TIFFDataType dt)
return tif->tif_foundfield = (ret ? *ret : NULL);
}
const TIFFField*
static const TIFFField*
_TIFFFindFieldByName(TIFF* tif, const char *field_name, TIFFDataType dt)
{
TIFFField key = {0, 0, 0, TIFF_NOTYPE, 0, 0, 0, 0, 0, 0, NULL, NULL};

3
libtiff/tif_jpeg_12.c
View File

@ -5,6 +5,9 @@
# define TIFFInitJPEG TIFFInitJPEG_12
int
TIFFInitJPEG_12(TIFF* tif, int scheme);
# include LIBJPEG_12_PATH
# include "tif_jpeg.c"