Mercurial > forge

changeset 11189:be8b9efda07d octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
immaximas: fix license by using proper MIT license text after private conversation with copyright owner Peter Kovesi
author carandraug
date Mon, 29 Oct 2012 03:23:26 +0000
parents 5b0c129a01ba
children d5dab9e52aa6
files main/image/DESCRIPTION main/image/inst/immaximas.m
diffstat 2 files changed, 17 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/main/image/DESCRIPTION	Sun Oct 28 20:25:06 2012 +0000
+++ b/main/image/DESCRIPTION	Mon Oct 29 03:23:26 2012 +0000
@@ -10,5 +10,5 @@
  statistics, spatial and geometric transformations, morphological
  operations, linear filtering, and much more.
 Depends: octave (>= 3.6.0), signal (>= 1.2.0)
-License: GPLv3+, simplified BSD
+License: GPLv3+, MIT, simplified BSD
 Url: http://octave.sf.net
--- a/main/image/inst/immaximas.m	Sun Oct 28 20:25:06 2012 +0000
+++ b/main/image/inst/immaximas.m	Mon Oct 29 03:23:26 2012 +0000
@@ -2,15 +2,24 @@
 ## School of Computer Science & Software Engineering
 ## The University of Western Australia
 ## http://www.csse.uwa.edu.au/
-##   
+##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
-## in the Software without restriction, subject to the following conditions:
-## 
-## The above copyright notice and this permission notice shall be included in all
-## copies or substantial portions of the Software.
-## 
-## The Software is provided "as is", without warranty of any kind.
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice shall be included in
+## all copies or substantial portions of the Software.
+##
+## The software is provided "as is", without warranty of any kind, express or
+## implied, including but not limited to the warranties of merchantability,
+## fitness for a particular purpose and noninfringement. In no event shall the
+## authors or copyright holders be liable for any claim, damages or other
+## liability, whether in an action of contract, tort or otherwise, arising from,
+## out of or in connection with the software or the use or other dealings in the
+## software.
 ##
 ## I've made minor changes compared to the original 'nonmaxsuppts' function developed
 ## by Peter Kovesi. The original is available at
@@ -105,4 +114,3 @@
     varargout{nd+1} = im(ind);
   endif
 endfunction
-