Mercurial > forge
changeset 11210:2af39a984337 octave-forge
maint: change Andy Adler code to GPLv3+ after permission from him though e-mail on mailing list
| author | carandraug |
|---|---|
| date | Mon, 05 Nov 2012 23:50:31 +0000 |
| parents | 47f4637b3ee1 |
| children | 85065c00e580 |
| files | main/general/src/SHA1.cc main/image/inst/bwselect.m main/image/inst/edge.m main/image/src/bwfill.cc main/image/src/rotate_scale.cc |
| diffstat | 5 files changed, 56 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/main/general/src/SHA1.cc Mon Nov 05 09:53:39 2012 +0000 +++ b/main/general/src/SHA1.cc Mon Nov 05 23:50:31 2012 +0000 @@ -1,6 +1,17 @@ -// Copyright (C) 1999 Andy Adler -// This code has no warrany whatsoever. -// Do what you like with this code as long as you leave this copyright in place. +// Copyright (C) 1999 Andy Adler <adler@sce.carleton.ca> +// +// This program 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. +// +// This program 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 +// this program; if not, see <http://www.gnu.org/licenses/>. // Note that part of the code below is on the public domain. That part will // marked as such.
--- a/main/image/inst/bwselect.m Mon Nov 05 09:53:39 2012 +0000 +++ b/main/image/inst/bwselect.m Mon Nov 05 23:50:31 2012 +0000 @@ -1,6 +1,17 @@ -## Copyright (C) 1999 Andy Adler -## This code has no warrany whatsoever. -## Do what you like with this code as long as you leave this copyright in place. +## Copyright (C) 1999 Andy Adler <adler@sce.carleton.ca> +## +## This program 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. +## +## This program 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 +## this program; if not, see <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {[@var{imout}, @var{idx}] =} bwselect(@var{im}, @var{cols}, @var{rows}, @var{connect})
--- a/main/image/inst/edge.m Mon Nov 05 09:53:39 2012 +0000 +++ b/main/image/inst/edge.m Mon Nov 05 23:50:31 2012 +0000 @@ -1,3 +1,4 @@ +## Copyright (C) 1999 Andy Adler <adler@sce.carleton.ca> ## Copyright (C) 2008 Søren Hauberg <soren@hauberg.org> ## ## This program is free software; you can redistribute it and/or modify it under @@ -135,13 +136,6 @@ ## @seealso{fspecial, nonmax_supress} ## @end deftypefn -## Note: The implementation and help text for the 'andy' edge detector came with -## the following notice: -## Copyright (C) 1999 Andy Adler -## This code has no warrany whatsoever. -## Do what you like with this code as long as you -## leave this copyright in place. - function [bw, out_threshold, g45_out, g135_out] = edge (im, method, varargin) ## Get the image if (nargin == 0)
--- a/main/image/src/bwfill.cc Mon Nov 05 09:53:39 2012 +0000 +++ b/main/image/src/bwfill.cc Mon Nov 05 23:50:31 2012 +0000 @@ -1,6 +1,17 @@ -// Copyright (C) 1999 Andy Adler -// This code has no warrany whatsoever. -// Do what you like with this code as long as you leave this copyright in place. +// Copyright (C) 1999 Andy Adler <adler@sce.carleton.ca> +// +// This program 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. +// +// This program 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 +// this program; if not, see <http://www.gnu.org/licenses/>. #include <octave/oct.h>
--- a/main/image/src/rotate_scale.cc Mon Nov 05 09:53:39 2012 +0000 +++ b/main/image/src/rotate_scale.cc Mon Nov 05 23:50:31 2012 +0000 @@ -1,7 +1,17 @@ -//Copyright (C) 2003 Andy Adler +// Copyright (C) 2003 Andy Adler <adler@sce.carleton.ca> +// +// This program 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. // -// This code has no warrany whatsover. Do what you like with this code -// as long as you leave this copyright in place. +// This program 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 +// this program; if not, see <http://www.gnu.org/licenses/>. /* * ROTATE_SCALE: rotate and scale a matrix using bilinear interpolation