Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d099603

Browse filesBrowse files
authored
Merge pull request #14433 from meeseeksmachine/auto-backport-of-pr-14425-on-v2.2.x
Backport PR #14425 on branch v2.2.x (Lic restore license paint)
2 parents 06b0b52 + cb2b802 commit d099603
Copy full SHA for d099603

File tree

Expand file treeCollapse file tree

2 files changed

+23
-4
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+23
-4
lines changed

‎LICENSE/LICENSE_PAINT

Copy file name to clipboard
+20Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright 2000 by Object Craft P/L, Melbourne, Australia.
2+
3+
All Rights Reserved
4+
5+
Permission to use, copy, modify, and distribute this software and its
6+
documentation for any purpose and without fee is hereby granted,
7+
provided that the above copyright notice appear in all copies and that
8+
both that copyright notice and this permission notice appear in
9+
supporting documentation, and that the name of Object Craft
10+
is not be used in advertising or publicity pertaining to
11+
distribution of the software without specific, written prior
12+
permission.
13+
14+
OBJECT CRAFT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
15+
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
16+
EVENT SHALL OBJECT CRAFT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
17+
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
18+
USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
19+
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
20+
PERFORMANCE OF THIS SOFTWARE.

‎src/_png.cpp

Copy file name to clipboardExpand all lines: src/_png.cpp
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
/* -*- mode: c++; c-basic-offset: 4 -*- */
22

3-
// this code is heavily adapted from the paint license, which is in
4-
// the file paint.license (BSD compatible) included in this
5-
// distribution. TODO, add license file to MANIFEST.in and CVS
6-
73
/* For linux, png.h must be imported before Python.h because
84
png.h needs to be the one to define setjmp.
95
Undefining _POSIX_C_SOURCE and _XOPEN_SOURCE stops a couple
@@ -140,6 +136,9 @@ const char *Py_write_png__doc__ =
140136
" Byte string containing the PNG content if None was passed in for\n"
141137
" file, otherwise None is returned.\n";
142138

139+
// this code is heavily adapted from
140+
// https://www.object-craft.com.au/projects/paint/ which licensed under the
141+
// (BSD compatible) LICENSE_PAINT which is included in this distribution.
143142
static PyObject *Py_write_png(PyObject *self, PyObject *args, PyObject *kwds)
144143
{
145144
numpy::array_view<unsigned char, 3> buffer;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.