- Update to 1.9.0 release (clang support improved)

- Handle python bindings in proper way (off by default)
- Make HDF and OpenEXR support optional (on by default)
- Use OptionsNG
- Declare LICENSE
- Trim Makefile header

Feature safe:	yes

3 files changed, 249 insertions, 88 deletions

diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index e60a37208d6a..fd321879f826 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -1,17 +1,8 @@
-# New ports collection makefile for:   panorama-tools
-# Date created:        26 august 2004
-# Whom:                cartola (Carlos E. G. Carvalho)
-#
+# Created by:                cartola (Carlos E. G. Carvalho)
 # $FreeBSD$
-#
-# This port has been made as a building dependence for the hugin port.
-# As far as I could test the hugin port runs without this port installed, so the package
-# does not need to refer to this dependence.
-# The hugin port is a gui interface to interact with panorama tools.
 
 PORTNAME=	vigra
-PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTVERSION=	1.9.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://hci.iwr.uni-heidelberg.de/vigra/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -19,24 +10,48 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	VIGRA stands for "Vision with Generic Algorithms"
 
+LICENSE=	MIT
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_CMAKE=	yes
 CMAKE_ARGS=	-DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \
-		-DDOCINSTALL:PATH=${DOCSDIR_REL} \
-		-DWITH_HDF5=1
+		-DDOCINSTALL:PATH=${DOCSDIR_REL}
 
 USE_LDCONFIG=	yes
 
-OPTIONS=	PYTHON "Python bindings" off
+OPTIONS_DEFINE=		HDF5 OPENEXR PYTHON
+OPTIONS_DEFAULT=	HDF5 OPENEXR
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MHDF5}
+CMAKE_ARGS+=	-DWITH_HDF5=1
+LIB_DEPENDS+=	hdf5.7:${PORTSDIR}/science/hdf5-18
+.else
+CMAKE_ARGS+=	-DWITH_HDF5=0
+.endif
+
+.if ${PORT_OPTIONS:MOPENEXR}
+CMAKE_ARGS+=	-DWITH_OPENEXR=1
+LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
+.else
+CMAKE_ARGS+=	-DWITH_OPENEXR=0
+.endif
+
+.if ${PORT_OPTIONS:MPYTHON}
 CONFLICTS_BUILD=	python3*
+CMAKE_ARGS+=	-DWITH_VIGRANUMPY=1
 USE_PYTHON=	2.6-2.7
+BUILD_DEPENDS+=	nosetests:${PORTSDIR}/devel/py-nose
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy
+#BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+LIB_DEPENDS=	boost_python:${PORTSDIR}/devel/boost-python-libs
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+PLIST_SUB+=	PYTHON=""
 .else
 CMAKE_ARGS+=	-DWITH_VIGRANUMPY=0
+PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
@@ -69,14 +84,6 @@ LIB_DEPENDS+=	fftw3:${PORTSDIR}/math/fftw3
 LIB_DEPENDS+=	fftw3f:${PORTSDIR}/math/fftw3-float
 .endif
 
-.if !defined(WITHOUT_VIGRA_HDF5)
-LIB_DEPENDS+=	hdf5.7:${PORTSDIR}/science/hdf5-18
-.endif
-
-.if !defined(WITHOUT_VIGRA_OPENEXR)
-LIB_DEPENDS+=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR
-.endif
-
 post-patch:
 # FIXME: This is ugly
 	@${RM} ${WRKSRC}/include/vigra/*.orig
diff --git a/graphics/vigra/distinfo b/graphics/vigra/distinfo
index b6e660007ea8..97d9b171bd8f 100644
--- a/graphics/vigra/distinfo
+++ b/graphics/vigra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vigra-1.8.0-src.tar.gz) = fc3a87d220ce23e79d163c58dd280fd534b81a870d2b140f1d072bbc82c78214
-SIZE (vigra-1.8.0-src.tar.gz) = 29814914
+SHA256 (vigra-1.9.0-src.tar.gz) = 8fbdccb553a4925323098ab27b710fbc87d48f37bf81d404994936a31a31cf01
+SIZE (vigra-1.9.0-src.tar.gz) = 30813416
diff --git a/graphics/vigra/pkg-plist b/graphics/vigra/pkg-plist
index fac940a33f33..a1ce593deab9 100644
--- a/graphics/vigra/pkg-plist
+++ b/graphics/vigra/pkg-plist
@@ -1,5 +1,7 @@
 bin/vigra-config
 include/vigra/accessor.hxx
+include/vigra/accumulator-grammar.hxx
+include/vigra/accumulator.hxx
 include/vigra/affine_registration.hxx
 include/vigra/affinegeometry.hxx
 include/vigra/algorithm.hxx
@@ -9,6 +11,7 @@ include/vigra/basicgeometry.hxx
 include/vigra/basicimage.hxx
 include/vigra/basicimageview.hxx
 include/vigra/bessel.hxx
+include/vigra/bit_array.hxx
 include/vigra/bordertreatment.hxx
 include/vigra/boundarytensor.hxx
 include/vigra/box.hxx
@@ -23,6 +26,7 @@ include/vigra/config.hxx
 include/vigra/configVersion.hxx
 include/vigra/contourcirculator.hxx
 include/vigra/convolution.hxx
+include/vigra/coordinate_iterator.hxx
 include/vigra/copyimage.hxx
 include/vigra/cornerdetection.hxx
 include/vigra/diff2d.hxx
@@ -40,13 +44,17 @@ include/vigra/gaborfilter.hxx
 include/vigra/gaussians.hxx
 include/vigra/gradient_energy_tensor.hxx
 include/vigra/hdf5impex.hxx
+include/vigra/histogram.hxx
 include/vigra/imagecontainer.hxx
 include/vigra/imageinfo.hxx
 include/vigra/imageiterator.hxx
 include/vigra/imageiteratoradapter.hxx
 include/vigra/impex.hxx
+include/vigra/impexalpha.hxx
+include/vigra/impexbase.hxx
 include/vigra/initimage.hxx
 include/vigra/inspectimage.hxx
+include/vigra/inspector_passes.hxx
 include/vigra/interpolating_accessor.hxx
 include/vigra/invariant_features3D.hxx
 include/vigra/iteratoradapter.hxx
@@ -70,6 +78,7 @@ include/vigra/multi_distance.hxx
 include/vigra/multi_fft.hxx
 include/vigra/multi_impex.hxx
 include/vigra/multi_iterator.hxx
+include/vigra/multi_iterator_coupled.hxx
 include/vigra/multi_localminmax.hxx
 include/vigra/multi_math.hxx
 include/vigra/multi_morphology.hxx
@@ -89,6 +98,7 @@ include/vigra/orientedtensorfilters.hxx
 include/vigra/pixelneighborhood.hxx
 include/vigra/polygon.hxx
 include/vigra/polynomial.hxx
+include/vigra/project2ellipse.hxx
 include/vigra/promote_traits.hxx
 include/vigra/promote_traits.hxx.py
 include/vigra/python_utility.hxx
@@ -139,6 +149,8 @@ include/vigra/timing.hxx
 include/vigra/tinyvector.hxx
 include/vigra/transformimage.hxx
 include/vigra/tuple.hxx
+include/vigra/tv_filter.hxx
+include/vigra/type_lists.hxx
 include/vigra/union_find.hxx
 include/vigra/unsupervised_decomposition.hxx
 include/vigra/utilities.hxx
@@ -149,7 +161,27 @@ include/vigra/wigner-matrix.hxx
 include/vigra/windows.h
 lib/libvigraimpex.so
 lib/libvigraimpex.so.4
-lib/libvigraimpex.so.4.180
+lib/libvigraimpex.so.4.190
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/__version__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/analysis.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/arraytypes.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/colors.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/filters.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/fourier.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/geometry.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/impex.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/learning.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/noise.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/optimization.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/imagewindow.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/overlays.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/quickdialog.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/sampling.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/tagged_array.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/ufunc.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/vigranumpycore.so
 lib/vigra/VigraConfig.cmake
 lib/vigra/VigraConfigVersion.cmake
 lib/vigra/vigra-targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -193,6 +225,8 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/Utilities.html
 %%DOCSDIR%%/vigra/VigraMatlab.html
 %%DOCSDIR%%/vigra/accessor_8hxx_source.html
+%%DOCSDIR%%/vigra/accumulator-grammar_8hxx_source.html
+%%DOCSDIR%%/vigra/accumulator_8hxx_source.html
 %%DOCSDIR%%/vigra/affine__registration_8hxx_source.html
 %%DOCSDIR%%/vigra/affinegeometry_8hxx_source.html
 %%DOCSDIR%%/vigra/algorithm_8hxx_source.html
@@ -202,9 +236,11 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/basicgeometry_8hxx_source.html
 %%DOCSDIR%%/vigra/basicimage_8hxx_source.html
 %%DOCSDIR%%/vigra/basicimageview_8hxx_source.html
+%%DOCSDIR%%/vigra/bc_s.png
 %%DOCSDIR%%/vigra/bessel_8hxx_source.html
+%%DOCSDIR%%/vigra/bit__array_8hxx_source.html
 %%DOCSDIR%%/vigra/bordertreatment_8hxx_source.html
-%%DOCSDIR%%/vigra/boundarytensor.cxx-example.html
+%%DOCSDIR%%/vigra/boundarytensor_8cxx-example.html
 %%DOCSDIR%%/vigra/boundarytensor_8hxx_source.html
 %%DOCSDIR%%/vigra/box_8hxx_source.html
 %%DOCSDIR%%/vigra/bucket__queue_8hxx_source.html
@@ -267,8 +303,14 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/classvigra_1_1ConstValueIterator.html
 %%DOCSDIR%%/vigra/classvigra_1_1ConvolutionOptions-members.html
 %%DOCSDIR%%/vigra/classvigra_1_1ConvolutionOptions.html
+%%DOCSDIR%%/vigra/classvigra_1_1CoordinateConstValueAccessor-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1CoordinateConstValueAccessor.html
 %%DOCSDIR%%/vigra/classvigra_1_1CoscotFunction-members.html
 %%DOCSDIR%%/vigra/classvigra_1_1CoscotFunction.html
+%%DOCSDIR%%/vigra/classvigra_1_1CoupledHandle-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1CoupledHandle.html
+%%DOCSDIR%%/vigra/classvigra_1_1CoupledScanOrderIterator-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1CoupledScanOrderIterator.html
 %%DOCSDIR%%/vigra/classvigra_1_1CrackContourCirculator-members.html
 %%DOCSDIR%%/vigra/classvigra_1_1CrackContourCirculator.html
 %%DOCSDIR%%/vigra/classvigra_1_1DT__StackEntry-members.html
@@ -347,6 +389,8 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/classvigra_1_1HDF5Handle.html
 %%DOCSDIR%%/vigra/classvigra_1_1HDF5ImportInfo-members.html
 %%DOCSDIR%%/vigra/classvigra_1_1HDF5ImportInfo.html
+%%DOCSDIR%%/vigra/classvigra_1_1HistogramOptions-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1HistogramOptions.html
 %%DOCSDIR%%/vigra/classvigra_1_1ImageArray-members.html
 %%DOCSDIR%%/vigra/classvigra_1_1ImageArray.html
 %%DOCSDIR%%/vigra/classvigra_1_1ImageArray.png
@@ -441,6 +485,8 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/classvigra_1_1PolynomialView-members.html
 %%DOCSDIR%%/vigra/classvigra_1_1PolynomialView.html
 %%DOCSDIR%%/vigra/classvigra_1_1PolynomialView.png
+%%DOCSDIR%%/vigra/classvigra_1_1PriorityQueue-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1PriorityQueue.html
 %%DOCSDIR%%/vigra/classvigra_1_1ProblemSpec-members.html
 %%DOCSDIR%%/vigra/classvigra_1_1ProblemSpec.html
 %%DOCSDIR%%/vigra/classvigra_1_1Processor_3_01ClassificationTag_00_01LabelType_00_01T1_00_01C1_00_01T2_00_01C2_01_4-members.html
@@ -630,6 +676,86 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/classvigra_1_1YPrimePbPr2RGBPrimeFunctor.html
 %%DOCSDIR%%/vigra/classvigra_1_1YPrimeUV2RGBPrimeFunctor-members.html
 %%DOCSDIR%%/vigra/classvigra_1_1YPrimeUV2RGBPrimeFunctor.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1AbsPowerSum-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1AbsPowerSum.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1AccumulatorChain-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1AccumulatorChain.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1AccumulatorChainArray-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1AccumulatorChainArray.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1ArgMaxWeight-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1ArgMaxWeight.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1ArgMinWeight-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1ArgMinWeight.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1AutoRangeHistogram-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1AutoRangeHistogram.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Central-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Central.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Central_3_01PowerSum_3_012_01_4_01_4-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Central_3_01PowerSum_3_012_01_4_01_4.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Central_3_01PowerSum_3_013_01_4_01_4-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Central_3_01PowerSum_3_013_01_4_01_4.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Central_3_01PowerSum_3_014_01_4_01_4-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Central_3_01PowerSum_3_014_01_4_01_4.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Coord-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Coord.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1CoordinateSystem-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1CoordinateSystem.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1DataArg-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1DataArg.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1DivideByCount-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1DivideByCount.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1DivideUnbiased-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1DivideUnbiased.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1DynamicAccumulatorChain-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1DynamicAccumulatorChain.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1DynamicAccumulatorChain.png
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1DynamicAccumulatorChainArray-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1DynamicAccumulatorChainArray.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1DynamicAccumulatorChainArray.png
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1FlatScatterMatrix-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1FlatScatterMatrix.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Global-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Global.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1GlobalRangeHistogram-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1GlobalRangeHistogram.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1IntegerHistogram-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1IntegerHistogram.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Kurtosis-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Kurtosis.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1LabelArg-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1LabelArg.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Maximum-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Maximum.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Minimum-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Minimum.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1PowerSum-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1PowerSum.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Principal-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Principal.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Principal_3_01CoordinateSystem_01_4-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Principal_3_01CoordinateSystem_01_4.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Principal_3_01PowerSum_3_012_01_4_01_4-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Principal_3_01PowerSum_3_012_01_4_01_4.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1RootDivideByCount-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1RootDivideByCount.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1RootDivideUnbiased-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1RootDivideUnbiased.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1ScatterMatrixEigensystem-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1ScatterMatrixEigensystem.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Skewness-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Skewness.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1StandardQuantiles-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1StandardQuantiles.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1UnbiasedKurtosis-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1UnbiasedKurtosis.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1UnbiasedSkewness-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1UnbiasedSkewness.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1UserRangeHistogram-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1UserRangeHistogram.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1WeightArg-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1WeightArg.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Weighted-members.html
+%%DOCSDIR%%/vigra/classvigra_1_1acc_1_1Weighted.html
 %%DOCSDIR%%/vigra/classvigra_1_1linalg_1_1LeastAngleRegressionOptions-members.html
 %%DOCSDIR%%/vigra/classvigra_1_1linalg_1_1LeastAngleRegressionOptions.html
 %%DOCSDIR%%/vigra/classvigra_1_1linalg_1_1Matrix-members.html
@@ -690,14 +816,16 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/classvigra_1_1sRGB2RGBFunctor-members.html
 %%DOCSDIR%%/vigra/classvigra_1_1sRGB2RGBFunctor.html
 %%DOCSDIR%%/vigra/clebsch-gordan_8hxx_source.html
+%%DOCSDIR%%/vigra/closed.png
 %%DOCSDIR%%/vigra/codec_8hxx_source.html
 %%DOCSDIR%%/vigra/colorconversions_8hxx_source.html
 %%DOCSDIR%%/vigra/combineimages_8hxx_source.html
 %%DOCSDIR%%/vigra/configVersion_8hxx_source.html
 %%DOCSDIR%%/vigra/config_8hxx_source.html
 %%DOCSDIR%%/vigra/contourcirculator_8hxx_source.html
-%%DOCSDIR%%/vigra/convert.cxx-example.html
+%%DOCSDIR%%/vigra/convert_8cxx-example.html
 %%DOCSDIR%%/vigra/convolution_8hxx_source.html
+%%DOCSDIR%%/vigra/coordinate__iterator_8hxx_source.html
 %%DOCSDIR%%/vigra/copyimage_8hxx_source.html
 %%DOCSDIR%%/vigra/cornerdetection_8hxx_source.html
 %%DOCSDIR%%/vigra/deprecated.html
@@ -713,7 +841,7 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/documents/viff.ps
 %%DOCSDIR%%/vigra/documents/vigra.gif
 %%DOCSDIR%%/vigra/doxygen.png
-%%DOCSDIR%%/vigra/edge.cxx-example.html
+%%DOCSDIR%%/vigra/edge_8cxx-example.html
 %%DOCSDIR%%/vigra/edgedetection_8hxx_source.html
 %%DOCSDIR%%/vigra/eigensystem_8hxx_source.html
 %%DOCSDIR%%/vigra/error_8hxx_source.html
@@ -726,8 +854,34 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/form_0.png
 %%DOCSDIR%%/vigra/form_1.png
 %%DOCSDIR%%/vigra/form_10.png
+%%DOCSDIR%%/vigra/form_100.png
+%%DOCSDIR%%/vigra/form_101.png
+%%DOCSDIR%%/vigra/form_102.png
+%%DOCSDIR%%/vigra/form_103.png
+%%DOCSDIR%%/vigra/form_104.png
+%%DOCSDIR%%/vigra/form_105.png
+%%DOCSDIR%%/vigra/form_106.png
+%%DOCSDIR%%/vigra/form_107.png
+%%DOCSDIR%%/vigra/form_108.png
+%%DOCSDIR%%/vigra/form_109.png
 %%DOCSDIR%%/vigra/form_11.png
+%%DOCSDIR%%/vigra/form_110.png
+%%DOCSDIR%%/vigra/form_111.png
+%%DOCSDIR%%/vigra/form_112.png
+%%DOCSDIR%%/vigra/form_113.png
+%%DOCSDIR%%/vigra/form_114.png
+%%DOCSDIR%%/vigra/form_115.png
+%%DOCSDIR%%/vigra/form_116.png
+%%DOCSDIR%%/vigra/form_117.png
+%%DOCSDIR%%/vigra/form_118.png
+%%DOCSDIR%%/vigra/form_119.png
 %%DOCSDIR%%/vigra/form_12.png
+%%DOCSDIR%%/vigra/form_120.png
+%%DOCSDIR%%/vigra/form_121.png
+%%DOCSDIR%%/vigra/form_122.png
+%%DOCSDIR%%/vigra/form_123.png
+%%DOCSDIR%%/vigra/form_124.png
+%%DOCSDIR%%/vigra/form_125.png
 %%DOCSDIR%%/vigra/form_13.png
 %%DOCSDIR%%/vigra/form_14.png
 %%DOCSDIR%%/vigra/form_15.png
@@ -813,6 +967,16 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/form_88.png
 %%DOCSDIR%%/vigra/form_89.png
 %%DOCSDIR%%/vigra/form_9.png
+%%DOCSDIR%%/vigra/form_90.png
+%%DOCSDIR%%/vigra/form_91.png
+%%DOCSDIR%%/vigra/form_92.png
+%%DOCSDIR%%/vigra/form_93.png
+%%DOCSDIR%%/vigra/form_94.png
+%%DOCSDIR%%/vigra/form_95.png
+%%DOCSDIR%%/vigra/form_96.png
+%%DOCSDIR%%/vigra/form_97.png
+%%DOCSDIR%%/vigra/form_98.png
+%%DOCSDIR%%/vigra/form_99.png
 %%DOCSDIR%%/vigra/formula.repository
 %%DOCSDIR%%/vigra/functionindex.html
 %%DOCSDIR%%/vigra/functions.html
@@ -874,6 +1038,7 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/functions_type_0x64.html
 %%DOCSDIR%%/vigra/functions_type_0x65.html
 %%DOCSDIR%%/vigra/functions_type_0x66.html
+%%DOCSDIR%%/vigra/functions_type_0x68.html
 %%DOCSDIR%%/vigra/functions_type_0x69.html
 %%DOCSDIR%%/vigra/functions_type_0x6c.html
 %%DOCSDIR%%/vigra/functions_type_0x6d.html
@@ -902,6 +1067,7 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/group__EdgeDetection.html
 %%DOCSDIR%%/vigra/group__FFTWComplexAccessors.html
 %%DOCSDIR%%/vigra/group__FFTWComplexOperators.html
+%%DOCSDIR%%/vigra/group__FeatureAccumulators.html
 %%DOCSDIR%%/vigra/group__FixedPoint16Operations.html
 %%DOCSDIR%%/vigra/group__FixedPointOperations.html
 %%DOCSDIR%%/vigra/group__FixedSizeInt.html
@@ -933,7 +1099,7 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/group__MultiPointoperators.html
 %%DOCSDIR%%/vigra/group__NoiseNormalization.html
 %%DOCSDIR%%/vigra/group__NonLinearDiffusion.html
-%%DOCSDIR%%/vigra/group__OpenCL.html
+%%DOCSDIR%%/vigra/group__OpenCL-Accessors.html
 %%DOCSDIR%%/vigra/group__Optimization.html
 %%DOCSDIR%%/vigra/group__PixelNeighborhood.html
 %%DOCSDIR%%/vigra/group__PolarColors.html
@@ -966,19 +1132,23 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/group__VoxelNeighborhood.html
 %%DOCSDIR%%/vigra/hdf5impex_8hxx_source.html
 %%DOCSDIR%%/vigra/hierarchy.html
+%%DOCSDIR%%/vigra/histogram_8hxx_source.html
 %%DOCSDIR%%/vigra/imagecontainer_8hxx_source.html
 %%DOCSDIR%%/vigra/imageinfo_8hxx_source.html
 %%DOCSDIR%%/vigra/imageiterator_8hxx_source.html
 %%DOCSDIR%%/vigra/imageiteratoradapter_8hxx_source.html
 %%DOCSDIR%%/vigra/impex_8hxx.html
 %%DOCSDIR%%/vigra/impex_8hxx_source.html
+%%DOCSDIR%%/vigra/impexalpha_8hxx_source.html
+%%DOCSDIR%%/vigra/impexbase_8hxx_source.html
 %%DOCSDIR%%/vigra/index.html
 %%DOCSDIR%%/vigra/initimage_8hxx_source.html
 %%DOCSDIR%%/vigra/inspectimage_8hxx_source.html
+%%DOCSDIR%%/vigra/inspector__passes_8hxx_source.html
 %%DOCSDIR%%/vigra/interpolating__accessor_8hxx_source.html
 %%DOCSDIR%%/vigra/invariant__features3D_8hxx_source.html
-%%DOCSDIR%%/vigra/invert.cxx-example.html
-%%DOCSDIR%%/vigra/invert__explicitly.cxx-example.html
+%%DOCSDIR%%/vigra/invert_8cxx-example.html
+%%DOCSDIR%%/vigra/invert_explicitly_8cxx-example.html
 %%DOCSDIR%%/vigra/iteratoradapter_8hxx_source.html
 %%DOCSDIR%%/vigra/iteratortags_8hxx_source.html
 %%DOCSDIR%%/vigra/iteratortraits_8hxx_source.html
@@ -1001,6 +1171,7 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/multi__fft_8hxx_source.html
 %%DOCSDIR%%/vigra/multi__impex_8hxx_source.html
 %%DOCSDIR%%/vigra/multi__iterator_8hxx_source.html
+%%DOCSDIR%%/vigra/multi__iterator__coupled_8hxx_source.html
 %%DOCSDIR%%/vigra/multi__localminmax_8hxx_source.html
 %%DOCSDIR%%/vigra/multi__math_8hxx_source.html
 %%DOCSDIR%%/vigra/multi__morphology_8hxx_source.html
@@ -1009,52 +1180,9 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/multi__resize_8hxx_source.html
 %%DOCSDIR%%/vigra/multi__tensorutilities_8hxx_source.html
 %%DOCSDIR%%/vigra/namespacemembers.html
-%%DOCSDIR%%/vigra/namespacemembers_0x62.html
-%%DOCSDIR%%/vigra/namespacemembers_0x63.html
-%%DOCSDIR%%/vigra/namespacemembers_0x64.html
-%%DOCSDIR%%/vigra/namespacemembers_0x65.html
-%%DOCSDIR%%/vigra/namespacemembers_0x66.html
-%%DOCSDIR%%/vigra/namespacemembers_0x67.html
-%%DOCSDIR%%/vigra/namespacemembers_0x68.html
-%%DOCSDIR%%/vigra/namespacemembers_0x69.html
-%%DOCSDIR%%/vigra/namespacemembers_0x6a.html
-%%DOCSDIR%%/vigra/namespacemembers_0x6c.html
-%%DOCSDIR%%/vigra/namespacemembers_0x6d.html
-%%DOCSDIR%%/vigra/namespacemembers_0x6e.html
-%%DOCSDIR%%/vigra/namespacemembers_0x6f.html
-%%DOCSDIR%%/vigra/namespacemembers_0x70.html
-%%DOCSDIR%%/vigra/namespacemembers_0x71.html
-%%DOCSDIR%%/vigra/namespacemembers_0x72.html
-%%DOCSDIR%%/vigra/namespacemembers_0x73.html
-%%DOCSDIR%%/vigra/namespacemembers_0x74.html
-%%DOCSDIR%%/vigra/namespacemembers_0x75.html
-%%DOCSDIR%%/vigra/namespacemembers_0x76.html
-%%DOCSDIR%%/vigra/namespacemembers_0x77.html
-%%DOCSDIR%%/vigra/namespacemembers_0x79.html
 %%DOCSDIR%%/vigra/namespacemembers_enum.html
 %%DOCSDIR%%/vigra/namespacemembers_eval.html
 %%DOCSDIR%%/vigra/namespacemembers_func.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x62.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x63.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x64.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x65.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x66.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x67.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x68.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x69.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x6a.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x6c.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x6d.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x6e.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x6f.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x70.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x71.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x72.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x73.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x74.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x76.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x77.html
-%%DOCSDIR%%/vigra/namespacemembers_func_0x79.html
 %%DOCSDIR%%/vigra/namespacemembers_type.html
 %%DOCSDIR%%/vigra/namespacemembers_vars.html
 %%DOCSDIR%%/vigra/namespaces.html
@@ -1063,11 +1191,14 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/namespacevigra_1_1FourNeighborhood.html
 %%DOCSDIR%%/vigra/namespacevigra_1_1Neighborhood3DSix.html
 %%DOCSDIR%%/vigra/namespacevigra_1_1Neighborhood3DTwentySix.html
+%%DOCSDIR%%/vigra/namespacevigra_1_1acc.html
 %%DOCSDIR%%/vigra/namespacevigra_1_1linalg.html
 %%DOCSDIR%%/vigra/namespacevigra_1_1multi__math.html
 %%DOCSDIR%%/vigra/namespacevigra_1_1rf_1_1algorithms.html
 %%DOCSDIR%%/vigra/namespacevigra_1_1rf_1_1split.html
 %%DOCSDIR%%/vigra/namespacevigra_1_1rf_1_1visitors.html
+%%DOCSDIR%%/vigra/nav_f.png
+%%DOCSDIR%%/vigra/nav_h.png
 %%DOCSDIR%%/vigra/navigator_8hxx_source.html
 %%DOCSDIR%%/vigra/noise__normalization_8hxx_source.html
 %%DOCSDIR%%/vigra/nonlineardiffusion_8hxx_source.html
@@ -1076,15 +1207,17 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/numpy__array__converters_8hxx_source.html
 %%DOCSDIR%%/vigra/numpy__array__taggedshape_8hxx_source.html
 %%DOCSDIR%%/vigra/numpy__array__traits_8hxx_source.html
+%%DOCSDIR%%/vigra/open.png
 %%DOCSDIR%%/vigra/orientedtensorfilters_8hxx_source.html
 %%DOCSDIR%%/vigra/pages.html
-%%DOCSDIR%%/vigra/palette.cxx-example.html
+%%DOCSDIR%%/vigra/palette_8cxx-example.html
 %%DOCSDIR%%/vigra/pixelneighborhood_8hxx_source.html
 %%DOCSDIR%%/vigra/polygon_8hxx_source.html
 %%DOCSDIR%%/vigra/polynomial_8hxx_source.html
-%%DOCSDIR%%/vigra/profile.cxx-example.html
+%%DOCSDIR%%/vigra/profile_8cxx-example.html
+%%DOCSDIR%%/vigra/project2ellipse_8hxx_source.html
 %%DOCSDIR%%/vigra/promote__traits_8hxx_source.html
-%%DOCSDIR%%/vigra/pyramid.cxx-example.html
+%%DOCSDIR%%/vigra/pyramid_8cxx-example.html
 %%DOCSDIR%%/vigra/python__utility_8hxx_source.html
 %%DOCSDIR%%/vigra/quadprog_8hxx_source.html
 %%DOCSDIR%%/vigra/quaternion_8hxx_source.html
@@ -1096,7 +1229,7 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/recursiveconvolution_8hxx_source.html
 %%DOCSDIR%%/vigra/regression_8hxx_source.html
 %%DOCSDIR%%/vigra/resampling__convolution_8hxx_source.html
-%%DOCSDIR%%/vigra/resize.cxx-example.html
+%%DOCSDIR%%/vigra/resize_8cxx-example.html
 %%DOCSDIR%%/vigra/resizeimage_8hxx_source.html
 %%DOCSDIR%%/vigra/rf__algorithm_8hxx_source.html
 %%DOCSDIR%%/vigra/rf__common_8hxx_source.html
@@ -1119,7 +1252,7 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/singular__value__decomposition_8hxx_source.html
 %%DOCSDIR%%/vigra/sized__int_8hxx_source.html
 %%DOCSDIR%%/vigra/slanted__edge__mtf_8hxx_source.html
-%%DOCSDIR%%/vigra/smooth.cxx-example.html
+%%DOCSDIR%%/vigra/smooth_8cxx-example.html
 %%DOCSDIR%%/vigra/splices_8hxx_source.html
 %%DOCSDIR%%/vigra/splineimageview_8hxx_source.html
 %%DOCSDIR%%/vigra/splines_8hxx_source.html
@@ -1127,19 +1260,24 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/stdconvolution_8hxx_source.html
 %%DOCSDIR%%/vigra/stdimage_8hxx_source.html
 %%DOCSDIR%%/vigra/stdimagefunctions_8hxx_source.html
+%%DOCSDIR%%/vigra/structvigra_1_1CoupledIteratorType-members.html
+%%DOCSDIR%%/vigra/structvigra_1_1CoupledIteratorType.html
 %%DOCSDIR%%/vigra/structvigra_1_1IteratorTraits-members.html
 %%DOCSDIR%%/vigra/structvigra_1_1IteratorTraits.html
 %%DOCSDIR%%/vigra/structvigra_1_1MeshGridAccessor-members.html
 %%DOCSDIR%%/vigra/structvigra_1_1MeshGridAccessor.html
 %%DOCSDIR%%/vigra/structvigra_1_1StridedArrayTag.html
 %%DOCSDIR%%/vigra/structvigra_1_1UnstridedArrayTag.html
+%%DOCSDIR%%/vigra/structvigra_1_1acc_1_1Select-members.html
+%%DOCSDIR%%/vigra/structvigra_1_1acc_1_1Select.html
 %%DOCSDIR%%/vigra/structvigra_1_1rf_1_1algorithms_1_1HC__Entry-members.html
 %%DOCSDIR%%/vigra/structvigra_1_1rf_1_1algorithms_1_1HC__Entry.html
-%%DOCSDIR%%/vigra/subimage.cxx-example.html
+%%DOCSDIR%%/vigra/subimage_8cxx-example.html
 %%DOCSDIR%%/vigra/symmetry_8hxx_source.html
-%%DOCSDIR%%/vigra/tab_b.gif
-%%DOCSDIR%%/vigra/tab_l.gif
-%%DOCSDIR%%/vigra/tab_r.gif
+%%DOCSDIR%%/vigra/tab_a.png
+%%DOCSDIR%%/vigra/tab_b.png
+%%DOCSDIR%%/vigra/tab_h.png
+%%DOCSDIR%%/vigra/tab_s.png
 %%DOCSDIR%%/vigra/tabs.css
 %%DOCSDIR%%/vigra/tensorutilities_8hxx_source.html
 %%DOCSDIR%%/vigra/tiff_8hxx_source.html
@@ -1147,37 +1285,51 @@ lib/vigra/vigra-targets.cmake
 %%DOCSDIR%%/vigra/timing_8hxx_source.html
 %%DOCSDIR%%/vigra/tinyvector_8hxx_source.html
 %%DOCSDIR%%/vigra/todo.html
+%%DOCSDIR%%/vigra/total_variation_8cxx-example.html
 %%DOCSDIR%%/vigra/transformimage_8hxx_source.html
 %%DOCSDIR%%/vigra/tuple_8hxx_source.html
+%%DOCSDIR%%/vigra/tv__filter_8hxx_source.html
+%%DOCSDIR%%/vigra/type__lists_8hxx_source.html
 %%DOCSDIR%%/vigra/union__find_8hxx_source.html
 %%DOCSDIR%%/vigra/unsupervised__decomposition_8hxx_source.html
 %%DOCSDIR%%/vigra/utilities_8hxx_source.html
 %%DOCSDIR%%/vigra/vigra-icon.ico
 %%DOCSDIR%%/vigra/vigra.css
-%%DOCSDIR%%/vigra/voronoi.cxx-example.html
+%%DOCSDIR%%/vigra/voronoi_8cxx-example.html
 %%DOCSDIR%%/vigra/voxelneighborhood_8hxx_source.html
-%%DOCSDIR%%/vigra/watershed.cxx-example.html
+%%DOCSDIR%%/vigra/watershed_8cxx-example.html
 %%DOCSDIR%%/vigra/watersheds3d_8hxx_source.html
 %%DOCSDIR%%/vigra/watersheds_8hxx_source.html
 %%DOCSDIR%%/vigra/wigner-matrix_8hxx_source.html
 %%DOCSDIR%%/vigranumpy/.buildinfo
 %%DOCSDIR%%/vigranumpy/_sources/index.txt
+%%DOCSDIR%%/vigranumpy/_static/ajax-loader.gif
 %%DOCSDIR%%/vigranumpy/_static/basic.css
+%%DOCSDIR%%/vigranumpy/_static/comment-bright.png
+%%DOCSDIR%%/vigranumpy/_static/comment-close.png
+%%DOCSDIR%%/vigranumpy/_static/comment.png
 %%DOCSDIR%%/vigranumpy/_static/default.css
 %%DOCSDIR%%/vigranumpy/_static/doctools.js
+%%DOCSDIR%%/vigranumpy/_static/down-pressed.png
+%%DOCSDIR%%/vigranumpy/_static/down.png
 %%DOCSDIR%%/vigranumpy/_static/file.png
 %%DOCSDIR%%/vigranumpy/_static/jquery.js
 %%DOCSDIR%%/vigranumpy/_static/minus.png
 %%DOCSDIR%%/vigranumpy/_static/plus.png
 %%DOCSDIR%%/vigranumpy/_static/pygments.css
 %%DOCSDIR%%/vigranumpy/_static/searchtools.js
+%%DOCSDIR%%/vigranumpy/_static/sidebar.js
+%%DOCSDIR%%/vigranumpy/_static/underscore.js
+%%DOCSDIR%%/vigranumpy/_static/up-pressed.png
+%%DOCSDIR%%/vigranumpy/_static/up.png
 %%DOCSDIR%%/vigranumpy/_static/vigra-icon.ico
+%%DOCSDIR%%/vigranumpy/_static/websupport.js
 %%DOCSDIR%%/vigranumpy/doctrees/environment.pickle
 %%DOCSDIR%%/vigranumpy/doctrees/index.doctree
 %%DOCSDIR%%/vigranumpy/genindex.html
 %%DOCSDIR%%/vigranumpy/index.html
-%%DOCSDIR%%/vigranumpy/modindex.html
 %%DOCSDIR%%/vigranumpy/objects.inv
+%%DOCSDIR%%/vigranumpy/py-modindex.html
 %%DOCSDIR%%/vigranumpy/search.html
 %%DOCSDIR%%/vigranumpy/searchindex.js
 @dirrm %%DOCSDIR%%/vigra/documents
@@ -1187,6 +1339,8 @@ lib/vigra/vigra-targets.cmake
 @dirrm %%DOCSDIR%%/vigranumpy/_static
 @dirrm %%DOCSDIR%%/vigranumpy
 @dirrm %%DOCSDIR%%
+@dirrm lib/vigra
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/vigra/pyqt
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/vigra
 @dirrm include/vigra/random_forest
 @dirrm include/vigra
-@dirrm lib/vigra