From fd115c22e7792d011059e252440e213d526a4a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Wed, 22 Jan 2020 16:53:22 +0100 Subject: [PATCH] Restore the BSD-2-clause license header of two files Those had been incorrectly converted to GPL-3+ in commit 1bf81c9f5a79757c23356f16fe015ae4f10bebde. --- license.txt | 2 ++ matlab/utilities/graphics/colorspace.m | 31 ++++++++++------- .../graphics/distinguishable_colors.m | 33 +++++++++++-------- 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/license.txt b/license.txt index f58493bd6..5c10b81a7 100644 --- a/license.txt +++ b/license.txt @@ -203,10 +203,12 @@ License: permissive-lmmcp Files: matlab/utilities/graphics/distinguishable_colors.m Copyright: 2010-2011 Timothy E. Holy + 2017 Dynare Team License: BSD-2-clause Files: matlab/utilities/graphics/colorspace.m Copyright: 2005-2010 Pascal Getreuer + 2017 Dynare Team License: BSD-2-clause Files: doc/*.rst doc/*.tex doc/*.svg doc/*.pdf doc/*.bib diff --git a/matlab/utilities/graphics/colorspace.m b/matlab/utilities/graphics/colorspace.m index a83aee2ff..c9332ca74 100644 --- a/matlab/utilities/graphics/colorspace.m +++ b/matlab/utilities/graphics/colorspace.m @@ -84,20 +84,27 @@ function varargout = colorspace(Conversion,varargin) % Copyright (C) 2005-2010 Pascal Getreuer % Copyright (C) 2017 Dynare Team % -% This file is part of Dynare. +% Redistribution and use in source and binary forms, with or without +% modification, are permitted provided that the following conditions are +% met: % -% Dynare is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version. +% * Redistributions of source code must retain the above copyright +% notice, this list of conditions and the following disclaimer. +% * 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 % -% Dynare is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with Dynare. If not, see . +% 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 OWNER 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. %%% Input parsing %%% if nargin < 2, error('Not enough input arguments.'); end diff --git a/matlab/utilities/graphics/distinguishable_colors.m b/matlab/utilities/graphics/distinguishable_colors.m index 7b668886f..549033c8e 100644 --- a/matlab/utilities/graphics/distinguishable_colors.m +++ b/matlab/utilities/graphics/distinguishable_colors.m @@ -54,23 +54,30 @@ function colors = distinguishable_colors(n_colors,bg,func) % func = @(x) colorspace('RGB->Lab',x); % c = distinguishable_colors(25,'w',func); -% Copyright (C) 2005-2010 2010-2011 by Timothy E. Holy +% Copyright (C) 2010-2011 by Timothy E. Holy % Copyright (C) 2017 Dynare Team % -% This file is part of Dynare. +% Redistribution and use in source and binary forms, with or without +% modification, are permitted provided that the following conditions are +% met: % -% Dynare is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version. +% * Redistributions of source code must retain the above copyright +% notice, this list of conditions and the following disclaimer. +% * 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 % -% Dynare is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with Dynare. If not, see . +% 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 OWNER 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. % Parse the inputs if (nargin < 2)