Skip to content

Commit 54957c7

Browse files
committed
LICENSE and README
1 parent 296fa6d commit 54957c7

File tree

6 files changed

+125
-17
lines changed

6 files changed

+125
-17
lines changed

Application.mk

-2
This file was deleted.

LICENSE

+111
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
2+
This copy of the libpng notices is provided for your convenience. In case of
3+
any discrepancy between this copy and the notices in the file png.h that is
4+
included in the libpng distribution, the latter shall prevail.
5+
6+
COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
7+
8+
If you modify libpng you may insert additional notices immediately following
9+
this sentence.
10+
11+
This code is released under the libpng license.
12+
13+
libpng versions 1.2.6, August 15, 2004, through 1.4.1, February 25, 2010, are
14+
Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
15+
distributed according to the same disclaimer and license as libpng-1.2.5
16+
with the following individual added to the list of Contributing Authors
17+
18+
Cosmin Truta
19+
20+
libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
21+
Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
22+
distributed according to the same disclaimer and license as libpng-1.0.6
23+
with the following individuals added to the list of Contributing Authors
24+
25+
Simon-Pierre Cadieux
26+
Eric S. Raymond
27+
Gilles Vollant
28+
29+
and with the following additions to the disclaimer:
30+
31+
There is no warranty against interference with your enjoyment of the
32+
library or against infringement. There is no warranty that our
33+
efforts or the library will fulfill any of your particular purposes
34+
or needs. This library is provided with all faults, and the entire
35+
risk of satisfactory quality, performance, accuracy, and effort is with
36+
the user.
37+
38+
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
39+
Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
40+
distributed according to the same disclaimer and license as libpng-0.96,
41+
with the following individuals added to the list of Contributing Authors:
42+
43+
Tom Lane
44+
Glenn Randers-Pehrson
45+
Willem van Schaik
46+
47+
libpng versions 0.89, June 1996, through 0.96, May 1997, are
48+
Copyright (c) 1996, 1997 Andreas Dilger
49+
Distributed according to the same disclaimer and license as libpng-0.88,
50+
with the following individuals added to the list of Contributing Authors:
51+
52+
John Bowler
53+
Kevin Bracey
54+
Sam Bushell
55+
Magnus Holmgren
56+
Greg Roelofs
57+
Tom Tanner
58+
59+
libpng versions 0.5, May 1995, through 0.88, January 1996, are
60+
Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
61+
62+
For the purposes of this copyright and license, "Contributing Authors"
63+
is defined as the following set of individuals:
64+
65+
Andreas Dilger
66+
Dave Martindale
67+
Guy Eric Schalnat
68+
Paul Schmidt
69+
Tim Wegner
70+
71+
The PNG Reference Library is supplied "AS IS". The Contributing Authors
72+
and Group 42, Inc. disclaim all warranties, expressed or implied,
73+
including, without limitation, the warranties of merchantability and of
74+
fitness for any purpose. The Contributing Authors and Group 42, Inc.
75+
assume no liability for direct, indirect, incidental, special, exemplary,
76+
or consequential damages, which may result from the use of the PNG
77+
Reference Library, even if advised of the possibility of such damage.
78+
79+
Permission is hereby granted to use, copy, modify, and distribute this
80+
source code, or portions hereof, for any purpose, without fee, subject
81+
to the following restrictions:
82+
83+
1. The origin of this source code must not be misrepresented.
84+
85+
2. Altered versions must be plainly marked as such and must not
86+
be misrepresented as being the original source.
87+
88+
3. This Copyright notice may not be removed or altered from any
89+
source or altered source distribution.
90+
91+
The Contributing Authors and Group 42, Inc. specifically permit, without
92+
fee, and encourage the use of this source code as a component to
93+
supporting the PNG file format in commercial products. If you use this
94+
source code in a product, acknowledgment is not required but would be
95+
appreciated.
96+
97+
98+
A "png_get_copyright" function is available, for convenient use in "about"
99+
boxes and the like:
100+
101+
printf("%s",png_get_copyright(NULL));
102+
103+
Also, the PNG logo (in PNG format, of course) is supplied in the
104+
files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
105+
106+
Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a
107+
certification mark of the Open Source Initiative.
108+
109+
Glenn Randers-Pehrson
110+
glennrp at users.sourceforge.net
111+
February 25, 2010

README.rst

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
libpng for Android
2+
==================
3+
This is a repackaging of libpng 1.4.1 for Android by Julien Rebetez.
4+
5+
Most changes went in config.h and writing the Makefiles.
6+
7+
The original libpng website is : http://www.libpng.org/pub/png/libpng.html
8+
9+
Assuming 'ndk-build' is in your path, you can use the build.sh script to create a static library.
10+

build.sh

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
ndk-build NDK_PROJECT_PATH=./ $@

jni/Android.mk

-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
1-
# Copyright (C) 2009 The Android Open Source Project
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
#
151
LOCAL_PATH := $(call my-dir)
16-
172
include $(CLEAR_VARS)
183

194
LOCAL_CFLAGS :=

jni/Application.mk

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
APP_OPTIM := release
2+
APP_MODULES := libpng

0 commit comments

Comments
 (0)