relicense VW files

visionworkbench · Oct 23, 2009 · ea86aa9 · ea86aa9
1 parent e5e279a
commit ea86aa9
Show file tree

Hide file tree

Showing 684 changed files with 864 additions and 695 deletions.
diff --git a/m4/ax_arg.m4 b/m4/ax_arg.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_check_functions.m4 b/m4/ax_check_functions.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_check_introspection.m4 b/m4/ax_check_introspection.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_common_options.m4 b/m4/ax_common_options.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_config_header_prefix.m4 b/m4/ax_config_header_prefix.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_find_files.m4 b/m4/ax_find_files.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_group_pkg.m4 b/m4/ax_group_pkg.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_instead_if.m4 b/m4/ax_instead_if.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_load_deps.m4 b/m4/ax_load_deps.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_log.m4 b/m4/ax_log.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_module.m4 b/m4/ax_module.m4
@@ -1,9 +1,10 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__
 
+
 # Usage: AX_MODULE(<name>, <directory>, <library>, <default>, <prerequisites>, <required dependencies>[, <optional dependencies>])
 AC_DEFUN([AX_MODULE],
 [

diff --git a/m4/ax_module_python.m4 b/m4/ax_module_python.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_pkg.m4 b/m4/ax_pkg.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_pkg_apple.m4 b/m4/ax_pkg_apple.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_pkg_boost.m4 b/m4/ax_pkg_boost.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_pkg_boost_check_version.m4 b/m4/ax_pkg_boost_check_version.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_pkg_boost_lib.m4 b/m4/ax_pkg_boost_lib.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_pkg_check_function.m4 b/m4/ax_pkg_check_function.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_pkg_one_of.m4 b/m4/ax_pkg_one_of.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_pkg_pthreads.m4 b/m4/ax_pkg_pthreads.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_prog_ar.m4 b/m4/ax_prog_ar.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/m4/ax_try_cppflags.m4 b/m4/ax_try_cppflags.m4
@@ -1,5 +1,5 @@
 dnl __BEGIN_LICENSE__
-dnl Copyright (C) 2006, 2007 United States Government as represented by
+dnl Copyright (C) 2006-2009 United States Government as represented by
 dnl the Administrator of the National Aeronautics and Space Administration.
 dnl All Rights Reserved.
 dnl __END_LICENSE__

diff --git a/scripts/create-test.sh b/scripts/create-test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # __BEGIN_LICENSE__
-# Copyright (C) 2006, 2007 United States Government as represented by
+# Copyright (C) 2006-2009 United States Government as represented by
 # the Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 # __END_LICENSE__

diff --git a/scripts/include-graph.py b/scripts/include-graph.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 # __BEGIN_LICENSE__
-# Copyright (C) 2006, 2007 United States Government as represented by
+# Copyright (C) 2006-2009 United States Government as represented by
 # the Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 # __END_LICENSE__
 
+
 from __future__ import with_statement
 
 import sys

diff --git a/scripts/relicense.pl b/scripts/relicense.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # __BEGIN_LICENSE__
-# Copyright (C) 2006, 2007 United States Government as represented by
+# Copyright (C) 2006-2009 United States Government as represented by
 # the Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 # __END_LICENSE__
@@ -16,6 +16,9 @@
     ".ac"   => "dnl",
     ".am"   => "#",
     ".cc"   => "//",
+    ".cpp"  => "//",
+    ".cxx"  => "//",
+    ".hpp"  => "//",
     ".cg"   => "//",
     ".glsl" => "//",
     ".h"    => "//",
@@ -74,7 +77,7 @@
 
 __DATA__
  __BEGIN_LICENSE__
- Copyright (C) 2006, 2007 United States Government as represented by
+ Copyright (C) 2006-2009 United States Government as represented by
  the Administrator of the National Aeronautics and Space Administration.
  All Rights Reserved.
  __END_LICENSE__
diff --git a/scripts/templates.js b/scripts/templates.js
@@ -1,5 +1,5 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,5 +1,5 @@
 # __BEGIN_LICENSE__
-# Copyright (C) 2006, 2007 United States Government as represented by
+# Copyright (C) 2006-2009 United States Government as represented by
 # the Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 # __END_LICENSE__

diff --git a/src/test/Helpers.h b/src/test/Helpers.h
@@ -1,3 +1,10 @@
+// __BEGIN_LICENSE__
+// Copyright (C) 2006-2009 United States Government as represented by
+// the Administrator of the National Aeronautics and Space Administration.
+// All Rights Reserved.
+// __END_LICENSE__
+
+
 #ifndef __VW_TESTS_CONFIG_TEST_H__
 #define __VW_TESTS_CONFIG_TEST_H__
 

diff --git a/src/vw/Camera.h b/src/vw/Camera.h
@@ -1,5 +1,5 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__

diff --git a/src/vw/Camera/BayerFilter.h b/src/vw/Camera/BayerFilter.h
@@ -1,5 +1,5 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__

diff --git a/src/vw/Camera/BundleAdjust.h b/src/vw/Camera/BundleAdjust.h
@@ -1,9 +1,10 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__
 
+
 /// \file BundleAdjust.h
 /// 
 /// Optimization classes for carrying out bundle adjustment of cameras.

diff --git a/src/vw/Camera/BundleAdjustModelBase.h b/src/vw/Camera/BundleAdjustModelBase.h
@@ -4,6 +4,7 @@
 // All Rights Reserved.
 // __END_LICENSE__
 
+
 /// \file BundleAdjustModelBase.h
 /// 
 /// Classes used to define the bundle adjustment problem. Every

diff --git a/src/vw/Camera/BundleAdjustReport.cc b/src/vw/Camera/BundleAdjustReport.cc
@@ -1,9 +1,10 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__
 
+
 #include <vw/Camera/BundleAdjustReport.h>
 namespace fs = boost::filesystem;
 

diff --git a/src/vw/Camera/BundleAdjustReport.h b/src/vw/Camera/BundleAdjustReport.h
@@ -1,6 +1,5 @@
-
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__

diff --git a/src/vw/Camera/BundleAdjustmentBase.h b/src/vw/Camera/BundleAdjustmentBase.h
@@ -4,6 +4,7 @@
 // All Rights Reserved.
 // __END_LICENSE__
 
+
 /// \file BundleAdjustmentBase.h
 /// 
 /// This is the generic outline for code that performs bundle

diff --git a/src/vw/Camera/BundleAdjustmentRef.h b/src/vw/Camera/BundleAdjustmentRef.h
@@ -4,6 +4,7 @@
 // All Rights Reserved.
 // __END_LICENSE__
 
+
 /// \file BundleAdjustmentRef.h
 ///
 /// Reference implementation of bundle adjustment. Very slow!

diff --git a/src/vw/Camera/BundleAdjustmentRobustRef.h b/src/vw/Camera/BundleAdjustmentRobustRef.h
@@ -4,6 +4,7 @@
 // All Rights Reserved.
 // __END_LICENSE__
 
+
 /// \file BundleAdjustmentRobustRef.h
 ///
 /// Reference implementation of robust bundle adjustment. Very slow!

diff --git a/src/vw/Camera/BundleAdjustmentRobustSparse.h b/src/vw/Camera/BundleAdjustmentRobustSparse.h
@@ -4,6 +4,7 @@
 // All Rights Reserved.
 // __END_LICENSE__
 
+
 /// \file BundleAdjustmentSparse.h
 ///
 /// Sparse implementation of bundle adjustment. Fast yo!

diff --git a/src/vw/Camera/BundleAdjustmentSparse.h b/src/vw/Camera/BundleAdjustmentSparse.h
@@ -4,6 +4,7 @@
 // All Rights Reserved.
 // __END_LICENSE__
 
+
 /// \file BundleAdjustmentSparse.h
 ///
 /// Sparse implementation of bundle adjustment. Fast yo!

diff --git a/src/vw/Camera/CAHVModel.cc b/src/vw/Camera/CAHVModel.cc
@@ -1,5 +1,5 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__

diff --git a/src/vw/Camera/CAHVModel.h b/src/vw/Camera/CAHVModel.h
@@ -1,5 +1,5 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__

diff --git a/src/vw/Camera/CAHVORModel.cc b/src/vw/Camera/CAHVORModel.cc
@@ -1,5 +1,5 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__

diff --git a/src/vw/Camera/CAHVORModel.h b/src/vw/Camera/CAHVORModel.h
@@ -1,5 +1,5 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__

diff --git a/src/vw/Camera/CameraModel.h b/src/vw/Camera/CameraModel.h
@@ -1,5 +1,5 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__

diff --git a/src/vw/Camera/CameraTransform.h b/src/vw/Camera/CameraTransform.h
@@ -1,5 +1,5 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__

diff --git a/src/vw/Camera/ControlNetwork.cc b/src/vw/Camera/ControlNetwork.cc
@@ -1,5 +1,5 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__

diff --git a/src/vw/Camera/ControlNetwork.h b/src/vw/Camera/ControlNetwork.h
@@ -1,5 +1,5 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__

diff --git a/src/vw/Camera/Exif.cc b/src/vw/Camera/Exif.cc
@@ -1,9 +1,10 @@
 // __BEGIN_LICENSE__
-// Copyright (C) 2006, 2007 United States Government as represented by
+// Copyright (C) 2006-2009 United States Government as represented by
 // the Administrator of the National Aeronautics and Space Administration.
 // All Rights Reserved.
 // __END_LICENSE__
 
+
 // Note: The following code for parsing EXIF information in the Vision
 // Workbench camera module was adapted from JHead : the EXIF Jpeg
 // header manipulation tool written by Matthias Wandel