Changes 1.8.0:

* Various extensions to Local Minima and Maxima (3D algorithms, on-the-fly
  thresholding).
* Added vigra::BucketQueue, vigra::MappedBucketQueue.
* Refactored and extended 2D watershed algorithms (especially
  watershedsRegionGrowing()).
* Added the vigra::Quaternion class.
* Added Unsupervised Decomposition.
* Added mathematical functions (even(), odd(), gamma(), loggamma(), legendre(),
  besselJ(), besselY(), linearSequence(), indexSort(), inversePermutation(),
  applyPermutation(), checksum())
* Implemented wrapper of the FFTW library to support arbitrary dimensional
  Fourier transforms (see fourierTransform() and vigra::FFTWPlan) and FFT-based
  convolution (see convolveFFT() and vigra::FFTWConvolvePlan) and refactored
  vigra::FFTWComplex.
* Added cannyEdgelListThreshold(), cannyEdgelList3x3Threshold().
* Added capability to handle subarrays and anisotropic resolution to
  separableConvolveMultiArray() and related Gaussian filters. Added windowRatio
  parameters to vigra::Kernel1D::initGaussian() and
  vigra::Kernel1D::initGaussianDerivative()
* Added vigra::StridedScanOrderIterator and corresponding
  vigra::MultiArrayView::begin().
* Extended vigra::MultiArrayView. Added vigra::Shape1 ... vigra::Shape5
  convenience typedefs.
* Implemented vigra::multi_math (arithmetic and algebraic functions for
  multi-dimensional arrays).
* Extended the vigra::HDF5File class.
* Improved and documented the Timing macros for runtime measurements.
* Added support for the OpenEXR image format and multi-page TIFF. Improved
  support for the SIF format.
* vigranumpy: added axistags and completly re-implemented VigraArray and the
  conversion between Python and C++ arrays in terms of axistags.
* Minor improvements and bug fixes in the code and documentation.

5 files changed, 243 insertions, 223 deletions

diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 724e2418e99..c7f32fb6dbb 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2011/05/02 12:57:22 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2011/10/16 17:47:49 adam Exp $
 
-DISTNAME=	vigra-1.7.1-src
+DISTNAME=	vigra-1.8.0-src
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://hci.iwr.uni-heidelberg.de/vigra/
 
@@ -29,6 +28,7 @@ SUBST_FILES.python+=	config/vigra-config.in
 # Update when PYTHON_VERSION_DEFAULT changes!
 SUBST_SED.python+=	-e 's,/usr/bin/env.*python,${PREFIX}/bin/python2.6,'
 SUBST_MESSAGE.python=	Fixing path to python.
+
 # Package doesn't need dependency, only packages using the script,
 # usually during configure, so don't depend on python.
 CHECK_INTERPRETER_SKIP=	bin/vigra-config
@@ -36,6 +36,7 @@ CHECK_INTERPRETER_SKIP=	bin/vigra-config
 .include "options.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/graphics/vigra/PLIST b/graphics/vigra/PLIST
index 10c885f09d8..e888807ea34 100644
--- a/graphics/vigra/PLIST
+++ b/graphics/vigra/PLIST
@@ -1,17 +1,22 @@
-@comment $NetBSD: PLIST,v 1.4 2011/01/29 16:29:03 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/10/16 17:47:49 adam Exp $
 bin/vigra-config
 include/vigra/accessor.hxx
 include/vigra/affine_registration.hxx
 include/vigra/affinegeometry.hxx
+include/vigra/algorithm.hxx
 include/vigra/array_vector.hxx
+include/vigra/axistags.hxx
 include/vigra/basicgeometry.hxx
 include/vigra/basicimage.hxx
 include/vigra/basicimageview.hxx
+include/vigra/bessel.hxx
 include/vigra/bordertreatment.hxx
 include/vigra/boundarytensor.hxx
 include/vigra/box.hxx
+include/vigra/bucket_queue.hxx
 include/vigra/cellconfigurations.hxx
 include/vigra/cellimage.hxx
+include/vigra/clebsch-gordan.hxx
 include/vigra/codec.hxx
 include/vigra/colorconversions.hxx
 include/vigra/combineimages.hxx
@@ -44,6 +49,7 @@ include/vigra/impex.hxx
 include/vigra/initimage.hxx
 include/vigra/inspectimage.hxx
 include/vigra/interpolating_accessor.hxx
+include/vigra/invariant_features3D.hxx
 include/vigra/iteratoradapter.hxx
 include/vigra/iteratortags.hxx
 include/vigra/iteratortraits.hxx
@@ -62,9 +68,13 @@ include/vigra/metaprogramming.hxx
 include/vigra/multi_array.hxx
 include/vigra/multi_convolution.hxx
 include/vigra/multi_distance.hxx
+include/vigra/multi_fft.hxx
 include/vigra/multi_impex.hxx
 include/vigra/multi_iterator.hxx
+include/vigra/multi_localminmax.hxx
+include/vigra/multi_math.hxx
 include/vigra/multi_morphology.hxx
+include/vigra/multi_opencl.hxx
 include/vigra/multi_pointoperators.hxx
 include/vigra/multi_resize.hxx
 include/vigra/multi_tensorutilities.hxx
@@ -74,6 +84,8 @@ include/vigra/nonlineardiffusion.hxx
 include/vigra/numerictraits.hxx
 include/vigra/numpy_array.hxx
 include/vigra/numpy_array_converters.hxx
+include/vigra/numpy_array_taggedshape.hxx
+include/vigra/numpy_array_traits.hxx
 include/vigra/orientedtensorfilters.hxx
 include/vigra/pixelneighborhood.hxx
 include/vigra/polygon.hxx
@@ -82,6 +94,7 @@ include/vigra/promote_traits.hxx
 include/vigra/promote_traits.hxx.py
 include/vigra/python_utility.hxx
 include/vigra/quadprog.hxx
+include/vigra/quaternion.hxx
 include/vigra/random.hxx
 include/vigra/random_forest.hxx
 include/vigra/random_forest/features.hxx
@@ -128,14 +141,16 @@ include/vigra/tinyvector.hxx
 include/vigra/transformimage.hxx
 include/vigra/tuple.hxx
 include/vigra/union_find.hxx
+include/vigra/unsupervised_decomposition.hxx
 include/vigra/utilities.hxx
 include/vigra/voxelneighborhood.hxx
 include/vigra/watersheds.hxx
 include/vigra/watersheds3d.hxx
+include/vigra/wigner-matrix.hxx
 include/vigra/windows.h
 lib/libvigraimpex.so
-lib/libvigraimpex.so.3
-lib/libvigraimpex.so.3.171
+lib/libvigraimpex.so.4
+lib/libvigraimpex.so.4.180
 lib/vigra/VigraConfig.cmake
 lib/vigra/VigraConfigVersion.cmake
 lib/vigra/vigra-targets-release.cmake
@@ -173,25 +188,32 @@ share/doc/vigra/PromoteTraits.html
 share/doc/vigra/RGBValueTraits.html
 share/doc/vigra/RationalTraits.html
 share/doc/vigra/SquareRootTraits.html
+share/doc/vigra/TimingMacros.html
 share/doc/vigra/TinyVectorTraits.html
 share/doc/vigra/TupleTypes.html
 share/doc/vigra/Utilities.html
 share/doc/vigra/VigraMatlab.html
-share/doc/vigra/accessor_8hxx-source.html
-share/doc/vigra/affine__registration_8hxx-source.html
-share/doc/vigra/affinegeometry_8hxx-source.html
+share/doc/vigra/accessor_8hxx_source.html
+share/doc/vigra/affine__registration_8hxx_source.html
+share/doc/vigra/affinegeometry_8hxx_source.html
+share/doc/vigra/algorithm_8hxx_source.html
 share/doc/vigra/annotated.html
-share/doc/vigra/array__vector_8hxx-source.html
-share/doc/vigra/basicgeometry_8hxx-source.html
-share/doc/vigra/basicimage_8hxx-source.html
-share/doc/vigra/basicimageview_8hxx-source.html
-share/doc/vigra/binary_8hxx-source.html
-share/doc/vigra/bordertreatment_8hxx-source.html
-share/doc/vigra/boundarytensor_8cxx-example.html
-share/doc/vigra/boundarytensor_8hxx-source.html
-share/doc/vigra/box_8hxx-source.html
-share/doc/vigra/cellconfigurations_8hxx-source.html
-share/doc/vigra/cellimage_8hxx-source.html
+share/doc/vigra/array__vector_8hxx_source.html
+share/doc/vigra/axistags_8hxx_source.html
+share/doc/vigra/basicgeometry_8hxx_source.html
+share/doc/vigra/basicimage_8hxx_source.html
+share/doc/vigra/basicimageview_8hxx_source.html
+share/doc/vigra/bessel_8hxx_source.html
+share/doc/vigra/bordertreatment_8hxx_source.html
+share/doc/vigra/boundarytensor.cxx-example.html
+share/doc/vigra/boundarytensor_8hxx_source.html
+share/doc/vigra/box_8hxx_source.html
+share/doc/vigra/bucket__queue_8hxx_source.html
+share/doc/vigra/cellconfigurations_8hxx_source.html
+share/doc/vigra/cellimage_8hxx_source.html
+share/doc/vigra/classcl__TYPE3WriteAccessor__s1.html
+share/doc/vigra/classcl__TYPE3WriteAccessor__s2.html
+share/doc/vigra/classcl__charNAccessor__COMP.html
 share/doc/vigra/classes.html
 share/doc/vigra/classvigra_1_1ArrayOfRegionStatistics-members.html
 share/doc/vigra/classvigra_1_1ArrayOfRegionStatistics.html
@@ -214,7 +236,6 @@ share/doc/vigra/classvigra_1_1BasicImageIterator.html
 share/doc/vigra/classvigra_1_1BasicImageIterator.png
 share/doc/vigra/classvigra_1_1BasicImageIteratorBase-members.html
 share/doc/vigra/classvigra_1_1BasicImageIteratorBase.html
-share/doc/vigra/classvigra_1_1BasicImageIteratorBase.png
 share/doc/vigra/classvigra_1_1BasicImageView-members.html
 share/doc/vigra/classvigra_1_1BasicImageView.html
 share/doc/vigra/classvigra_1_1BestGiniOfColumn-members.html
@@ -227,6 +248,9 @@ share/doc/vigra/classvigra_1_1Box-members.html
 share/doc/vigra/classvigra_1_1Box.html
 share/doc/vigra/classvigra_1_1BrightnessContrastFunctor-members.html
 share/doc/vigra/classvigra_1_1BrightnessContrastFunctor.html
+share/doc/vigra/classvigra_1_1BucketQueue-members.html
+share/doc/vigra/classvigra_1_1BucketQueue.html
+share/doc/vigra/classvigra_1_1BucketQueue.png
 share/doc/vigra/classvigra_1_1CatmullRomSpline-members.html
 share/doc/vigra/classvigra_1_1CatmullRomSpline.html
 share/doc/vigra/classvigra_1_1ColumnIterator-members.html
@@ -242,6 +266,8 @@ share/doc/vigra/classvigra_1_1ConstStridedImageIterator.html
 share/doc/vigra/classvigra_1_1ConstStridedImageIterator.png
 share/doc/vigra/classvigra_1_1ConstValueIterator-members.html
 share/doc/vigra/classvigra_1_1ConstValueIterator.html
+share/doc/vigra/classvigra_1_1ConvolutionOptions-members.html
+share/doc/vigra/classvigra_1_1ConvolutionOptions.html
 share/doc/vigra/classvigra_1_1CoscotFunction-members.html
 share/doc/vigra/classvigra_1_1CoscotFunction.html
 share/doc/vigra/classvigra_1_1CrackContourCirculator-members.html
@@ -265,15 +291,21 @@ share/doc/vigra/classvigra_1_1EntropyCriterion-members.html
 share/doc/vigra/classvigra_1_1EntropyCriterion.html
 share/doc/vigra/classvigra_1_1FFTWComplex-members.html
 share/doc/vigra/classvigra_1_1FFTWComplex.html
+share/doc/vigra/classvigra_1_1FFTWConvolvePlan-members.html
+share/doc/vigra/classvigra_1_1FFTWConvolvePlan.html
 share/doc/vigra/classvigra_1_1FFTWImaginaryAccessor-members.html
 share/doc/vigra/classvigra_1_1FFTWImaginaryAccessor.html
 share/doc/vigra/classvigra_1_1FFTWMagnitudeAccessor-members.html
 share/doc/vigra/classvigra_1_1FFTWMagnitudeAccessor.html
 share/doc/vigra/classvigra_1_1FFTWPhaseAccessor-members.html
 share/doc/vigra/classvigra_1_1FFTWPhaseAccessor.html
+share/doc/vigra/classvigra_1_1FFTWPlan-members.html
+share/doc/vigra/classvigra_1_1FFTWPlan.html
 share/doc/vigra/classvigra_1_1FFTWRealAccessor-members.html
 share/doc/vigra/classvigra_1_1FFTWRealAccessor.html
 share/doc/vigra/classvigra_1_1FFTWRealAccessor.png
+share/doc/vigra/classvigra_1_1FFTWSquaredMagnitudeAccessor-members.html
+share/doc/vigra/classvigra_1_1FFTWSquaredMagnitudeAccessor.html
 share/doc/vigra/classvigra_1_1FFTWWriteRealAccessor-members.html
 share/doc/vigra/classvigra_1_1FFTWWriteRealAccessor.html
 share/doc/vigra/classvigra_1_1FFTWWriteRealAccessor.png
@@ -328,7 +360,6 @@ share/doc/vigra/classvigra_1_1ImageIterator.html
 share/doc/vigra/classvigra_1_1ImageIterator.png
 share/doc/vigra/classvigra_1_1ImageIteratorBase-members.html
 share/doc/vigra/classvigra_1_1ImageIteratorBase.html
-share/doc/vigra/classvigra_1_1ImageIteratorBase.png
 share/doc/vigra/classvigra_1_1ImagePyramid-members.html
 share/doc/vigra/classvigra_1_1ImagePyramid.html
 share/doc/vigra/classvigra_1_1IteratorAdaptor-members.html
@@ -347,6 +378,8 @@ share/doc/vigra/classvigra_1_1LastValueFunctor-members.html
 share/doc/vigra/classvigra_1_1LastValueFunctor.html
 share/doc/vigra/classvigra_1_1LineIterator-members.html
 share/doc/vigra/classvigra_1_1LineIterator.html
+share/doc/vigra/classvigra_1_1LocalMinmaxOptions-members.html
+share/doc/vigra/classvigra_1_1LocalMinmaxOptions.html
 share/doc/vigra/classvigra_1_1Luv2RGBFunctor-members.html
 share/doc/vigra/classvigra_1_1Luv2RGBFunctor.html
 share/doc/vigra/classvigra_1_1Luv2RGBPrimeFunctor-members.html
@@ -355,6 +388,9 @@ share/doc/vigra/classvigra_1_1Luv2XYZFunctor-members.html
 share/doc/vigra/classvigra_1_1Luv2XYZFunctor.html
 share/doc/vigra/classvigra_1_1MagnitudeFunctor-members.html
 share/doc/vigra/classvigra_1_1MagnitudeFunctor.html
+share/doc/vigra/classvigra_1_1MappedBucketQueue-members.html
+share/doc/vigra/classvigra_1_1MappedBucketQueue.html
+share/doc/vigra/classvigra_1_1MappedBucketQueue.png
 share/doc/vigra/classvigra_1_1MultiArray-members.html
 share/doc/vigra/classvigra_1_1MultiArray.html
 share/doc/vigra/classvigra_1_1MultiArray.png
@@ -364,7 +400,8 @@ share/doc/vigra/classvigra_1_1MultiArrayShape-members.html
 share/doc/vigra/classvigra_1_1MultiArrayShape.html
 share/doc/vigra/classvigra_1_1MultiArrayView-members.html
 share/doc/vigra/classvigra_1_1MultiArrayView.html
-share/doc/vigra/classvigra_1_1MultiArrayView.png
+share/doc/vigra/classvigra_1_1MultiCoordinateNavigator-members.html
+share/doc/vigra/classvigra_1_1MultiCoordinateNavigator.html
 share/doc/vigra/classvigra_1_1MultiImageAccessor2-members.html
 share/doc/vigra/classvigra_1_1MultiImageAccessor2.html
 share/doc/vigra/classvigra_1_1MultiIterator-members.html
@@ -394,12 +431,8 @@ share/doc/vigra/classvigra_1_1NumpyAnyArray.png
 share/doc/vigra/classvigra_1_1NumpyArray-members.html
 share/doc/vigra/classvigra_1_1NumpyArray.html
 share/doc/vigra/classvigra_1_1NumpyArray.png
-share/doc/vigra/classvigra_1_1OOB__Visitor-members.html
-share/doc/vigra/classvigra_1_1OOB__Visitor.html
-share/doc/vigra/classvigra_1_1OOB__Visitor.png
-share/doc/vigra/classvigra_1_1OnlineLearnVisitor-members.html
-share/doc/vigra/classvigra_1_1OnlineLearnVisitor.html
-share/doc/vigra/classvigra_1_1OnlineLearnVisitor.png
+share/doc/vigra/classvigra_1_1PLSAOptions-members.html
+share/doc/vigra/classvigra_1_1PLSAOptions.html
 share/doc/vigra/classvigra_1_1Point2D-members.html
 share/doc/vigra/classvigra_1_1Point2D.html
 share/doc/vigra/classvigra_1_1Point2D.png
@@ -415,8 +448,8 @@ share/doc/vigra/classvigra_1_1Processor_3_01ClassificationTag_00_01LabelType_00_
 share/doc/vigra/classvigra_1_1Processor_3_01ClassificationTag_00_01LabelType_00_01T1_00_01C1_00_01T2_00_01C2_01_4.html
 share/doc/vigra/classvigra_1_1Processor_3_01RegressionTag_00_01LabelType_00_01T1_00_01C1_00_01T2_00_01C2_01_4-members.html
 share/doc/vigra/classvigra_1_1Processor_3_01RegressionTag_00_01LabelType_00_01T1_00_01C1_00_01T2_00_01C2_01_4.html
-share/doc/vigra/classvigra_1_1RF__Traits-members.html
-share/doc/vigra/classvigra_1_1RF__Traits.html
+share/doc/vigra/classvigra_1_1Quaternion-members.html
+share/doc/vigra/classvigra_1_1Quaternion.html
 share/doc/vigra/classvigra_1_1RGB2LabFunctor-members.html
 share/doc/vigra/classvigra_1_1RGB2LabFunctor.html
 share/doc/vigra/classvigra_1_1RGB2LuvFunctor-members.html
@@ -480,6 +513,8 @@ share/doc/vigra/classvigra_1_1Sampler-members.html
 share/doc/vigra/classvigra_1_1Sampler.html
 share/doc/vigra/classvigra_1_1SamplerOptions-members.html
 share/doc/vigra/classvigra_1_1SamplerOptions.html
+share/doc/vigra/classvigra_1_1SeedOptions-members.html
+share/doc/vigra/classvigra_1_1SeedOptions.html
 share/doc/vigra/classvigra_1_1SeedRgDirectValueFunctor-members.html
 share/doc/vigra/classvigra_1_1SeedRgDirectValueFunctor.html
 share/doc/vigra/classvigra_1_1SequenceAccessor-members.html
@@ -540,6 +575,8 @@ share/doc/vigra/classvigra_1_1StridedImageIterator.html
 share/doc/vigra/classvigra_1_1StridedImageIterator.png
 share/doc/vigra/classvigra_1_1StridedMultiIterator-members.html
 share/doc/vigra/classvigra_1_1StridedMultiIterator.html
+share/doc/vigra/classvigra_1_1StridedScanOrderIterator-members.html
+share/doc/vigra/classvigra_1_1StridedScanOrderIterator.html
 share/doc/vigra/classvigra_1_1Threshold-members.html
 share/doc/vigra/classvigra_1_1Threshold.html
 share/doc/vigra/classvigra_1_1ThresholdSplit-members.html
@@ -550,7 +587,6 @@ share/doc/vigra/classvigra_1_1TinyVector.html
 share/doc/vigra/classvigra_1_1TinyVector.png
 share/doc/vigra/classvigra_1_1TinyVectorBase-members.html
 share/doc/vigra/classvigra_1_1TinyVectorBase.html
-share/doc/vigra/classvigra_1_1TinyVectorBase.png
 share/doc/vigra/classvigra_1_1TinyVectorView-members.html
 share/doc/vigra/classvigra_1_1TinyVectorView.html
 share/doc/vigra/classvigra_1_1TinyVectorView.png
@@ -558,9 +594,6 @@ share/doc/vigra/classvigra_1_1UniformIntRandomFunctor-members.html
 share/doc/vigra/classvigra_1_1UniformIntRandomFunctor.html
 share/doc/vigra/classvigra_1_1UniformRandomFunctor-members.html
 share/doc/vigra/classvigra_1_1UniformRandomFunctor.html
-share/doc/vigra/classvigra_1_1VariableImportanceVisitor-members.html
-share/doc/vigra/classvigra_1_1VariableImportanceVisitor.html
-share/doc/vigra/classvigra_1_1VariableImportanceVisitor.png
 share/doc/vigra/classvigra_1_1VectorAccessor-members.html
 share/doc/vigra/classvigra_1_1VectorAccessor.html
 share/doc/vigra/classvigra_1_1VectorAccessor.png
@@ -574,13 +607,14 @@ share/doc/vigra/classvigra_1_1VectorNormFunctor-members.html
 share/doc/vigra/classvigra_1_1VectorNormFunctor.html
 share/doc/vigra/classvigra_1_1VectorNormSqFunctor-members.html
 share/doc/vigra/classvigra_1_1VectorNormSqFunctor.html
-share/doc/vigra/classvigra_1_1VisitorBase-members.html
-share/doc/vigra/classvigra_1_1VisitorBase.html
-share/doc/vigra/classvigra_1_1VisitorBase.png
 share/doc/vigra/classvigra_1_1VolumeExportInfo-members.html
 share/doc/vigra/classvigra_1_1VolumeExportInfo.html
 share/doc/vigra/classvigra_1_1VolumeImportInfo-members.html
 share/doc/vigra/classvigra_1_1VolumeImportInfo.html
+share/doc/vigra/classvigra_1_1WatershedOptions-members.html
+share/doc/vigra/classvigra_1_1WatershedOptions.html
+share/doc/vigra/classvigra_1_1WignerMatrix-members.html
+share/doc/vigra/classvigra_1_1WignerMatrix.html
 share/doc/vigra/classvigra_1_1XYZ2LabFunctor-members.html
 share/doc/vigra/classvigra_1_1XYZ2LabFunctor.html
 share/doc/vigra/classvigra_1_1XYZ2LuvFunctor-members.html
@@ -597,24 +631,11 @@ share/doc/vigra/classvigra_1_1YPrimePbPr2RGBPrimeFunctor-members.html
 share/doc/vigra/classvigra_1_1YPrimePbPr2RGBPrimeFunctor.html
 share/doc/vigra/classvigra_1_1YPrimeUV2RGBPrimeFunctor-members.html
 share/doc/vigra/classvigra_1_1YPrimeUV2RGBPrimeFunctor.html
-share/doc/vigra/classvigra_1_1detail_1_1DecisionTree-members.html
-share/doc/vigra/classvigra_1_1detail_1_1DecisionTree.html
-share/doc/vigra/classvigra_1_1detail_1_1RF__DEFAULT-members.html
-share/doc/vigra/classvigra_1_1detail_1_1RF__DEFAULT.html
-share/doc/vigra/classvigra_1_1detail_1_1Value__Chooser-members.html
-share/doc/vigra/classvigra_1_1detail_1_1Value__Chooser.html
-share/doc/vigra/classvigra_1_1detail_1_1staticMultiArrayViewHelper-members.html
-share/doc/vigra/classvigra_1_1detail_1_1staticMultiArrayViewHelper.html
 share/doc/vigra/classvigra_1_1linalg_1_1LeastAngleRegressionOptions-members.html
 share/doc/vigra/classvigra_1_1linalg_1_1LeastAngleRegressionOptions.html
 share/doc/vigra/classvigra_1_1linalg_1_1Matrix-members.html
 share/doc/vigra/classvigra_1_1linalg_1_1Matrix.html
 share/doc/vigra/classvigra_1_1linalg_1_1Matrix.png
-share/doc/vigra/classvigra_1_1rf_1_1StopVisiting-members.html
-share/doc/vigra/classvigra_1_1rf_1_1StopVisiting.html
-share/doc/vigra/classvigra_1_1rf_1_1StopVisiting.png
-share/doc/vigra/classvigra_1_1rf_1_1VisitorNode-members.html
-share/doc/vigra/classvigra_1_1rf_1_1VisitorNode.html
 share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1ClusterImportanceVisitor-members.html
 share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1ClusterImportanceVisitor.html
 share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1ClusterImportanceVisitor.png
@@ -669,22 +690,21 @@ share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1detail_1_1VisitorNode-members.ht
 share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1detail_1_1VisitorNode.html
 share/doc/vigra/classvigra_1_1sRGB2RGBFunctor-members.html
 share/doc/vigra/classvigra_1_1sRGB2RGBFunctor.html
-share/doc/vigra/codec_8hxx-source.html
-share/doc/vigra/colorconversions_8hxx-source.html
-share/doc/vigra/combineimages_8hxx-source.html
-share/doc/vigra/configVersion_8hxx-source.html
-share/doc/vigra/config_8hxx-source.html
-share/doc/vigra/contourcirculator_8hxx-source.html
-share/doc/vigra/convert_8cxx-example.html
-share/doc/vigra/convolution_8hxx-source.html
-share/doc/vigra/copyimage_8hxx-source.html
-share/doc/vigra/cornerdetection_8hxx-source.html
+share/doc/vigra/clebsch-gordan_8hxx_source.html
+share/doc/vigra/codec_8hxx_source.html
+share/doc/vigra/colorconversions_8hxx_source.html
+share/doc/vigra/combineimages_8hxx_source.html
+share/doc/vigra/configVersion_8hxx_source.html
+share/doc/vigra/config_8hxx_source.html
+share/doc/vigra/contourcirculator_8hxx_source.html
+share/doc/vigra/convert.cxx-example.html
+share/doc/vigra/convolution_8hxx_source.html
+share/doc/vigra/copyimage_8hxx_source.html
+share/doc/vigra/cornerdetection_8hxx_source.html
 share/doc/vigra/deprecated.html
-share/doc/vigra/diff2d_8hxx-source.html
-share/doc/vigra/distancetransform_8hxx-source.html
-share/doc/vigra/documents/DataAccessors.doc
+share/doc/vigra/diff2d_8hxx_source.html
+share/doc/vigra/distancetransform_8hxx_source.html
 share/doc/vigra/documents/DataAccessors.ps
-share/doc/vigra/documents/FunctorFactory.doc
 share/doc/vigra/documents/FunctorFactory.ps
 share/doc/vigra/documents/GenericProg2D.ps
 share/doc/vigra/documents/bullet.gif
@@ -694,15 +714,16 @@ share/doc/vigra/documents/tutorial_reference.pdf
 share/doc/vigra/documents/viff.ps
 share/doc/vigra/documents/vigra.gif
 share/doc/vigra/doxygen.png
-share/doc/vigra/edge_8cxx-example.html
-share/doc/vigra/edgedetection_8hxx-source.html
-share/doc/vigra/eigensystem_8hxx-source.html
-share/doc/vigra/error_8hxx-source.html
-share/doc/vigra/features_8hxx-source.html
-share/doc/vigra/fftw3_8hxx-source.html
+share/doc/vigra/edge.cxx-example.html
+share/doc/vigra/edgedetection_8hxx_source.html
+share/doc/vigra/eigensystem_8hxx_source.html
+share/doc/vigra/error_8hxx_source.html
+share/doc/vigra/examples.html
+share/doc/vigra/features_8hxx_source.html
+share/doc/vigra/fftw3_8hxx_source.html
 share/doc/vigra/files.html
-share/doc/vigra/fixedpoint_8hxx-source.html
-share/doc/vigra/flatmorphology_8hxx-source.html
+share/doc/vigra/fixedpoint_8hxx_source.html
+share/doc/vigra/flatmorphology_8hxx_source.html
 share/doc/vigra/form_0.png
 share/doc/vigra/form_1.png
 share/doc/vigra/form_10.png
@@ -782,6 +803,16 @@ share/doc/vigra/form_77.png
 share/doc/vigra/form_78.png
 share/doc/vigra/form_79.png
 share/doc/vigra/form_8.png
+share/doc/vigra/form_80.png
+share/doc/vigra/form_81.png
+share/doc/vigra/form_82.png
+share/doc/vigra/form_83.png
+share/doc/vigra/form_84.png
+share/doc/vigra/form_85.png
+share/doc/vigra/form_86.png
+share/doc/vigra/form_87.png
+share/doc/vigra/form_88.png
+share/doc/vigra/form_89.png
 share/doc/vigra/form_9.png
 share/doc/vigra/formula.repository
 share/doc/vigra/functionindex.html
@@ -800,6 +831,7 @@ share/doc/vigra/functions_0x6d.html
 share/doc/vigra/functions_0x6e.html
 share/doc/vigra/functions_0x6f.html
 share/doc/vigra/functions_0x70.html
+share/doc/vigra/functions_0x71.html
 share/doc/vigra/functions_0x72.html
 share/doc/vigra/functions_0x73.html
 share/doc/vigra/functions_0x74.html
@@ -826,6 +858,7 @@ share/doc/vigra/functions_func_0x6d.html
 share/doc/vigra/functions_func_0x6e.html
 share/doc/vigra/functions_func_0x6f.html
 share/doc/vigra/functions_func_0x70.html
+share/doc/vigra/functions_func_0x71.html
 share/doc/vigra/functions_func_0x72.html
 share/doc/vigra/functions_func_0x73.html
 share/doc/vigra/functions_func_0x74.html
@@ -852,11 +885,13 @@ share/doc/vigra/functions_type_0x73.html
 share/doc/vigra/functions_type_0x74.html
 share/doc/vigra/functions_type_0x76.html
 share/doc/vigra/functions_vars.html
-share/doc/vigra/functorexpression_8hxx-source.html
-share/doc/vigra/functortraits_8hxx-source.html
-share/doc/vigra/gaborfilter_8hxx-source.html
-share/doc/vigra/gaussians_8hxx-source.html
-share/doc/vigra/gradient__energy__tensor_8hxx-source.html
+share/doc/vigra/functorexpression_8hxx_source.html
+share/doc/vigra/functortraits_8hxx_source.html
+share/doc/vigra/gaborfilter_8hxx_source.html
+share/doc/vigra/gaussians_8hxx_source.html
+share/doc/vigra/globals.html
+share/doc/vigra/globals_defs.html
+share/doc/vigra/gradient__energy__tensor_8hxx_source.html
 share/doc/vigra/group__ColorConversions.html
 share/doc/vigra/group__CombineAlgo.html
 share/doc/vigra/group__CombineFunctor.html
@@ -887,7 +922,6 @@ share/doc/vigra/group__LinearAlgebraModule.html
 share/doc/vigra/group__LocalMinMax.html
 share/doc/vigra/group__MachineLearning.html
 share/doc/vigra/group__MathFunctions.html
-share/doc/vigra/group__MathFunctionsons.html
 share/doc/vigra/group__MatrixAlgebra.html
 share/doc/vigra/group__Morphology.html
 share/doc/vigra/group__MultiArrayConvolutionFilters.html
@@ -896,13 +930,16 @@ share/doc/vigra/group__MultiArrayMorphology.html
 share/doc/vigra/group__MultiArrayTags.html
 share/doc/vigra/group__MultiArrayToImage.html
 share/doc/vigra/group__MultiIteratorGroup.html
+share/doc/vigra/group__MultiMathModule.html
 share/doc/vigra/group__MultiPointoperators.html
 share/doc/vigra/group__NoiseNormalization.html
 share/doc/vigra/group__NonLinearDiffusion.html
+share/doc/vigra/group__OpenCL.html
 share/doc/vigra/group__Optimization.html
 share/doc/vigra/group__PixelNeighborhood.html
 share/doc/vigra/group__PolarColors.html
 share/doc/vigra/group__Polynomials.html
+share/doc/vigra/group__QuaternionOperations.html
 share/doc/vigra/group__RGBValueAccessors.html
 share/doc/vigra/group__RGBValueOperators.html
 share/doc/vigra/group__RandomNumberGeneration.html
@@ -922,51 +959,56 @@ share/doc/vigra/group__TensorImaging.html
 share/doc/vigra/group__TinyVectorOperators.html
 share/doc/vigra/group__TransformAlgo.html
 share/doc/vigra/group__TransformFunctor.html
+share/doc/vigra/group__Unsupervised__Decomposition.html
 share/doc/vigra/group__VigraHDF5Impex.html
 share/doc/vigra/group__VigraImpex.html
 share/doc/vigra/group__VigraSIFImport.html
 share/doc/vigra/group__VolumeImpex.html
 share/doc/vigra/group__VoxelNeighborhood.html
-share/doc/vigra/hdf5impex_8hxx-source.html
+share/doc/vigra/hdf5impex_8hxx_source.html
 share/doc/vigra/hierarchy.html
-share/doc/vigra/imagecontainer_8hxx-source.html
-share/doc/vigra/imageinfo_8hxx-source.html
-share/doc/vigra/imageiterator_8hxx-source.html
-share/doc/vigra/imageiteratoradapter_8hxx-source.html
-share/doc/vigra/impex_8hxx-source.html
+share/doc/vigra/imagecontainer_8hxx_source.html
+share/doc/vigra/imageinfo_8hxx_source.html
+share/doc/vigra/imageiterator_8hxx_source.html
+share/doc/vigra/imageiteratoradapter_8hxx_source.html
 share/doc/vigra/impex_8hxx.html
+share/doc/vigra/impex_8hxx_source.html
 share/doc/vigra/index.html
-share/doc/vigra/index__sampling_8hxx-source.html
-share/doc/vigra/initimage_8hxx-source.html
-share/doc/vigra/inspectimage_8hxx-source.html
-share/doc/vigra/interpolating__accessor_8hxx-source.html
-share/doc/vigra/invert_8cxx-example.html
-share/doc/vigra/invert__explicitly_8cxx-example.html
-share/doc/vigra/iteratoradapter_8hxx-source.html
-share/doc/vigra/iteratortags_8hxx-source.html
-share/doc/vigra/iteratortraits_8hxx-source.html
-share/doc/vigra/labelimage_8hxx-source.html
-share/doc/vigra/labelvolume_8hxx-source.html
-share/doc/vigra/linear__algebra_8hxx-source.html
-share/doc/vigra/linear__solve_8hxx-source.html
-share/doc/vigra/localminmax_8hxx-source.html
-share/doc/vigra/mathutil_8hxx-source.html
-share/doc/vigra/matlab_8hxx-source.html
-share/doc/vigra/matlab__FLEXTYPE_8hxx-source.html
-share/doc/vigra/matrix_8hxx-source.html
-share/doc/vigra/memory_8hxx-source.html
-share/doc/vigra/meshgrid_8hxx-source.html
-share/doc/vigra/metaprogramming_8hxx-source.html
+share/doc/vigra/initimage_8hxx_source.html
+share/doc/vigra/inspectimage_8hxx_source.html
+share/doc/vigra/interpolating__accessor_8hxx_source.html
+share/doc/vigra/invariant__features3D_8hxx_source.html
+share/doc/vigra/invert.cxx-example.html
+share/doc/vigra/invert__explicitly.cxx-example.html
+share/doc/vigra/iteratoradapter_8hxx_source.html
+share/doc/vigra/iteratortags_8hxx_source.html
+share/doc/vigra/iteratortraits_8hxx_source.html
+share/doc/vigra/labelimage_8hxx_source.html
+share/doc/vigra/labelvolume_8hxx_source.html
+share/doc/vigra/linear__algebra_8hxx_source.html
+share/doc/vigra/linear__solve_8hxx_source.html
+share/doc/vigra/localminmax_8hxx_source.html
+share/doc/vigra/mathutil_8hxx_source.html
+share/doc/vigra/matlab_8hxx_source.html
+share/doc/vigra/matlab__FLEXTYPE_8hxx_source.html
+share/doc/vigra/matrix_8hxx_source.html
+share/doc/vigra/memory_8hxx_source.html
+share/doc/vigra/meshgrid_8hxx_source.html
+share/doc/vigra/metaprogramming_8hxx_source.html
 share/doc/vigra/modules.html
-share/doc/vigra/multi__array_8hxx-source.html
-share/doc/vigra/multi__convolution_8hxx-source.html
-share/doc/vigra/multi__distance_8hxx-source.html
-share/doc/vigra/multi__impex_8hxx-source.html
-share/doc/vigra/multi__iterator_8hxx-source.html
-share/doc/vigra/multi__morphology_8hxx-source.html
-share/doc/vigra/multi__pointoperators_8hxx-source.html
-share/doc/vigra/multi__resize_8hxx-source.html
-share/doc/vigra/multi__tensorutilities_8hxx-source.html
+share/doc/vigra/multi__array_8hxx_source.html
+share/doc/vigra/multi__convolution_8hxx_source.html
+share/doc/vigra/multi__distance_8hxx_source.html
+share/doc/vigra/multi__fft_8hxx_source.html
+share/doc/vigra/multi__impex_8hxx_source.html
+share/doc/vigra/multi__iterator_8hxx_source.html
+share/doc/vigra/multi__localminmax_8hxx_source.html
+share/doc/vigra/multi__math_8hxx_source.html
+share/doc/vigra/multi__morphology_8hxx_source.html
+share/doc/vigra/multi__opencl_8hxx_source.html
+share/doc/vigra/multi__pointoperators_8hxx_source.html
+share/doc/vigra/multi__resize_8hxx_source.html
+share/doc/vigra/multi__tensorutilities_8hxx_source.html
 share/doc/vigra/namespacemembers.html
 share/doc/vigra/namespacemembers_0x62.html
 share/doc/vigra/namespacemembers_0x63.html
@@ -1022,71 +1064,70 @@ share/doc/vigra/namespacevigra_1_1EightNeighborhood.html
 share/doc/vigra/namespacevigra_1_1FourNeighborhood.html
 share/doc/vigra/namespacevigra_1_1Neighborhood3DSix.html
 share/doc/vigra/namespacevigra_1_1Neighborhood3DTwentySix.html
-share/doc/vigra/namespacevigra_1_1detail.html
 share/doc/vigra/namespacevigra_1_1linalg.html
+share/doc/vigra/namespacevigra_1_1multi__math.html
 share/doc/vigra/namespacevigra_1_1rf_1_1algorithms.html
 share/doc/vigra/namespacevigra_1_1rf_1_1split.html
 share/doc/vigra/namespacevigra_1_1rf_1_1visitors.html
-share/doc/vigra/navigator_8hxx-source.html
-share/doc/vigra/noise__normalization_8hxx-source.html
-share/doc/vigra/nonlineardiffusion_8hxx-source.html
-share/doc/vigra/numerictraits_8hxx-source.html
-share/doc/vigra/numpy__array_8hxx-source.html
-share/doc/vigra/numpy__array__converters_8hxx-source.html
-share/doc/vigra/orientedtensorfilters_8hxx-source.html
+share/doc/vigra/navigator_8hxx_source.html
+share/doc/vigra/noise__normalization_8hxx_source.html
+share/doc/vigra/nonlineardiffusion_8hxx_source.html
+share/doc/vigra/numerictraits_8hxx_source.html
+share/doc/vigra/numpy__array_8hxx_source.html
+share/doc/vigra/numpy__array__converters_8hxx_source.html
+share/doc/vigra/numpy__array__taggedshape_8hxx_source.html
+share/doc/vigra/numpy__array__traits_8hxx_source.html
+share/doc/vigra/orientedtensorfilters_8hxx_source.html
 share/doc/vigra/pages.html
-share/doc/vigra/palette_8cxx-example.html
-share/doc/vigra/pixelneighborhood_8hxx-source.html
-share/doc/vigra/polygon_8hxx-source.html
-share/doc/vigra/polynomial_8hxx-source.html
-share/doc/vigra/profile_8cxx-example.html
-share/doc/vigra/promote__traits_8hxx-source.html
-share/doc/vigra/pyramid_8cxx-example.html
-share/doc/vigra/python__utility_8hxx-source.html
-share/doc/vigra/quadprog_8hxx-source.html
-share/doc/vigra/random_8hxx-source.html
-share/doc/vigra/random__forest_8hxx-source.html
-share/doc/vigra/random__forest__deprec_8hxx-source.html
-share/doc/vigra/random__forest__hdf5__impex_8hxx-source.html
-share/doc/vigra/rational_8hxx-source.html
-share/doc/vigra/recursiveconvolution-merge_8hxx-source.html
-share/doc/vigra/recursiveconvolution-old_8hxx-source.html
-share/doc/vigra/recursiveconvolution_8hxx-source.html
-share/doc/vigra/regression_8hxx-source.html
-share/doc/vigra/resampling__convolution_8hxx-source.html
-share/doc/vigra/resize_8cxx-example.html
-share/doc/vigra/resizeimage_8hxx-source.html
-share/doc/vigra/rf__algorithm_8hxx-source.html
-share/doc/vigra/rf__algorithm__prototyping_8hxx-source.html
-share/doc/vigra/rf__common_8hxx-source.html
-share/doc/vigra/rf__decisionTree_8hxx-source.html
-share/doc/vigra/rf__earlystopping_8hxx-source.html
-share/doc/vigra/rf__nodeproxy_8hxx-source.html
-share/doc/vigra/rf__online__prediction__set_8hxx-source.html
-share/doc/vigra/rf__preprocessing_8hxx-source.html
-share/doc/vigra/rf__region_8hxx-source.html
-share/doc/vigra/rf__ridge__split_8hxx-source.html
-share/doc/vigra/rf__sampling_8hxx-source.html
-share/doc/vigra/rf__split_8hxx-source.html
-share/doc/vigra/rf__visitors_8hxx-source.html
-share/doc/vigra/rfftw_8hxx-source.html
-share/doc/vigra/rgbvalue_8hxx-source.html
-share/doc/vigra/sampling_8hxx-source.html
-share/doc/vigra/seededregiongrowing3d_8hxx-source.html
-share/doc/vigra/seededregiongrowing_8hxx-source.html
-share/doc/vigra/separableconvolution_8hxx-source.html
-share/doc/vigra/sifImport_8hxx-source.html
-share/doc/vigra/singular__value__decomposition_8hxx-source.html
-share/doc/vigra/sized__int_8hxx-source.html
-share/doc/vigra/slanted__edge__mtf_8hxx-source.html
-share/doc/vigra/smooth_8cxx-example.html
-share/doc/vigra/splices_8hxx-source.html
-share/doc/vigra/splineimageview_8hxx-source.html
-share/doc/vigra/splines_8hxx-source.html
-share/doc/vigra/static__assert_8hxx-source.html
-share/doc/vigra/stdconvolution_8hxx-source.html
-share/doc/vigra/stdimage_8hxx-source.html
-share/doc/vigra/stdimagefunctions_8hxx-source.html
+share/doc/vigra/palette.cxx-example.html
+share/doc/vigra/pixelneighborhood_8hxx_source.html
+share/doc/vigra/polygon_8hxx_source.html
+share/doc/vigra/polynomial_8hxx_source.html
+share/doc/vigra/profile.cxx-example.html
+share/doc/vigra/promote__traits_8hxx_source.html
+share/doc/vigra/pyramid.cxx-example.html
+share/doc/vigra/python__utility_8hxx_source.html
+share/doc/vigra/quadprog_8hxx_source.html
+share/doc/vigra/quaternion_8hxx_source.html
+share/doc/vigra/random_8hxx_source.html
+share/doc/vigra/random__forest_8hxx_source.html
+share/doc/vigra/random__forest__deprec_8hxx_source.html
+share/doc/vigra/random__forest__hdf5__impex_8hxx_source.html
+share/doc/vigra/rational_8hxx_source.html
+share/doc/vigra/recursiveconvolution_8hxx_source.html
+share/doc/vigra/regression_8hxx_source.html
+share/doc/vigra/resampling__convolution_8hxx_source.html
+share/doc/vigra/resize.cxx-example.html
+share/doc/vigra/resizeimage_8hxx_source.html
+share/doc/vigra/rf__algorithm_8hxx_source.html
+share/doc/vigra/rf__common_8hxx_source.html
+share/doc/vigra/rf__decisionTree_8hxx_source.html
+share/doc/vigra/rf__earlystopping_8hxx_source.html
+share/doc/vigra/rf__nodeproxy_8hxx_source.html
+share/doc/vigra/rf__online__prediction__set_8hxx_source.html
+share/doc/vigra/rf__preprocessing_8hxx_source.html
+share/doc/vigra/rf__region_8hxx_source.html
+share/doc/vigra/rf__ridge__split_8hxx_source.html
+share/doc/vigra/rf__split_8hxx_source.html
+share/doc/vigra/rf__visitors_8hxx_source.html
+share/doc/vigra/rfftw_8hxx_source.html
+share/doc/vigra/rgbvalue_8hxx_source.html
+share/doc/vigra/sampling_8hxx_source.html
+share/doc/vigra/seededregiongrowing3d_8hxx_source.html
+share/doc/vigra/seededregiongrowing_8hxx_source.html
+share/doc/vigra/separableconvolution_8hxx_source.html
+share/doc/vigra/sifImport_8hxx_source.html
+share/doc/vigra/singular__value__decomposition_8hxx_source.html
+share/doc/vigra/sized__int_8hxx_source.html
+share/doc/vigra/slanted__edge__mtf_8hxx_source.html
+share/doc/vigra/smooth.cxx-example.html
+share/doc/vigra/splices_8hxx_source.html
+share/doc/vigra/splineimageview_8hxx_source.html
+share/doc/vigra/splines_8hxx_source.html
+share/doc/vigra/static__assert_8hxx_source.html
+share/doc/vigra/stdconvolution_8hxx_source.html
+share/doc/vigra/stdimage_8hxx_source.html
+share/doc/vigra/stdimagefunctions_8hxx_source.html
 share/doc/vigra/structvigra_1_1IteratorTraits-members.html
 share/doc/vigra/structvigra_1_1IteratorTraits.html
 share/doc/vigra/structvigra_1_1MeshGridAccessor-members.html
@@ -1095,29 +1136,31 @@ share/doc/vigra/structvigra_1_1StridedArrayTag.html
 share/doc/vigra/structvigra_1_1UnstridedArrayTag.html
 share/doc/vigra/structvigra_1_1rf_1_1algorithms_1_1HC__Entry-members.html
 share/doc/vigra/structvigra_1_1rf_1_1algorithms_1_1HC__Entry.html
-share/doc/vigra/structvigra_1_1rf_1_1algorithms_1_1VarSelectOutput-members.html
-share/doc/vigra/structvigra_1_1rf_1_1algorithms_1_1VarSelectOutput.html
-share/doc/vigra/subimage_8cxx-example.html
-share/doc/vigra/symmetry_8hxx-source.html
+share/doc/vigra/subimage.cxx-example.html
+share/doc/vigra/symmetry_8hxx_source.html
 share/doc/vigra/tab_b.gif
 share/doc/vigra/tab_l.gif
 share/doc/vigra/tab_r.gif
 share/doc/vigra/tabs.css
-share/doc/vigra/tensorutilities_8hxx-source.html
-share/doc/vigra/tiff_8hxx-source.html
-share/doc/vigra/timing_8hxx-source.html
-share/doc/vigra/tinyvector_8hxx-source.html
+share/doc/vigra/tensorutilities_8hxx_source.html
+share/doc/vigra/tiff_8hxx_source.html
+share/doc/vigra/timing_8hxx.html
+share/doc/vigra/timing_8hxx_source.html
+share/doc/vigra/tinyvector_8hxx_source.html
 share/doc/vigra/todo.html
-share/doc/vigra/transformimage_8hxx-source.html
-share/doc/vigra/tuple_8hxx-source.html
-share/doc/vigra/union__find_8hxx-source.html
-share/doc/vigra/utilities_8hxx-source.html
+share/doc/vigra/transformimage_8hxx_source.html
+share/doc/vigra/tuple_8hxx_source.html
+share/doc/vigra/union__find_8hxx_source.html
+share/doc/vigra/unsupervised__decomposition_8hxx_source.html
+share/doc/vigra/utilities_8hxx_source.html
+share/doc/vigra/vigra-icon.ico
 share/doc/vigra/vigra.css
-share/doc/vigra/voronoi_8cxx-example.html
-share/doc/vigra/voxelneighborhood_8hxx-source.html
-share/doc/vigra/watershed_8cxx-example.html
-share/doc/vigra/watersheds3d_8hxx-source.html
-share/doc/vigra/watersheds_8hxx-source.html
+share/doc/vigra/voronoi.cxx-example.html
+share/doc/vigra/voxelneighborhood_8hxx_source.html
+share/doc/vigra/watershed.cxx-example.html
+share/doc/vigra/watersheds3d_8hxx_source.html
+share/doc/vigra/watersheds_8hxx_source.html
+share/doc/vigra/wigner-matrix_8hxx_source.html
 share/doc/vigranumpy/.buildinfo
 share/doc/vigranumpy/_sources/index.txt
 share/doc/vigranumpy/_static/basic.css
@@ -1129,12 +1172,11 @@ share/doc/vigranumpy/_static/minus.png
 share/doc/vigranumpy/_static/plus.png
 share/doc/vigranumpy/_static/pygments.css
 share/doc/vigranumpy/_static/searchtools.js
+share/doc/vigranumpy/_static/vigra-icon.ico
 share/doc/vigranumpy/doctrees/environment.pickle
 share/doc/vigranumpy/doctrees/index.doctree
 share/doc/vigranumpy/genindex.html
-share/doc/vigranumpy/i.html
 share/doc/vigranumpy/index.html
-share/doc/vigranumpy/index.html.old
 share/doc/vigranumpy/modindex.html
 share/doc/vigranumpy/objects.inv
 share/doc/vigranumpy/search.html
diff --git a/graphics/vigra/buildlink3.mk b/graphics/vigra/buildlink3.mk
index 2a847a10c7a..14edf09c860 100644
--- a/graphics/vigra/buildlink3.mk
+++ b/graphics/vigra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2011/01/29 16:29:03 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2011/10/16 17:47:49 adam Exp $
 
 BUILDLINK_TREE+=	vigra
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	vigra
 VIGRA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.vigra+=	vigra>=1.7.0
-BUILDLINK_ABI_DEPENDS.vigra+=	vigra>=1.7.0nb1
+BUILDLINK_ABI_DEPENDS.vigra+=	vigra>=1.8.0
 BUILDLINK_PKGSRCDIR.vigra?=	../../graphics/vigra
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/vigra/distinfo b/graphics/vigra/distinfo
index d1a44deec11..89ba28cc49d 100644
--- a/graphics/vigra/distinfo
+++ b/graphics/vigra/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2011/01/29 16:29:03 adam Exp $
+$NetBSD: distinfo,v 1.6 2011/10/16 17:47:49 adam Exp $
 
-SHA1 (vigra-1.7.1-src.tar.gz) = f90f54da31a6544057c25df7dbcc6954604de079
-RMD160 (vigra-1.7.1-src.tar.gz) = 67a27b11f3d844b01fd8f2b0d2fe761099f8170b
-Size (vigra-1.7.1-src.tar.gz) = 28481160 bytes
-SHA1 (patch-ab) = c29adad37bad561e74a5d96f0b4c840c97f0d835
+SHA1 (vigra-1.8.0-src.tar.gz) = 09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2
+RMD160 (vigra-1.8.0-src.tar.gz) = 99d781da6e0ca94ce3404e1bcb3adeb9e43a2017
+Size (vigra-1.8.0-src.tar.gz) = 29814914 bytes
diff --git a/graphics/vigra/patches/patch-ab b/graphics/vigra/patches/patch-ab
deleted file mode 100644
index daa187a7150..00000000000
--- a/graphics/vigra/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2011/01/29 16:29:03 adam Exp $
-
---- src/impex/png.cxx.orig	2011-01-29 15:14:21.000000000 +0000
-+++ src/impex/png.cxx
-@@ -320,7 +320,7 @@ namespace vigra {
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
-         char * dummyName;
-         int dummyCompType;
--        char * profilePtr;
-+        png_bytep profilePtr;
-         png_uint_32 profileLen;
-         if (png_get_valid( png, info, PNG_INFO_iCCP )) {
-             png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
-@@ -592,7 +592,7 @@ namespace vigra {
-         // set icc profile
-         if (iccProfile.size() > 0) {
-             png_set_iCCP(png, info, (png_charp)("icc"), 0,
--                         (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
-+                         (png_bytep)iccProfile.begin(), (png_uint_32)iccProfile.size());
-         }
- #endif
-