From 2b3c47194cc5d18fbf5d5b41a0a05a33580affb6 Mon Sep 17 00:00:00 2001
From: Matthew Webster <mwebster@fmrib.ox.ac.uk>
Date: Wed, 26 Oct 2011 13:13:19 +0000
Subject: [PATCH] restored copyrights after CB commit
---
fsl_regfilt.cc | 63 +----------------------------------------------
meldata.cc | 66 +-------------------------------------------------
2 files changed, 2 insertions(+), 127 deletions(-)
diff --git a/fsl_regfilt.cc b/fsl_regfilt.cc
index f3cab40..9df3dd3 100644
--- a/fsl_regfilt.cc
+++ b/fsl_regfilt.cc
@@ -4,68 +4,7 @@
Copyright (C) 2006-2011 University of Oxford / Christian F. Beckmann */
-/* Part of FSL - FMRIB's Software Library
- http://www.fmrib.ox.ac.uk/fsl
- fsl@fmrib.ox.ac.uk
-
- Developed at FMRIB (Oxford Centre for Functional Magnetic Resonance
- Imaging of the Brain), Department of Clinical Neurology, Oxford
- University, Oxford, UK
-
-
- LICENCE
-
- FMRIB Software Library, Release 4.0 (c) 2007, The University of
- Oxford (the "Software")
-
- The Software remains the property of the University of Oxford ("the
- University").
-
- The Software is distributed "AS IS" under this Licence solely for
- non-commercial use in the hope that it will be useful, but in order
- that the University as a charitable foundation protects its assets for
- the benefit of its educational and research purposes, the University
- makes clear that no condition is made or to be implied, nor is any
- warranty given or to be implied, as to the accuracy of the Software,
- or that it will be suitable for any particular purpose or for use
- under any specific conditions. Furthermore, the University disclaims
- all responsibility for the use which is made of the Software. It
- further disclaims any liability for the outcomes arising from using
- the Software.
-
- The Licensee agrees to indemnify the University and hold the
- University harmless from and against any and all claims, damages and
- liabilities asserted by third parties (including claims for
- negligence) which arise directly or indirectly from the use of the
- Software or the sale of any products based on the Software.
-
- No part of the Software may be reproduced, modified, transmitted or
- transferred in any form or by any means, electronic or mechanical,
- without the express permission of the University. The permission of
- the University is not required if the said reproduction, modification,
- transmission or transference is done without financial return, the
- conditions of this Licence are imposed upon the receiver of the
- product, and all original and amended source code is included in any
- transmitted product. You may be held legally responsible for any
- copyright infringement that is caused or encouraged by your failure to
- abide by these terms and conditions.
-
- You are not permitted under this Licence to use this Software
- commercially. Use for which any financial return is received shall be
- defined as commercial use, and includes (1) integration of all or part
- of the source code or the Software into a product for sale or license
- by or on behalf of Licensee to third parties or (2) use of the
- Software or any derivative of it for research with the final aim of
- developing software products for sale or license to a third party or
- (3) use of the Software or any derivative of it for research with the
- final aim of developing non-software products for sale or license to a
- third party, or (4) use of the Software to provide any service to an
- external organisation for which payment is received. If you are
- interested in using the Software commercially, please contact Isis
- Innovation Limited ("Isis"), the technology transfer company of the
- University, to negotiate a licence. Contact details are:
- innovation@isis.ox.ac.uk quoting reference DE/1112. */
-
+/* CCOPYRIGHT */
#include "libvis/miscplot.h"
#include "miscmaths/miscmaths.h"
#include "miscmaths/miscprob.h"
diff --git a/meldata.cc b/meldata.cc
index 84e5aac..207ede2 100644
--- a/meldata.cc
+++ b/meldata.cc
@@ -7,69 +7,7 @@
Copyright (C) 1999-2008 University of Oxford */
-// {{{ includes/namespaces
-
-/* Part of FSL - FMRIB's Software Library
- http://www.fmrib.ox.ac.uk/fsl
- fsl@fmrib.ox.ac.uk
-
- Developed at FMRIB (Oxford Centre for Functional Magnetic Resonance
- Imaging of the Brain), Department of Clinical Neurology, Oxford
- University, Oxford, UK
-
-
- LICENCE
-
- FMRIB Software Library, Release 4.0 (c) 2007, The University of
- Oxford (the "Software")
-
- The Software remains the property of the University of Oxford ("the
- University").
-
- The Software is distributed "AS IS" under this Licence solely for
- non-commercial use in the hope that it will be useful, but in order
- that the University as a charitable foundation protects its assets for
- the benefit of its educational and research purposes, the University
- makes clear that no condition is made or to be implied, nor is any
- warranty given or to be implied, as to the accuracy of the Software,
- or that it will be suitable for any particular purpose or for use
- under any specific conditions. Furthermore, the University disclaims
- all responsibility for the use which is made of the Software. It
- further disclaims any liability for the outcomes arising from using
- the Software.
-
- The Licensee agrees to indemnify the University and hold the
- University harmless from and against any and all claims, damages and
- liabilities asserted by third parties (including claims for
- negligence) which arise directly or indirectly from the use of the
- Software or the sale of any products based on the Software.
-
- No part of the Software may be reproduced, modified, transmitted or
- transferred in any form or by any means, electronic or mechanical,
- without the express permission of the University. The permission of
- the University is not required if the said reproduction, modification,
- transmission or transference is done without financial return, the
- conditions of this Licence are imposed upon the receiver of the
- product, and all original and amended source code is included in any
- transmitted product. You may be held legally responsible for any
- copyright infringement that is caused or encouraged by your failure to
- abide by these terms and conditions.
-
- You are not permitted under this Licence to use this Software
- commercially. Use for which any financial return is received shall be
- defined as commercial use, and includes (1) integration of all or part
- of the source code or the Software into a product for sale or license
- by or on behalf of Licensee to third parties or (2) use of the
- Software or any derivative of it for research with the final aim of
- developing software products for sale or license to a third party or
- (3) use of the Software or any derivative of it for research with the
- final aim of developing non-software products for sale or license to a
- third party, or (4) use of the Software to provide any service to an
- external organisation for which payment is received. If you are
- interested in using the Software commercially, please contact Isis
- Innovation Limited ("Isis"), the technology transfer company of the
- University, to negotiate a licence. Contact details are:
- innovation@isis.ox.ac.uk quoting reference DE/1112. */
+/* CCOPYRIGHT */
#include "newimage/newimageall.h"
#include "meloptions.h"
@@ -82,8 +20,6 @@
using namespace Utilities;
using namespace NEWIMAGE;
-
-// }}}
namespace Melodic{
// {{{ Setup
--
GitLab