Skip to content

T
Third Party Libpng

OpenHarmony / Third Party Libpng
大约 1 年 前同步成功

通知 4
Star 22
Fork 0
T
Third Party Libpng

体验新版 GitCode，发现更多精彩内容 >>

提交 5f0c9fab 编写于 作者: G Glenn Randers-Pehrson
浏览文件
操作

[libpng16] Bump version to 1.6.33rc01

上级 397c7eea
隐藏空白更改
内联 并排
Showing with 73 addition and 64 deletion
ANNOUNCE
浏览文件 @ 5f0c9fab
Libpng 1.6.33beta04 - September 14, 2017
Libpng 1.6.33rc01 - September 20, 2017
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
......@@ -8,20 +8,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
1.6.33beta04.tar.xz (LZMA-compressed, recommended)
1.6.33beta04.tar.gz
1.6.33rc01.tar.xz (LZMA-compressed, recommended)
1.6.33rc01.tar.gz
Source files with CRLF line endings (for Windows), without the
"configure" script
lp1633b04.7z (LZMA-compressed, recommended)
lp1633b04.zip
lp1633r01.7z (LZMA-compressed, recommended)
lp1633r01.zip
Other information:
1.6.33beta04-README.txt
1.6.33beta04-LICENSE.txt
libpng-1.6.33beta04-*.asc (armored detached GPG signatures)
1.6.33rc01-README.txt
1.6.33rc01-LICENSE.txt
libpng-1.6.33rc01-*.asc (armored detached GPG signatures)
Changes since the last public release (1.6.32):
Version 1.6.33beta01 [August 28, 2017]
......@@ -46,7 +46,13 @@ Version 1.6.33beta03 [September 14, 2017]
Use pnglibconf.h.prebuilt when building for ANDROID with cmake (Github
issue 162, by rcdailey).
Version 1.6.33beta04 [September 14, 2017]
Version 1.6.33rc01 [September 20, 2017]
Initialize memory allocated by png_inflate to zero, using memset, to
stop an oss-fuzz "use of uninitialized value" detection in png_set_text_2()
due to truncated iTXT or zTXT chunk.
Initialize memory allocated by png_read_buffer to zero, using memset, to
stop an oss-fuzz "use of uninitialized value" detection in
png_icc_check_tag_table()() due to truncated iCCP chunk.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
......
CHANGES
浏览文件 @ 5f0c9fab
......@@ -6016,7 +6016,13 @@ Version 1.6.33beta03 [September 14, 2017]
Use pnglibconf.h.prebuilt when building for ANDROID with cmake (Github
issue 162, by rcdailey).
Version 1.6.33beta04 [September 14, 2017]
Version 1.6.33rc01 [September 20, 2017]
Initialize memory allocated by png_inflate to zero, using memset, to
stop an oss-fuzz "use of uninitialized value" detection in png_set_text_2()
due to truncated iTXT or zTXT chunk.
Initialize memory allocated by png_read_buffer to zero, using memset, to
stop an oss-fuzz "use of uninitialized value" detection in
png_icc_check_tag_table()() due to truncated iCCP chunk.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
......
CMakeLists.txt
浏览文件 @ 5f0c9fab
......@@ -844,7 +844,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW)
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(png PROPERTIES
# VERSION 16.${PNGLIB_RELEASE}.1.6.33beta04
# VERSION 16.${PNGLIB_RELEASE}.1.6.33rc01
VERSION 16.${PNGLIB_RELEASE}.0
SOVERSION 16
CLEAN_DIRECT_OUTPUT 1)
......
LICENSE
浏览文件 @ 5f0c9fab
......@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.0.7, July 1, 2000 through 1.6.33beta04, September 14, 2017 are
libpng versions 1.0.7, July 1, 2000 through 1.6.33rc01, September 20, 2017 are
Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
......@@ -130,4 +130,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
September 14, 2017
September 20, 2017
README
浏览文件 @ 5f0c9fab
README for libpng version 1.6.33beta04 - September 14, 2017 (shared library 16.0)
README for libpng version 1.6.33rc01 - September 20, 2017 (shared library 16.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
......
configure.ac
浏览文件 @ 5f0c9fab
......@@ -25,7 +25,7 @@ AC_PREREQ([2.68])
dnl Version number stuff here:
AC_INIT([libpng],[1.6.33beta04],[png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng],[1.6.33rc01],[png-mng-implement@lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts])
# libpng does not follow GNU file name conventions (hence 'foreign')
......@@ -46,7 +46,7 @@ dnl automake, so the following is not necessary (and is not defined anyway):
dnl AM_PREREQ([1.11.2])
dnl stop configure from automagically running automake
PNGLIB_VERSION=1.6.33beta04
PNGLIB_VERSION=1.6.33rc01
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
PNGLIB_RELEASE=33
......
contrib/oss-fuzz/libpng_read_fuzzer.cc
浏览文件 @ 5f0c9fab
......@@ -5,7 +5,7 @@
// Use of this source code is governed by a BSD-style license that may
// be found in the LICENSE file https://cs.chromium.org/chromium/src/LICENSE
// Last changed in libpng 1.6.33beta03 [September 14, 2017]
// Last changed in libpng 1.6.33beta03 [September 20, 2017]
// The modifications in 2017 by Glenn Randers-Pehrson include
// 1. addition of a PNG_CLEANUP macro,
......
libpng-manual.txt
浏览文件 @ 5f0c9fab
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.33beta04 - September 14, 2017
libpng version 1.6.33rc01 - September 20, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2017 Glenn Randers-Pehrson
......@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.6.33beta04 - September 14, 2017
libpng versions 0.97, January 1998, through 1.6.33rc01 - September 20, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2017 Glenn Randers-Pehrson
......@@ -5405,7 +5405,7 @@ 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.6.33beta04 are Y2K compliant. It is my belief that earlier
upward through 1.6.33rc01 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has two year fields. One is a 2-byte unsigned integer
......
libpng.3
浏览文件 @ 5f0c9fab
.TH LIBPNG 3 "September 14, 2017"
.TH LIBPNG 3 "September 20, 2017"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.33beta04
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.33rc01
.SH SYNOPSIS
\fB
#include <png.h>\fP
......@@ -518,7 +518,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.33beta04 - September 14, 2017
libpng version 1.6.33rc01 - September 20, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2017 Glenn Randers-Pehrson
......@@ -529,7 +529,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.6.33beta04 - September 14, 2017
libpng versions 0.97, January 1998, through 1.6.33rc01 - September 20, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2017 Glenn Randers-Pehrson
......@@ -5923,7 +5923,7 @@ 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.6.33beta04 are Y2K compliant. It is my belief that earlier
upward through 1.6.33rc01 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has two year fields. One is a 2-byte unsigned integer
......@@ -6081,7 +6081,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.6.33beta04 - September 14, 2017:
Libpng version 1.6.33rc01 - September 20, 2017:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
......@@ -6106,7 +6106,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.0.7, July 1, 2000 through 1.6.33beta04, September 14, 2017 are
libpng versions 1.0.7, July 1, 2000 through 1.6.33rc01, September 20, 2017 are
Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
......@@ -6234,7 +6234,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
September 14, 2017
September 20, 2017
.\" end of man page
libpngpf.3
浏览文件 @ 5f0c9fab
.TH LIBPNGPF 3 "April 1, 2017"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.33beta04
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.33rc01
(private functions)
.SH SYNOPSIS
\fB\fB#include \fI\fI"pngpriv.h"
......
png.c
浏览文件 @ 5f0c9fab
......@@ -14,7 +14,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_6_33beta04 Your_png_h_is_not_version_1_6_33beta04;
typedef png_libpng_version_1_6_33rc01 Your_png_h_is_not_version_1_6_33rc01;
#ifdef __GNUC__
/* The version tests may need to be added to, but the problem warning has
......@@ -816,14 +816,14 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
"libpng version 1.6.33beta04 - September 19, 2017" PNG_STRING_NEWLINE \
"libpng version 1.6.33rc01 - September 20, 2017" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson" \
PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE;
# else
return "libpng version 1.6.33beta04 - September 19, 2017\
return "libpng version 1.6.33rc01 - September 20, 2017\
Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
......
png.h
浏览文件 @ 5f0c9fab
/* png.h - header file for PNG reference library
*
* libpng version 1.6.33beta04, September 14, 2017
* libpng version 1.6.33rc01, September 20, 2017
*
* Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......@@ -12,7 +12,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.6.33beta04, September 14, 2017:
* libpng versions 0.97, January 1998, through 1.6.33rc01, September 20, 2017:
* Glenn Randers-Pehrson.
* See also "Contributing Authors", below.
*/
......@@ -25,7 +25,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.0.7, July 1, 2000 through 1.6.33beta04, September 14, 2017 are
* libpng versions 1.0.7, July 1, 2000 through 1.6.33rc01, September 20, 2017 are
* Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
* derived from libpng-1.0.6, and are distributed according to the same
* disclaimer and license as libpng-1.0.6 with the following individuals
......@@ -241,13 +241,13 @@
* Y2K compliance in libpng:
* =========================
*
* September 14, 2017
* September 20, 2017
*
* 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.6.33beta04 are Y2K compliant. It is my belief that
* upward through 1.6.33rc01 are Y2K compliant. It is my belief that
* earlier versions were also Y2K compliant.
*
* Libpng only has two year fields. One is a 2-byte unsigned integer
......@@ -309,8 +309,8 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.33beta04"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.33beta04 - September 14, 2017\n"
#define PNG_LIBPNG_VER_STRING "1.6.33rc01"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.33rc01 - September 20, 2017\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
......@@ -324,7 +324,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 04
#define PNG_LIBPNG_VER_BUILD 01
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
......@@ -341,7 +341,7 @@
#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
PNG_LIBPNG_BUILD_PRIVATE */
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
......@@ -459,7 +459,7 @@ extern "C" {
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
typedef char* png_libpng_version_1_6_33beta04;
typedef char* png_libpng_version_1_6_33rc01;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
......
pngconf.h
浏览文件 @ 5f0c9fab
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.6.33beta04, September 14, 2017
* libpng version 1.6.33rc01, September 20, 2017
*
* Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
pngrutil.c
浏览文件 @ 5f0c9fab
......@@ -671,9 +671,6 @@ png_decompress_chunk(png_structrp png_ptr,
(terminate != 0);
png_bytep text = png_voidcast(png_bytep, png_malloc_base(png_ptr,
buffer_size));
/* Stop an oss-fuzz "use of uninitialized value" detection
* in png_set_text_2()
*/
memset(text, 0, buffer_size);
if (text != NULL)
......
pngtest.c
浏览文件 @ 5f0c9fab
......@@ -2153,4 +2153,4 @@ main(void)
#endif
/* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_6_33beta04 Your_png_h_is_not_version_1_6_33beta04;
typedef png_libpng_version_1_6_33rc01 Your_png_h_is_not_version_1_6_33rc01;
projects/vstudio/README.txt
浏览文件 @ 5f0c9fab
VisualStudio instructions
libpng version 1.6.33beta04 - September 14, 2017
libpng version 1.6.33rc01 - September 20, 2017
Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
......
projects/vstudio/zlib.props
浏览文件 @ 5f0c9fab
......@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
* libpng version 1.6.33beta04 - September 14, 2017
* libpng version 1.6.33rc01 - September 20, 2017
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
......
scripts/README.txt
浏览文件 @ 5f0c9fab
Makefiles for libpng version 1.6.33beta04 - September 14, 2017
Makefiles for libpng version 1.6.33rc01 - September 20, 2017
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
(gcc, creates libpng16.so.16.1.6.33beta04)
(gcc, creates libpng16.so.16.1.6.33rc01)
makefile.linux-opt=> Linux/ELF makefile with hardware optimizations on
(gcc, creates libpng16.so.16.1.6.33beta04)
(gcc, creates libpng16.so.16.1.6.33rc01)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
......@@ -35,12 +35,12 @@ pnglibconf.h.prebuilt => Stores configuration settings
makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc,
creates libpng16.so.16.1.6.33beta04)
creates libpng16.so.16.1.6.33rc01)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng16.so.16.1.6.33beta04)
creates libpng16.so.16.1.6.33rc01)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng16.so.16.1.6.33beta04)
creates libpng16.so.16.1.6.33rc01)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
......
scripts/def.c
浏览文件 @ 5f0c9fab
......@@ -21,7 +21,7 @@ PNG_DFN "OS2 DESCRIPTION "PNG image compression library""
PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE"
PNG_DFN ""
PNG_DFN "EXPORTS"
PNG_DFN ";Version 1.6.33beta04"
PNG_DFN ";Version 1.6.33rc01"
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"
......
scripts/libpng-config-head.in
浏览文件 @ 5f0c9fab
......@@ -11,7 +11,7 @@
# Modeled after libxml-config.
version=1.6.33beta04
version=1.6.33rc01
prefix=""
libdir=""
libs=""
......
scripts/libpng.pc.in
浏览文件 @ 5f0c9fab
......@@ -5,6 +5,6 @@ includedir=@includedir@/libpng16
Name: libpng
Description: Loads and saves PNG files
Version: 1.6.33beta04
Version: 1.6.33rc01
Libs: -L${libdir} -lpng16
Cflags: -I${includedir}
scripts/makefile.ne12bsd
浏览文件 @ 5f0c9fab
......@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng16
LIB= png16
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.6.33beta04
SHLIB_MINOR= 1.6.33rc01
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
......
scripts/makefile.netbsd
浏览文件 @ 5f0c9fab
......@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 16
SHLIB_MINOR= 1.6.33beta04
SHLIB_MINOR= 1.6.33rc01
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
......
scripts/makefile.openbsd
浏览文件 @ 5f0c9fab
......@@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 16
SHLIB_MINOR= 1.6.33beta04
SHLIB_MINOR= 1.6.33rc01
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
......
scripts/pnglibconf.h.prebuilt
浏览文件 @ 5f0c9fab
/* libpng 1.6.33beta04 STANDARD API DEFINITION */
/* libpng 1.6.33rc01 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
/* Libpng version 1.6.33beta04 - September 14, 2017 */
/* Libpng version 1.6.33rc01 - September 20, 2017 */
/* Copyright (c) 1998-2017 Glenn Randers-Pehrson */
......
scripts/symbols.def
浏览文件 @ 5f0c9fab
;Version 1.6.33beta04
;Version 1.6.33rc01
;--------------------------------------------------------------
; LIBPNG symbol list as a Win32 DEF file
; Contains all the symbols that can be exported from libpng
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或