Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
f8a8ead5
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,发现更多精彩内容 >>
提交
f8a8ead5
编写于
2月 22, 2013
作者:
G
Glenn Randers-Pehrson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[libpng16] Update the INSTALL document.
上级
6df55cec
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
52 addition
and
34 deletion
+52
-34
ANNOUNCE
ANNOUNCE
+3
-2
CHANGES
CHANGES
+2
-1
INSTALL
INSTALL
+20
-4
LICENSE
LICENSE
+2
-2
README
README
+1
-1
libpng-manual.txt
libpng-manual.txt
+3
-3
libpng.3
libpng.3
+7
-7
libpngpf.3
libpngpf.3
+1
-1
png.5
png.5
+1
-1
png.c
png.c
+2
-2
png.h
png.h
+5
-5
pngconf.h
pngconf.h
+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
+1
-1
scripts/pnglibconf.dfa
scripts/pnglibconf.dfa
+0
-0
scripts/pnglibconf.h.prebuilt
scripts/pnglibconf.h.prebuilt
+1
-1
未找到文件。
ANNOUNCE
浏览文件 @
f8a8ead5
Libpng 1.6.1beta03 - February
19
, 2013
Libpng 1.6.1beta03 - February
22
, 2013
This is not intended to be a public release. It will be replaced
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.
within a few weeks by a public version or by another test version.
...
@@ -49,13 +49,14 @@ Version 1.6.1beta02 [February 19, 2013]
...
@@ -49,13 +49,14 @@ Version 1.6.1beta02 [February 19, 2013]
Folded long lines.
Folded long lines.
Reenabled code to allow zero length PLTE chunks for MNG.
Reenabled code to allow zero length PLTE chunks for MNG.
Version 1.6.1beta03 [February
19
, 2013]
Version 1.6.1beta03 [February
22
, 2013]
Fixed ALIGNED_MEMORY support.
Fixed ALIGNED_MEMORY support.
Allow run-time ARM NEON checking to be disabled. A new configure option:
Allow run-time ARM NEON checking to be disabled. A new configure option:
--enable-arm-neon=always will stop the run-time checks. New checks
--enable-arm-neon=always will stop the run-time checks. New checks
within arm/arm_init.c will cause the code not to be compiled unless
within arm/arm_init.c will cause the code not to be compiled unless
__ARM_NEON__ is set. This should make it fail safe (if someone asks
__ARM_NEON__ is set. This should make it fail safe (if someone asks
for it on then the build will fail if it can't be done.)
for it on then the build will fail if it can't be done.)
Updated the INSTALL document.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
(subscription required; visit
...
...
CHANGES
浏览文件 @
f8a8ead5
...
@@ -4406,13 +4406,14 @@ Version 1.6.1beta02 [February 19, 2013]
...
@@ -4406,13 +4406,14 @@ Version 1.6.1beta02 [February 19, 2013]
Folded long lines.
Folded long lines.
Reenabled code to allow zero length PLTE chunks for MNG.
Reenabled code to allow zero length PLTE chunks for MNG.
Version 1.6.1beta03 [February
19
, 2013]
Version 1.6.1beta03 [February
22
, 2013]
Fixed ALIGNED_MEMORY support.
Fixed ALIGNED_MEMORY support.
Allow run-time ARM NEON checking to be disabled. A new configure option:
Allow run-time ARM NEON checking to be disabled. A new configure option:
--enable-arm-neon=always will stop the run-time checks. New checks
--enable-arm-neon=always will stop the run-time checks. New checks
within arm/arm_init.c will cause the code not to be compiled unless
within arm/arm_init.c will cause the code not to be compiled unless
__ARM_NEON__ is set. This should make it fail safe (if someone asks
__ARM_NEON__ is set. This should make it fail safe (if someone asks
for it on then the build will fail if it can't be done.)
for it on then the build will fail if it can't be done.)
Updated the INSTALL document.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
(subscription required; visit
...
...
INSTALL
浏览文件 @
f8a8ead5
...
@@ -41,16 +41,31 @@ is not already on your system. zlib can usually be found
...
@@ -41,16 +41,31 @@ is not already on your system. zlib can usually be found
wherever you got libpng. zlib can be placed in another directory,
wherever you got libpng. zlib can be placed in another directory,
at the same level as libpng.
at the same level as libpng.
If your system already has a preinstalled zlib you will still need
to have access to the zlib.h and zconf.h include files that
correspond to the version of zlib that's installed.
If you wish to test with a particular zlib that is not first in the
standard library search path, put ZLIBLIB, ZLIBINC, INCLUDES, LDFLAGS,
LIBS, and LD_LIBRARY_PATH in your environment before running "make test"
or "make distcheck":
ZLIBLIB=/path/to/lib export ZLIBLIB
ZLIBINC=/path/to/include export ZLIBINC
INCLUDES="-I$ZLIBINC" export INCLUDES
LDFLAGS="-L$ZLIBLIB" export LDFLAGS
LIBS=$ZLIBLIB/libz.a export LIBS
LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH
If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC
in your environment and type "make ZLIBLIB=$ZLIBLIB ZLIBINC=$ZLIBINC test".
If you want to use "cmake" (see www.cmake.org), type
If you want to use "cmake" (see www.cmake.org), type
cmake . -DCMAKE_INSTALL_PREFIX=/path
cmake . -DCMAKE_INSTALL_PREFIX=/path
make
make
make install
make install
If your system already has a preinstalled zlib you will still need
to have access to the zlib.h and zconf.h include files that
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
You can rename the directories that you downloaded (they
might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.5"
might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.5"
or "zlib125") so that you have directories called "zlib" and "libpng".
or "zlib125") so that you have directories called "zlib" and "libpng".
...
@@ -71,6 +86,7 @@ Your directory structure should look like this:
...
@@ -71,6 +86,7 @@ Your directory structure should look like this:
depcomp, install-sh, mkinstalldirs, test-pngtest.sh
depcomp, install-sh, mkinstalldirs, test-pngtest.sh
contrib
contrib
gregbook
gregbook
libtests
pngminim
pngminim
pngminus
pngminus
pngsuite
pngsuite
...
...
LICENSE
浏览文件 @
f8a8ead5
...
@@ -10,7 +10,7 @@ this sentence.
...
@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February
19
, 2013, are
libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February
22
, 2013, are
Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are
Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
with the following individual added to the list of Contributing Authors
...
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
...
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
glennrp at users.sourceforge.net
February
19
, 2013
February
22
, 2013
README
浏览文件 @
f8a8ead5
README for libpng version 1.6.1beta03 - February
19
, 2013 (shared library 16.0)
README for libpng version 1.6.1beta03 - February
22
, 2013 (shared library 16.0)
See the note about version numbers near the top of png.h
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
See INSTALL for instructions on how to install libpng.
...
...
libpng-manual.txt
浏览文件 @
f8a8ead5
libpng-manual.txt - A description on how to use and modify libpng
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.1beta03 - February
19
, 2013
libpng version 1.6.1beta03 - February
22
, 2013
Updated and distributed by Glenn Randers-Pehrson
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2013 Glenn Randers-Pehrson
Copyright (c) 1998-2013 Glenn Randers-Pehrson
...
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
...
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
Based on:
libpng versions 0.97, January 1998, through 1.6.1beta03 - February
19
, 2013
libpng versions 0.97, January 1998, through 1.6.1beta03 - February
22
, 2013
Updated and distributed by Glenn Randers-Pehrson
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2013 Glenn Randers-Pehrson
Copyright (c) 1998-2013 Glenn Randers-Pehrson
...
@@ -5151,7 +5151,7 @@ Other rules can be inferred by inspecting the libpng source.
...
@@ -5151,7 +5151,7 @@ Other rules can be inferred by inspecting the libpng source.
XVI. Y2K Compliance in libpng
XVI. Y2K Compliance in libpng
February
19
, 2013
February
22
, 2013
Since the PNG Development group is an ad-hoc body, we can't make
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
an official declaration.
...
...
libpng.3
浏览文件 @
f8a8ead5
.TH LIBPNG 3 "February
19
, 2013"
.TH LIBPNG 3 "February
22
, 2013"
.SH NAME
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta03
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta03
.SH SYNOPSIS
.SH SYNOPSIS
...
@@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
...
@@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
.SH LIBPNG.TXT
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.1beta03 - February
19
, 2013
libpng version 1.6.1beta03 - February
22
, 2013
Updated and distributed by Glenn Randers-Pehrson
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2013 Glenn Randers-Pehrson
Copyright (c) 1998-2013 Glenn Randers-Pehrson
...
@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
...
@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
Based on:
libpng versions 0.97, January 1998, through 1.6.1beta03 - February
19
, 2013
libpng versions 0.97, January 1998, through 1.6.1beta03 - February
22
, 2013
Updated and distributed by Glenn Randers-Pehrson
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2013 Glenn Randers-Pehrson
Copyright (c) 1998-2013 Glenn Randers-Pehrson
...
@@ -5656,7 +5656,7 @@ Other rules can be inferred by inspecting the libpng source.
...
@@ -5656,7 +5656,7 @@ Other rules can be inferred by inspecting the libpng source.
.SH XVI. Y2K Compliance in libpng
.SH XVI. Y2K Compliance in libpng
February
19
, 2013
February
22
, 2013
Since the PNG Development group is an ad-hoc body, we can't make
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
an official declaration.
...
@@ -5927,7 +5927,7 @@ possible without all of you.
...
@@ -5927,7 +5927,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.6.1beta03 - February
19
, 2013:
Libpng version 1.6.1beta03 - February
22
, 2013:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
...
@@ -5950,7 +5950,7 @@ this sentence.
...
@@ -5950,7 +5950,7 @@ this sentence.
This code is released under the libpng license.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February
19
, 2013, are
libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February
22
, 2013, are
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
with the following individual added to the list of Contributing Authors
...
@@ -6049,7 +6049,7 @@ certification mark of the Open Source Initiative.
...
@@ -6049,7 +6049,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
glennrp at users.sourceforge.net
February
19
, 2013
February
22
, 2013
.\" end of man page
.\" end of man page
libpngpf.3
浏览文件 @
f8a8ead5
.TH LIBPNGPF 3 "February
19
, 2013"
.TH LIBPNGPF 3 "February
22
, 2013"
.SH NAME
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta03
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta03
(private functions)
(private functions)
...
...
png.5
浏览文件 @
f8a8ead5
.TH PNG 5 "February
19
, 2013"
.TH PNG 5 "February
22
, 2013"
.SH NAME
.SH NAME
png \- Portable Network Graphics (PNG) format
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
.SH DESCRIPTION
...
...
png.c
浏览文件 @
f8a8ead5
...
@@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr)
...
@@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
#else
# ifdef __STDC__
# ifdef __STDC__
return
PNG_STRING_NEWLINE
\
return
PNG_STRING_NEWLINE
\
"libpng version 1.6.1beta03 - February
19
, 2013"
PNG_STRING_NEWLINE
\
"libpng version 1.6.1beta03 - February
22
, 2013"
PNG_STRING_NEWLINE
\
"Copyright (c) 1998-2013 Glenn Randers-Pehrson"
PNG_STRING_NEWLINE
\
"Copyright (c) 1998-2013 Glenn Randers-Pehrson"
PNG_STRING_NEWLINE
\
"Copyright (c) 1996-1997 Andreas Dilger"
PNG_STRING_NEWLINE
\
"Copyright (c) 1996-1997 Andreas Dilger"
PNG_STRING_NEWLINE
\
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."
\
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."
\
PNG_STRING_NEWLINE
;
PNG_STRING_NEWLINE
;
# else
# else
return
"libpng version 1.6.1beta03 - February
19
, 2013\
return
"libpng version 1.6.1beta03 - February
22
, 2013\
Copyright (c) 1998-2013 Glenn Randers-Pehrson\
Copyright (c) 1998-2013 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."
;
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."
;
...
...
png.h
浏览文件 @
f8a8ead5
/* png.h - header file for PNG reference library
/* png.h - header file for PNG reference library
*
*
* libpng version 1.6.1beta03 - February
19
, 2013
* libpng version 1.6.1beta03 - February
22
, 2013
* Copyright (c) 1998-2013 Glenn Randers-Pehrson
* Copyright (c) 1998-2013 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
* Authors and maintainers:
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* 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.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.6.1beta03 - February
19
, 2013: Glenn
* libpng versions 0.97, January 1998, through 1.6.1beta03 - February
22
, 2013: Glenn
* See also "Contributing Authors", below.
* See also "Contributing Authors", below.
*
*
* Note about libpng version numbers:
* Note about libpng version numbers:
...
@@ -201,7 +201,7 @@
...
@@ -201,7 +201,7 @@
*
*
* This code is released under the libpng license.
* This code is released under the libpng license.
*
*
* libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February
19
, 2013, are
* libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February
22
, 2013, are
* Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are
* Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5
* distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors:
* with the following individual added to the list of Contributing Authors:
...
@@ -313,7 +313,7 @@
...
@@ -313,7 +313,7 @@
* Y2K compliance in libpng:
* Y2K compliance in libpng:
* =========================
* =========================
*
*
* February
19
, 2013
* February
22
, 2013
*
*
* Since the PNG Development group is an ad-hoc body, we can't make
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
* an official declaration.
...
@@ -381,7 +381,7 @@
...
@@ -381,7 +381,7 @@
/* Version information for png.h - this should match the version in png.c */
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.1beta03"
#define PNG_LIBPNG_VER_STRING "1.6.1beta03"
#define PNG_HEADER_VERSION_STRING \
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.6.1beta03 - February
19
, 2013\n"
" libpng version 1.6.1beta03 - February
22
, 2013\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
...
...
pngconf.h
浏览文件 @
f8a8ead5
/* pngconf.h - machine configurable file for libpng
/* pngconf.h - machine configurable file for libpng
*
*
* libpng version 1.6.1beta03 - February
19
, 2013
* libpng version 1.6.1beta03 - February
22
, 2013
*
*
* Copyright (c) 1998-2013 Glenn Randers-Pehrson
* Copyright (c) 1998-2013 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
...
...
projects/vstudio/readme.txt
浏览文件 @
f8a8ead5
VisualStudio instructions
VisualStudio instructions
libpng version 1.6.1beta03 - February
19
, 2013
libpng version 1.6.1beta03 - February
22
, 2013
Copyright (c) 1998-2010 Glenn Randers-Pehrson
Copyright (c) 1998-2010 Glenn Randers-Pehrson
...
...
projects/vstudio/zlib.props
浏览文件 @
f8a8ead5
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<!--
<!--
* zlib.props - location of zlib source
* zlib.props - location of zlib source
*
*
* libpng version 1.6.1beta03 - February
19
, 2013
* libpng version 1.6.1beta03 - February
22
, 2013
*
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
*
...
...
scripts/README.txt
浏览文件 @
f8a8ead5
Makefiles for libpng version 1.6.1beta03 - February
19
, 2013
Makefiles for libpng version 1.6.1beta03 - February
22
, 2013
pnglibconf.h.prebuilt => Stores configuration settings
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
makefile.linux => Linux/ELF makefile
...
...
scripts/pnglibconf.dfa
100644 → 100755
浏览文件 @
f8a8ead5
文件模式从 100644 更改为 100755
scripts/pnglibconf.h.prebuilt
浏览文件 @
f8a8ead5
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
/* pnglibconf.h - library build configuration */
/* pnglibconf.h - library build configuration */
/* Libpng 1.6.1beta03 - February
19
, 2013 */
/* Libpng 1.6.1beta03 - February
22
, 2013 */
/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录