Merge pull request #14433 from meeseeksmachine/auto-backport-of-pr-14425-on-v2.2.x

tacaswell · web-flow · commit d0996033519e · 2019-06-03T23:18:15.000-04:00
Backport PR #14425 on branch v2.2.x (Lic restore license paint)
diff --git a/LICENSE/LICENSE_PAINT b/LICENSE/LICENSE_PAINT
@@ -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.
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -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
@@ -140,6 +136,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;
