Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
c47ddcf2
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,发现更多精彩内容 >>
提交
c47ddcf2
编写于
1月 30, 2017
作者:
V
Vadim Barkov
提交者:
GitHub
1月 30, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'libpng16' into libpng16
上级
565d4bee
f604c74a
变更
31
隐藏空白更改
内联
并排
Showing
31 changed file
with
135 addition
and
82 deletion
+135
-82
ANNOUNCE
ANNOUNCE
+14
-9
CHANGES
CHANGES
+6
-1
CMakeLists.txt
CMakeLists.txt
+1
-1
LICENSE
LICENSE
+2
-2
Makefile.am
Makefile.am
+5
-0
README
README
+1
-1
configure.ac
configure.ac
+38
-3
contrib/libtests/pngvalid.c
contrib/libtests/pngvalid.c
+7
-9
libpng-manual.txt
libpng-manual.txt
+3
-3
libpng.3
libpng.3
+8
-8
libpngpf.3
libpngpf.3
+2
-2
png.5
png.5
+1
-1
png.c
png.c
+4
-4
png.h
png.h
+9
-9
pngconf.h
pngconf.h
+1
-1
pngpriv.h
pngpriv.h
+2
-2
pngrutil.c
pngrutil.c
+1
-1
pngstruct.h
pngstruct.h
+1
-1
pngtest.c
pngtest.c
+1
-1
pngwutil.c
pngwutil.c
+12
-7
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
浏览文件 @
c47ddcf2
Libpng 1.6.29beta0
1 - January 6
, 2017
Libpng 1.6.29beta0
2 - January 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,28 +8,33 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
1.6.29beta0
1
.tar.xz (LZMA-compressed, recommended)
1.6.29beta0
1
.tar.gz
1.6.29beta0
2
.tar.xz (LZMA-compressed, recommended)
1.6.29beta0
2
.tar.gz
Source files with CRLF line endings (for Windows), without the
"configure" script
lp1629b0
1
.7z (LZMA-compressed, recommended)
lp1629b0
1
.zip
lp1629b0
2
.7z (LZMA-compressed, recommended)
lp1629b0
2
.zip
Other information:
1.6.29beta0
1
-README.txt
1.6.29beta0
1
-LICENSE.txt
libpng-1.6.29beta0
1
-*.asc (armored detached GPG signatures)
1.6.29beta0
2
-README.txt
1.6.29beta0
2
-LICENSE.txt
libpng-1.6.29beta0
2
-*.asc (armored detached GPG signatures)
Changes since the last public release (1.6.28):
Version 1.6.29beta01 [January
6
, 2017]
Version 1.6.29beta01 [January
12
, 2017]
Readded "include(GNUInstallDirs)" to CMakeLists.txt (Gianfranco Costamagna).
Moved SSE2 optimization code into the main libpng source directory.
Configure libpng with "configure --enable-intel-sse" or compile
libpng with "-DPNG_INTEL_SSE" in CPPFLAGS to enable it.
Simplified conditional compilation in pngvalid.c, for AIX (Michael Felt).
Version 1.6.29beta02 [January 20, 2017]
Avoid conditional directives that break statements in pngrutil.c (Romero
Malaquias)
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
...
...
CHANGES
浏览文件 @
c47ddcf2
...
...
@@ -5794,11 +5794,16 @@ Version 1.6.28rc03 [January 4, 2017]
Version 1.6.28 [January 5, 2017]
No changes.
Version 1.6.29beta01 [January
6
, 2017]
Version 1.6.29beta01 [January
12
, 2017]
Readded "include(GNUInstallDirs)" to CMakeLists.txt (Gianfranco Costamagna).
Moved SSE2 optimization code into the main libpng source directory.
Configure libpng with "configure --enable-intel-sse" or compile
libpng with "-DPNG_INTEL_SSE" in CPPFLAGS to enable it.
Simplified conditional compilation in pngvalid.c, for AIX (Michael Felt).
Version 1.6.29beta02 [January 20, 2017]
Avoid conditional directives that break statements in pngrutil.c (Romero
Malaquias)
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
...
...
CMakeLists.txt
浏览文件 @
c47ddcf2
...
...
@@ -737,7 +737,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.29beta0
1
# VERSION 16.${PNGLIB_RELEASE}.1.6.29beta0
2
VERSION 16.
${
PNGLIB_RELEASE
}
.0
SOVERSION 16
CLEAN_DIRECT_OUTPUT 1
)
...
...
LICENSE
浏览文件 @
c47ddcf2
...
...
@@ -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.29beta0
1, January 6
, 2017 are
libpng versions 1.0.7, July 1, 2000 through 1.6.29beta0
2, January 12
, 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
...
...
@@ -129,4 +129,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
January
6
, 2017
January
12
, 2017
Makefile.am
浏览文件 @
c47ddcf2
...
...
@@ -102,6 +102,11 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += mips/mips_init.c\
mips/filter_msa_intrinsics.c
endif
if
PNG_INTEL_SSE
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
_la_SOURCES
+=
intel/intel_init.c
\
intel/filter_sse2_intrinsics.c
endif
if
PNG_POWERPC_VSX
libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
_la_SOURCES
+=
powerpc/powerpc_init.c
\
powerpc/filter_vsx_intrinsics.c
...
...
README
浏览文件 @
c47ddcf2
README for libpng version 1.6.29beta0
1 - January 5
, 2017 (shared library 16.0)
README for libpng version 1.6.29beta0
2 - January 12
, 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
浏览文件 @
c47ddcf2
...
...
@@ -25,7 +25,7 @@ AC_PREREQ([2.68])
dnl Version number stuff here:
AC_INIT([libpng],[1.6.29beta0
1
],[png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng],[1.6.29beta0
2
],[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.29beta0
1
PNGLIB_VERSION=1.6.29beta0
2
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
PNGLIB_RELEASE=28
...
...
@@ -391,6 +391,42 @@ AM_CONDITIONAL([PNG_MIPS_MSA],
mipsel*|mips64el*) :;;
esac])
# INTEL
# =====
#
# INTEL SSE (SIMD) support.
AC_ARG_ENABLE([intel-sse],
AS_HELP_STRING([[[--enable-intel-sse]]],
[Enable Intel SSE optimizations: =no/off, yes/on:]
[no/off: disable the optimizations;]
[yes/on: enable the optimizations.]
[If not specified: determined by the compiler.]),
[case "$enableval" in
no|off)
# disable the default enabling:
AC_DEFINE([PNG_INTEL_SSE_OPT], [0],
[Disable Intel SSE optimizations])
# Prevent inclusion of the assembler files below:
enable_intel_sse=no;;
yes|on)
AC_DEFINE([PNG_INTEL_SSE_OPT], [1],
[Enable Intel SSE optimizations]);;
*)
AC_MSG_ERROR([--enable-intel-sse=${enable_intel_sse}: invalid value])
esac])
# Add Intel specific files to all builds where the host_cpu is Intel ('x86*')
# or where Intel optimizations were explicitly requested (this allows a
# fallback if a future host CPU does not match 'x86*')
AM_CONDITIONAL([PNG_INTEL_SSE],
[test "$enable_intel_sse" != 'no' &&
case "$host_cpu" in
i?86|x86_64) :;;
*) test "$enable_intel_sse" != '';;
esac])
# PowerPC
# ===
#
...
...
@@ -436,7 +472,6 @@ AM_CONDITIONAL([PNG_POWERPC_VSX],
powerpc*) :;;
esac])
AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]])
# Config files, substituting as above
...
...
contrib/libtests/pngvalid.c
浏览文件 @
c47ddcf2
/* pngvalid.c - validate libpng by constructing then reading png files.
*
* Last changed in libpng 1.6.2
7 [December 29, 2016
]
* Copyright (c) 2014-201
6
John Cunningham Bowler
* Last changed in libpng 1.6.2
9 [(PENDING RELEASE)
]
* Copyright (c) 2014-201
7
John Cunningham Bowler
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
...
...
@@ -7742,13 +7742,11 @@ image_transform_png_set_rgb_to_gray_ini(const image_transform *this,
* NOTE: this number only affects the internal limit check in pngvalid,
* it has no effect on the limits applied to the libpng values.
*/
that
->
pm
->
limit
+=
pow
(
# if DIGITIZE
2
.
0
# else
1
.
0
# endif
/
255
,
data
.
gamma
);
#if DIGITIZE
that
->
pm
->
limit
+=
pow
(
2
.
0
/
255
,
data
.
gamma
);
#else
that
->
pm
->
limit
+=
pow
(
1
.
0
/
255
,
data
.
gamma
);
#endif
}
}
...
...
libpng-manual.txt
浏览文件 @
c47ddcf2
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.29beta0
1 - January 6
, 2017
libpng version 1.6.29beta0
2 - January 12
, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2016 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.29beta0
1 - January 6
, 2017
libpng versions 0.97, January 1998, through 1.6.29beta0
2 - January 12
, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2016 Glenn Randers-Pehrson
...
...
@@ -5355,7 +5355,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.29beta0
1
are Y2K compliant. It is my belief that earlier
upward through 1.6.29beta0
2
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
浏览文件 @
c47ddcf2
.TH LIBPNG 3 "January
6
, 2017"
.TH LIBPNG 3 "January
12
, 2017"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.29beta0
1
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.29beta0
2
.SH SYNOPSIS
\fB
#include <png.h>\fP
...
...
@@ -510,7 +510,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.29beta0
1 - January 6
, 2017
libpng version 1.6.29beta0
2 - January 12
, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2016 Glenn Randers-Pehrson
...
...
@@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.6.29beta0
1 - January 6
, 2017
libpng versions 0.97, January 1998, through 1.6.29beta0
2 - January 12
, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2016 Glenn Randers-Pehrson
...
...
@@ -5865,7 +5865,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.29beta0
1
are Y2K compliant. It is my belief that earlier
upward through 1.6.29beta0
2
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
...
...
@@ -6023,7 +6023,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.6.29beta0
1 - January 6
, 2017:
Libpng version 1.6.29beta0
2 - January 12
, 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).
...
...
@@ -6048,7 +6048,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.0.7, July 1, 2000 through 1.6.29beta0
1, January 6
, 2017 are
libpng versions 1.0.7, July 1, 2000 through 1.6.29beta0
2, January 12
, 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
...
...
@@ -6175,7 +6175,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
January
6
, 2017
January
12
, 2017
.\" end of man page
libpngpf.3
浏览文件 @
c47ddcf2
.TH LIBPNGPF 3 "January
6
, 2017"
.TH LIBPNGPF 3 "January
12
, 2017"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.29beta0
1
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.29beta0
2
(private functions)
.SH SYNOPSIS
\fB#include \fI"pngpriv.h"
...
...
png.5
浏览文件 @
c47ddcf2
.TH PNG 5 "January
5
, 2017"
.TH PNG 5 "January
12
, 2017"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
...
...
png.c
浏览文件 @
c47ddcf2
/* png.c - location for general purpose libpng functions
*
* Last changed in libpng 1.6.28 [
(PENDING RELEASE)
]
* Last changed in libpng 1.6.28 [
January 5, 2017%
]
* Copyright (c) 1998-2002,2004,2006-2017 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.)
...
...
@@ -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_29beta0
1
Your_png_h_is_not_version_1_6_29beta01
;
typedef
png_libpng_version_1_6_29beta0
2
Your_png_h_is_not_version_1_6_29beta02
;
/* 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
...
...
@@ -776,14 +776,14 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return
PNG_STRING_NEWLINE
\
"libpng version 1.6.29beta0
1 - January 5
, 2017"
PNG_STRING_NEWLINE
\
"libpng version 1.6.29beta0
2 - January 12
, 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.29beta0
1 - January 5
, 2017\
return
"libpng version 1.6.29beta0
2 - January 12
, 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
浏览文件 @
c47ddcf2
/* png.h - header file for PNG reference library
*
* libpng version 1.6.29beta0
1, January 6
, 2017
* libpng version 1.6.29beta0
2, January 12
, 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.29beta0
1, January 6
, 2017:
* libpng versions 0.97, January 1998, through 1.6.29beta0
2, January 12
, 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.29beta0
1, January 6
, 2017 are
* libpng versions 1.0.7, July 1, 2000 through 1.6.29beta0
2, January 12
, 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
...
...
@@ -240,13 +240,13 @@
* Y2K compliance in libpng:
* =========================
*
* January
6
, 2017
* January
12
, 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.29beta0
1
are Y2K compliant. It is my belief that
* upward through 1.6.29beta0
2
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
...
...
@@ -308,8 +308,8 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.29beta0
1
"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.29beta0
1 - January 6
, 2017\n"
#define PNG_LIBPNG_VER_STRING "1.6.29beta0
2
"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.29beta0
2 - January 12
, 2017\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
...
...
@@ -323,7 +323,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 0
1
#define PNG_LIBPNG_VER_BUILD 0
2
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
...
...
@@ -458,7 +458,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_29beta0
1
;
typedef
char
*
png_libpng_version_1_6_29beta0
2
;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
...
...
pngconf.h
浏览文件 @
c47ddcf2
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.6.29beta0
1, January 5
, 2017
* libpng version 1.6.29beta0
2, January 12
, 2017
*
* Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
...
...
pngpriv.h
浏览文件 @
c47ddcf2
/* pngpriv.h - private declarations for use inside libpng
*
* Last changed in libpng 1.6.2
6 [October 20, 2016
]
* Copyright (c) 1998-2002,2004,2006-201
6
Glenn Randers-Pehrson
* Last changed in libpng 1.6.2
9 [(PENDING RELEASE)
]
* Copyright (c) 1998-2002,2004,2006-201
7
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.)
*
...
...
pngrutil.c
浏览文件 @
c47ddcf2
/* pngrutil.c - utilities to read a PNG file
*
* Last changed in libpng 1.6.27 [
(PENDING RELEASE)
]
* Last changed in libpng 1.6.27 [
December 29, 2016
]
* Copyright (c) 1998-2002,2004,2006-2016 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.)
...
...
pngstruct.h
浏览文件 @
c47ddcf2
/* pngstruct.h - header file for PNG reference library
*
* Last changed in libpng 1.6.28 [
(PENDING RELEASE)
]
* Last changed in libpng 1.6.28 [
January 5, 2017
]
* Copyright (c) 1998-2002,2004,2006-2017 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.)
...
...
pngtest.c
浏览文件 @
c47ddcf2
...
...
@@ -2088,4 +2088,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_29beta0
1
Your_png_h_is_not_version_1_6_29beta01
;
typedef
png_libpng_version_1_6_29beta0
2
Your_png_h_is_not_version_1_6_29beta02
;
pngwutil.c
浏览文件 @
c47ddcf2
...
...
@@ -675,6 +675,7 @@ png_write_IHDR(png_structrp png_ptr, png_uint_32 width, png_uint_32 height,
int
interlace_type
)
{
png_byte
buf
[
13
];
/* Buffer to store the IHDR info */
int
is_invalid_depth
;
png_debug
(
1
,
"in png_write_IHDR"
);
...
...
@@ -700,11 +701,11 @@ png_write_IHDR(png_structrp png_ptr, png_uint_32 width, png_uint_32 height,
break
;
case
PNG_COLOR_TYPE_RGB
:
is_invalid_depth
=
(
bit_depth
!=
8
);
#ifdef PNG_WRITE_16BIT_SUPPORTED
if
(
bit_depth
!=
8
&&
bit_depth
!=
16
)
#else
if
(
bit_depth
!=
8
)
is_invalid_depth
=
(
is_invalid_depth
&&
bit_depth
!=
16
);
#endif
if
(
is_invalid_depth
)
png_error
(
png_ptr
,
"Invalid bit depth for RGB image"
);
png_ptr
->
channels
=
3
;
...
...
@@ -726,18 +727,22 @@ png_write_IHDR(png_structrp png_ptr, png_uint_32 width, png_uint_32 height,
break
;
case
PNG_COLOR_TYPE_GRAY_ALPHA
:
if
(
bit_depth
!=
8
&&
bit_depth
!=
16
)
is_invalid_depth
=
(
bit_depth
!=
8
);
#ifdef PNG_WRITE_16BIT_SUPPORTED
is_invalid_depth
=
(
is_invalid_depth
&&
bit_depth
!=
16
);
#endif
if
(
is_invalid_depth
)
png_error
(
png_ptr
,
"Invalid bit depth for grayscale+alpha image"
);
png_ptr
->
channels
=
2
;
break
;
case
PNG_COLOR_TYPE_RGB_ALPHA
:
is_invalid_depth
=
(
bit_depth
!=
8
);
#ifdef PNG_WRITE_16BIT_SUPPORTED
if
(
bit_depth
!=
8
&&
bit_depth
!=
16
)
#else
if
(
bit_depth
!=
8
)
is_invalid_depth
=
(
is_invalid_depth
&&
bit_depth
!=
16
);
#endif
if
(
is_invalid_depth
)
png_error
(
png_ptr
,
"Invalid bit depth for RGBA image"
);
png_ptr
->
channels
=
4
;
...
...
projects/vstudio/README.txt
浏览文件 @
c47ddcf2
VisualStudio instructions
libpng version 1.6.29beta0
1 - January 5
, 2017
libpng version 1.6.29beta0
2 - January 12
, 2017
Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
...
...
projects/vstudio/zlib.props
浏览文件 @
c47ddcf2
...
...
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
* libpng version 1.6.29beta0
1 - January 5
, 2017
* libpng version 1.6.29beta0
2 - January 12
, 2017
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
...
...
scripts/README.txt
浏览文件 @
c47ddcf2
Makefiles for libpng version 1.6.29beta0
1 - January 5
, 2017
Makefiles for libpng version 1.6.29beta0
2 - January 12
, 2017
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
(gcc, creates libpng16.so.16.1.6.29beta0
1
)
(gcc, creates libpng16.so.16.1.6.29beta0
2
)
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.29beta0
1
)
creates libpng16.so.16.1.6.29beta0
2
)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng16.so.16.1.6.29beta0
1
)
creates libpng16.so.16.1.6.29beta0
2
)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng16.so.16.1.6.29beta0
1
)
creates libpng16.so.16.1.6.29beta0
2
)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
...
...
scripts/def.c
浏览文件 @
c47ddcf2
...
...
@@ -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.29beta0
1
"
PNG_DFN
";Version 1.6.29beta0
2
"
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"
...
...
scripts/libpng-config-head.in
浏览文件 @
c47ddcf2
...
...
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
version
=
1.6.29beta0
1
version
=
1.6.29beta0
2
prefix
=
""
libdir
=
""
libs
=
""
...
...
scripts/libpng.pc.in
浏览文件 @
c47ddcf2
...
...
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng16
Name: libpng
Description: Loads and saves PNG files
Version: 1.6.29beta0
1
Version: 1.6.29beta0
2
Libs: -L${libdir} -lpng16
Cflags: -I${includedir}
scripts/makefile.ne12bsd
浏览文件 @
c47ddcf2
...
...
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng16
LIB
=
png16
SHLIB_MAJOR
=
0
SHLIB_MINOR
=
1.6.29beta0
1
SHLIB_MINOR
=
1.6.29beta0
2
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
浏览文件 @
c47ddcf2
...
...
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB
=
png
SHLIB_MAJOR
=
16
SHLIB_MINOR
=
1.6.29beta0
1
SHLIB_MINOR
=
1.6.29beta0
2
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
浏览文件 @
c47ddcf2
...
...
@@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR
=
${PREFIX}
/man/cat
SHLIB_MAJOR
=
16
SHLIB_MINOR
=
1.6.29beta0
1
SHLIB_MINOR
=
1.6.29beta0
2
LIB
=
png
SRCS
=
png.c pngerror.c pngget.c pngmem.c pngpread.c
\
...
...
scripts/pnglibconf.h.prebuilt
浏览文件 @
c47ddcf2
/* libpng 1.6.29beta0
1
STANDARD API DEFINITION */
/* libpng 1.6.29beta0
2
STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
/* Libpng version 1.6.29beta0
1 - January 5
, 2017 */
/* Libpng version 1.6.29beta0
2 - January 12
, 2017 */
/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
...
...
scripts/symbols.def
浏览文件 @
c47ddcf2
;Version 1.6.29beta0
1
;Version 1.6.29beta0
2
;--------------------------------------------------------------
; 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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录