From ca2b3137dd700165f9645b98ed47d0fd09ce50ca Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 2 Oct 2024 14:38:49 -0500 Subject: [PATCH] Fix up licensing stuff --- LICENSE.txt | 24 ++++++++++++++++ pom.xml | 7 +---- .../java/net/imglib2/appose/DTypeUtils.java | 28 +++++++++++++++++++ .../java/net/imglib2/appose/NDArrayUtils.java | 28 +++++++++++++++++++ .../net/imglib2/appose/SharedMemoryImg.java | 28 +++++++++++++++++++ .../imglib2/appose/SharedMemoryImgTest.java | 8 +++--- 6 files changed, 113 insertions(+), 10 deletions(-) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..0b33c31 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,24 @@ +Copyright (c) 2024, Tobias Pietzsch and Curtis Rueden. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/pom.xml b/pom.xml index c31e2ae..a76d6fb 100644 --- a/pom.xml +++ b/pom.xml @@ -85,12 +85,7 @@ bsd_2 ImgLib2: a general-purpose, multidimensional image processing library. ImgLib2 authors - Tobias Pietzsch, Stephan Preibisch, Stephan Saalfeld, -John Bogovic, Albert Cardona, Barry DeZonia, Christian Dietz, Jan Funke, -Aivar Grislis, Jonathan Hale, Grant Harris, Stefan Helfrich, Mark Hiner, -Martin Horn, Steffen Jaensch, Lee Kamentsky, Larry Lindsey, Melissa Linkert, -Mark Longair, Brian Northan, Nick Perry, Curtis Rueden, Johannes Schindelin, -Jean-Yves Tinevez and Michael Zinsmaier. + Tobias Pietzsch and Curtis Rueden. 0.3.0 diff --git a/src/main/java/net/imglib2/appose/DTypeUtils.java b/src/main/java/net/imglib2/appose/DTypeUtils.java index 9905d4f..58926e8 100644 --- a/src/main/java/net/imglib2/appose/DTypeUtils.java +++ b/src/main/java/net/imglib2/appose/DTypeUtils.java @@ -1,3 +1,31 @@ +/*- + * #%L + * ImgLib2: a general-purpose, multidimensional image processing library. + * %% + * Copyright (C) 2024 Tobias Pietzsch and Curtis Rueden. + * %% + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * #L% + */ package net.imglib2.appose; import java.util.function.Supplier; diff --git a/src/main/java/net/imglib2/appose/NDArrayUtils.java b/src/main/java/net/imglib2/appose/NDArrayUtils.java index dc1a451..4df6ffa 100644 --- a/src/main/java/net/imglib2/appose/NDArrayUtils.java +++ b/src/main/java/net/imglib2/appose/NDArrayUtils.java @@ -1,3 +1,31 @@ +/*- + * #%L + * ImgLib2: a general-purpose, multidimensional image processing library. + * %% + * Copyright (C) 2024 Tobias Pietzsch and Curtis Rueden. + * %% + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * #L% + */ package net.imglib2.appose; import static org.apposed.appose.NDArray.Shape.Order.F_ORDER; diff --git a/src/main/java/net/imglib2/appose/SharedMemoryImg.java b/src/main/java/net/imglib2/appose/SharedMemoryImg.java index b0ea507..5ad4a6e 100644 --- a/src/main/java/net/imglib2/appose/SharedMemoryImg.java +++ b/src/main/java/net/imglib2/appose/SharedMemoryImg.java @@ -1,3 +1,31 @@ +/*- + * #%L + * ImgLib2: a general-purpose, multidimensional image processing library. + * %% + * Copyright (C) 2024 Tobias Pietzsch and Curtis Rueden. + * %% + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * #L% + */ package net.imglib2.appose; import org.apposed.appose.NDArray; diff --git a/src/test/java/net/imglib2/appose/SharedMemoryImgTest.java b/src/test/java/net/imglib2/appose/SharedMemoryImgTest.java index e92bdc9..a99186b 100644 --- a/src/test/java/net/imglib2/appose/SharedMemoryImgTest.java +++ b/src/test/java/net/imglib2/appose/SharedMemoryImgTest.java @@ -1,18 +1,18 @@ /*- * #%L - * Appose: multi-language interprocess cooperation with shared memory. + * ImgLib2: a general-purpose, multidimensional image processing library. * %% - * Copyright (C) 2023 Appose developers. + * Copyright (C) 2024 Tobias Pietzsch and Curtis Rueden. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE