mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng14] Quieted more harmless warnings from Coverity-scan.

Browse Source
This commit is contained in:
Glenn Randers-Pehrson
2015-02-06 11:57:17 -06:00
parent 83e10a6347
commit 4743e9e892
4 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
png.h
View File

@@ -1,8 +1,8 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.4.15rc01 - February 5, 2015
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
* libpng version 1.4.15rc02 - February 6, 2015
* Copyright (c) 1998-2015 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -11,7 +11,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.4.15rc01 - February 5, 2015: Glenn
* libpng versions 0.97, January 1998, through 1.4.15rc02 - February 6, 2015: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -209,7 +209,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.4.15rc01, February 5, 2015, are
* libpng versions 1.2.6, August 15, 2004, through 1.4.15rc02, February 6, 2015, are
* Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors:
@@ -321,13 +321,13 @@
* Y2K compliance in libpng:
* =========================
*
* February 5, 2015
* February 6, 2015
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.4.15rc01 are Y2K compliant. It is my belief that earlier
* upward through 1.4.15rc02 are Y2K compliant. It is my belief that earlier
* versions were also Y2K compliant.
*
* Libpng only has three year fields. One is a 2-byte unsigned integer
@@ -383,9 +383,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.4.15rc01"
#define PNG_LIBPNG_VER_STRING "1.4.15rc02"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.4.15rc01 - February 5, 2015\n"
" libpng version 1.4.15rc02 - February 6, 2015\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
@@ -398,7 +398,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 01
#define PNG_LIBPNG_VER_BUILD 02
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1509,7 +1509,7 @@ struct png_struct_def
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
typedef png_structp version_1_4_15rc01;
typedef png_structp version_1_4_15rc02;
typedef png_struct FAR * FAR * png_structpp;
@@ -2675,10 +2675,10 @@ PNG_EXPORT(png_bytep,png_get_io_chunk_name)
* format for negative values, which is almost certainly true.
*/
# define png_get_uint_32(buf) \
(((png_uint_32)(*(buf)) << 24) + \
((png_uint_32)(*((buf) + 1)) << 16) + \
((png_uint_32)(*((buf) + 2)) << 8) + \
((png_uint_32)(*((buf) + 3))))
(((png_uint_32)((*(buf)) & 0xff) << 24) + \
((png_uint_32)((*((buf) + 1)) & 0xff) << 16) + \
((png_uint_32)((*((buf) + 2)) & 0xff) << 8) + \
((png_uint_32)((*((buf) + 3)) & 0xff)))
/* The following definition introduces an API incompatibility (but not
* an ABI incompatibility) with libpng-1.4.0 through 1.4.4. Prior to