diff --git a/LICENSE b/LICENSE index 8d3c3d3..23ffe9d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2023 Stefan Haustein and Aaron Liu +Copyright (c) 2024 Stefan Haustein and Aaron Liu This program is free software: you may copy, redistribute and/or modify it under the terms of (at your option) either the Apache License, Version 2.0, @@ -10,5 +10,10 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see either - for the Apache License, Version 2.0 -, or for the GNU GPL, version 3. + for the Apache License, Version 2.0, +or for the GNU GPL, version 3. + +Note that the code contained in this package contains the CImg library, +which is licensed under either [CeCILL 2.0](https://spdx.org/licenses/CECILL-2.0.html) +(close to GPL and compatible with it) or [CeCILL-C](https://spdx.org/licenses/CECILL-C) +(close to LGPL and compatible with Apache). diff --git a/README.md b/README.md index 0b2c699..a59215b 100644 --- a/README.md +++ b/README.md @@ -93,4 +93,5 @@ For the example below, the top image was generated with the character optimizati ## Licensing -You are free to use this code under either the GPL (3 or later) or the Apache 2.0. We also use the CImg library, which is licensed under either [CeCILL 2.0](https://spdx.org/licenses/CECILL-2.0.html) (close to GPL and compatible with it) or [CeCILL-C](https://spdx.org/licenses/CECILL-C) (close to LGPL and compatible with Apache). +You are free to use this code under either the GPL (3 or later) or version 2.0 of the Apache license. We include the CImg library, which +is licensed under either [CeCILL 2.0](https://spdx.org/licenses/CECILL-2.0.html) (close to GPL and compatible with it) or [CeCILL-C] (https://spdx.org/licenses/CECILL-C) (close to LGPL and compatible with Apache).