5 files changed, 50 insertions, 19 deletions

diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile
index 88bd5552384b..72f02070622c 100644
--- a/graphics/visionworkbench/Makefile
+++ b/graphics/visionworkbench/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	visionworkbench
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://ti.arc.nasa.gov/m/project/nasa-vision-workbench/
 DISTNAME=	VisionWorkbench-${PORTVERSION}
diff --git a/graphics/visionworkbench/distinfo b/graphics/visionworkbench/distinfo
index 08eca11c1263..c7dcf5ea0bce 100644
--- a/graphics/visionworkbench/distinfo
+++ b/graphics/visionworkbench/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VisionWorkbench-2.1.0.tar.gz) = c0dca6b95c5daf4a7e2e4dafa91ccbf0d4baa06074556d83cb7f8f8a49295b9f
-SIZE (VisionWorkbench-2.1.0.tar.gz) = 15861504
+SHA256 (VisionWorkbench-2.2.0.tar.gz) = 6de25ddadfa08ecffeefc68911e96306a47a022efc3aabfb5d7bb526790a8353
+SIZE (VisionWorkbench-2.2.0.tar.gz) = 15855789
diff --git a/graphics/visionworkbench/files/patch-src__vw__FileIO__JpegIO.h b/graphics/visionworkbench/files/patch-src__vw__FileIO__JpegIO.h
new file mode 100644
index 000000000000..f4d8abc51613
--- /dev/null
+++ b/graphics/visionworkbench/files/patch-src__vw__FileIO__JpegIO.h
@@ -0,0 +1,10 @@
+--- ./src/vw/FileIO/JpegIO.h.orig	2011-06-28 20:33:29.794509350 -0400
++++ ./src/vw/FileIO/JpegIO.h	2011-06-28 20:34:22.289507903 -0400
+@@ -4,6 +4,7 @@
+ // All Rights Reserved.
+ // __END_LICENSE__
+ 
++#include <stdio.h>
+ 
+ #ifndef __VW_FILEIO_JPEGIO_H__
+ #define __VW_FILEIO_JPEGIO_H__
diff --git a/graphics/visionworkbench/pkg-descr b/graphics/visionworkbench/pkg-descr
index 0b0ffac4db64..7f1dd9c46fe4 100644
--- a/graphics/visionworkbench/pkg-descr
+++ b/graphics/visionworkbench/pkg-descr
@@ -1,4 +1,4 @@
 The NASA Vision Workbench (VW) is a general purpose image processing and
 computer vision library.
 
-WWW:	http://ti.arc.nasa.gov/project/nasa-vision-workbench/
+WWW:	http://ti.arc.nasa.gov/tech/asr/intelligent-robotics/nasa-vision-workbench/
diff --git a/graphics/visionworkbench/pkg-plist b/graphics/visionworkbench/pkg-plist
index cdad02315c22..9d4fd6511c72 100644
--- a/graphics/visionworkbench/pkg-plist
+++ b/graphics/visionworkbench/pkg-plist
@@ -1,6 +1,5 @@
 bin/bayer
 bin/blend
-bin/cnet_editor
 bin/colormap
 bin/contourgen
 bin/correlate
@@ -23,7 +22,6 @@ include/vw/BundleAdjustment/AdjustBase.h
 include/vw/BundleAdjustment/AdjustRef.h
 include/vw/BundleAdjustment/AdjustRobustRef.h
 include/vw/BundleAdjustment/AdjustRobustSparse.h
-include/vw/BundleAdjustment/AdjustRobustSparseKGCP.h
 include/vw/BundleAdjustment/AdjustSparse.h
 include/vw/BundleAdjustment/BundleAdjustReport.h
 include/vw/BundleAdjustment/CameraRelation.h
@@ -33,6 +31,7 @@ include/vw/BundleAdjustment/ModelBase.h
 include/vw/Camera.h
 include/vw/Camera/BayerFilter.h
 include/vw/Camera/CAHVModel.h
+include/vw/Camera/CAHVOREModel.h
 include/vw/Camera/CAHVORModel.h
 include/vw/Camera/CameraGeometry.h
 include/vw/Camera/CameraModel.h
@@ -59,6 +58,7 @@ include/vw/Cartography/PointImageManipulation.h
 include/vw/Cartography/Projection.h
 include/vw/Cartography/SimplePointImageManipulation.h
 include/vw/Cartography/ToastTransform.h
+include/vw/Cartography/detail/BresenhamLine.h
 include/vw/Core.h
 include/vw/Core/Cache.h
 include/vw/Core/CompoundTypes.h
@@ -72,6 +72,8 @@ include/vw/Core/Log.h
 include/vw/Core/ProgressCallback.h
 include/vw/Core/Settings.h
 include/vw/Core/Stopwatch.h
+include/vw/Core/System.h
+include/vw/Core/TemporaryFile.h
 include/vw/Core/Thread.h
 include/vw/Core/ThreadPool.h
 include/vw/Core/ThreadQueue.h
@@ -86,7 +88,15 @@ include/vw/FileIO/DiskImageResourcePBM.h
 include/vw/FileIO/DiskImageResourcePDS.h
 include/vw/FileIO/DiskImageResourcePNG.h
 include/vw/FileIO/DiskImageView.h
+include/vw/FileIO/GdalIO.h
+include/vw/FileIO/JpegIO.h
 include/vw/FileIO/KML.h
+include/vw/FileIO/MemoryImageResource.h
+include/vw/FileIO/MemoryImageResourceGDAL.h
+include/vw/FileIO/MemoryImageResourceJPEG.h
+include/vw/FileIO/MemoryImageResourcePNG.h
+include/vw/FileIO/PngIO.h
+include/vw/FileIO/ScanlineIO.h
 include/vw/HDR.h
 include/vw/HDR/CameraCurve.h
 include/vw/HDR/GlobalToneMap.h
@@ -105,6 +115,7 @@ include/vw/Image/ImageIO.h
 include/vw/Image/ImageMath.h
 include/vw/Image/ImageResource.h
 include/vw/Image/ImageResourceImpl.h
+include/vw/Image/ImageResourceStream.h
 include/vw/Image/ImageResourceView.h
 include/vw/Image/ImageView.h
 include/vw/Image/ImageViewBase.h
@@ -174,6 +185,7 @@ include/vw/Mosaic/GMapQuadTreeConfig.h
 include/vw/Mosaic/GigapanQuadTreeConfig.h
 include/vw/Mosaic/ImageComposite.h
 include/vw/Mosaic/KMLQuadTreeConfig.h
+include/vw/Mosaic/QuadTreeConfig.h
 include/vw/Mosaic/QuadTreeGenerator.h
 include/vw/Mosaic/TMSQuadTreeConfig.h
 include/vw/Mosaic/ToastQuadTreeConfig.h
@@ -181,6 +193,9 @@ include/vw/Mosaic/UniviewQuadTreeConfig.h
 include/vw/Stereo.h
 include/vw/Stereo/AffineMixtureComponent.h
 include/vw/Stereo/Correlate.h
+include/vw/Stereo/Correlate.tcc
+include/vw/Stereo/CorrelateResearch.h
+include/vw/Stereo/CorrelateResearch.tcc
 include/vw/Stereo/CorrelatorView.h
 include/vw/Stereo/DisparityMap.h
 include/vw/Stereo/EMSubpixelCorrelatorView.h
@@ -196,45 +211,51 @@ include/vw/Stereo/StereoView.h
 include/vw/Stereo/SubpixelView.h
 include/vw/Stereo/UniformMixtureComponent.h
 include/vw/config.h
+include/vw/tools.h
+include/vw/tools/Common.h
 include/vw/vw.h
-lib/libvw-2.1.0.so
+lib/libvw-2.2.0.so
 lib/libvw.la
 lib/libvw.so
-lib/libvwBundleAdjustment-2.1.0.so
+lib/libvwBundleAdjustment-2.2.0.so
 lib/libvwBundleAdjustment.la
 lib/libvwBundleAdjustment.so
-lib/libvwCamera-2.1.0.so
+lib/libvwCamera-2.2.0.so
 lib/libvwCamera.la
 lib/libvwCamera.so
-lib/libvwCartography-2.1.0.so
+lib/libvwCartography-2.2.0.so
 lib/libvwCartography.la
 lib/libvwCartography.so
-lib/libvwCore-2.1.0.so
+lib/libvwCore-2.2.0.so
 lib/libvwCore.la
 lib/libvwCore.so
-lib/libvwFileIO-2.1.0.so
+lib/libvwFileIO-2.2.0.so
 lib/libvwFileIO.la
 lib/libvwFileIO.so
-lib/libvwHDR-2.1.0.so
+lib/libvwHDR-2.2.0.so
 lib/libvwHDR.la
 lib/libvwHDR.so
-lib/libvwImage-2.1.0.so
+lib/libvwImage-2.2.0.so
 lib/libvwImage.la
 lib/libvwImage.so
-lib/libvwInterestPoint-2.1.0.so
+lib/libvwInterestPoint-2.2.0.so
 lib/libvwInterestPoint.la
 lib/libvwInterestPoint.so
-lib/libvwMath-2.1.0.so
+lib/libvwMath-2.2.0.so
 lib/libvwMath.la
 lib/libvwMath.so
-lib/libvwMosaic-2.1.0.so
+lib/libvwMosaic-2.2.0.so
 lib/libvwMosaic.la
 lib/libvwMosaic.so
-lib/libvwStereo-2.1.0.so
+lib/libvwStereo-2.2.0.so
 lib/libvwStereo.la
 lib/libvwStereo.so
+lib/libvwTools-2.2.0.so
+lib/libvwTools.la
+lib/libvwTools.so
 @dirrm include/vw/BundleAdjustment
 @dirrm include/vw/Camera
+@dirrm include/vw/Cartography/detail
 @dirrm include/vw/Cartography
 @dirrm include/vw/Core
 @dirrm include/vw/FileIO
@@ -244,4 +265,5 @@ lib/libvwStereo.so
 @dirrm include/vw/Math
 @dirrm include/vw/Mosaic
 @dirrm include/vw/Stereo
+@dirrm include/vw/tools
 @dirrm include/vw