Skip to content

T
Third Party Libpng

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

通知 4
Star 22
Fork 0
T
Third Party Libpng

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

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

[libpng16] Bump version to 1.6.1beta01

上级 c53778ff
展开全部 隐藏空白更改
内联 并排
Showing with 253 addition and 75 deletion
ANNOUNCE
浏览文件 @ 681de8c8
此差异已折叠。
CHANGES
浏览文件 @ 681de8c8
......@@ -4381,6 +4381,8 @@ Version 1.6.0rc08 [February 10, 2013]
Version 1.6.0 [February 14, 2013]
No changes.
Version 1.6.1 [February 14, 2013]
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
......
CMakeLists.txt
浏览文件 @ 681de8c8
......@@ -35,7 +35,7 @@ enable_testing()
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 6)
set(PNGLIB_RELEASE 0)
set(PNGLIB_RELEASE 1)
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
......@@ -260,7 +260,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW)
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 16.${PNGLIB_RELEASE}.1.6.0
# VERSION 16.${PNGLIB_RELEASE}.1.6.1beta01
VERSION 16.${PNGLIB_RELEASE}.0
SOVERSION 16
CLEAN_DIRECT_OUTPUT 1)
......
LICENSE
浏览文件 @ 681de8c8
......@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.6.0, February 14, 2013, are
libpng versions 1.2.6, August 15, 2004, through 1.6.1beta01, February 14, 2013, are
Copyright (c) 2004, 2006-2012 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
......
README
浏览文件 @ 681de8c8
README for libpng version 1.6.0 - February 14, 2013 (shared library 16.0)
README for libpng version 1.6.1beta01 - February 14, 2013 (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
浏览文件 @ 681de8c8
......@@ -18,7 +18,7 @@ AC_PREREQ([2.68])
dnl Version number stuff here:
AC_INIT([libpng],[1.6.0],[png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng],[1.6.1beta01],[png-mng-implement@lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts])
# libpng does not follow GNU file name conventions (hence 'foreign')
......@@ -37,10 +37,10 @@ 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.0
PNGLIB_VERSION=1.6.1beta01
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
PNGLIB_RELEASE=0
PNGLIB_RELEASE=1
dnl End of version number stuff
......
contrib/tools/cvtcolor.c
浏览文件 @ 681de8c8
......@@ -3,7 +3,7 @@
*
* Last changed in libpng 1.6.0 [February 14, 2013]
*
* COPYRIGHT: Written by John Cunningham Bowler, 2012.
* COPYRIGHT: Written by John Cunningham Bowler, 2013.
* To the extent possible under law, the author has waived all copyright and
* related or neighboring rights to this work. This work is published from:
* United States.
......
contrib/tools/intgamma.sh
浏览文件 @ 681de8c8
......@@ -4,7 +4,7 @@
#
# Last changed in libpng 1.6.0 [February 14, 2013]
#
# COPYRIGHT: Written by John Cunningham Bowler, 2012.
# COPYRIGHT: Written by John Cunningham Bowler, 2013.
# To the extent possible under law, the author has waived all copyright and
# related or neighboring rights to this work. This work is published from:
# United States.
......
contrib/tools/makesRGB.c
浏览文件 @ 681de8c8
......@@ -2,7 +2,7 @@
*
* Last changed in libpng 1.6.0 [February 14, 2013]
*
* COPYRIGHT: Written by John Cunningham Bowler, 2012.
* COPYRIGHT: Written by John Cunningham Bowler, 2013.
* To the extent possible under law, the author has waived all copyright and
* related or neighboring rights to this work. This work is published from:
* United States.
......
contrib/tools/sRGB.h
浏览文件 @ 681de8c8
......@@ -3,7 +3,7 @@
*
* Last changed in libpng 1.6.0 [February 14, 2013]
*
* COPYRIGHT: Written by John Cunningham Bowler, 2012.
* COPYRIGHT: Written by John Cunningham Bowler, 2013.
* To the extent possible under law, the author has waived all copyright and
* related or neighboring rights to this work. This work is published from:
* United States.
......
libpng-manual.txt
浏览文件 @ 681de8c8
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.0 - February 14, 2013
libpng version 1.6.1beta01 - February 14, 2013
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2013 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.0 - February 14, 2013
libpng versions 0.97, January 1998, through 1.6.1beta01 - February 14, 2013
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2013 Glenn Randers-Pehrson
......@@ -5156,7 +5156,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.0 are Y2K compliant. It is my belief that earlier
upward through 1.6.1beta01 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
浏览文件 @ 681de8c8
.TH LIBPNG 3 "February 14, 2013"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta01
.SH SYNOPSIS
\fB
#include <png.h>\fP
......@@ -504,7 +504,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.0 - February 14, 2013
libpng version 1.6.1beta01 - February 14, 2013
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2013 Glenn Randers-Pehrson
......@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.6.0 - February 14, 2013
libpng versions 0.97, January 1998, through 1.6.1beta01 - February 14, 2013
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2013 Glenn Randers-Pehrson
......@@ -5661,7 +5661,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.0 are Y2K compliant. It is my belief that earlier
upward through 1.6.1beta01 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
......@@ -5869,6 +5869,7 @@ the first widely used release:
1.6.0beta01-40 16 10600 16.so.16.0[.0]
1.6.0rc01-08 16 10600 16.so.16.0[.0]
1.6.0 16 10600 16.so.16.0[.0]
1.6.1beta01 16 10601 16.so.16.1[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
......@@ -5925,7 +5926,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.6.0 - February 14, 2013:
Libpng version 1.6.1beta01 - February 14, 2013:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
......@@ -5948,7 +5949,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.6.0, February 14, 2013, are
libpng versions 1.2.6, August 15, 2004, through 1.6.1beta01, February 14, 2013, are
Copyright (c) 2004,2006-2007 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
......
libpngpf.3
浏览文件 @ 681de8c8
.TH LIBPNGPF 3 "February 14, 2013"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta01
(private functions)
.SH SYNOPSIS
\fB#include \fI"pngpriv.h"
......
png.c
浏览文件 @ 681de8c8
......@@ -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_0 Your_png_h_is_not_version_1_6_0;
typedef png_libpng_version_1_6_1beta01 Your_png_h_is_not_version_1_6_1beta01;
/* Tells libpng that we have already handled the first "num_bytes" bytes
* of the PNG file signature. If the PNG data is embedded into another
......@@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
"libpng version 1.6.0 - February 14, 2013" PNG_STRING_NEWLINE \
"libpng version 1.6.1beta01 - February 14, 2013" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2013 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.0 - February 14, 2013\
return "libpng version 1.6.1beta01 - February 14, 2013\
Copyright (c) 1998-2013 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
......
png.h
浏览文件 @ 681de8c8
/* png.h - header file for PNG reference library
*
* libpng version 1.6.0 - February 14, 2013
* libpng version 1.6.1beta01 - February 14, 2013
* Copyright (c) 1998-2013 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.6.0 - February 14, 2013: Glenn
* libpng versions 0.97, January 1998, through 1.6.1beta01 - February 14, 2013: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
......@@ -169,6 +169,7 @@
* 1.6.0beta01-40 16 10600 16.so.16.0[.0]
* 1.6.0rc01-08 16 10600 16.so.16.0[.0]
* 1.6.0 16 10600 16.so.16.0[.0]
* 1.6.1beta01 16 10601 16.so.16.1[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
......@@ -200,7 +201,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.6.0, February 14, 2013, are
* libpng versions 1.2.6, August 15, 2004, through 1.6.1beta01, February 14, 2013, 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:
......@@ -318,7 +319,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.6.0 are Y2K compliant. It is my belief that
* upward through 1.6.1beta01 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
......@@ -378,9 +379,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.0"
#define PNG_LIBPNG_VER_STRING "1.6.1beta01"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.6.0 - February 14, 2013\n"
" libpng version 1.6.1beta01 - February 14, 2013\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
......@@ -388,13 +389,13 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 6
#define PNG_LIBPNG_VER_RELEASE 0
#define PNG_LIBPNG_VER_RELEASE 1
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 0
#define PNG_LIBPNG_VER_BUILD 01
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
......@@ -411,7 +412,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_STABLE
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
......@@ -419,7 +420,7 @@
* version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
*/
#define PNG_LIBPNG_VER 10600 /* 1.6.0 */
#define PNG_LIBPNG_VER 10601 /* 1.6.1 */
/* Library configuration: these options cannot be changed after
* the library has been built.
......@@ -524,7 +525,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_0;
typedef char* png_libpng_version_1_6_1beta01;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
......
pngconf.h
浏览文件 @ 681de8c8
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.6.0 - February 14, 2013
* libpng version 1.6.1beta01 - February 14, 2013
*
* Copyright (c) 1998-2013 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
pngtest.c
浏览文件 @ 681de8c8
......@@ -1949,4 +1949,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_0 Your_png_h_is_not_version_1_6_0;
typedef png_libpng_version_1_6_1beta01 Your_png_h_is_not_version_1_6_1beta01;
projects/vstudio/readme.txt
浏览文件 @ 681de8c8
VisualStudio instructions
libpng version 1.6.0 - February 14, 2013
libpng version 1.6.1beta01 - February 14, 2013
Copyright (c) 1998-2010 Glenn Randers-Pehrson
......
projects/vstudio/zlib.props
浏览文件 @ 681de8c8
......@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
* libpng version 1.6.0 - February 14, 2013
* libpng version 1.6.1beta01 - February 14, 2013
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
......
scripts/README.txt
浏览文件 @ 681de8c8
Makefiles for libpng version 1.6.0 - February 14, 2013
Makefiles for libpng version 1.6.1beta01 - February 14, 2013
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
(gcc, creates libpng16.so.16.1.6.0)
(gcc, creates libpng16.so.16.1.6.1beta01)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
......@@ -20,7 +20,7 @@ pnglibconf.h.prebuilt => Stores configuration settings
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
(gcc, creates libpng16.so.16.1.6.0)
(gcc, creates libpng16.so.16.1.6.1beta01)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
......@@ -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.0)
creates libpng16.so.16.1.6.1beta01)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng16.so.16.1.6.0)
creates libpng16.so.16.1.6.1beta01)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng16.so.16.1.6.0)
creates libpng16.so.16.1.6.1beta01)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
......
scripts/def.dfn
浏览文件 @ 681de8c8
......@@ -25,7 +25,7 @@ S-OS2 DESCRIPTION "PNG image compression library"-E
S-OS2 CODE PRELOAD MOVEABLE DISCARDABLE-E
S--E
S-EXPORTS-E
S-;Version 1.6.0-E
S-;Version 1.6.1beta01-E
/* NOTE: PNG_JOIN is interpreted by the calling script as a signal to
* join the two things on either side, so we can do symbol
......
scripts/libpng-config-head.in
浏览文件 @ 681de8c8
......@@ -11,7 +11,7 @@
# Modeled after libxml-config.
version=1.6.0
version=1.6.1beta01
prefix=""
libdir=""
libs=""
......
scripts/libpng.pc.in
浏览文件 @ 681de8c8
......@@ -5,6 +5,6 @@ includedir=@includedir@/libpng16
Name: libpng
Description: Loads and saves PNG files
Version: 1.6.0
Version: 1.6.1beta01
Libs: -L${libdir} -lpng16
Cflags: -I${includedir}
scripts/makefile.cegcc
浏览文件 @ 681de8c8
......@@ -23,7 +23,7 @@
VERMAJ = 1
VERMIN = 6
VERMIC = 0
VERMIC = 1
VER = $(VERMAJ).$(VERMIN).$(VERMIC)
NAME = libpng
PACKAGE = $(NAME)-$(VER)
......
scripts/makefile.linux
浏览文件 @ 681de8c8
......@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng16
PNGMAJ = 16
RELEASE = 0
RELEASE = 1
# Shared library names:
LIBSO=$(LIBNAME).so
......
scripts/makefile.msys
浏览文件 @ 681de8c8
......@@ -18,7 +18,7 @@ exec_prefix=$(prefix)
# Library name:
LIBNAME = libpng16
PNGMAJ = 16
RELEASE = 0
RELEASE = 1
# Shared library names:
LIBSO=$(LIBNAME).dll
......
scripts/makefile.ne12bsd
浏览文件 @ 681de8c8
......@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng16
LIB= png16
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.6.0
SHLIB_MINOR= 1.6.1beta01
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
浏览文件 @ 681de8c8
......@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 16
SHLIB_MINOR= 1.6.0
SHLIB_MINOR= 1.6.1beta01
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
浏览文件 @ 681de8c8
......@@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 16
SHLIB_MINOR= 1.6.0
SHLIB_MINOR= 1.6.1beta01
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
......
scripts/pnglibconf.h.prebuilt
浏览文件 @ 681de8c8
......@@ -3,7 +3,7 @@
/* pnglibconf.h - library build configuration */
/* Libpng 1.6.0 - February 14, 2013 */
/* Libpng 1.6.1beta01 - February 14, 2013 */
/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
......
scripts/symbols.def
浏览文件 @ 681de8c8
......@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.6.0
;Version 1.6.1beta01
png_access_version_number @1
png_set_sig_bytes @2
png_sig_cmp @3
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或