From 19bd812be20a44c3cff5a7ca3c25b6cd25161adf Mon Sep 17 00:00:00 2001 From: Zack Moratto Date: Tue, 8 Jun 2010 22:28:49 +0000 Subject: [PATCH] Update licensing --- Makefile.am | 22 ++++------------- config/rules.mak | 2 +- config/tests.am | 7 ++++++ configure.ac | 2 +- data/cam2map4stereo.py | 11 ++++----- data/hiedr2mosaic.py | 11 ++++----- graveyard/CameraAdjust.h | 24 ++++--------------- graveyard/DEM.cc | 24 ++++--------------- graveyard/DEM.h | 24 ++++--------------- graveyard/DiskImageResourceDDD.cc | 24 ++++--------------- graveyard/DiskImageResourceDDD.h | 24 ++++--------------- graveyard/HRSC/ExtoriExtrinsics.h | 24 ++++--------------- graveyard/HRSC/HRSC.cc | 24 ++++--------------- graveyard/HRSC/HRSC.h | 24 ++++--------------- graveyard/HRSC/Makefile.am | 6 +++++ graveyard/HRSC/StereoSessionHRSC.cc | 24 ++++--------------- graveyard/HRSC/StereoSessionHRSC.h | 24 ++++--------------- graveyard/MOC/Ephemeris.cc | 24 ++++--------------- graveyard/MOC/Ephemeris.h | 24 ++++--------------- graveyard/MOC/MOLA.cc | 24 ++++--------------- graveyard/MOC/MOLA.h | 24 ++++--------------- graveyard/MOC/MOLAReader.cc | 24 ++++--------------- graveyard/MOC/MOLAReader.h | 24 ++++--------------- graveyard/MOC/Makefile.am | 6 +++++ graveyard/MOC/Metadata.cc | 24 ++++--------------- graveyard/MOC/Metadata.h | 24 ++++--------------- graveyard/MOC/StereoSessionMOC.cc | 24 ++++--------------- graveyard/MOC/StereoSessionMOC.h | 24 ++++--------------- graveyard/SurfaceNURBS.h | 24 ++++--------------- graveyard/TiePointTransform.h | 24 ++++--------------- graveyard/ctximage.cc | 24 ++++--------------- graveyard/cuda_code.h | 6 +++++ graveyard/cuda_test.cc | 7 ++++++ graveyard/gui/AlignmentWidget.cc | 7 ++++++ graveyard/gui/AlignmentWidget.h | 7 ++++++ graveyard/gui/CorrelationWidget.cc | 7 ++++++ graveyard/gui/CorrelationWidget.h | 7 ++++++ graveyard/gui/CostFunctionWidget.cc | 7 ++++++ graveyard/gui/CostFunctionWidget.h | 7 ++++++ graveyard/gui/InputWidget.cc | 7 ++++++ graveyard/gui/InputWidget.h | 7 ++++++ graveyard/gui/KyleStereo.h | 7 ++++++ graveyard/gui/MainWindow.cc | 7 ++++++ graveyard/gui/MainWindow.h | 7 ++++++ graveyard/gui/Noise.h | 7 ++++++ graveyard/gui/PreprocessWidget.cc | 7 ++++++ graveyard/gui/PreprocessWidget.h | 7 ++++++ graveyard/gui/PreviewGLWidget.cc | 7 ++++++ graveyard/gui/PreviewGLWidget.h | 7 ++++++ graveyard/gui/QCompatFormLayout.h | 7 ++++++ graveyard/gui/SearchWindowWidget.cc | 7 ++++++ graveyard/gui/SearchWindowWidget.h | 7 ++++++ graveyard/gui/StereoGuiSession.cc | 24 ++++--------------- graveyard/gui/StereoGuiSession.h | 7 ++++++ graveyard/nff_terrain.cc | 2 +- graveyard/nff_terrain.h | 2 +- graveyard/nurbs.cc | 24 ++++--------------- graveyard/point2mesh.cc | 24 ++++--------------- graveyard/stereo_gui.cc | 24 ++++--------------- graveyard/tests/Makefile.am | 7 ++++++ graveyard/tests/TestNURBS.h | 24 ++++--------------- graveyard/tests/TestPEDR.h | 24 ++++--------------- m4/ax_app.m4 | 2 +- m4/ax_common_options.m4 | 2 +- m4/ax_config_header_prefix.m4 | 2 +- m4/ax_find_files.m4 | 2 +- m4/ax_group_pkg.m4 | 2 +- m4/ax_instead_if.m4 | 2 +- m4/ax_log.m4 | 2 +- m4/ax_module.m4 | 2 +- m4/ax_pkg_check_function.m4 | 2 +- m4/ax_prog_ar.m4 | 2 +- m4/ax_try_cppflags.m4 | 2 +- src/Makefile.am | 2 +- src/asp/Core.h | 2 +- src/asp/Core/BlobIndexThreaded.cc | 2 +- src/asp/Core/BlobIndexThreaded.h | 2 +- src/asp/Core/BundleAdjustUtils.cc | 2 +- src/asp/Core/BundleAdjustUtils.h | 2 +- src/asp/Core/ErodeView.h | 2 +- src/asp/Core/InpaintView.h | 2 +- src/asp/Core/Macros.h | 3 ++- src/asp/Core/Makefile.am | 2 +- src/asp/Core/MedianFilter.h | 2 +- src/asp/Core/OrthoRasterizer.h | 2 +- src/asp/Core/SoftwareRenderer.cc | 2 +- src/asp/Core/SoftwareRenderer.h | 2 +- src/asp/Core/SparseView.h | 2 +- src/asp/Core/StereoSettings.cc | 2 +- src/asp/Core/StereoSettings.h | 2 +- src/asp/Core/tests/Makefile.am | 2 +- src/asp/Core/tests/TestBlobIndexThreaded.cxx | 3 ++- src/asp/Core/tests/TestErodeView.cxx | 3 ++- src/asp/IsisIO.h | 2 +- src/asp/IsisIO/BaseEquation.h | 2 +- src/asp/IsisIO/DiskImageResourceIsis.cc | 2 +- src/asp/IsisIO/DiskImageResourceIsis.h | 2 +- src/asp/IsisIO/Equation.cc | 2 +- src/asp/IsisIO/Equation.h | 2 +- src/asp/IsisIO/IsisAdjustCameraModel.cc | 3 ++- src/asp/IsisIO/IsisAdjustCameraModel.h | 3 ++- src/asp/IsisIO/IsisCameraModel.h | 2 +- src/asp/IsisIO/IsisInterface.cc | 3 ++- src/asp/IsisIO/IsisInterface.h | 3 ++- src/asp/IsisIO/IsisInterfaceFrame.cc | 3 ++- src/asp/IsisIO/IsisInterfaceFrame.h | 3 ++- src/asp/IsisIO/IsisInterfaceLineScan.cc | 3 ++- src/asp/IsisIO/IsisInterfaceLineScan.h | 3 ++- src/asp/IsisIO/IsisInterfaceMapFrame.cc | 3 ++- src/asp/IsisIO/IsisInterfaceMapFrame.h | 3 ++- src/asp/IsisIO/IsisInterfaceMapLineScan.cc | 3 ++- src/asp/IsisIO/IsisInterfaceMapLineScan.h | 3 ++- src/asp/IsisIO/Makefile.am | 2 +- src/asp/IsisIO/PolyEquation.cc | 2 +- src/asp/IsisIO/PolyEquation.h | 2 +- src/asp/IsisIO/RPNEquation.cc | 2 +- src/asp/IsisIO/RPNEquation.h | 2 +- src/asp/IsisIO/tests/Makefile.am | 2 +- .../IsisIO/tests/TestEphemerisEquations.cxx | 3 ++- .../tests/TestIsisAdjustCameraModel.cxx | 3 ++- src/asp/IsisIO/tests/TestIsisCameraModel.cxx | 3 ++- src/asp/MPI/BundleAdjustmentMPI.h | 1 + src/asp/MPI/Makefile.am | 2 +- src/asp/MPI/isis_mpi_adjust.cc | 7 ++++++ src/asp/Makefile.am | 2 +- src/asp/PhotometryTK/AlbedoAccumulators.h | 7 ++++++ src/asp/PhotometryTK/ErrorAccumulators.h | 7 ++++++ src/asp/PhotometryTK/ImageAccumulators.h | 7 ++++++ src/asp/PhotometryTK/Makefile.am | 2 +- src/asp/PhotometryTK/ProjectFileIO.h | 1 + src/asp/PhotometryTK/ProjectService.cc | 7 ++++++ src/asp/PhotometryTK/ProjectService.h | 7 ++++++ src/asp/PhotometryTK/RemoteProjectFile.cc | 7 ++++++ src/asp/PhotometryTK/RemoteProjectFile.h | 7 ++++++ src/asp/PhotometryTK/TimeAccumulators.h | 7 ++++++ src/asp/PhotometryTK/mipmap.cc | 3 ++- src/asp/PhotometryTK/phodrg2plate.cc | 3 ++- src/asp/PhotometryTK/phoinit.py | 6 +++++ src/asp/PhotometryTK/phoinitet.cc | 3 ++- src/asp/PhotometryTK/phoinitfile.cc | 3 ++- src/asp/PhotometryTK/phoitalbedo.cc | 3 ++- src/asp/PhotometryTK/phoitdem.cc | 3 ++- src/asp/PhotometryTK/phoiterror.cc | 3 ++- src/asp/PhotometryTK/phoitreflect.cc | 3 ++- src/asp/PhotometryTK/phoittime.cc | 3 ++- src/asp/PhotometryTK/phosolve.py | 6 +++++ src/asp/PhotometryTK/ptk_server.cc | 7 ++++++ src/asp/PhotometryTK/shadow_mask.cc | 7 ++++++ src/asp/PhotometryTK/tests/Makefile.am | 2 +- .../tests/TestAlbedoAccumulators.cxx | 3 ++- .../tests/TestErrorAccumulators.cxx | 3 ++- .../PhotometryTK/tests/TestFullIteration.cxx | 3 ++- .../PhotometryTK/tests/TestProjectFileIO.cxx | 3 ++- .../PhotometryTK/tests/TestProjectService.cxx | 3 ++- .../tests/TestTimeAccumulators.cxx | 3 ++- src/asp/Sessions.h | 2 +- src/asp/Sessions/ISIS/Makefile.am | 2 +- src/asp/Sessions/ISIS/PhotometricOutlier.cc | 2 +- src/asp/Sessions/ISIS/PhotometricOutlier.h | 2 +- src/asp/Sessions/ISIS/StereoSessionIsis.cc | 2 +- src/asp/Sessions/ISIS/StereoSessionIsis.h | 2 +- src/asp/Sessions/Keypoint/Makefile.am | 2 +- .../Keypoint/StereoSessionKeypoint.cc | 2 +- .../Sessions/Keypoint/StereoSessionKeypoint.h | 2 +- src/asp/Sessions/Makefile.am | 2 +- src/asp/Sessions/Pinhole/Makefile.am | 2 +- .../Sessions/Pinhole/StereoSessionPinhole.cc | 2 +- .../Sessions/Pinhole/StereoSessionPinhole.h | 2 +- src/asp/Sessions/RMAX/Makefile.am | 2 +- src/asp/Sessions/RMAX/RMAX.cc | 2 +- src/asp/Sessions/RMAX/RMAX.h | 2 +- src/asp/Sessions/RMAX/StereoSessionRmax.cc | 2 +- src/asp/Sessions/RMAX/StereoSessionRmax.h | 2 +- src/asp/Sessions/StereoSession.cc | 2 +- src/asp/Sessions/StereoSession.h | 2 +- src/asp/SpiceIO.h | 2 +- src/asp/SpiceIO/Makefile.am | 2 +- src/asp/SpiceIO/SpiceUtilities.cc | 2 +- src/asp/SpiceIO/SpiceUtilities.h | 2 +- src/asp/SpiceIO/TabulatedDataReader.cc | 2 +- src/asp/SpiceIO/TabulatedDataReader.h | 2 +- src/asp/Tools/Makefile.am | 2 +- src/asp/Tools/aligndem.cc | 3 ++- src/asp/Tools/bundle_adjust.cc | 2 +- src/asp/Tools/bundlevis.cc | 2 +- src/asp/Tools/bundlevis.h | 2 +- src/asp/Tools/dem_profile.cc | 4 ++++ src/asp/Tools/disparitydebug.cc | 2 +- src/asp/Tools/geodiff.cc | 3 ++- src/asp/Tools/hsv_merge.cc | 7 ++++++ src/asp/Tools/isis_adjust.cc | 3 ++- src/asp/Tools/isis_adjust.h | 3 ++- src/asp/Tools/orbitviz.cc | 2 +- src/asp/Tools/orthoproject.cc | 2 +- src/asp/Tools/plateorthoproject.cc | 3 ++- src/asp/Tools/point2dem.cc | 2 +- src/asp/Tools/point2mesh.cc | 2 +- src/asp/Tools/reconstruct.cc | 2 +- src/asp/Tools/results.cc | 2 +- src/asp/Tools/rmax2cahvor.cc | 2 +- src/asp/Tools/rmax_adjust.cc | 3 ++- src/asp/Tools/stereo.cc | 2 +- src/asp/Tools/stereo.h | 2 +- src/asp/Tools/stereo_correlation.h | 6 +++++ src/asp/Tools/stereo_filtering.h | 7 ++++++ src/asp/Tools/stereo_preprocessing.h | 6 +++++ src/asp/Tools/stereo_refinement.h | 7 ++++++ src/asp/Tools/stereo_triangulation.h | 7 ++++++ src/test/test_main.cc | 7 ++++++ thirdparty/autotroll.mak | 7 ++++++ thirdparty/cuda.mak | 7 ++++++ thirdparty/gtest/include/gtest/gtest.h | 7 ++++++ thirdparty/gtest/src/gtest-all.cc | 7 ++++++ thirdparty/gtest/src/gtest_main.cc | 7 ++++++ thirdparty/m4/autotroll.m4 | 7 ++++++ thirdparty/protobuf.mak | 7 ++++++ 216 files changed, 667 insertions(+), 738 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9bc70f385..7ab7eca26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,24 +1,10 @@ # __BEGIN_LICENSE__ -# -# Copyright (C) 2006 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration -# (NASA). All Rights Reserved. -# -# This software is distributed under the NASA Open Source Agreement -# (NOSA), version 1.3. The NOSA has been approved by the Open Source -# Initiative. See the file COPYING at the top of the distribution -# directory tree for the complete NOSA document. -# -# THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -# KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -# LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -# SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -# A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -# THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -# DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -# +# Copyright (C) 2006-2010 United States Government as represented by +# the Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. # __END_LICENSE__ + ######################################################################## # sources ######################################################################## diff --git a/config/rules.mak b/config/rules.mak index 7cf991e78..314943479 100644 --- a/config/rules.mak +++ b/config/rules.mak @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006, 2007 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/config/tests.am b/config/tests.am index 02a10d4f8..7cf901682 100644 --- a/config/tests.am +++ b/config/tests.am @@ -1,3 +1,10 @@ +# __BEGIN_LICENSE__ +# Copyright (C) 2006-2010 United States Government as represented by +# the Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# __END_LICENSE__ + + GTEST_DIR = $(top_srcdir)/thirdparty/gtest libgtest_la_SOURCES = $(GTEST_DIR)/src/gtest-all.cc $(top_srcdir)/src/test/test_main.cc diff --git a/configure.ac b/configure.ac index 64719354e..db58beab6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl __BEGIN_LICENSE__ -dnl Copyright (C) 2009-2010 United States Government as represented by +dnl Copyright (C) 2006-2010 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/data/cam2map4stereo.py b/data/cam2map4stereo.py index 4bd69d431..3bb4f50ec 100644 --- a/data/cam2map4stereo.py +++ b/data/cam2map4stereo.py @@ -1,10 +1,9 @@ #!/usr/bin/env python - -# __BEGIN_LICENSE__ -# Copyright (C) 2006-2010 United States Government as represented by -# the Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# __END_LICENSE__ +# __BEGIN_LICENSE__ +# Copyright (C) 2006-2010 United States Government as represented by +# the Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# __END_LICENSE__ import os, glob, optparse, re, shutil, subprocess, sys, string; diff --git a/data/hiedr2mosaic.py b/data/hiedr2mosaic.py index 96140e12c..29380acb1 100755 --- a/data/hiedr2mosaic.py +++ b/data/hiedr2mosaic.py @@ -1,10 +1,9 @@ #!/usr/bin/env python - -# __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__ +# __BEGIN_LICENSE__ +# Copyright (C) 2006-2010 United States Government as represented by +# the Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# __END_LICENSE__ import os, glob, optparse, re, shutil, subprocess, sys, string diff --git a/graveyard/CameraAdjust.h b/graveyard/CameraAdjust.h index 5024f0708..a83dec470 100644 --- a/graveyard/CameraAdjust.h +++ b/graveyard/CameraAdjust.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file CameraAdjust.h /// diff --git a/graveyard/DEM.cc b/graveyard/DEM.cc index 517a88805..1e599af75 100644 --- a/graveyard/DEM.cc +++ b/graveyard/DEM.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file DEM.cc /// diff --git a/graveyard/DEM.h b/graveyard/DEM.h index de5c54bf8..9e295bdab 100644 --- a/graveyard/DEM.h +++ b/graveyard/DEM.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file DEM.h /// diff --git a/graveyard/DiskImageResourceDDD.cc b/graveyard/DiskImageResourceDDD.cc index 9f15ef499..eb93d50fd 100644 --- a/graveyard/DiskImageResourceDDD.cc +++ b/graveyard/DiskImageResourceDDD.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2006 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2006 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file DiskImageResourceDDD.cc /// #ifdef _MSC_VER diff --git a/graveyard/DiskImageResourceDDD.h b/graveyard/DiskImageResourceDDD.h index 081d158e9..6d07f86b3 100644 --- a/graveyard/DiskImageResourceDDD.h +++ b/graveyard/DiskImageResourceDDD.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2006 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2006 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file DiskImageResourceDDD.h /// /// Provides support for Malin Space Science System's DDD image file diff --git a/graveyard/HRSC/ExtoriExtrinsics.h b/graveyard/HRSC/ExtoriExtrinsics.h index a491d50ab..e82f863b6 100644 --- a/graveyard/HRSC/ExtoriExtrinsics.h +++ b/graveyard/HRSC/ExtoriExtrinsics.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file ExtoriExtrinsics.h /// /// Utilities for describing extrinsic camera parameters based on an diff --git a/graveyard/HRSC/HRSC.cc b/graveyard/HRSC/HRSC.cc index 1a5859e9d..a14f80d71 100644 --- a/graveyard/HRSC/HRSC.cc +++ b/graveyard/HRSC/HRSC.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file HRSC.cc /// diff --git a/graveyard/HRSC/HRSC.h b/graveyard/HRSC/HRSC.h index 9cd7cf46d..7fcb80797 100644 --- a/graveyard/HRSC/HRSC.h +++ b/graveyard/HRSC/HRSC.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file HRSC.h /// diff --git a/graveyard/HRSC/Makefile.am b/graveyard/HRSC/Makefile.am index 8425a4322..28e0042a9 100644 --- a/graveyard/HRSC/Makefile.am +++ b/graveyard/HRSC/Makefile.am @@ -1,3 +1,9 @@ +# __BEGIN_LICENSE__ +# Copyright (C) 2006-2010 United States Government as represented by +# the Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# __END_LICENSE__ + ######################################################################### # sources diff --git a/graveyard/HRSC/StereoSessionHRSC.cc b/graveyard/HRSC/StereoSessionHRSC.cc index 9ad6e076c..27828d350 100644 --- a/graveyard/HRSC/StereoSessionHRSC.cc +++ b/graveyard/HRSC/StereoSessionHRSC.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file StereoSessionHRSC.cc /// diff --git a/graveyard/HRSC/StereoSessionHRSC.h b/graveyard/HRSC/StereoSessionHRSC.h index 4027e8869..27f402543 100644 --- a/graveyard/HRSC/StereoSessionHRSC.h +++ b/graveyard/HRSC/StereoSessionHRSC.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file StereoSessionHRSC.h /// diff --git a/graveyard/MOC/Ephemeris.cc b/graveyard/MOC/Ephemeris.cc index a23cd4a7d..34b7522bd 100644 --- a/graveyard/MOC/Ephemeris.cc +++ b/graveyard/MOC/Ephemeris.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file Ephemeris.cc /// diff --git a/graveyard/MOC/Ephemeris.h b/graveyard/MOC/Ephemeris.h index 54d7c9671..2419e0581 100644 --- a/graveyard/MOC/Ephemeris.h +++ b/graveyard/MOC/Ephemeris.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file Ephemeris.h /// diff --git a/graveyard/MOC/MOLA.cc b/graveyard/MOC/MOLA.cc index 9de6658c0..b2648da27 100644 --- a/graveyard/MOC/MOLA.cc +++ b/graveyard/MOC/MOLA.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file MOLA.cc /// diff --git a/graveyard/MOC/MOLA.h b/graveyard/MOC/MOLA.h index 660ea52bb..4c1315684 100644 --- a/graveyard/MOC/MOLA.h +++ b/graveyard/MOC/MOLA.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file MOLA.h /// diff --git a/graveyard/MOC/MOLAReader.cc b/graveyard/MOC/MOLAReader.cc index 001685260..90b63bc27 100644 --- a/graveyard/MOC/MOLAReader.cc +++ b/graveyard/MOC/MOLAReader.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file MOLAReader.cc /// diff --git a/graveyard/MOC/MOLAReader.h b/graveyard/MOC/MOLAReader.h index 8c9daf1d8..a3ad8fa1a 100644 --- a/graveyard/MOC/MOLAReader.h +++ b/graveyard/MOC/MOLAReader.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file MOLA.h /// diff --git a/graveyard/MOC/Makefile.am b/graveyard/MOC/Makefile.am index 618f51fa6..769d6ebb9 100644 --- a/graveyard/MOC/Makefile.am +++ b/graveyard/MOC/Makefile.am @@ -1,3 +1,9 @@ +# __BEGIN_LICENSE__ +# Copyright (C) 2006-2010 United States Government as represented by +# the Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# __END_LICENSE__ + ######################################################################### # sources diff --git a/graveyard/MOC/Metadata.cc b/graveyard/MOC/Metadata.cc index 6417db8b5..9a60e71a9 100644 --- a/graveyard/MOC/Metadata.cc +++ b/graveyard/MOC/Metadata.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file Metadata.cc /// diff --git a/graveyard/MOC/Metadata.h b/graveyard/MOC/Metadata.h index 178a04cf9..519c05b11 100644 --- a/graveyard/MOC/Metadata.h +++ b/graveyard/MOC/Metadata.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file Metadata.h /// diff --git a/graveyard/MOC/StereoSessionMOC.cc b/graveyard/MOC/StereoSessionMOC.cc index c3e9a2a91..e12a218d4 100644 --- a/graveyard/MOC/StereoSessionMOC.cc +++ b/graveyard/MOC/StereoSessionMOC.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file StereoSessionMOC.cc /// diff --git a/graveyard/MOC/StereoSessionMOC.h b/graveyard/MOC/StereoSessionMOC.h index b902bfdb0..84f8e6938 100644 --- a/graveyard/MOC/StereoSessionMOC.h +++ b/graveyard/MOC/StereoSessionMOC.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file StereoSessionMOC.h /// diff --git a/graveyard/SurfaceNURBS.h b/graveyard/SurfaceNURBS.h index 9a0625341..9c253112a 100644 --- a/graveyard/SurfaceNURBS.h +++ b/graveyard/SurfaceNURBS.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file SurfaceNURBS.h /// diff --git a/graveyard/TiePointTransform.h b/graveyard/TiePointTransform.h index 5979f85dd..3bea9c056 100644 --- a/graveyard/TiePointTransform.h +++ b/graveyard/TiePointTransform.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file TiePointTransform.h /// diff --git a/graveyard/ctximage.cc b/graveyard/ctximage.cc index ce331b21d..95de6a86d 100644 --- a/graveyard/ctximage.cc +++ b/graveyard/ctximage.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file ctximage.cc /// diff --git a/graveyard/cuda_code.h b/graveyard/cuda_code.h index 604581aeb..0a6509c6d 100644 --- a/graveyard/cuda_code.h +++ b/graveyard/cuda_code.h @@ -1,2 +1,8 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + void invert_image (float* img, int width, int height); diff --git a/graveyard/cuda_test.cc b/graveyard/cuda_test.cc index b8a044413..2bf6b294b 100644 --- a/graveyard/cuda_test.cc +++ b/graveyard/cuda_test.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include #include diff --git a/graveyard/gui/AlignmentWidget.cc b/graveyard/gui/AlignmentWidget.cc index 5ea90d292..66d022288 100644 --- a/graveyard/gui/AlignmentWidget.cc +++ b/graveyard/gui/AlignmentWidget.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include #include #include diff --git a/graveyard/gui/AlignmentWidget.h b/graveyard/gui/AlignmentWidget.h index a9e2238b4..50363356b 100644 --- a/graveyard/gui/AlignmentWidget.h +++ b/graveyard/gui/AlignmentWidget.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __ALIGNMENT_WIDGET_H__ #define __ALIGNMENT_WIDGET_H__ diff --git a/graveyard/gui/CorrelationWidget.cc b/graveyard/gui/CorrelationWidget.cc index bdb85bd3b..7fe4da6a8 100644 --- a/graveyard/gui/CorrelationWidget.cc +++ b/graveyard/gui/CorrelationWidget.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include #include "CorrelationWidget.h" diff --git a/graveyard/gui/CorrelationWidget.h b/graveyard/gui/CorrelationWidget.h index 85c5be103..c1c27b054 100644 --- a/graveyard/gui/CorrelationWidget.h +++ b/graveyard/gui/CorrelationWidget.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __CORRELATION_WIDGET_H__ #define __CORRELATION_WIDGET_H__ diff --git a/graveyard/gui/CostFunctionWidget.cc b/graveyard/gui/CostFunctionWidget.cc index a4f5b911a..c96b9b013 100644 --- a/graveyard/gui/CostFunctionWidget.cc +++ b/graveyard/gui/CostFunctionWidget.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include #include diff --git a/graveyard/gui/CostFunctionWidget.h b/graveyard/gui/CostFunctionWidget.h index 905ae70a0..80c640609 100644 --- a/graveyard/gui/CostFunctionWidget.h +++ b/graveyard/gui/CostFunctionWidget.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __COST_FUNCTION_WIDGET_H__ #define __COST_FUNCTION_WIDGET_H__ diff --git a/graveyard/gui/InputWidget.cc b/graveyard/gui/InputWidget.cc index 7b4b77669..004733b63 100644 --- a/graveyard/gui/InputWidget.cc +++ b/graveyard/gui/InputWidget.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include #include #include diff --git a/graveyard/gui/InputWidget.h b/graveyard/gui/InputWidget.h index 54c6ba06f..1aec66097 100644 --- a/graveyard/gui/InputWidget.h +++ b/graveyard/gui/InputWidget.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __INPUT_WIDGET_H__ #define __INPUT_WIDGET_H__ diff --git a/graveyard/gui/KyleStereo.h b/graveyard/gui/KyleStereo.h index e3768dc74..195ed1c49 100644 --- a/graveyard/gui/KyleStereo.h +++ b/graveyard/gui/KyleStereo.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __VW_KYLE_STEREO__ #define __VW_KYLE_STEREO__ diff --git a/graveyard/gui/MainWindow.cc b/graveyard/gui/MainWindow.cc index 53f7147f8..6c8d3540e 100644 --- a/graveyard/gui/MainWindow.cc +++ b/graveyard/gui/MainWindow.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include #include "gui/StereoGuiSession.h" diff --git a/graveyard/gui/MainWindow.h b/graveyard/gui/MainWindow.h index 7ef298901..0ca7b2321 100644 --- a/graveyard/gui/MainWindow.h +++ b/graveyard/gui/MainWindow.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __MAINWINDOW_H__ #define __MAINWINDOW_H__ diff --git a/graveyard/gui/Noise.h b/graveyard/gui/Noise.h index e16bce187..a909949ec 100644 --- a/graveyard/gui/Noise.h +++ b/graveyard/gui/Noise.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __NOISE_H__ #define __NOISE_H__ diff --git a/graveyard/gui/PreprocessWidget.cc b/graveyard/gui/PreprocessWidget.cc index a3755df9f..e2cc0bf0e 100644 --- a/graveyard/gui/PreprocessWidget.cc +++ b/graveyard/gui/PreprocessWidget.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include #include #include diff --git a/graveyard/gui/PreprocessWidget.h b/graveyard/gui/PreprocessWidget.h index 3dddc1c32..9948e1088 100644 --- a/graveyard/gui/PreprocessWidget.h +++ b/graveyard/gui/PreprocessWidget.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __PREPROCESS_WIDGET_H__ #define __PREPROCESS_WIDGET_H__ diff --git a/graveyard/gui/PreviewGLWidget.cc b/graveyard/gui/PreviewGLWidget.cc index 7f10a29e9..56d2f16a1 100644 --- a/graveyard/gui/PreviewGLWidget.cc +++ b/graveyard/gui/PreviewGLWidget.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include // VW diff --git a/graveyard/gui/PreviewGLWidget.h b/graveyard/gui/PreviewGLWidget.h index c3bcf6e9d..48e9d7b52 100644 --- a/graveyard/gui/PreviewGLWidget.h +++ b/graveyard/gui/PreviewGLWidget.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __PREVIEW_GL_WIDGET_H__ #define __PREVIEW_GL_WIDGET_H__ diff --git a/graveyard/gui/QCompatFormLayout.h b/graveyard/gui/QCompatFormLayout.h index 8c2d0ed88..4a445de20 100644 --- a/graveyard/gui/QCompatFormLayout.h +++ b/graveyard/gui/QCompatFormLayout.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __QCOMPAT_FORM_LAYOUT_H__ #define __QCOMPAT_FORM_LAYOUT_H__ diff --git a/graveyard/gui/SearchWindowWidget.cc b/graveyard/gui/SearchWindowWidget.cc index 1402e2aab..fd7218151 100644 --- a/graveyard/gui/SearchWindowWidget.cc +++ b/graveyard/gui/SearchWindowWidget.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include #include "gui/SearchWindowWidget.h" diff --git a/graveyard/gui/SearchWindowWidget.h b/graveyard/gui/SearchWindowWidget.h index a697ba20d..21663e6b9 100644 --- a/graveyard/gui/SearchWindowWidget.h +++ b/graveyard/gui/SearchWindowWidget.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __SEARCH_WINDOW_WIDGET_H__ #define __SEARCH_WINDOW_WIDGET_H__ diff --git a/graveyard/gui/StereoGuiSession.cc b/graveyard/gui/StereoGuiSession.cc index 7bb931a60..e89b8c264 100644 --- a/graveyard/gui/StereoGuiSession.cc +++ b/graveyard/gui/StereoGuiSession.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file StereoGuiSession.cc /// diff --git a/graveyard/gui/StereoGuiSession.h b/graveyard/gui/StereoGuiSession.h index 75490613b..3bc871f34 100644 --- a/graveyard/gui/StereoGuiSession.h +++ b/graveyard/gui/StereoGuiSession.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __STEREO_GUI_SESSION_H__ #define __STEREO_GUI_SESSION_H__ diff --git a/graveyard/nff_terrain.cc b/graveyard/nff_terrain.cc index 4bfaf4ca0..5ca680bba 100644 --- a/graveyard/nff_terrain.cc +++ b/graveyard/nff_terrain.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/graveyard/nff_terrain.h b/graveyard/nff_terrain.h index 2f712af29..10f9170d9 100644 --- a/graveyard/nff_terrain.h +++ b/graveyard/nff_terrain.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/graveyard/nurbs.cc b/graveyard/nurbs.cc index d511613a6..c1456b691 100644 --- a/graveyard/nurbs.cc +++ b/graveyard/nurbs.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file nurbs.cc /// diff --git a/graveyard/point2mesh.cc b/graveyard/point2mesh.cc index 661986f59..00339cc3f 100644 --- a/graveyard/point2mesh.cc +++ b/graveyard/point2mesh.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file point2mesh.cc /// diff --git a/graveyard/stereo_gui.cc b/graveyard/stereo_gui.cc index 71616c80d..aed7bbe45 100644 --- a/graveyard/stereo_gui.cc +++ b/graveyard/stereo_gui.cc @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file stereo_gui.cc /// diff --git a/graveyard/tests/Makefile.am b/graveyard/tests/Makefile.am index 3a7bb2d9d..e30f22434 100644 --- a/graveyard/tests/Makefile.am +++ b/graveyard/tests/Makefile.am @@ -1,3 +1,10 @@ +# __BEGIN_LICENSE__ +# Copyright (C) 2006-2010 United States Government as represented by +# the Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# __END_LICENSE__ + + TESTS = #TestPEDR TestNURBS #nodist_TestNURBS_SOURCES = TestNURBS.cxx diff --git a/graveyard/tests/TestNURBS.h b/graveyard/tests/TestNURBS.h index e195d1ea6..ff742ea22 100644 --- a/graveyard/tests/TestNURBS.h +++ b/graveyard/tests/TestNURBS.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file TestNURBS.h /// diff --git a/graveyard/tests/TestPEDR.h b/graveyard/tests/TestPEDR.h index 4b01bb92b..7c6e3a5bb 100644 --- a/graveyard/tests/TestPEDR.h +++ b/graveyard/tests/TestPEDR.h @@ -1,26 +1,10 @@ // __BEGIN_LICENSE__ -// -// Copyright (C) 2008 United States Government as represented by the -// Administrator of the National Aeronautics and Space Administration -// (NASA). All Rights Reserved. -// -// Copyright 2008 Carnegie Mellon University. All rights reserved. -// -// This software is distributed under the NASA Open Source Agreement -// (NOSA), version 1.3. The NOSA has been approved by the Open Source -// Initiative. See the file COPYING at the top of the distribution -// directory tree for the complete NOSA document. -// -// THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY -// KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT -// LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO -// SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR -// A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT -// THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT -// DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. -// +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file TestPEDR.h /// diff --git a/m4/ax_app.m4 b/m4/ax_app.m4 index 879068e32..11f7c53f9 100644 --- a/m4/ax_app.m4 +++ b/m4/ax_app.m4 @@ -1,5 +1,5 @@ dnl __BEGIN_LICENSE__ -dnl Copyright (C) 2006-2009 United States Government as represented by +dnl Copyright (C) 2006-2010 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 index a87180e31..e37d3d7ad 100644 --- a/m4/ax_common_options.m4 +++ b/m4/ax_common_options.m4 @@ -1,5 +1,5 @@ dnl __BEGIN_LICENSE__ -dnl Copyright (C) 2006-2009 United States Government as represented by +dnl Copyright (C) 2006-2010 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 index 37b950e89..212241244 100644 --- 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-2009 United States Government as represented by +dnl Copyright (C) 2006-2010 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 index be65890ce..2890112c4 100644 --- a/m4/ax_find_files.m4 +++ b/m4/ax_find_files.m4 @@ -1,5 +1,5 @@ dnl __BEGIN_LICENSE__ -dnl Copyright (C) 2006-2009 United States Government as represented by +dnl Copyright (C) 2006-2010 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 index f51f46c4b..d30a8de45 100644 --- a/m4/ax_group_pkg.m4 +++ b/m4/ax_group_pkg.m4 @@ -1,5 +1,5 @@ dnl __BEGIN_LICENSE__ -dnl Copyright (C) 2006-2009 United States Government as represented by +dnl Copyright (C) 2006-2010 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 index 56979d914..04f63e08d 100644 --- a/m4/ax_instead_if.m4 +++ b/m4/ax_instead_if.m4 @@ -1,5 +1,5 @@ dnl __BEGIN_LICENSE__ -dnl Copyright (C) 2006-2009 United States Government as represented by +dnl Copyright (C) 2006-2010 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 index f7f749e80..eb7e2239f 100644 --- a/m4/ax_log.m4 +++ b/m4/ax_log.m4 @@ -1,5 +1,5 @@ dnl __BEGIN_LICENSE__ -dnl Copyright (C) 2006-2009 United States Government as represented by +dnl Copyright (C) 2006-2010 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 index ee152e595..731a622d5 100644 --- a/m4/ax_module.m4 +++ b/m4/ax_module.m4 @@ -1,5 +1,5 @@ dnl __BEGIN_LICENSE__ -dnl Copyright (C) 2006-2009 United States Government as represented by +dnl Copyright (C) 2006-2010 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 index 1f65a3160..65e4160a2 100644 --- 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-2009 United States Government as represented by +dnl Copyright (C) 2006-2010 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 index 53cb86870..100533c64 100644 --- a/m4/ax_prog_ar.m4 +++ b/m4/ax_prog_ar.m4 @@ -1,5 +1,5 @@ dnl __BEGIN_LICENSE__ -dnl Copyright (C) 2006-2009 United States Government as represented by +dnl Copyright (C) 2006-2010 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 index 289ea0cdc..540b118a0 100644 --- a/m4/ax_try_cppflags.m4 +++ b/m4/ax_try_cppflags.m4 @@ -1,5 +1,5 @@ dnl __BEGIN_LICENSE__ -dnl Copyright (C) 2006-2009 United States Government as represented by +dnl Copyright (C) 2006-2010 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/src/Makefile.am b/src/Makefile.am index c96d2df95..55832d59b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/Core.h b/src/asp/Core.h index 6298c941e..30fd98337 100644 --- a/src/asp/Core.h +++ b/src/asp/Core.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/BlobIndexThreaded.cc b/src/asp/Core/BlobIndexThreaded.cc index abc494489..7246e1048 100644 --- a/src/asp/Core/BlobIndexThreaded.cc +++ b/src/asp/Core/BlobIndexThreaded.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/BlobIndexThreaded.h b/src/asp/Core/BlobIndexThreaded.h index fe2835b8c..e2262ac0a 100644 --- a/src/asp/Core/BlobIndexThreaded.h +++ b/src/asp/Core/BlobIndexThreaded.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/BundleAdjustUtils.cc b/src/asp/Core/BundleAdjustUtils.cc index b3a8aed3e..9134e6626 100644 --- a/src/asp/Core/BundleAdjustUtils.cc +++ b/src/asp/Core/BundleAdjustUtils.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/BundleAdjustUtils.h b/src/asp/Core/BundleAdjustUtils.h index 32248f955..a37422fb7 100644 --- a/src/asp/Core/BundleAdjustUtils.h +++ b/src/asp/Core/BundleAdjustUtils.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/ErodeView.h b/src/asp/Core/ErodeView.h index b995cb22b..22280d48b 100644 --- a/src/asp/Core/ErodeView.h +++ b/src/asp/Core/ErodeView.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/InpaintView.h b/src/asp/Core/InpaintView.h index 1bd0a63bf..a715af861 100644 --- a/src/asp/Core/InpaintView.h +++ b/src/asp/Core/InpaintView.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/Macros.h b/src/asp/Core/Macros.h index 2b9e35df0..de814b6c2 100644 --- a/src/asp/Core/Macros.h +++ b/src/asp/Core/Macros.h @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + /// \file Macros.h /// diff --git a/src/asp/Core/Makefile.am b/src/asp/Core/Makefile.am index 3dd37caff..f1fba7007 100644 --- a/src/asp/Core/Makefile.am +++ b/src/asp/Core/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/Core/MedianFilter.h b/src/asp/Core/MedianFilter.h index 0aa9ea782..16be5717b 100644 --- a/src/asp/Core/MedianFilter.h +++ b/src/asp/Core/MedianFilter.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/OrthoRasterizer.h b/src/asp/Core/OrthoRasterizer.h index a20a867ac..49581eb7b 100644 --- a/src/asp/Core/OrthoRasterizer.h +++ b/src/asp/Core/OrthoRasterizer.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/SoftwareRenderer.cc b/src/asp/Core/SoftwareRenderer.cc index 2ab7d0a96..2c7bafaf1 100644 --- a/src/asp/Core/SoftwareRenderer.cc +++ b/src/asp/Core/SoftwareRenderer.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/SoftwareRenderer.h b/src/asp/Core/SoftwareRenderer.h index 57eaaeec2..ef575c78c 100644 --- a/src/asp/Core/SoftwareRenderer.h +++ b/src/asp/Core/SoftwareRenderer.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/SparseView.h b/src/asp/Core/SparseView.h index a46423f18..7411f6d3f 100644 --- a/src/asp/Core/SparseView.h +++ b/src/asp/Core/SparseView.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/StereoSettings.cc b/src/asp/Core/StereoSettings.cc index 26da696be..110d07db8 100644 --- a/src/asp/Core/StereoSettings.cc +++ b/src/asp/Core/StereoSettings.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/StereoSettings.h b/src/asp/Core/StereoSettings.h index b1c557225..0a44b4fce 100644 --- a/src/asp/Core/StereoSettings.h +++ b/src/asp/Core/StereoSettings.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Core/tests/Makefile.am b/src/asp/Core/tests/Makefile.am index 172fea9c9..ea34eca62 100644 --- a/src/asp/Core/tests/Makefile.am +++ b/src/asp/Core/tests/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/Core/tests/TestBlobIndexThreaded.cxx b/src/asp/Core/tests/TestBlobIndexThreaded.cxx index 2ef15bd8e..d42076371 100644 --- a/src/asp/Core/tests/TestBlobIndexThreaded.cxx +++ b/src/asp/Core/tests/TestBlobIndexThreaded.cxx @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include #include diff --git a/src/asp/Core/tests/TestErodeView.cxx b/src/asp/Core/tests/TestErodeView.cxx index ad3c76bc1..af6577e81 100644 --- a/src/asp/Core/tests/TestErodeView.cxx +++ b/src/asp/Core/tests/TestErodeView.cxx @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include #include diff --git a/src/asp/IsisIO.h b/src/asp/IsisIO.h index 9db17f9ee..f41775d5b 100644 --- a/src/asp/IsisIO.h +++ b/src/asp/IsisIO.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/IsisIO/BaseEquation.h b/src/asp/IsisIO/BaseEquation.h index 476e129bc..91a5bab41 100644 --- a/src/asp/IsisIO/BaseEquation.h +++ b/src/asp/IsisIO/BaseEquation.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/IsisIO/DiskImageResourceIsis.cc b/src/asp/IsisIO/DiskImageResourceIsis.cc index 83e942eb0..c529e5e0b 100644 --- a/src/asp/IsisIO/DiskImageResourceIsis.cc +++ b/src/asp/IsisIO/DiskImageResourceIsis.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/IsisIO/DiskImageResourceIsis.h b/src/asp/IsisIO/DiskImageResourceIsis.h index 4019ec6c8..1bb3d719f 100644 --- a/src/asp/IsisIO/DiskImageResourceIsis.h +++ b/src/asp/IsisIO/DiskImageResourceIsis.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/IsisIO/Equation.cc b/src/asp/IsisIO/Equation.cc index 466b9cc7d..1b888625d 100644 --- a/src/asp/IsisIO/Equation.cc +++ b/src/asp/IsisIO/Equation.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/IsisIO/Equation.h b/src/asp/IsisIO/Equation.h index 3f16d9f73..5ee2e2aff 100644 --- a/src/asp/IsisIO/Equation.h +++ b/src/asp/IsisIO/Equation.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/IsisIO/IsisAdjustCameraModel.cc b/src/asp/IsisIO/IsisAdjustCameraModel.cc index 602aa5145..23c3314fe 100644 --- a/src/asp/IsisIO/IsisAdjustCameraModel.cc +++ b/src/asp/IsisIO/IsisAdjustCameraModel.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // ASP & VW #include #include diff --git a/src/asp/IsisIO/IsisAdjustCameraModel.h b/src/asp/IsisIO/IsisAdjustCameraModel.h index 20061fcb4..ce4c4ab14 100644 --- a/src/asp/IsisIO/IsisAdjustCameraModel.h +++ b/src/asp/IsisIO/IsisAdjustCameraModel.h @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // IsisAdjustCameraModel // // IsisAdjustCameraModel is a clean break from IsisCameraModel diff --git a/src/asp/IsisIO/IsisCameraModel.h b/src/asp/IsisIO/IsisCameraModel.h index cc3c353e7..9313bf23f 100644 --- a/src/asp/IsisIO/IsisCameraModel.h +++ b/src/asp/IsisIO/IsisCameraModel.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/IsisIO/IsisInterface.cc b/src/asp/IsisIO/IsisInterface.cc index 8a2f40899..8e609b1d1 100644 --- a/src/asp/IsisIO/IsisInterface.cc +++ b/src/asp/IsisIO/IsisInterface.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // ASP #include #include diff --git a/src/asp/IsisIO/IsisInterface.h b/src/asp/IsisIO/IsisInterface.h index 6b474d8f0..0302c1338 100644 --- a/src/asp/IsisIO/IsisInterface.h +++ b/src/asp/IsisIO/IsisInterface.h @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + /// \file IsisInterface.h /// /// Generic Interface with ISIS diff --git a/src/asp/IsisIO/IsisInterfaceFrame.cc b/src/asp/IsisIO/IsisInterfaceFrame.cc index 2eaa48afb..6fdde7ccf 100644 --- a/src/asp/IsisIO/IsisInterfaceFrame.cc +++ b/src/asp/IsisIO/IsisInterfaceFrame.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // ASP #include diff --git a/src/asp/IsisIO/IsisInterfaceFrame.h b/src/asp/IsisIO/IsisInterfaceFrame.h index 63d0cd517..2aa8e40ae 100644 --- a/src/asp/IsisIO/IsisInterfaceFrame.h +++ b/src/asp/IsisIO/IsisInterfaceFrame.h @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + /// \file IsisInterfaceFrame.h /// /// Frame Camera Interface with ISIS diff --git a/src/asp/IsisIO/IsisInterfaceLineScan.cc b/src/asp/IsisIO/IsisInterfaceLineScan.cc index c17c15a6e..5d80b64a2 100644 --- a/src/asp/IsisIO/IsisInterfaceLineScan.cc +++ b/src/asp/IsisIO/IsisInterfaceLineScan.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // ASP #include diff --git a/src/asp/IsisIO/IsisInterfaceLineScan.h b/src/asp/IsisIO/IsisInterfaceLineScan.h index c9d854b30..64a24fa3b 100644 --- a/src/asp/IsisIO/IsisInterfaceLineScan.h +++ b/src/asp/IsisIO/IsisInterfaceLineScan.h @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + /// \file IsisInterfaceLineScane.h /// /// Line Scan Camera Interface with ISIS diff --git a/src/asp/IsisIO/IsisInterfaceMapFrame.cc b/src/asp/IsisIO/IsisInterfaceMapFrame.cc index 5ea508959..d46aa9cd7 100644 --- a/src/asp/IsisIO/IsisInterfaceMapFrame.cc +++ b/src/asp/IsisIO/IsisInterfaceMapFrame.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // ASP #include #include diff --git a/src/asp/IsisIO/IsisInterfaceMapFrame.h b/src/asp/IsisIO/IsisInterfaceMapFrame.h index 9b964f031..74cdada99 100644 --- a/src/asp/IsisIO/IsisInterfaceMapFrame.h +++ b/src/asp/IsisIO/IsisInterfaceMapFrame.h @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + /// \file IsisInterfaceMapFrame.h /// /// Map Projected Frame Camera Interface with ISIS diff --git a/src/asp/IsisIO/IsisInterfaceMapLineScan.cc b/src/asp/IsisIO/IsisInterfaceMapLineScan.cc index 8fc28c559..2eae2a422 100644 --- a/src/asp/IsisIO/IsisInterfaceMapLineScan.cc +++ b/src/asp/IsisIO/IsisInterfaceMapLineScan.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // ASP #include #include diff --git a/src/asp/IsisIO/IsisInterfaceMapLineScan.h b/src/asp/IsisIO/IsisInterfaceMapLineScan.h index 8708b51d3..b2be1db16 100644 --- a/src/asp/IsisIO/IsisInterfaceMapLineScan.h +++ b/src/asp/IsisIO/IsisInterfaceMapLineScan.h @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + /// \file IsisInterfaceMapLineScane.h /// /// Map Projected Line Scan Camera Interface with ISIS diff --git a/src/asp/IsisIO/Makefile.am b/src/asp/IsisIO/Makefile.am index c50deb6e4..d6820df2a 100644 --- a/src/asp/IsisIO/Makefile.am +++ b/src/asp/IsisIO/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/IsisIO/PolyEquation.cc b/src/asp/IsisIO/PolyEquation.cc index 4a7abcc17..8ab0ff303 100644 --- a/src/asp/IsisIO/PolyEquation.cc +++ b/src/asp/IsisIO/PolyEquation.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/IsisIO/PolyEquation.h b/src/asp/IsisIO/PolyEquation.h index efc16de94..935595bfd 100644 --- a/src/asp/IsisIO/PolyEquation.h +++ b/src/asp/IsisIO/PolyEquation.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/IsisIO/RPNEquation.cc b/src/asp/IsisIO/RPNEquation.cc index bd0e15649..bdb4997fa 100644 --- a/src/asp/IsisIO/RPNEquation.cc +++ b/src/asp/IsisIO/RPNEquation.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/IsisIO/RPNEquation.h b/src/asp/IsisIO/RPNEquation.h index 7389a6b63..bd7e5e806 100644 --- a/src/asp/IsisIO/RPNEquation.h +++ b/src/asp/IsisIO/RPNEquation.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/IsisIO/tests/Makefile.am b/src/asp/IsisIO/tests/Makefile.am index bfe5049a2..5a2c29b12 100644 --- a/src/asp/IsisIO/tests/Makefile.am +++ b/src/asp/IsisIO/tests/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/IsisIO/tests/TestEphemerisEquations.cxx b/src/asp/IsisIO/tests/TestEphemerisEquations.cxx index 4a9c4ba67..ce1a37755 100644 --- a/src/asp/IsisIO/tests/TestEphemerisEquations.cxx +++ b/src/asp/IsisIO/tests/TestEphemerisEquations.cxx @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include #include diff --git a/src/asp/IsisIO/tests/TestIsisAdjustCameraModel.cxx b/src/asp/IsisIO/tests/TestIsisAdjustCameraModel.cxx index 795d9c8a8..d87b9aba8 100644 --- a/src/asp/IsisIO/tests/TestIsisAdjustCameraModel.cxx +++ b/src/asp/IsisIO/tests/TestIsisAdjustCameraModel.cxx @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include #include diff --git a/src/asp/IsisIO/tests/TestIsisCameraModel.cxx b/src/asp/IsisIO/tests/TestIsisCameraModel.cxx index 43ee1a0cc..47aae850c 100644 --- a/src/asp/IsisIO/tests/TestIsisCameraModel.cxx +++ b/src/asp/IsisIO/tests/TestIsisCameraModel.cxx @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include #include diff --git a/src/asp/MPI/BundleAdjustmentMPI.h b/src/asp/MPI/BundleAdjustmentMPI.h index 3ed1cee66..53f1aea3e 100644 --- a/src/asp/MPI/BundleAdjustmentMPI.h +++ b/src/asp/MPI/BundleAdjustmentMPI.h @@ -4,6 +4,7 @@ // All Rights Reserved. // __END_LICENSE__ + /// \file BundleAdjustmentMPI.h /// /// Header to define MPI interactions diff --git a/src/asp/MPI/Makefile.am b/src/asp/MPI/Makefile.am index 0223533c3..165af48fd 100644 --- a/src/asp/MPI/Makefile.am +++ b/src/asp/MPI/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/MPI/isis_mpi_adjust.cc b/src/asp/MPI/isis_mpi_adjust.cc index 8b70b2fe9..74e278d5e 100644 --- a/src/asp/MPI/isis_mpi_adjust.cc +++ b/src/asp/MPI/isis_mpi_adjust.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include using namespace vw; diff --git a/src/asp/Makefile.am b/src/asp/Makefile.am index f608c2d38..3b213bbcb 100644 --- a/src/asp/Makefile.am +++ b/src/asp/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/PhotometryTK/AlbedoAccumulators.h b/src/asp/PhotometryTK/AlbedoAccumulators.h index 670654f45..813f9c85c 100644 --- a/src/asp/PhotometryTK/AlbedoAccumulators.h +++ b/src/asp/PhotometryTK/AlbedoAccumulators.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __ASP_PHO_ALBEDO_ACCUMULATORS_H__ #define __ASP_PHO_ALBEDO_ACCUMULATORS_H__ diff --git a/src/asp/PhotometryTK/ErrorAccumulators.h b/src/asp/PhotometryTK/ErrorAccumulators.h index ff8a5d2be..3a8d491c0 100644 --- a/src/asp/PhotometryTK/ErrorAccumulators.h +++ b/src/asp/PhotometryTK/ErrorAccumulators.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __ASP_PHO_ERROR_ACCUMULATORS_H__ #define __ASP_PHO_ERROR_ACCUMULATORS_H__ diff --git a/src/asp/PhotometryTK/ImageAccumulators.h b/src/asp/PhotometryTK/ImageAccumulators.h index 2a4a5eff0..03f380d03 100644 --- a/src/asp/PhotometryTK/ImageAccumulators.h +++ b/src/asp/PhotometryTK/ImageAccumulators.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __ASP_PHO_IMAGE_ACCUMULATORS_H__ #define __ASP_PHO_IMAGE_ACCUMULATORS_H__ diff --git a/src/asp/PhotometryTK/Makefile.am b/src/asp/PhotometryTK/Makefile.am index 49d412692..a29bf0508 100644 --- a/src/asp/PhotometryTK/Makefile.am +++ b/src/asp/PhotometryTK/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/PhotometryTK/ProjectFileIO.h b/src/asp/PhotometryTK/ProjectFileIO.h index 1d9d4dfbd..6c4131d1a 100644 --- a/src/asp/PhotometryTK/ProjectFileIO.h +++ b/src/asp/PhotometryTK/ProjectFileIO.h @@ -4,6 +4,7 @@ // All Rights Reserved. // __END_LICENSE__ + #ifndef __PROJECT_FILE_IO_H__ #define __PROJECT_FILE_IO_H__ diff --git a/src/asp/PhotometryTK/ProjectService.cc b/src/asp/PhotometryTK/ProjectService.cc index a43ec3fe7..3218110a4 100644 --- a/src/asp/PhotometryTK/ProjectService.cc +++ b/src/asp/PhotometryTK/ProjectService.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include #include #include diff --git a/src/asp/PhotometryTK/ProjectService.h b/src/asp/PhotometryTK/ProjectService.h index 8e6162819..79e8cd6d6 100644 --- a/src/asp/PhotometryTK/ProjectService.h +++ b/src/asp/PhotometryTK/ProjectService.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __ASP_PHOTOMETRYTK_PROJECT_SERVICE_H__ #define __ASP_PHOTOMETRYTK_PROJECT_SERVICE_H__ diff --git a/src/asp/PhotometryTK/RemoteProjectFile.cc b/src/asp/PhotometryTK/RemoteProjectFile.cc index 800c6f06f..c5cc74dbe 100644 --- a/src/asp/PhotometryTK/RemoteProjectFile.cc +++ b/src/asp/PhotometryTK/RemoteProjectFile.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include using namespace vw; using namespace asp::pho; diff --git a/src/asp/PhotometryTK/RemoteProjectFile.h b/src/asp/PhotometryTK/RemoteProjectFile.h index 61432b4bd..07268936f 100644 --- a/src/asp/PhotometryTK/RemoteProjectFile.h +++ b/src/asp/PhotometryTK/RemoteProjectFile.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __ASP_PHOTOMETRYTK_REMOTE_PROJECT_FILE_H__ #define __ASP_PHOTOMETRYTK_REMOTE_PROJECT_FILE_H__ diff --git a/src/asp/PhotometryTK/TimeAccumulators.h b/src/asp/PhotometryTK/TimeAccumulators.h index 79c4663a0..a9ab30f1a 100644 --- a/src/asp/PhotometryTK/TimeAccumulators.h +++ b/src/asp/PhotometryTK/TimeAccumulators.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __ASP_PHO_TIME_ACCUMULATORS_H__ #define __ASP_PHO_TIME_ACCUMULATORS_H__ diff --git a/src/asp/PhotometryTK/mipmap.cc b/src/asp/PhotometryTK/mipmap.cc index eb949a555..1831f8852 100644 --- a/src/asp/PhotometryTK/mipmap.cc +++ b/src/asp/PhotometryTK/mipmap.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2010 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // In the future this should handle different project types #include diff --git a/src/asp/PhotometryTK/phodrg2plate.cc b/src/asp/PhotometryTK/phodrg2plate.cc index d67342e58..25d2560c7 100644 --- a/src/asp/PhotometryTK/phodrg2plate.cc +++ b/src/asp/PhotometryTK/phodrg2plate.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2010 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // What's this file supposed to do ? // // (Pho)tometry DRG 2 Platefiles diff --git a/src/asp/PhotometryTK/phoinit.py b/src/asp/PhotometryTK/phoinit.py index b209b39af..8f1a08d38 100644 --- a/src/asp/PhotometryTK/phoinit.py +++ b/src/asp/PhotometryTK/phoinit.py @@ -1,4 +1,10 @@ #!/usr/bin/env python +# __BEGIN_LICENSE__ +# Copyright (C) 2006-2010 United States Government as represented by +# the Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# __END_LICENSE__ + import os, optparse, multiprocessing, sys; diff --git a/src/asp/PhotometryTK/phoinitet.cc b/src/asp/PhotometryTK/phoinitet.cc index 5a480c5ce..9325ae0d5 100644 --- a/src/asp/PhotometryTK/phoinitet.cc +++ b/src/asp/PhotometryTK/phoinitet.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2010 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // What's this file supposed to do ? // // (Pho)tometry (Init)ialize (E)xposure (T)ime diff --git a/src/asp/PhotometryTK/phoinitfile.cc b/src/asp/PhotometryTK/phoinitfile.cc index 3a757d16f..efa918171 100644 --- a/src/asp/PhotometryTK/phoinitfile.cc +++ b/src/asp/PhotometryTK/phoinitfile.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2010 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // What's this file supposed to do ? // // (Pho)tometry (Init)ialize Phofile diff --git a/src/asp/PhotometryTK/phoitalbedo.cc b/src/asp/PhotometryTK/phoitalbedo.cc index c41b5df3a..1a7f46578 100644 --- a/src/asp/PhotometryTK/phoitalbedo.cc +++ b/src/asp/PhotometryTK/phoitalbedo.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2010 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // What's this file supposed to do ? // // (Pho)tometry (It)eration (Albedo) Update diff --git a/src/asp/PhotometryTK/phoitdem.cc b/src/asp/PhotometryTK/phoitdem.cc index 1097e6649..b5f721efc 100644 --- a/src/asp/PhotometryTK/phoitdem.cc +++ b/src/asp/PhotometryTK/phoitdem.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2010 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // What's this file supposed to do ? // // (Pho)tometry (It)eration (DEM) Update diff --git a/src/asp/PhotometryTK/phoiterror.cc b/src/asp/PhotometryTK/phoiterror.cc index 86d5cc4ac..5f9497af1 100644 --- a/src/asp/PhotometryTK/phoiterror.cc +++ b/src/asp/PhotometryTK/phoiterror.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2010 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // What's this file supposed to do ? // // (Pho)tometry (It)eration (Error) Update diff --git a/src/asp/PhotometryTK/phoitreflect.cc b/src/asp/PhotometryTK/phoitreflect.cc index e48f3d8b9..eefdfc0a7 100644 --- a/src/asp/PhotometryTK/phoitreflect.cc +++ b/src/asp/PhotometryTK/phoitreflect.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2010 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // What's this file supposed to do ? // // (Pho)tometry (It)eration (Reflect)ance Update diff --git a/src/asp/PhotometryTK/phoittime.cc b/src/asp/PhotometryTK/phoittime.cc index c791ab7c3..3bfeb466d 100644 --- a/src/asp/PhotometryTK/phoittime.cc +++ b/src/asp/PhotometryTK/phoittime.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2010 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + // What's this file supposed to do ? // // (Pho)tometry (It)eration Exposure (Time) Update diff --git a/src/asp/PhotometryTK/phosolve.py b/src/asp/PhotometryTK/phosolve.py index d2e36b0ca..11fb4aa31 100644 --- a/src/asp/PhotometryTK/phosolve.py +++ b/src/asp/PhotometryTK/phosolve.py @@ -1,4 +1,10 @@ #!/usr/bin/env python2.6 +# __BEGIN_LICENSE__ +# Copyright (C) 2006-2010 United States Government as represented by +# the Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# __END_LICENSE__ + import os, optparse, multiprocessing, sys; from multiprocessing import Pool diff --git a/src/asp/PhotometryTK/ptk_server.cc b/src/asp/PhotometryTK/ptk_server.cc index 442acd790..1873bd974 100644 --- a/src/asp/PhotometryTK/ptk_server.cc +++ b/src/asp/PhotometryTK/ptk_server.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include #include #include diff --git a/src/asp/PhotometryTK/shadow_mask.cc b/src/asp/PhotometryTK/shadow_mask.cc index 22518fb4e..158fc1ffc 100644 --- a/src/asp/PhotometryTK/shadow_mask.cc +++ b/src/asp/PhotometryTK/shadow_mask.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include #include namespace po = boost::program_options; diff --git a/src/asp/PhotometryTK/tests/Makefile.am b/src/asp/PhotometryTK/tests/Makefile.am index f2cb7c748..68d7f6bc4 100644 --- a/src/asp/PhotometryTK/tests/Makefile.am +++ b/src/asp/PhotometryTK/tests/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/PhotometryTK/tests/TestAlbedoAccumulators.cxx b/src/asp/PhotometryTK/tests/TestAlbedoAccumulators.cxx index 771eb65fd..56a420cc7 100644 --- a/src/asp/PhotometryTK/tests/TestAlbedoAccumulators.cxx +++ b/src/asp/PhotometryTK/tests/TestAlbedoAccumulators.cxx @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include #include #include diff --git a/src/asp/PhotometryTK/tests/TestErrorAccumulators.cxx b/src/asp/PhotometryTK/tests/TestErrorAccumulators.cxx index 105390100..127dd7583 100644 --- a/src/asp/PhotometryTK/tests/TestErrorAccumulators.cxx +++ b/src/asp/PhotometryTK/tests/TestErrorAccumulators.cxx @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include #include #include diff --git a/src/asp/PhotometryTK/tests/TestFullIteration.cxx b/src/asp/PhotometryTK/tests/TestFullIteration.cxx index 36d24a530..cb3965ca3 100644 --- a/src/asp/PhotometryTK/tests/TestFullIteration.cxx +++ b/src/asp/PhotometryTK/tests/TestFullIteration.cxx @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include #include #include diff --git a/src/asp/PhotometryTK/tests/TestProjectFileIO.cxx b/src/asp/PhotometryTK/tests/TestProjectFileIO.cxx index 67aff6bb3..fc76e21a2 100644 --- a/src/asp/PhotometryTK/tests/TestProjectFileIO.cxx +++ b/src/asp/PhotometryTK/tests/TestProjectFileIO.cxx @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include #include #include diff --git a/src/asp/PhotometryTK/tests/TestProjectService.cxx b/src/asp/PhotometryTK/tests/TestProjectService.cxx index 34a1ca904..0efb3b951 100644 --- a/src/asp/PhotometryTK/tests/TestProjectService.cxx +++ b/src/asp/PhotometryTK/tests/TestProjectService.cxx @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include #include #include diff --git a/src/asp/PhotometryTK/tests/TestTimeAccumulators.cxx b/src/asp/PhotometryTK/tests/TestTimeAccumulators.cxx index c929e59d3..ab1ff909d 100644 --- a/src/asp/PhotometryTK/tests/TestTimeAccumulators.cxx +++ b/src/asp/PhotometryTK/tests/TestTimeAccumulators.cxx @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include #include #include diff --git a/src/asp/Sessions.h b/src/asp/Sessions.h index 99d888598..6735ea333 100644 --- a/src/asp/Sessions.h +++ b/src/asp/Sessions.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/ISIS/Makefile.am b/src/asp/Sessions/ISIS/Makefile.am index e1e0b70aa..4dd9fba16 100644 --- a/src/asp/Sessions/ISIS/Makefile.am +++ b/src/asp/Sessions/ISIS/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/Sessions/ISIS/PhotometricOutlier.cc b/src/asp/Sessions/ISIS/PhotometricOutlier.cc index 3a4f336e8..95bd3aa08 100644 --- a/src/asp/Sessions/ISIS/PhotometricOutlier.cc +++ b/src/asp/Sessions/ISIS/PhotometricOutlier.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/ISIS/PhotometricOutlier.h b/src/asp/Sessions/ISIS/PhotometricOutlier.h index d0067a884..0d064e47f 100644 --- a/src/asp/Sessions/ISIS/PhotometricOutlier.h +++ b/src/asp/Sessions/ISIS/PhotometricOutlier.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/ISIS/StereoSessionIsis.cc b/src/asp/Sessions/ISIS/StereoSessionIsis.cc index 6fd8481bc..659bf1e80 100644 --- a/src/asp/Sessions/ISIS/StereoSessionIsis.cc +++ b/src/asp/Sessions/ISIS/StereoSessionIsis.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/ISIS/StereoSessionIsis.h b/src/asp/Sessions/ISIS/StereoSessionIsis.h index 87f5e8016..0ca641665 100644 --- a/src/asp/Sessions/ISIS/StereoSessionIsis.h +++ b/src/asp/Sessions/ISIS/StereoSessionIsis.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/Keypoint/Makefile.am b/src/asp/Sessions/Keypoint/Makefile.am index 30acfbe8e..b9f85e1ce 100644 --- a/src/asp/Sessions/Keypoint/Makefile.am +++ b/src/asp/Sessions/Keypoint/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/Sessions/Keypoint/StereoSessionKeypoint.cc b/src/asp/Sessions/Keypoint/StereoSessionKeypoint.cc index 8139db67b..7a8f8de73 100644 --- a/src/asp/Sessions/Keypoint/StereoSessionKeypoint.cc +++ b/src/asp/Sessions/Keypoint/StereoSessionKeypoint.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/Keypoint/StereoSessionKeypoint.h b/src/asp/Sessions/Keypoint/StereoSessionKeypoint.h index 58a73c3bd..8f26b6a6a 100644 --- a/src/asp/Sessions/Keypoint/StereoSessionKeypoint.h +++ b/src/asp/Sessions/Keypoint/StereoSessionKeypoint.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/Makefile.am b/src/asp/Sessions/Makefile.am index 22fae0364..cbd6ee7a1 100644 --- a/src/asp/Sessions/Makefile.am +++ b/src/asp/Sessions/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/Sessions/Pinhole/Makefile.am b/src/asp/Sessions/Pinhole/Makefile.am index aa1d3e2c4..131eb733f 100644 --- a/src/asp/Sessions/Pinhole/Makefile.am +++ b/src/asp/Sessions/Pinhole/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/Sessions/Pinhole/StereoSessionPinhole.cc b/src/asp/Sessions/Pinhole/StereoSessionPinhole.cc index 0e73a1bb3..111390a30 100644 --- a/src/asp/Sessions/Pinhole/StereoSessionPinhole.cc +++ b/src/asp/Sessions/Pinhole/StereoSessionPinhole.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/Pinhole/StereoSessionPinhole.h b/src/asp/Sessions/Pinhole/StereoSessionPinhole.h index bf4b0269f..426bc879f 100644 --- a/src/asp/Sessions/Pinhole/StereoSessionPinhole.h +++ b/src/asp/Sessions/Pinhole/StereoSessionPinhole.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/RMAX/Makefile.am b/src/asp/Sessions/RMAX/Makefile.am index f95a875b0..b316373d7 100644 --- a/src/asp/Sessions/RMAX/Makefile.am +++ b/src/asp/Sessions/RMAX/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/Sessions/RMAX/RMAX.cc b/src/asp/Sessions/RMAX/RMAX.cc index 1c44b45fd..60b7cc4d7 100644 --- a/src/asp/Sessions/RMAX/RMAX.cc +++ b/src/asp/Sessions/RMAX/RMAX.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/RMAX/RMAX.h b/src/asp/Sessions/RMAX/RMAX.h index 1fde9893c..e16870b82 100644 --- a/src/asp/Sessions/RMAX/RMAX.h +++ b/src/asp/Sessions/RMAX/RMAX.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/RMAX/StereoSessionRmax.cc b/src/asp/Sessions/RMAX/StereoSessionRmax.cc index a66c2e3a2..541f78faa 100644 --- a/src/asp/Sessions/RMAX/StereoSessionRmax.cc +++ b/src/asp/Sessions/RMAX/StereoSessionRmax.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/RMAX/StereoSessionRmax.h b/src/asp/Sessions/RMAX/StereoSessionRmax.h index 05af0cdfc..03b0b8b31 100644 --- a/src/asp/Sessions/RMAX/StereoSessionRmax.h +++ b/src/asp/Sessions/RMAX/StereoSessionRmax.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/StereoSession.cc b/src/asp/Sessions/StereoSession.cc index 16aab2aaf..df3a487f2 100644 --- a/src/asp/Sessions/StereoSession.cc +++ b/src/asp/Sessions/StereoSession.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Sessions/StereoSession.h b/src/asp/Sessions/StereoSession.h index e1431ec0b..7319f1ed8 100644 --- a/src/asp/Sessions/StereoSession.h +++ b/src/asp/Sessions/StereoSession.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/SpiceIO.h b/src/asp/SpiceIO.h index 20eed5ca2..4914f55e4 100644 --- a/src/asp/SpiceIO.h +++ b/src/asp/SpiceIO.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/SpiceIO/Makefile.am b/src/asp/SpiceIO/Makefile.am index bb466e2cc..89ff3fe31 100644 --- a/src/asp/SpiceIO/Makefile.am +++ b/src/asp/SpiceIO/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/SpiceIO/SpiceUtilities.cc b/src/asp/SpiceIO/SpiceUtilities.cc index 315788a2b..1fc1daadc 100644 --- a/src/asp/SpiceIO/SpiceUtilities.cc +++ b/src/asp/SpiceIO/SpiceUtilities.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/SpiceIO/SpiceUtilities.h b/src/asp/SpiceIO/SpiceUtilities.h index a7a2afb58..2d5a48a6e 100644 --- a/src/asp/SpiceIO/SpiceUtilities.h +++ b/src/asp/SpiceIO/SpiceUtilities.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/SpiceIO/TabulatedDataReader.cc b/src/asp/SpiceIO/TabulatedDataReader.cc index 22663fbe3..7038e5b3c 100644 --- a/src/asp/SpiceIO/TabulatedDataReader.cc +++ b/src/asp/SpiceIO/TabulatedDataReader.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/SpiceIO/TabulatedDataReader.h b/src/asp/SpiceIO/TabulatedDataReader.h index 2da2d5db6..9c8b6b743 100644 --- a/src/asp/SpiceIO/TabulatedDataReader.h +++ b/src/asp/SpiceIO/TabulatedDataReader.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/Makefile.am b/src/asp/Tools/Makefile.am index 400fc1d36..685414df9 100644 --- a/src/asp/Tools/Makefile.am +++ b/src/asp/Tools/Makefile.am @@ -1,5 +1,5 @@ # __BEGIN_LICENSE__ -# Copyright (C) 2006-2009 United States Government as represented by +# Copyright (C) 2006-2010 United States Government as represented by # the Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # __END_LICENSE__ diff --git a/src/asp/Tools/aligndem.cc b/src/asp/Tools/aligndem.cc index ebffa368d..89c9ac17a 100644 --- a/src/asp/Tools/aligndem.cc +++ b/src/asp/Tools/aligndem.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include namespace po = boost::program_options; diff --git a/src/asp/Tools/bundle_adjust.cc b/src/asp/Tools/bundle_adjust.cc index 92e33960e..86a964aa4 100644 --- a/src/asp/Tools/bundle_adjust.cc +++ b/src/asp/Tools/bundle_adjust.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/bundlevis.cc b/src/asp/Tools/bundlevis.cc index 07443f24f..970ede653 100644 --- a/src/asp/Tools/bundlevis.cc +++ b/src/asp/Tools/bundlevis.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/bundlevis.h b/src/asp/Tools/bundlevis.h index 4c6e4a35d..1a8d7ddb9 100644 --- a/src/asp/Tools/bundlevis.h +++ b/src/asp/Tools/bundlevis.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/dem_profile.cc b/src/asp/Tools/dem_profile.cc index e3fdff290..3bb414274 100644 --- a/src/asp/Tools/dem_profile.cc +++ b/src/asp/Tools/dem_profile.cc @@ -1,6 +1,10 @@ // __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. // __END_LICENSE__ + /// \file dem_profile2.cc /// diff --git a/src/asp/Tools/disparitydebug.cc b/src/asp/Tools/disparitydebug.cc index 8b788817f..03e44f308 100644 --- a/src/asp/Tools/disparitydebug.cc +++ b/src/asp/Tools/disparitydebug.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/geodiff.cc b/src/asp/Tools/geodiff.cc index 855751945..efb2117d5 100644 --- a/src/asp/Tools/geodiff.cc +++ b/src/asp/Tools/geodiff.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include namespace po = boost::program_options; diff --git a/src/asp/Tools/hsv_merge.cc b/src/asp/Tools/hsv_merge.cc index 16447226c..426714e77 100644 --- a/src/asp/Tools/hsv_merge.cc +++ b/src/asp/Tools/hsv_merge.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include namespace po = boost::program_options; diff --git a/src/asp/Tools/isis_adjust.cc b/src/asp/Tools/isis_adjust.cc index 2af9d0d23..d3674e18c 100644 --- a/src/asp/Tools/isis_adjust.cc +++ b/src/asp/Tools/isis_adjust.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + /// \file isis_adjust.cc /// /// Utility for performing bundle adjustment of ISIS3 cube files. This diff --git a/src/asp/Tools/isis_adjust.h b/src/asp/Tools/isis_adjust.h index 2aa39891f..3e106327a 100644 --- a/src/asp/Tools/isis_adjust.h +++ b/src/asp/Tools/isis_adjust.h @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + /// \file isis_adjust.h /// /// Utility for performing bundle adjustment of ISIS3 cube files. This diff --git a/src/asp/Tools/orbitviz.cc b/src/asp/Tools/orbitviz.cc index df6feb729..0aaf57ac9 100644 --- a/src/asp/Tools/orbitviz.cc +++ b/src/asp/Tools/orbitviz.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/orthoproject.cc b/src/asp/Tools/orthoproject.cc index fa1f8d55b..754d562e0 100644 --- a/src/asp/Tools/orthoproject.cc +++ b/src/asp/Tools/orthoproject.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/plateorthoproject.cc b/src/asp/Tools/plateorthoproject.cc index 626d57b77..49aecb9c0 100644 --- a/src/asp/Tools/plateorthoproject.cc +++ b/src/asp/Tools/plateorthoproject.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + #include #include #include diff --git a/src/asp/Tools/point2dem.cc b/src/asp/Tools/point2dem.cc index 7f4b7886c..6605963d7 100644 --- a/src/asp/Tools/point2dem.cc +++ b/src/asp/Tools/point2dem.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/point2mesh.cc b/src/asp/Tools/point2mesh.cc index a941af949..c3a19b948 100644 --- a/src/asp/Tools/point2mesh.cc +++ b/src/asp/Tools/point2mesh.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/reconstruct.cc b/src/asp/Tools/reconstruct.cc index f12821a21..0ab084bad 100644 --- a/src/asp/Tools/reconstruct.cc +++ b/src/asp/Tools/reconstruct.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006, 2007 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/results.cc b/src/asp/Tools/results.cc index 9d11c9524..f0a9ecf0e 100644 --- a/src/asp/Tools/results.cc +++ b/src/asp/Tools/results.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/rmax2cahvor.cc b/src/asp/Tools/rmax2cahvor.cc index b7f1e8542..98cdb2f29 100644 --- a/src/asp/Tools/rmax2cahvor.cc +++ b/src/asp/Tools/rmax2cahvor.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/rmax_adjust.cc b/src/asp/Tools/rmax_adjust.cc index 4ffb88127..31631fb83 100644 --- a/src/asp/Tools/rmax_adjust.cc +++ b/src/asp/Tools/rmax_adjust.cc @@ -1,9 +1,10 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ + /// \file rmax_adjust.cc /// diff --git a/src/asp/Tools/stereo.cc b/src/asp/Tools/stereo.cc index 56c5fef4d..0bb25e564 100644 --- a/src/asp/Tools/stereo.cc +++ b/src/asp/Tools/stereo.cc @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/stereo.h b/src/asp/Tools/stereo.h index 4d83d9da5..0162ce589 100644 --- a/src/asp/Tools/stereo.h +++ b/src/asp/Tools/stereo.h @@ -1,5 +1,5 @@ // __BEGIN_LICENSE__ -// Copyright (C) 2006-2009 United States Government as represented by +// Copyright (C) 2006-2010 United States Government as represented by // the Administrator of the National Aeronautics and Space Administration. // All Rights Reserved. // __END_LICENSE__ diff --git a/src/asp/Tools/stereo_correlation.h b/src/asp/Tools/stereo_correlation.h index ca8190c28..18c47ba96 100644 --- a/src/asp/Tools/stereo_correlation.h +++ b/src/asp/Tools/stereo_correlation.h @@ -1,3 +1,9 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + /// \file stereo_correlation.h diff --git a/src/asp/Tools/stereo_filtering.h b/src/asp/Tools/stereo_filtering.h index 2b2882d4e..f8511f605 100644 --- a/src/asp/Tools/stereo_filtering.h +++ b/src/asp/Tools/stereo_filtering.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #ifndef __ASP_STEREO_FILTERING_H__ #define __ASP_STEREO_FILTERING_H__ diff --git a/src/asp/Tools/stereo_preprocessing.h b/src/asp/Tools/stereo_preprocessing.h index da2ec9aa9..cf4a0f00b 100644 --- a/src/asp/Tools/stereo_preprocessing.h +++ b/src/asp/Tools/stereo_preprocessing.h @@ -1,3 +1,9 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + /// \file stereo_preprocessing.h diff --git a/src/asp/Tools/stereo_refinement.h b/src/asp/Tools/stereo_refinement.h index e19b3004b..d60af130a 100644 --- a/src/asp/Tools/stereo_refinement.h +++ b/src/asp/Tools/stereo_refinement.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + /// \file stereo_refinement.h #ifndef __ASP_STEREO_REFINEMENT_H__ diff --git a/src/asp/Tools/stereo_triangulation.h b/src/asp/Tools/stereo_triangulation.h index d26b628dd..14a0f705e 100644 --- a/src/asp/Tools/stereo_triangulation.h +++ b/src/asp/Tools/stereo_triangulation.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + // \file stereo_triangulation #ifndef __ASP_STEREO_TRIANGULATION_H__ diff --git a/src/test/test_main.cc b/src/test/test_main.cc index 9b382e87a..d4482a31c 100644 --- a/src/test/test_main.cc +++ b/src/test/test_main.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + #include #include #include diff --git a/thirdparty/autotroll.mak b/thirdparty/autotroll.mak index d528e1acf..ff46b38bf 100644 --- a/thirdparty/autotroll.mak +++ b/thirdparty/autotroll.mak @@ -1,3 +1,10 @@ +# __BEGIN_LICENSE__ +# Copyright (C) 2006-2010 United States Government as represented by +# the Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# __END_LICENSE__ + + # Makerules. # This file is part of AutoTroll. # Copyright (C) 2006 Benoit Sigoure. diff --git a/thirdparty/cuda.mak b/thirdparty/cuda.mak index 9932fb18a..33857d8ca 100644 --- a/thirdparty/cuda.mak +++ b/thirdparty/cuda.mak @@ -1,3 +1,10 @@ +# __BEGIN_LICENSE__ +# Copyright (C) 2006-2010 United States Government as represented by +# the Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# __END_LICENSE__ + + # Makerules. NVCC=nvcc diff --git a/thirdparty/gtest/include/gtest/gtest.h b/thirdparty/gtest/include/gtest/gtest.h index c0a1902e2..c175d9b0a 100644 --- a/thirdparty/gtest/include/gtest/gtest.h +++ b/thirdparty/gtest/include/gtest/gtest.h @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + // Copyright 2005, Google Inc. // All rights reserved. // diff --git a/thirdparty/gtest/src/gtest-all.cc b/thirdparty/gtest/src/gtest-all.cc index 644479a63..c676f785e 100644 --- a/thirdparty/gtest/src/gtest-all.cc +++ b/thirdparty/gtest/src/gtest-all.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + // Copyright 2008, Google Inc. // All rights reserved. // diff --git a/thirdparty/gtest/src/gtest_main.cc b/thirdparty/gtest/src/gtest_main.cc index d20c02fdf..c1b9d8658 100644 --- a/thirdparty/gtest/src/gtest_main.cc +++ b/thirdparty/gtest/src/gtest_main.cc @@ -1,3 +1,10 @@ +// __BEGIN_LICENSE__ +// Copyright (C) 2006-2010 United States Government as represented by +// the Administrator of the National Aeronautics and Space Administration. +// All Rights Reserved. +// __END_LICENSE__ + + // Copyright 2006, Google Inc. // All rights reserved. // diff --git a/thirdparty/m4/autotroll.m4 b/thirdparty/m4/autotroll.m4 index 0d71db38c..0f8519832 100644 --- a/thirdparty/m4/autotroll.m4 +++ b/thirdparty/m4/autotroll.m4 @@ -1,3 +1,10 @@ +dnl __BEGIN_LICENSE__ +dnl Copyright (C) 2006-2010 United States Government as represented by +dnl the Administrator of the National Aeronautics and Space Administration. +dnl All Rights Reserved. +dnl __END_LICENSE__ + + # Build Qt apps with the autotools (Autoconf/Automake). # M4 macros. # This file is part of AutoTroll. diff --git a/thirdparty/protobuf.mak b/thirdparty/protobuf.mak index 133f6670a..fa22d7c2b 100644 --- a/thirdparty/protobuf.mak +++ b/thirdparty/protobuf.mak @@ -1,3 +1,10 @@ +# __BEGIN_LICENSE__ +# Copyright (C) 2006-2010 United States Government as represented by +# the Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# __END_LICENSE__ + + ######################################################################## # rules for compiling Google Protocol Buffers (using protoc) ########################################################################