Permalink
Browse files

all: Relicense VW as Apache 2

All our products from the Map makers is now Apache 2! Neeeaatt.
  • Loading branch information...
1 parent b946d01 commit 426c2c32c0955808d76d376d54fd9adbc7fafcd1 Zack Moratto committed Jun 5, 2012
Showing 857 changed files with 12,267 additions and 2,937 deletions.
View
Oops, something went wrong.
View
@@ -1,35 +1,29 @@
# __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-2012, United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. All
+# rights reserved.
+#
+# The NASA Vision Workbench is licensed under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
# __END_LICENSE__
Requirements
============
-If you are reading this document then you already have a copy of the
-Vision Workbench sources. You may want to confirm that you have the
-most most up-to-date distribution, which will always be available from
+If you are reading this document then you already have a copy of the
+Vision Workbench sources. You may want to confirm that you have the
+most most up-to-date distribution, which will always be available from
the NASA Ames open-source software website, at:
- http://ti.arc.nasa.gov/visionworkbench
+ http://irg.arc.nasa.gov/nasa-vision-workbench
There you will also be able to download an up-to-date copy of the
user's guide, called the Vision Workbook, which contains a more
complete description of how to get started with the Vision Workbench.
@@ -191,35 +185,35 @@ variable is, of course, called "PREFIX".
Common Problems
===============
-* I have (library X) installed in one location that I want to use, and
-there's another version installed system-wide. How do I get Vision
+* I have (library X) installed in one location that I want to use, and
+there's another version installed system-wide. How do I get Vision
Workbench to build with the version I want?
-Due to limitations in the underlying build system tools, the
-autodetection will always detect the system-installed library and ignore
-different installations, even if the PKG_PATHS environment variable is
-set. To get around this, set the following environment variables (where
-X is the name of the library as known by the configure script's
+Due to limitations in the underlying build system tools, the
+autodetection will always detect the system-installed library and ignore
+different installations, even if the PKG_PATHS environment variable is
+set. To get around this, set the following environment variables (where
+X is the name of the library as known by the configure script's
--with-X, in caps):
HAVE_PKG_X=yes
PKG_X_CPPFLAGS="-I/path/to/include/directory"
PKG_X_LDFLAGS="-L/path/to/library/directory"
-(These can be set in the config.options file.) Vision Workbench should
+(These can be set in the config.options file.) Vision Workbench should
then link against the library in the location specified in this manner.
* Vision Workbench crashes when opening a TIFF/GeoTIFF file!
-When linking against a GDAL library that uses an internal libtiff, the
-opening of TIFF files can fail to function correctly when Vision
-Workbench also links against another libtiff. To see whether or not
-GDAL is using an internal libtiff, run ldd on the gdal library and
-check its linkage; if it does not link, then check gdalinfo --format.
-If GTiff is supported, and ldd says that the gdal library is not linked
+When linking against a GDAL library that uses an internal libtiff, the
+opening of TIFF files can fail to function correctly when Vision
+Workbench also links against another libtiff. To see whether or not
+GDAL is using an internal libtiff, run ldd on the gdal library and
+check its linkage; if it does not link, then check gdalinfo --format.
+If GTiff is supported, and ldd says that the gdal library is not linked
against libtiff, then GDAL is using an internal libtiff library.
-In that case, you will want to disable libtiff. Add "--without-tiff" to
-the ./configure command line. This does not effect the functionality of
+In that case, you will want to disable libtiff. Add "--without-tiff" to
+the ./configure command line. This does not effect the functionality of
Vision Workbench, as it will use GDAL to open TIFF files instead.
View
@@ -1,7 +1,18 @@
# __BEGIN_LICENSE__
-# Copyright (C) 2006-2010 United States Government as represented by
-# the Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
+# Copyright (c) 2006-2012, United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. All
+# rights reserved.
+#
+# The NASA Vision Workbench is licensed under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
# __END_LICENSE__
View
@@ -15,7 +15,6 @@ pixel data types as well as a range of fundamental image processing
operations. The other modules provided in this release are:
* Math: geometric, numeric, and other mathematical types and functions
- * GPU: accelerated image processing using commodity graphics hardware
* HDR: creating, processing, and compressing high dynamic range images
* InterestPoint: Detecting, tracking, and matching interest points
* Mosaic: compositing, blending, and manipulating 2D image mosaics
@@ -30,22 +29,20 @@ detail in section 3, "LIBRARY STRUCTURE".
A. Copyright and License Summary
-Copyright (C) 2009 United States Government as represented by the
-Administrator of the National Aeronautics and Space Administration
-(NASA). All Rights Reserved.
+Copyright (c) 2006-2012, United States Government as represented by the
+Administrator of the National Aeronautics and Space Administration. 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 NASA Vision Workbench is licensed under the Apache License,
+Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
-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.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
B. Third-Party Libraries
@@ -114,17 +111,7 @@ platforms we provide public-domain implementations automatically
translated from the original Fortran and taken from the online Netlib
repository.
-C. GPU Module
-
-Most modern graphics hardware includes a general-purpose graphics
-processing unit (GPU), and this module provides an interface to take
-advantage of that high-performance hardware for a variety of basic
-image-processing operations. Under Linux it requires that you have
-installed the OpenGL interface library GLEW. It can optionally also
-take advantage of the NVIDIA CG library, which provides an alternative
-low-level framework which may be preferable on some graphics hardware.
-
-D. HDR Module
+C. HDR Module
While the core Vision Workbench library supports working with high
dynamic range (HDR) image data directly, most input and output devices
@@ -134,15 +121,15 @@ generating HDR images from collections of ordinary images as well as
providing several methods to compress HDR images for display on ordinary
output devices.
-E. InterestPoint Module
+D. InterestPoint Module
Interest points are points in an image that can be reliably detected and
tracked, such as corners or peaks. This module provides tools for
locating interest points in images in a variety of ways. It can also
generate local descriptors for those points using several methods which
can then be used to locate corresponding points in sets of images.
-F. Mosaic Module
+E. Mosaic Module
The Mosaic module provides tools for working with large images
assembled from many smaller images, such as panoramas or aerial maps.
@@ -151,7 +138,7 @@ blending the images in the mosaic to create a single large image, and
dicing the extremely large images that result into better formats for
visualization.
-G. Camera Module
+F. Camera Module
The Camera module provides a variety of data types and tools for
working with camera models and camera data. Most notably it includes
@@ -160,7 +147,7 @@ transform images between camera models, and the ability to interpret
camera data stored in the EXIF headers of image files generated by
digital cameras.
-H. Cartography Module
+G. Cartography Module
The Cartography module provides a variety of 2D and 3D mapping
capabilities. It allows you to georeference an image, specifying its
@@ -170,7 +157,7 @@ desired projection. It requires the PROJ.4 cartographic projection
library, and also optionally depends on the GDAL library which
provides support for a variety of GIS file formats.
-I. Testing Frameworks
+H. Testing Frameworks
Each module includes a collection of tests located in that module's
"tests/" subdirectory. You can use these tests to confirm that the
@@ -188,7 +175,7 @@ A. Obtaining the Software
If you are reading this text then presumably you have a copy of
the software. However, you can obtain the most recent version from
- http://ti.arc.nasa.gov/visionworkbench
+ http://irg.arc.nasa.gov/nasa-vision-workbench
Before attempting to configure, build or install the Vision Workbench
you should obtain and install any prerequisite libraries that you
@@ -206,9 +193,7 @@ documentation for details.
+---------+--------------------+------------------------------------+
| Boost | Core, etc. (req.) | http://www.boost.org/ |
| PROJ.4 | Cartography (req.) | http://www.remotesensing.org/proj/ |
-| GDAL | Cartography (opt.) | http://www.remotesensing.org/gdal/ |
-| GLEW | GPU (req.) | http://glew.sourceforge.net/ |
-| CG | GPU (opt.) | http://developer.nvidia.com/ |
+| GDAL | Cart/FileIO (opt.) | http://www.remotesensing.org/gdal/ |
| PNG | FileIO (opt.) | http://www.libpng.org/ |
| JPEG | FileIO (opt.) | http://www.ijg.org/ |
| TIFF | FileIO (opt.) | http://www.libtiff.org/ |
@@ -1,29 +1,22 @@
#! /bin/sh
# __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-2012, United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. All
+# rights reserved.
+#
+# The NASA Vision Workbench is licensed under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
# __END_LICENSE__
-
### config.options.example
#
# This file demonstrates how to configure the NASA Vision Workbench
View
@@ -1,7 +1,18 @@
# __BEGIN_LICENSE__
-# Copyright (C) 2006-2010 United States Government as represented by
-# the Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
+# Copyright (c) 2006-2012, United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. All
+# rights reserved.
+#
+# The NASA Vision Workbench is licensed under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
# __END_LICENSE__
View
@@ -1,7 +1,18 @@
# __BEGIN_LICENSE__
-# Copyright (C) 2006-2010 United States Government as represented by
-# the Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
+# Copyright (c) 2006-2012, United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. All
+# rights reserved.
+#
+# The NASA Vision Workbench is licensed under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
# __END_LICENSE__
View
@@ -1,7 +1,18 @@
# __BEGIN_LICENSE__
-# Copyright (C) 2006-2010 United States Government as represented by
-# the Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
+# Copyright (c) 2006-2012, United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration. All
+# rights reserved.
+#
+# The NASA Vision Workbench is licensed under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
# __END_LICENSE__
@@ -6,10 +6,9 @@ \chapter{Introduction}
effort of the Intelligent Robotics Group (IRG) and the Adaptive
Control and Evolvable Systems Group (ACES) within the Intelligent
Systems Division at the NASA Ames Research Center in Moffett Field,
-California. It is distributed under the NASA Open Source Agreement
-(NOSA) version 1.3, which has been certified by the Open Source
-Initiative (OSI). A copy of this agreement is included with every
-distribution of the Vision Workbench in a file called {\tt COPYING}.
+California. It is distributed under the Apach License, Version 2.0.
+A copy of this agreement is included with every distribution of the
+Vision Workbench in a file called {\tt COPYING}.
You can think of the Vision Workbench as a ``second-generation'' C/C++
image processing library. It draws on the authors' experiences over
Oops, something went wrong.

0 comments on commit 426c2c3

Please sign in to comment.