8000 Lic restore license paint by tacaswell · Pull Request #14425 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Lic restore license paint #14425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 3, 2019
Merged

Lic restore license paint #14425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e12fd3f
LIC: restore LICENSE_PAINT
tacaswell Jun 2, 2019
9c674e7
MNT: remove TODO about adding license
tacaswell Jun 2, 2019
968b467
MNT: move comment about LICENSE_PAINT to write_png function again
tacaswell Jun 2, 2019
5f37b9d
DOC: clarify comment about the source of the png writing code
tacaswell Jun 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions LICENSE/LICENSE_PAINT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Copyright 2000 by Object Craft P/L, Melbourne, Australia.

All Rights Reserved

Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Object Craft
is not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior
permission.

OBJECT CRAFT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL OBJECT CRAFT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
7 changes: 3 additions & 4 deletions src/_png.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
/* -*- mode: c++; c-basic-offset: 4 -*- */

// this code is heavily adapted from the paint license, which is in
// the file paint.license (BSD compatible) included in this
// distribution. TODO, add license file to MANIFEST.in and CVS

/* For linux, png.h must be imported before Python.h because
png.h needs to be the one to define setjmp.
Undefining _POSIX_C_SOURCE and _XOPEN_SOURCE stops a couple
Expand Down Expand Up @@ -139,6 +135,9 @@ const char *Py_write_png__doc__ =
" Byte string containing the PNG content if None was passed in for\n"
" file, otherwise None is returned.\n";

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