stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore the BSD-2-clause license header of two files 

Those had been incorrectly converted to GPL-3+ in commit
1bf81c9f5a.
time-shift
Sébastien Villemot 2020-01-22 16:53:22 +01:00
parent 00ee480674
commit fd115c22e7
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
3 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
license.txt
View File

@ -203,10 +203,12 @@ License: permissive-lmmcp
Files: matlab/utilities/graphics/distinguishable_colors.m Files: matlab/utilities/graphics/distinguishable_colors.m
Copyright: 2010-2011 Timothy E. Holy Copyright: 2010-2011 Timothy E. Holy
2017 Dynare Team
License: BSD-2-clause License: BSD-2-clause
Files: matlab/utilities/graphics/colorspace.m Files: matlab/utilities/graphics/colorspace.m
Copyright: 2005-2010 Pascal Getreuer Copyright: 2005-2010 Pascal Getreuer
2017 Dynare Team
License: BSD-2-clause License: BSD-2-clause
Files: doc/*.rst doc/*.tex doc/*.svg doc/*.pdf doc/*.bib Files: doc/*.rst doc/*.tex doc/*.svg doc/*.pdf doc/*.bib

31
matlab/utilities/graphics/colorspace.m
View File

@ -84,20 +84,27 @@ function varargout = colorspace(Conversion,varargin)
% Copyright (C) 2005-2010 Pascal Getreuer % Copyright (C) 2005-2010 Pascal Getreuer
% Copyright (C) 2017 Dynare Team % 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 % * Redistributions of source code must retain the above copyright
% it under the terms of the GNU General Public License as published by % notice, this list of conditions and the following disclaimer.
% the Free Software Foundation, either version 3 of the License, or % * Redistributions in binary form must reproduce the above copyright
% (at your option) any later version. % 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, % THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
% but WITHOUT ANY WARRANTY; without even the implied warranty of % AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the % IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
% GNU General Public License for more details. % ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
% % LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
% You should have received a copy of the GNU General Public License % CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
% along with Dynare. If not, see <http://www.gnu.org/licenses/>. % 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 %%% %%% Input parsing %%%
if nargin < 2, error('Not enough input arguments.'); end if nargin < 2, error('Not enough input arguments.'); end

33
matlab/utilities/graphics/distinguishable_colors.m
View File

@ -54,23 +54,30 @@ function colors = distinguishable_colors(n_colors,bg,func)
% func = @(x) colorspace('RGB->Lab',x); % func = @(x) colorspace('RGB->Lab',x);
% c = distinguishable_colors(25,'w',func); % 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 % 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 % * Redistributions of source code must retain the above copyright
% it under the terms of the GNU General Public License as published by % notice, this list of conditions and the following disclaimer.
% the Free Software Foundation, either version 3 of the License, or % * Redistributions in binary form must reproduce the above copyright
% (at your option) any later version. % 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, % THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
% but WITHOUT ANY WARRANTY; without even the implied warranty of % AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the % IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
% GNU General Public License for more details. % ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
% % LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
% You should have received a copy of the GNU General Public License % CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
% along with Dynare. If not, see <http://www.gnu.org/licenses/>. % 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 % Parse the inputs
if (nargin < 2) if (nargin < 2)