Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
12bebfe0
T
Third Party Libpng
项目概览
OpenHarmony
/
Third Party Libpng
大约 1 年 前同步成功
通知
4
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Libpng
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
12bebfe0
编写于
11月 28, 2015
作者:
J
John Bowler
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'libpng16' of ../../libpng into libpng16
上级
28a1cdfc
e7092bc5
变更
35
隐藏空白更改
内联
并排
Showing
35 changed file
with
76 addition
and
76 deletion
+76
-76
ANNOUNCE
ANNOUNCE
+3
-3
CHANGES
CHANGES
+1
-1
CMakeLists.txt
CMakeLists.txt
+1
-1
LICENSE
LICENSE
+2
-2
README
README
+1
-1
configure.ac
configure.ac
+2
-2
contrib/arm-neon/linux-auxv.c
contrib/arm-neon/linux-auxv.c
+1
-1
contrib/arm-neon/linux.c
contrib/arm-neon/linux.c
+1
-1
contrib/examples/simpleover.c
contrib/examples/simpleover.c
+4
-4
contrib/gregbook/rpng2-win.c
contrib/gregbook/rpng2-win.c
+1
-1
contrib/gregbook/rpng2-x.c
contrib/gregbook/rpng2-x.c
+2
-2
contrib/libtests/makepng.c
contrib/libtests/makepng.c
+3
-3
contrib/libtests/pngimage.c
contrib/libtests/pngimage.c
+2
-2
contrib/libtests/pngstest.c
contrib/libtests/pngstest.c
+1
-1
contrib/tools/genpng.c
contrib/tools/genpng.c
+3
-3
contrib/tools/png-fix-itxt.c
contrib/tools/png-fix-itxt.c
+1
-1
libpng-manual.txt
libpng-manual.txt
+3
-3
libpng.3
libpng.3
+9
-9
libpngpf.3
libpngpf.3
+2
-2
png.5
png.5
+1
-1
png.c
png.c
+3
-3
png.h
png.h
+11
-11
pngconf.h
pngconf.h
+1
-1
pngtest.c
pngtest.c
+1
-1
projects/vstudio/readme.txt
projects/vstudio/readme.txt
+1
-1
projects/vstudio/zlib.props
projects/vstudio/zlib.props
+1
-1
scripts/README.txt
scripts/README.txt
+5
-5
scripts/def.c
scripts/def.c
+1
-1
scripts/libpng-config-head.in
scripts/libpng-config-head.in
+1
-1
scripts/libpng.pc.in
scripts/libpng.pc.in
+1
-1
scripts/makefile.ne12bsd
scripts/makefile.ne12bsd
+1
-1
scripts/makefile.netbsd
scripts/makefile.netbsd
+1
-1
scripts/makefile.openbsd
scripts/makefile.openbsd
+1
-1
scripts/pnglibconf.h.prebuilt
scripts/pnglibconf.h.prebuilt
+2
-2
scripts/symbols.def
scripts/symbols.def
+1
-1
未找到文件。
ANNOUNCE
浏览文件 @
12bebfe0
Libpng 1.6.20rc01 - November 2
5
, 2015
Libpng 1.6.20rc01 - November 2
6
, 2015
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.
...
...
@@ -34,10 +34,10 @@ Version 1.6.20beta02 [November 23, 2015]
not info_ptr, that left png_set_PLTE() open to the CVE-2015-8126
vulnerability.
Version 1.6.20beta03 [November 2
5
, 2015]
Version 1.6.20beta03 [November 2
6
, 2015]
Backported tests from libpng-1.7.0beta69.
Version 1.6.20rc01 [November 2
5
, 2015]
Version 1.6.20rc01 [November 2
6
, 2015]
Fixed an error in handling of bad zlib CMINFO field, found by American
Fuzzy Lop, reported by Brian Carpenter. inflate() doesn't immediately
fault a bad CMINFO field; instead a 'too far back' error happens later
...
...
CHANGES
浏览文件 @
12bebfe0
...
...
@@ -5426,7 +5426,7 @@ Version 1.6.20beta02 [November 23, 2015]
Version 1.6.20beta03 [November 24, 2015]
Backported tests from libpng-1.7.0beta69.
Version 1.6.20rc01 [November 2
5
, 2015]
Version 1.6.20rc01 [November 2
6
, 2015]
Fixed an error in handling of bad zlib CMINFO field, found by American
Fuzzy Lop, reported by Brian Carpenter. inflate() doesn't immediately
fault a bad CMINFO field; instead a 'too far back' error happens later
...
...
CMakeLists.txt
浏览文件 @
12bebfe0
...
...
@@ -261,7 +261,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.20
beta03
# VERSION 16.${PNGLIB_RELEASE}.1.6.20
rc01
VERSION 16.
${
PNGLIB_RELEASE
}
.0
SOVERSION 16
CLEAN_DIRECT_OUTPUT 1
)
...
...
LICENSE
浏览文件 @
12bebfe0
...
...
@@ -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.20
beta03, November 24
, 2015, are
libpng versions 1.0.7, July 1, 2000, through 1.6.20
rc01, November 26
, 2015, are
Copyright (c) 2000-2002, 2004, 2006-2015 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
...
...
@@ -109,4 +109,4 @@ the additional disclaimers inserted at version 1.0.7.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
November 2
4
, 2015
November 2
6
, 2015
README
浏览文件 @
12bebfe0
README for libpng version 1.6.20
beta03 - November 24
, 2015 (shared library 16.0)
README for libpng version 1.6.20
rc01 - November 26
, 2015 (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
浏览文件 @
12bebfe0
...
...
@@ -18,7 +18,7 @@ AC_PREREQ([2.68])
dnl Version number stuff here:
AC_INIT([libpng],[1.6.20
beta03
],[png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng],[1.6.20
rc01
],[png-mng-implement@lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts])
# libpng does not follow GNU file name conventions (hence 'foreign')
...
...
@@ -39,7 +39,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.20
beta03
PNGLIB_VERSION=1.6.20
rc01
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
PNGLIB_RELEASE=20
...
...
contrib/arm-neon/linux-auxv.c
浏览文件 @
12bebfe0
...
...
@@ -7,7 +7,7 @@
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
* and license in png.h
*
*
* SEE contrib/arm-neon/README before reporting bugs
*
* STATUS: COMPILED, TESTED
...
...
contrib/arm-neon/linux.c
浏览文件 @
12bebfe0
...
...
@@ -72,7 +72,7 @@ png_have_neon(png_structp png_ptr)
state
=
Colon
;
break
;
}
/* did not match 'feature' */
state
=
SkipLine
;
/* FALL THROUGH */
...
...
contrib/examples/simpleover.c
浏览文件 @
12bebfe0
...
...
@@ -136,7 +136,7 @@ sprite_op(const struct sprite *sprite, int x_offset, int y_offset,
/* This is the optimized Porter-Duff 'Over' operation, when the
* input alpha is 0 the output is not changed.
*/
if
(
in_alpha
>
0
)
if
(
in_alpha
>
0
)
{
png_uint_16
*
out_pixel
=
sprite
->
buffer
+
((
y
+
y_offset
)
*
sprite
->
width
+
(
x
+
x_offset
))
*
4
;
...
...
@@ -184,7 +184,7 @@ sprite_op(const struct sprite *sprite, int x_offset, int y_offset,
}
}
static
int
static
int
create_sprite
(
struct
sprite
*
sprite
,
int
*
argc
,
const
char
***
argv
)
{
/* Read the arguments and create this sprite. The sprite buffer has already
...
...
@@ -415,7 +415,7 @@ simpleover_process(png_imagep output, png_bytep out_buf, int argc,
n
=
sscanf
(
argv
[
0
],
"--sprite=%u,%u,%"
str
(
sprite_name_chars
)
"s%c"
,
&
sprites
[
nsprites
].
width
,
&
sprites
[
nsprites
].
height
,
sprites
[
nsprites
].
name
,
&
tombstone
);
if
((
n
==
2
||
n
==
3
)
&&
sprites
[
nsprites
].
width
>
0
&&
sprites
[
nsprites
].
height
>
0
)
{
...
...
@@ -492,7 +492,7 @@ simpleover_process(png_imagep output, png_bytep out_buf, int argc,
if
(
!
add_sprite
(
output
,
out_buf
,
sprites
+
isprite
,
&
argc
,
&
argv
))
goto
out
;
/* error in add_sprite */
break
;
break
;
}
}
...
...
contrib/gregbook/rpng2-win.c
浏览文件 @
12bebfe0
...
...
@@ -33,7 +33,7 @@
- 2.02: fixed improper display of usage screen on PNG error(s); fixed
unexpected-EOF and file-read-error cases
- 2.03: removed runtime MMX-enabling/disabling and obsolete -mmx* options
- 2.04:
- 2.04:
(GR-P)
---------------------------------------------------------------------------
...
...
contrib/gregbook/rpng2-x.c
浏览文件 @
12bebfe0
...
...
@@ -496,12 +496,12 @@ int main(int argc, char **argv)
"
\t\t
transparent images; overrides -bgcolor
\n
"
,
num_bgpat
-
1
);
#ifdef FEATURE_LOOP
fprintf
(
stderr
,
fprintf
(
stderr
,
" -loop
\t
loops through background images after initial display
\n
"
"
\t\t
is complete (depends on -bgpat)
\n
"
" sec
\t
seconds to display each background image (default = 2)
\n
"
);
#endif
fprintf
(
stderr
,
fprintf
(
stderr
,
" dur
\t
duration in microseconds to wait after displaying each
\n
"
"
\t\t
row (for demo purposes)
\n
"
" -timing
\t
enables delay for every block read, to simulate modem
\n
"
...
...
contrib/libtests/makepng.c
浏览文件 @
12bebfe0
...
...
@@ -392,7 +392,7 @@ generate_row(png_bytep row, size_t rowbytes, unsigned int y, int color_type,
unsigned
int
*
colors
,
int
small
)
{
int
filters
=
0
;
/* file *MASK*, 0 means the default, not NONE */
png_uint_32
size_max
=
png_uint_32
size_max
=
image_size_of_type
(
color_type
,
bit_depth
,
colors
,
small
)
-
1
;
png_uint_32
depth_max
=
(
1U
<<
bit_depth
)
-
1
;
/* up to 65536 */
...
...
@@ -526,7 +526,7 @@ generate_row(png_bytep row, size_t rowbytes, unsigned int y, int color_type,
assert
(
0
/*NOT REACHED*/
);
}
}
else
switch
(
channels_of_type
(
color_type
))
{
/* 1 channel: a square image with a diamond, the least luminous colors are on
...
...
@@ -1913,7 +1913,7 @@ main(int argc, char **argv)
};
chunk_insert
*
new_insert
;
new_insert
=
add_tEXt
(
"Copyright"
,
copyright
);
if
(
new_insert
!=
NULL
)
{
...
...
contrib/libtests/pngimage.c
浏览文件 @
12bebfe0
...
...
@@ -948,7 +948,7 @@ update_display(struct display *dp)
if
((
transform_info
[
i
].
valid_chunks
==
0
||
(
transform_info
[
i
].
valid_chunks
&
chunks
)
!=
0
)
&&
(
transform_info
[
i
].
color_mask_required
&
ct
)
==
(
transform_info
[
i
].
color_mask_required
&
ct
)
==
transform_info
[
i
].
color_mask_required
&&
(
transform_info
[
i
].
color_mask_absent
&
ct
)
==
0
&&
(
transform_info
[
i
].
bit_depths
&
bd
)
!=
0
&&
...
...
@@ -1006,7 +1006,7 @@ compare_read(struct display *dp, int applied_transforms)
{
unsigned
long
chunks
=
png_get_valid
(
dp
->
read_pp
,
dp
->
read_ip
,
0xffffffff
);
if
(
chunks
!=
dp
->
chunks
)
display_log
(
dp
,
APP_FAIL
,
"PNG chunks changed from 0x%lx to 0x%lx"
,
(
unsigned
long
)
dp
->
chunks
,
chunks
);
...
...
contrib/libtests/pngstest.c
浏览文件 @
12bebfe0
...
...
@@ -3130,7 +3130,7 @@ write_one_file(Image *output, Image *image, int convert_to_8bit)
(
void
)
unlink
(
tmpfile
);
}
#endif
if
(
f
!=
NULL
)
{
if
(
png_image_write_to_stdio
(
&
image
->
image
,
f
,
convert_to_8bit
,
...
...
contrib/tools/genpng.c
浏览文件 @
12bebfe0
...
...
@@ -324,7 +324,7 @@ alpha_calc(const struct arg *arg, double x, double y)
{
double
wx
=
bicubic
[
abs
(
dx
)][
0
];
if
(
wx
!=
0
&&
arg
->
inside_fn
(
arg
,
x
+
dx
/
16
,
y
+
dy
/
16
))
if
(
wx
!=
0
&&
arg
->
inside_fn
(
arg
,
x
+
dx
/
16
,
y
+
dy
/
16
))
alphay
+=
wx
;
}
...
...
@@ -565,7 +565,7 @@ line_check(double x, double y, double x1, double y1, double x2, double y2,
/* The dot product is the distance down the line, the cross product is
* the distance away from the line:
*
* distance = |cross| / sqrt(len2)
* distance = |cross| / sqrt(len2)
*/
cross
=
x
*
ly
-
y
*
lx
;
...
...
@@ -722,7 +722,7 @@ pixel(png_uint_16p p, struct arg *args, int nargs, double x, double y)
/* 'a' may be negative or greater than 1; if it is, negative clamp the
* pixel to 0 if >1 clamp r/g/b:
*/
if
(
a
>
0
)
if
(
a
>
0
)
{
if
(
a
>
1
)
{
...
...
contrib/tools/png-fix-itxt.c
浏览文件 @
12bebfe0
...
...
@@ -8,7 +8,7 @@
* For conditions of distribution and use, see the disclaimer
* and license in png.h
*
* Usage:
* Usage:
*
* png-fix-itxt.exe < bad.png > good.png
*
...
...
libpng-manual.txt
浏览文件 @
12bebfe0
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.20
beta03 - November 24
, 2015
libpng version 1.6.20
rc01 - November 26
, 2015
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2015 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.20
beta03 - November 24
, 2015
libpng versions 0.97, January 1998, through 1.6.20
rc01 - November 26
, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
...
...
@@ -5323,7 +5323,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.20
beta03
are Y2K compliant. It is my belief that earlier
upward through 1.6.20
rc01
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
浏览文件 @
12bebfe0
.TH LIBPNG 3 "November 2
4
, 2015"
.TH LIBPNG 3 "November 2
6
, 2015"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.20
beta03
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.20
rc01
.SH SYNOPSIS
\fB
#include <png.h>\fP
...
...
@@ -508,7 +508,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.20
beta03 - November 24
, 2015
libpng version 1.6.20
rc01 - November 26
, 2015
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2015 Glenn Randers-Pehrson
...
...
@@ -519,7 +519,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.6.20
beta03 - November 24
, 2015
libpng versions 0.97, January 1998, through 1.6.20
rc01 - November 26
, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
...
...
@@ -5831,7 +5831,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.20
beta03
are Y2K compliant. It is my belief that earlier
upward through 1.6.20
rc01
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
...
...
@@ -5933,7 +5933,7 @@ the first widely used release:
...
1.5.23 15 10523 15.so.15.23[.0]
...
1.6.
19 16 10619 16.so.16.19
[.0]
1.6.
20 16 10620 16.so.16.20
[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
...
...
@@ -5989,7 +5989,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.6.20
beta03 - November 24
, 2015:
Libpng version 1.6.20
rc01 - November 26
, 2015:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
...
...
@@ -6014,7 +6014,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.0.7, July 1, 2000, through 1.6.20
beta03, November 24
, 2015, are
libpng versions 1.0.7, July 1, 2000, through 1.6.20
rc01, November 26
, 2015, are
Copyright (c) 2000-2002, 2004, 2006-2015 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
...
...
@@ -6113,7 +6113,7 @@ the additional disclaimers inserted at version 1.0.7.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
November 2
4
, 2015
November 2
6
, 2015
.\" end of man page
libpngpf.3
浏览文件 @
12bebfe0
.TH LIBPNGPF 3 "November 2
4
, 2015"
.TH LIBPNGPF 3 "November 2
6
, 2015"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.20
beta03
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.20
rc01
(private functions)
.SH SYNOPSIS
\fB#include \fI"pngpriv.h"
...
...
png.5
浏览文件 @
12bebfe0
.TH PNG 5 "November 2
4
, 2015"
.TH PNG 5 "November 2
6
, 2015"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
...
...
png.c
浏览文件 @
12bebfe0
...
...
@@ -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_20
beta03
Your_png_h_is_not_version_1_6_20beta03
;
typedef
png_libpng_version_1_6_20
rc01
Your_png_h_is_not_version_1_6_20rc01
;
/* 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
...
...
@@ -775,13 +775,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return
PNG_STRING_NEWLINE
\
"libpng version 1.6.20
beta03 - November 24
, 2015"
PNG_STRING_NEWLINE
\
"libpng version 1.6.20
rc01 - November 26
, 2015"
PNG_STRING_NEWLINE
\
"Copyright (c) 1998-2015 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.20
beta03 - November 24
, 2015\
return
"libpng version 1.6.20
rc01 - November 26
, 2015\
Copyright (c) 1998-2015 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."
;
...
...
png.h
浏览文件 @
12bebfe0
/* png.h - header file for PNG reference library
*
* libpng version 1.6.20
beta03, November 24
, 2015
* libpng version 1.6.20
rc01, November 26
, 2015
*
* Copyright (c) 1998-2015 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.20
beta03, November 24
, 2015:
* libpng versions 0.97, January 1998, through 1.6.20
rc01, November 26
, 2015:
* 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.20
beta03, November 24
, 2015, are
* libpng versions 1.0.7, July 1, 2000, through 1.6.20
rc01, November 26
, 2015, are
* Copyright (c) 2000-2002, 2004, 2006-2015 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
...
...
@@ -186,7 +186,7 @@
* ...
* 1.5.23 15 10523 15.so.15.23[.0]
* ...
* 1.6.
19 16 10619 16.so.16.19
[.0]
* 1.6.
20 16 10620 16.so.16.20
[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
...
...
@@ -214,13 +214,13 @@
* Y2K compliance in libpng:
* =========================
*
* November 2
4
, 2015
* November 2
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.6.20
beta03
are Y2K compliant. It is my belief that
* upward through 1.6.20
rc01
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
...
...
@@ -282,9 +282,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.20
beta03
"
#define PNG_LIBPNG_VER_STRING "1.6.20
rc01
"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.6.20
beta03 - November 24
, 2015\n"
" libpng version 1.6.20
rc01 - November 26
, 2015\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
...
...
@@ -298,7 +298,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 0
3
#define PNG_LIBPNG_VER_BUILD 0
1
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
...
...
@@ -315,7 +315,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.
...
...
@@ -433,7 +433,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_20
beta03
;
typedef
char
*
png_libpng_version_1_6_20
rc01
;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
...
...
pngconf.h
浏览文件 @
12bebfe0
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.6.20
beta03, November 24
, 2015
* libpng version 1.6.20
rc01, November 26
, 2015
*
* Copyright (c) 1998-2015 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
...
...
pngtest.c
浏览文件 @
12bebfe0
...
...
@@ -2070,4 +2070,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_20
beta03
Your_png_h_is_not_version_1_6_20beta03
;
typedef
png_libpng_version_1_6_20
rc01
Your_png_h_is_not_version_1_6_20rc01
;
projects/vstudio/readme.txt
浏览文件 @
12bebfe0
VisualStudio instructions
libpng version 1.6.20
beta03 - November 24
, 2015
libpng version 1.6.20
rc01 - November 26
, 2015
Copyright (c) 1998-2010 Glenn Randers-Pehrson
...
...
projects/vstudio/zlib.props
浏览文件 @
12bebfe0
...
...
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
* libpng version 1.6.20
beta03 - November 24
, 2015
* libpng version 1.6.20
rc01 - November 26
, 2015
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
...
...
scripts/README.txt
浏览文件 @
12bebfe0
Makefiles for libpng version 1.6.20
beta03 - November 24
, 2015
Makefiles for libpng version 1.6.20
rc01 - November 26
, 2015
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
(gcc, creates libpng16.so.16.1.6.20
beta03
)
(gcc, creates libpng16.so.16.1.6.20
rc01
)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
...
...
@@ -33,12 +33,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.20
beta03
)
creates libpng16.so.16.1.6.20
rc01
)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng16.so.16.1.6.20
beta03
)
creates libpng16.so.16.1.6.20
rc01
)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng16.so.16.1.6.20
beta03
)
creates libpng16.so.16.1.6.20
rc01
)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
...
...
scripts/def.c
浏览文件 @
12bebfe0
...
...
@@ -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.20
beta03
"
PNG_DFN
";Version 1.6.20
rc01
"
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"
...
...
scripts/libpng-config-head.in
浏览文件 @
12bebfe0
...
...
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
version
=
1.6.20
beta03
version
=
1.6.20
rc01
prefix
=
""
libdir
=
""
libs
=
""
...
...
scripts/libpng.pc.in
浏览文件 @
12bebfe0
...
...
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng16
Name: libpng
Description: Loads and saves PNG files
Version: 1.6.20
beta03
Version: 1.6.20
rc01
Libs: -L${libdir} -lpng16
Cflags: -I${includedir}
scripts/makefile.ne12bsd
浏览文件 @
12bebfe0
...
...
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng16
LIB
=
png16
SHLIB_MAJOR
=
0
SHLIB_MINOR
=
1.6.20
beta03
SHLIB_MINOR
=
1.6.20
rc01
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
浏览文件 @
12bebfe0
...
...
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB
=
png
SHLIB_MAJOR
=
16
SHLIB_MINOR
=
1.6.20
beta03
SHLIB_MINOR
=
1.6.20
rc01
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
浏览文件 @
12bebfe0
...
...
@@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR
=
${PREFIX}
/man/cat
SHLIB_MAJOR
=
16
SHLIB_MINOR
=
1.6.20
beta03
SHLIB_MINOR
=
1.6.20
rc01
LIB
=
png
SRCS
=
png.c pngerror.c pngget.c pngmem.c pngpread.c
\
...
...
scripts/pnglibconf.h.prebuilt
浏览文件 @
12bebfe0
/* libpng 1.6.20
beta03
STANDARD API DEFINITION */
/* libpng 1.6.20
rc01
STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
/* Libpng version 1.6.20
beta03 - November 24
, 2015 */
/* Libpng version 1.6.20
rc01 - November 26
, 2015 */
/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
...
...
scripts/symbols.def
浏览文件 @
12bebfe0
;Version 1.6.20
beta03
;Version 1.6.20
rc01
;--------------------------------------------------------------
; 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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录