Changes 1.7.1:

* Fixed the build process for MacOS X.
* Re-activeted vigra-config (script to query VIGRA installation information)
  and added VigraConfig.cmake (query VIGRA installation information from within
  cmake).
* Added CDash support (nightly builds and tests).
* Added convexHull().
* Added vigra::Box.
* Added vigra::Sampler class to sample given data in various ways.
* Added much new functionality to the vigra::RandomForest class (e.g. more
  split strategies, variable importance measures, feature selection)
* Added readSIF() (reader for the Andor SIF file format).
* Added vigra::HDF5File for easier navigation in HDF5 files.
* Added recursive approximation of the Gaussian filter
  (recursiveGaussianFilterX(), recursiveGaussianFilterY())
* vigranumpy: added Gabor filtering.
* Fixed multi-threading bugs at various places.
* Minor improvements and bug fixes in the code and documentation.

5 files changed, 1035 insertions, 235 deletions

diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index fa454287a42..32dcd24f6c5 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2011/01/13 13:36:10 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.9 2011/01/29 16:29:03 adam Exp $
 
-DISTNAME=	vigra-1.7.0-src
+DISTNAME=	vigra-1.7.1-src
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://hci.iwr.uni-heidelberg.de/vigra/
 
@@ -14,20 +12,19 @@ LICENSE=	mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
+USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
-USE_CMAKE=		yes
 
-INSTALL_MAKE_FLAGS+=	bindir=${DESTDIR}${PREFIX}/bin
-INSTALL_MAKE_FLAGS+=	docdir=${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-INSTALL_MAKE_FLAGS+=	includedir=${DESTDIR}${PREFIX}/include
-INSTALL_MAKE_FLAGS+=	libdir=${DESTDIR}${PREFIX}/lib
+CMAKE_ARGS+=	-D DOCINSTALL:PATH=${DESTDIR}${PREFIX}/share/doc
 
 .include "options.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/vigra/PLIST b/graphics/vigra/PLIST
index 26f4928d75b..10c885f09d8 100644
--- a/graphics/vigra/PLIST
+++ b/graphics/vigra/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2010/10/16 15:50:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/01/29 16:29:03 adam Exp $
+bin/vigra-config
 include/vigra/accessor.hxx
 include/vigra/affine_registration.hxx
 include/vigra/affinegeometry.hxx
@@ -8,6 +9,7 @@ include/vigra/basicimage.hxx
 include/vigra/basicimageview.hxx
 include/vigra/bordertreatment.hxx
 include/vigra/boundarytensor.hxx
+include/vigra/box.hxx
 include/vigra/cellconfigurations.hxx
 include/vigra/cellimage.hxx
 include/vigra/codec.hxx
@@ -74,6 +76,7 @@ include/vigra/numpy_array.hxx
 include/vigra/numpy_array_converters.hxx
 include/vigra/orientedtensorfilters.hxx
 include/vigra/pixelneighborhood.hxx
+include/vigra/polygon.hxx
 include/vigra/polynomial.hxx
 include/vigra/promote_traits.hxx
 include/vigra/promote_traits.hxx.py
@@ -81,6 +84,8 @@ include/vigra/python_utility.hxx
 include/vigra/quadprog.hxx
 include/vigra/random.hxx
 include/vigra/random_forest.hxx
+include/vigra/random_forest/features.hxx
+include/vigra/random_forest/rf_algorithm.hxx
 include/vigra/random_forest/rf_common.hxx
 include/vigra/random_forest/rf_decisionTree.hxx
 include/vigra/random_forest/rf_earlystopping.hxx
@@ -88,9 +93,10 @@ include/vigra/random_forest/rf_nodeproxy.hxx
 include/vigra/random_forest/rf_online_prediction_set.hxx
 include/vigra/random_forest/rf_preprocessing.hxx
 include/vigra/random_forest/rf_region.hxx
-include/vigra/random_forest/rf_sampling.hxx
+include/vigra/random_forest/rf_ridge_split.hxx
 include/vigra/random_forest/rf_split.hxx
 include/vigra/random_forest/rf_visitors.hxx
+include/vigra/random_forest/splices.hxx
 include/vigra/random_forest_deprec.hxx
 include/vigra/random_forest_hdf5_impex.hxx
 include/vigra/rational.hxx
@@ -100,9 +106,11 @@ include/vigra/resampling_convolution.hxx
 include/vigra/resizeimage.hxx
 include/vigra/rfftw.hxx
 include/vigra/rgbvalue.hxx
+include/vigra/sampling.hxx
 include/vigra/seededregiongrowing.hxx
 include/vigra/seededregiongrowing3d.hxx
 include/vigra/separableconvolution.hxx
+include/vigra/sifImport.hxx
 include/vigra/singular_value_decomposition.hxx
 include/vigra/sized_int.hxx
 include/vigra/slanted_edge_mtf.hxx
@@ -126,8 +134,1008 @@ include/vigra/watersheds.hxx
 include/vigra/watersheds3d.hxx
 include/vigra/windows.h
 lib/libvigraimpex.so
-lib/libvigraimpex.so.2
-lib/libvigraimpex.so.2.170
+lib/libvigraimpex.so.3
+lib/libvigraimpex.so.3.171
 lib/vigra/VigraConfig.cmake
+lib/vigra/VigraConfigVersion.cmake
 lib/vigra/vigra-targets-release.cmake
 lib/vigra/vigra-targets.cmake
+share/doc/vigra/AlgebraicConcepts.html
+share/doc/vigra/ArgumentObjectFactories.html
+share/doc/vigra/BorderTreatmentMode.html
+share/doc/vigra/Concepts.html
+share/doc/vigra/Convolution.html
+share/doc/vigra/CrackEdgeImage.html
+share/doc/vigra/CreditsChangelog.html
+share/doc/vigra/ErrorReporting.html
+share/doc/vigra/Examples.html
+share/doc/vigra/FFTWComplexTraits.html
+share/doc/vigra/FixedPoint16Traits.html
+share/doc/vigra/FixedPointTraits.html
+share/doc/vigra/FunctorExpressions.html
+share/doc/vigra/ImageAnalysis.html
+share/doc/vigra/ImageDataStructures.html
+share/doc/vigra/ImageProcessing.html
+share/doc/vigra/ImportExport.html
+share/doc/vigra/Installation.html
+share/doc/vigra/KernelArgumentObjectFactories.html
+share/doc/vigra/LICENSE.txt
+share/doc/vigra/MathConstants.html
+share/doc/vigra/MathFunctionality.html
+share/doc/vigra/MultiDimensionalArrays.html
+share/doc/vigra/MultiIteratorPage.html
+share/doc/vigra/NormTraits.html
+share/doc/vigra/NumericPromotionTraits.html
+share/doc/vigra/NumericTraits.html
+share/doc/vigra/PixelTypes.html
+share/doc/vigra/PointOperators.html
+share/doc/vigra/PromoteTraits.html
+share/doc/vigra/RGBValueTraits.html
+share/doc/vigra/RationalTraits.html
+share/doc/vigra/SquareRootTraits.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/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/classes.html
+share/doc/vigra/classvigra_1_1ArrayOfRegionStatistics-members.html
+share/doc/vigra/classvigra_1_1ArrayOfRegionStatistics.html
+share/doc/vigra/classvigra_1_1ArrayVector-members.html
+share/doc/vigra/classvigra_1_1ArrayVector.html
+share/doc/vigra/classvigra_1_1ArrayVector.png
+share/doc/vigra/classvigra_1_1ArrayVectorView-members.html
+share/doc/vigra/classvigra_1_1ArrayVectorView.html
+share/doc/vigra/classvigra_1_1ArrayVectorView.png
+share/doc/vigra/classvigra_1_1BSpline-members.html
+share/doc/vigra/classvigra_1_1BSpline.html
+share/doc/vigra/classvigra_1_1BSpline.png
+share/doc/vigra/classvigra_1_1BSplineBase-members.html
+share/doc/vigra/classvigra_1_1BSplineBase.html
+share/doc/vigra/classvigra_1_1BSplineBase.png
+share/doc/vigra/classvigra_1_1BasicImage-members.html
+share/doc/vigra/classvigra_1_1BasicImage.html
+share/doc/vigra/classvigra_1_1BasicImageIterator-members.html
+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
+share/doc/vigra/classvigra_1_1BestGiniOfColumn.html
+share/doc/vigra/classvigra_1_1BilinearInterpolatingAccessor-members.html
+share/doc/vigra/classvigra_1_1BilinearInterpolatingAccessor.html
+share/doc/vigra/classvigra_1_1BlueAccessor-members.html
+share/doc/vigra/classvigra_1_1BlueAccessor.html
+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_1CatmullRomSpline-members.html
+share/doc/vigra/classvigra_1_1CatmullRomSpline.html
+share/doc/vigra/classvigra_1_1ColumnIterator-members.html
+share/doc/vigra/classvigra_1_1ColumnIterator.html
+share/doc/vigra/classvigra_1_1ConstBasicImageIterator-members.html
+share/doc/vigra/classvigra_1_1ConstBasicImageIterator.html
+share/doc/vigra/classvigra_1_1ConstBasicImageIterator.png
+share/doc/vigra/classvigra_1_1ConstImageIterator-members.html
+share/doc/vigra/classvigra_1_1ConstImageIterator.html
+share/doc/vigra/classvigra_1_1ConstImageIterator.png
+share/doc/vigra/classvigra_1_1ConstStridedImageIterator-members.html
+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_1CoscotFunction-members.html
+share/doc/vigra/classvigra_1_1CoscotFunction.html
+share/doc/vigra/classvigra_1_1CrackContourCirculator-members.html
+share/doc/vigra/classvigra_1_1CrackContourCirculator.html
+share/doc/vigra/classvigra_1_1DT__StackEntry-members.html
+share/doc/vigra/classvigra_1_1DT__StackEntry.html
+share/doc/vigra/classvigra_1_1Diff2D-members.html
+share/doc/vigra/classvigra_1_1Diff2D.html
+share/doc/vigra/classvigra_1_1Diff2D.png
+share/doc/vigra/classvigra_1_1DiffusivityFunctor-members.html
+share/doc/vigra/classvigra_1_1DiffusivityFunctor.html
+share/doc/vigra/classvigra_1_1Dist2D-members.html
+share/doc/vigra/classvigra_1_1Dist2D.html
+share/doc/vigra/classvigra_1_1EarlyStoppStd-members.html
+share/doc/vigra/classvigra_1_1EarlyStoppStd.html
+share/doc/vigra/classvigra_1_1Edgel-members.html
+share/doc/vigra/classvigra_1_1Edgel.html
+share/doc/vigra/classvigra_1_1EightNeighborhood_1_1NeighborCode-members.html
+share/doc/vigra/classvigra_1_1EightNeighborhood_1_1NeighborCode.html
+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_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_1FFTWRealAccessor-members.html
+share/doc/vigra/classvigra_1_1FFTWRealAccessor.html
+share/doc/vigra/classvigra_1_1FFTWRealAccessor.png
+share/doc/vigra/classvigra_1_1FFTWWriteRealAccessor-members.html
+share/doc/vigra/classvigra_1_1FFTWWriteRealAccessor.html
+share/doc/vigra/classvigra_1_1FFTWWriteRealAccessor.png
+share/doc/vigra/classvigra_1_1FindAverage-members.html
+share/doc/vigra/classvigra_1_1FindAverage.html
+share/doc/vigra/classvigra_1_1FindAverageAndVariance-members.html
+share/doc/vigra/classvigra_1_1FindAverageAndVariance.html
+share/doc/vigra/classvigra_1_1FindBoundingRectangle-members.html
+share/doc/vigra/classvigra_1_1FindBoundingRectangle.html
+share/doc/vigra/classvigra_1_1FindMinMax-members.html
+share/doc/vigra/classvigra_1_1FindMinMax.html
+share/doc/vigra/classvigra_1_1FindROISize-members.html
+share/doc/vigra/classvigra_1_1FindROISize.html
+share/doc/vigra/classvigra_1_1FindSum-members.html
+share/doc/vigra/classvigra_1_1FindSum.html
+share/doc/vigra/classvigra_1_1FixedPoint-members.html
+share/doc/vigra/classvigra_1_1FixedPoint.html
+share/doc/vigra/classvigra_1_1FixedPoint16-members.html
+share/doc/vigra/classvigra_1_1FixedPoint16.html
+share/doc/vigra/classvigra_1_1FourNeighborhood_1_1NeighborCode-members.html
+share/doc/vigra/classvigra_1_1FourNeighborhood_1_1NeighborCode.html
+share/doc/vigra/classvigra_1_1FunctorTraits-members.html
+share/doc/vigra/classvigra_1_1FunctorTraits.html
+share/doc/vigra/classvigra_1_1GaborFilterFamily-members.html
+share/doc/vigra/classvigra_1_1GaborFilterFamily.html
+share/doc/vigra/classvigra_1_1GaborFilterFamily.png
+share/doc/vigra/classvigra_1_1GammaFunctor-members.html
+share/doc/vigra/classvigra_1_1GammaFunctor.html
+share/doc/vigra/classvigra_1_1Gaussian-members.html
+share/doc/vigra/classvigra_1_1Gaussian.html
+share/doc/vigra/classvigra_1_1GiniCriterion-members.html
+share/doc/vigra/classvigra_1_1GiniCriterion.html
+share/doc/vigra/classvigra_1_1GrayToRGBAccessor-members.html
+share/doc/vigra/classvigra_1_1GrayToRGBAccessor.html
+share/doc/vigra/classvigra_1_1GreenAccessor-members.html
+share/doc/vigra/classvigra_1_1GreenAccessor.html
+share/doc/vigra/classvigra_1_1HDF5File-members.html
+share/doc/vigra/classvigra_1_1HDF5File.html
+share/doc/vigra/classvigra_1_1HDF5Handle-members.html
+share/doc/vigra/classvigra_1_1HDF5Handle.html
+share/doc/vigra/classvigra_1_1HDF5ImportInfo-members.html
+share/doc/vigra/classvigra_1_1HDF5ImportInfo.html
+share/doc/vigra/classvigra_1_1ImageArray-members.html
+share/doc/vigra/classvigra_1_1ImageArray.html
+share/doc/vigra/classvigra_1_1ImageArray.png
+share/doc/vigra/classvigra_1_1ImageExportInfo-members.html
+share/doc/vigra/classvigra_1_1ImageExportInfo.html
+share/doc/vigra/classvigra_1_1ImageImportInfo-members.html
+share/doc/vigra/classvigra_1_1ImageImportInfo.html
+share/doc/vigra/classvigra_1_1ImageIterator-members.html
+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
+share/doc/vigra/classvigra_1_1IteratorAdaptor.html
+share/doc/vigra/classvigra_1_1Kernel1D-members.html
+share/doc/vigra/classvigra_1_1Kernel1D.html
+share/doc/vigra/classvigra_1_1Kernel2D-members.html
+share/doc/vigra/classvigra_1_1Kernel2D.html
+share/doc/vigra/classvigra_1_1Lab2RGBFunctor-members.html
+share/doc/vigra/classvigra_1_1Lab2RGBFunctor.html
+share/doc/vigra/classvigra_1_1Lab2RGBPrimeFunctor-members.html
+share/doc/vigra/classvigra_1_1Lab2RGBPrimeFunctor.html
+share/doc/vigra/classvigra_1_1Lab2XYZFunctor-members.html
+share/doc/vigra/classvigra_1_1Lab2XYZFunctor.html
+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_1Luv2RGBFunctor-members.html
+share/doc/vigra/classvigra_1_1Luv2RGBFunctor.html
+share/doc/vigra/classvigra_1_1Luv2RGBPrimeFunctor-members.html
+share/doc/vigra/classvigra_1_1Luv2RGBPrimeFunctor.html
+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_1MultiArray-members.html
+share/doc/vigra/classvigra_1_1MultiArray.html
+share/doc/vigra/classvigra_1_1MultiArray.png
+share/doc/vigra/classvigra_1_1MultiArrayNavigator-members.html
+share/doc/vigra/classvigra_1_1MultiArrayNavigator.html
+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_1MultiImageAccessor2-members.html
+share/doc/vigra/classvigra_1_1MultiImageAccessor2.html
+share/doc/vigra/classvigra_1_1MultiIterator-members.html
+share/doc/vigra/classvigra_1_1MultiIterator.html
+share/doc/vigra/classvigra_1_1NeighborOffsetCirculator-members.html
+share/doc/vigra/classvigra_1_1NeighborOffsetCirculator.html
+share/doc/vigra/classvigra_1_1Neighborhood3DSix_1_1NeighborCode3D-members.html
+share/doc/vigra/classvigra_1_1Neighborhood3DSix_1_1NeighborCode3D.html
+share/doc/vigra/classvigra_1_1Neighborhood3DTwentySix_1_1NeighborCode3D-members.html
+share/doc/vigra/classvigra_1_1Neighborhood3DTwentySix_1_1NeighborCode3D.html
+share/doc/vigra/classvigra_1_1NeighborhoodCirculator-members.html
+share/doc/vigra/classvigra_1_1NeighborhoodCirculator.html
+share/doc/vigra/classvigra_1_1NeighborhoodCirculator.png
+share/doc/vigra/classvigra_1_1NodeBase-members.html
+share/doc/vigra/classvigra_1_1NodeBase.html
+share/doc/vigra/classvigra_1_1NodeBase.png
+share/doc/vigra/classvigra_1_1Node_3_01e__ConstProbNode_01_4-members.html
+share/doc/vigra/classvigra_1_1Node_3_01e__ConstProbNode_01_4.html
+share/doc/vigra/classvigra_1_1Node_3_01e__ConstProbNode_01_4.png
+share/doc/vigra/classvigra_1_1NoiseNormalizationOptions-members.html
+share/doc/vigra/classvigra_1_1NoiseNormalizationOptions.html
+share/doc/vigra/classvigra_1_1NormalRandomFunctor-members.html
+share/doc/vigra/classvigra_1_1NormalRandomFunctor.html
+share/doc/vigra/classvigra_1_1NumpyAnyArray-members.html
+share/doc/vigra/classvigra_1_1NumpyAnyArray.html
+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_1Point2D-members.html
+share/doc/vigra/classvigra_1_1Point2D.html
+share/doc/vigra/classvigra_1_1Point2D.png
+share/doc/vigra/classvigra_1_1Polynomial-members.html
+share/doc/vigra/classvigra_1_1Polynomial.html
+share/doc/vigra/classvigra_1_1Polynomial.png
+share/doc/vigra/classvigra_1_1PolynomialView-members.html
+share/doc/vigra/classvigra_1_1PolynomialView.html
+share/doc/vigra/classvigra_1_1PolynomialView.png
+share/doc/vigra/classvigra_1_1ProblemSpec-members.html
+share/doc/vigra/classvigra_1_1ProblemSpec.html
+share/doc/vigra/classvigra_1_1Processor_3_01ClassificationTag_00_01LabelType_00_01T1_00_01C1_00_01T2_00_01C2_01_4-members.html
+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_1RGB2LabFunctor-members.html
+share/doc/vigra/classvigra_1_1RGB2LabFunctor.html
+share/doc/vigra/classvigra_1_1RGB2LuvFunctor-members.html
+share/doc/vigra/classvigra_1_1RGB2LuvFunctor.html
+share/doc/vigra/classvigra_1_1RGB2RGBPrimeFunctor-members.html
+share/doc/vigra/classvigra_1_1RGB2RGBPrimeFunctor.html
+share/doc/vigra/classvigra_1_1RGB2XYZFunctor-members.html
+share/doc/vigra/classvigra_1_1RGB2XYZFunctor.html
+share/doc/vigra/classvigra_1_1RGB2sRGBFunctor-members.html
+share/doc/vigra/classvigra_1_1RGB2sRGBFunctor.html
+share/doc/vigra/classvigra_1_1RGBAccessor-members.html
+share/doc/vigra/classvigra_1_1RGBAccessor.html
+share/doc/vigra/classvigra_1_1RGBAccessor.png
+share/doc/vigra/classvigra_1_1RGBGradientMagnitudeFunctor-members.html
+share/doc/vigra/classvigra_1_1RGBGradientMagnitudeFunctor.html
+share/doc/vigra/classvigra_1_1RGBPrime2LabFunctor-members.html
+share/doc/vigra/classvigra_1_1RGBPrime2LabFunctor.html
+share/doc/vigra/classvigra_1_1RGBPrime2LuvFunctor-members.html
+share/doc/vigra/classvigra_1_1RGBPrime2LuvFunctor.html
+share/doc/vigra/classvigra_1_1RGBPrime2RGBFunctor-members.html
+share/doc/vigra/classvigra_1_1RGBPrime2RGBFunctor.html
+share/doc/vigra/classvigra_1_1RGBPrime2XYZFunctor-members.html
+share/doc/vigra/classvigra_1_1RGBPrime2XYZFunctor.html
+share/doc/vigra/classvigra_1_1RGBPrime2YPrimeCbCrFunctor-members.html
+share/doc/vigra/classvigra_1_1RGBPrime2YPrimeCbCrFunctor.html
+share/doc/vigra/classvigra_1_1RGBPrime2YPrimeIQFunctor-members.html
+share/doc/vigra/classvigra_1_1RGBPrime2YPrimeIQFunctor.html
+share/doc/vigra/classvigra_1_1RGBPrime2YPrimePbPrFunctor-members.html
+share/doc/vigra/classvigra_1_1RGBPrime2YPrimePbPrFunctor.html
+share/doc/vigra/classvigra_1_1RGBPrime2YPrimeUVFunctor-members.html
+share/doc/vigra/classvigra_1_1RGBPrime2YPrimeUVFunctor.html
+share/doc/vigra/classvigra_1_1RGBToGrayAccessor-members.html
+share/doc/vigra/classvigra_1_1RGBToGrayAccessor.html
+share/doc/vigra/classvigra_1_1RGBValue-members.html
+share/doc/vigra/classvigra_1_1RGBValue.html
+share/doc/vigra/classvigra_1_1RGBValue.png
+share/doc/vigra/classvigra_1_1RandomForest-members.html
+share/doc/vigra/classvigra_1_1RandomForest.html
+share/doc/vigra/classvigra_1_1RandomForestClassCounter-members.html
+share/doc/vigra/classvigra_1_1RandomForestClassCounter.html
+share/doc/vigra/classvigra_1_1RandomForestOptions-members.html
+share/doc/vigra/classvigra_1_1RandomForestOptions.html
+share/doc/vigra/classvigra_1_1RandomNumberGenerator-members.html
+share/doc/vigra/classvigra_1_1RandomNumberGenerator.html
+share/doc/vigra/classvigra_1_1Rational-members.html
+share/doc/vigra/classvigra_1_1Rational.html
+share/doc/vigra/classvigra_1_1Rect2D-members.html
+share/doc/vigra/classvigra_1_1Rect2D.html
+share/doc/vigra/classvigra_1_1RedAccessor-members.html
+share/doc/vigra/classvigra_1_1RedAccessor.html
+share/doc/vigra/classvigra_1_1ReduceFunctor-members.html
+share/doc/vigra/classvigra_1_1ReduceFunctor.html
+share/doc/vigra/classvigra_1_1RestrictedNeighborhoodCirculator-members.html
+share/doc/vigra/classvigra_1_1RestrictedNeighborhoodCirculator.html
+share/doc/vigra/classvigra_1_1RestrictedNeighborhoodCirculator.png
+share/doc/vigra/classvigra_1_1RowIterator-members.html
+share/doc/vigra/classvigra_1_1RowIterator.html
+share/doc/vigra/classvigra_1_1SIFImportInfo-members.html
+share/doc/vigra/classvigra_1_1SIFImportInfo.html
+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_1SeedRgDirectValueFunctor-members.html
+share/doc/vigra/classvigra_1_1SeedRgDirectValueFunctor.html
+share/doc/vigra/classvigra_1_1SequenceAccessor-members.html
+share/doc/vigra/classvigra_1_1SequenceAccessor.html
+share/doc/vigra/classvigra_1_1SequenceAccessor.png
+share/doc/vigra/classvigra_1_1Size2D-members.html
+share/doc/vigra/classvigra_1_1Size2D.html
+share/doc/vigra/classvigra_1_1Size2D.png
+share/doc/vigra/classvigra_1_1SlantedEdgeMTFOptions-members.html
+share/doc/vigra/classvigra_1_1SlantedEdgeMTFOptions.html
+share/doc/vigra/classvigra_1_1SortSamplesByDimensions-members.html
+share/doc/vigra/classvigra_1_1SortSamplesByDimensions.html
+share/doc/vigra/classvigra_1_1Splice-members.html
+share/doc/vigra/classvigra_1_1Splice.html
+share/doc/vigra/classvigra_1_1SplineImageView-members.html
+share/doc/vigra/classvigra_1_1SplineImageView.html
+share/doc/vigra/classvigra_1_1SplineImageView0-members.html
+share/doc/vigra/classvigra_1_1SplineImageView0.html
+share/doc/vigra/classvigra_1_1SplineImageView1-members.html
+share/doc/vigra/classvigra_1_1SplineImageView1.html
+share/doc/vigra/classvigra_1_1SplitBase-members.html
+share/doc/vigra/classvigra_1_1SplitBase.html
+share/doc/vigra/classvigra_1_1SplitBase.png
+share/doc/vigra/classvigra_1_1StandardAccessor-members.html
+share/doc/vigra/classvigra_1_1StandardAccessor.html
+share/doc/vigra/classvigra_1_1StandardConstAccessor-members.html
+share/doc/vigra/classvigra_1_1StandardConstAccessor.html
+share/doc/vigra/classvigra_1_1StandardConstValueAccessor-members.html
+share/doc/vigra/classvigra_1_1StandardConstValueAccessor.html
+share/doc/vigra/classvigra_1_1StandardValueAccessor-members.html
+share/doc/vigra/classvigra_1_1StandardValueAccessor.html
+share/doc/vigra/classvigra_1_1StaticPolynomial-members.html
+share/doc/vigra/classvigra_1_1StaticPolynomial.html
+share/doc/vigra/classvigra_1_1StaticPolynomial.png
+share/doc/vigra/classvigra_1_1StopAfterTree-members.html
+share/doc/vigra/classvigra_1_1StopAfterTree.html
+share/doc/vigra/classvigra_1_1StopAfterTree.png
+share/doc/vigra/classvigra_1_1StopAfterVoteCount-members.html
+share/doc/vigra/classvigra_1_1StopAfterVoteCount.html
+share/doc/vigra/classvigra_1_1StopAfterVoteCount.png
+share/doc/vigra/classvigra_1_1StopBase-members.html
+share/doc/vigra/classvigra_1_1StopBase.html
+share/doc/vigra/classvigra_1_1StopBase.png
+share/doc/vigra/classvigra_1_1StopIfBinTest-members.html
+share/doc/vigra/classvigra_1_1StopIfBinTest.html
+share/doc/vigra/classvigra_1_1StopIfBinTest.png
+share/doc/vigra/classvigra_1_1StopIfConverging-members.html
+share/doc/vigra/classvigra_1_1StopIfConverging.html
+share/doc/vigra/classvigra_1_1StopIfConverging.png
+share/doc/vigra/classvigra_1_1StopIfMargin-members.html
+share/doc/vigra/classvigra_1_1StopIfMargin.html
+share/doc/vigra/classvigra_1_1StopIfMargin.png
+share/doc/vigra/classvigra_1_1StopIfProb-members.html
+share/doc/vigra/classvigra_1_1StopIfProb.html
+share/doc/vigra/classvigra_1_1StopIfProb.png
+share/doc/vigra/classvigra_1_1StridedImageIterator-members.html
+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_1Threshold-members.html
+share/doc/vigra/classvigra_1_1Threshold.html
+share/doc/vigra/classvigra_1_1ThresholdSplit-members.html
+share/doc/vigra/classvigra_1_1ThresholdSplit.html
+share/doc/vigra/classvigra_1_1ThresholdSplit.png
+share/doc/vigra/classvigra_1_1TinyVector-members.html
+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
+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
+share/doc/vigra/classvigra_1_1VectorComponentAccessor-members.html
+share/doc/vigra/classvigra_1_1VectorComponentAccessor.html
+share/doc/vigra/classvigra_1_1VectorComponentValueAccessor-members.html
+share/doc/vigra/classvigra_1_1VectorComponentValueAccessor.html
+share/doc/vigra/classvigra_1_1VectorElementAccessor-members.html
+share/doc/vigra/classvigra_1_1VectorElementAccessor.html
+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_1XYZ2LabFunctor-members.html
+share/doc/vigra/classvigra_1_1XYZ2LabFunctor.html
+share/doc/vigra/classvigra_1_1XYZ2LuvFunctor-members.html
+share/doc/vigra/classvigra_1_1XYZ2LuvFunctor.html
+share/doc/vigra/classvigra_1_1XYZ2RGBFunctor-members.html
+share/doc/vigra/classvigra_1_1XYZ2RGBFunctor.html
+share/doc/vigra/classvigra_1_1XYZ2RGBPrimeFunctor-members.html
+share/doc/vigra/classvigra_1_1XYZ2RGBPrimeFunctor.html
+share/doc/vigra/classvigra_1_1YPrimeCbCr2RGBPrimeFunctor-members.html
+share/doc/vigra/classvigra_1_1YPrimeCbCr2RGBPrimeFunctor.html
+share/doc/vigra/classvigra_1_1YPrimeIQ2RGBPrimeFunctor-members.html
+share/doc/vigra/classvigra_1_1YPrimeIQ2RGBPrimeFunctor.html
+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
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1CorrectStatus-members.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1CorrectStatus.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1Draw-members.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1Draw.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1GetClusterVariables-members.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1GetClusterVariables.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1HClustering-members.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1HClustering.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1NormalizeStatus-members.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1NormalizeStatus.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1PermuteCluster-members.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1PermuteCluster.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1RFErrorCallback-members.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1RFErrorCallback.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1VariableSelectionResult-members.html
+share/doc/vigra/classvigra_1_1rf_1_1algorithms_1_1VariableSelectionResult.html
+share/doc/vigra/classvigra_1_1rf_1_1split_1_1Median-members.html
+share/doc/vigra/classvigra_1_1rf_1_1split_1_1Median.html
+share/doc/vigra/classvigra_1_1rf_1_1split_1_1RandomSplitOfColumn-members.html
+share/doc/vigra/classvigra_1_1rf_1_1split_1_1RandomSplitOfColumn.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1CompleteOOBInfo-members.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1CompleteOOBInfo.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1CompleteOOBInfo.png
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1CorrelationVisitor-members.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1CorrelationVisitor.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1CorrelationVisitor.png
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1OOB__Error-members.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1OOB__Error.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1OOB__Error.png
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1OOB__PerTreeError-members.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1OOB__PerTreeError.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1OOB__PerTreeError.png
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1OnlineLearnVisitor-members.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1OnlineLearnVisitor.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1OnlineLearnVisitor.png
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1RandomForestProgressVisitor-members.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1RandomForestProgressVisitor.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1RandomForestProgressVisitor.png
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1StopVisiting-members.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1StopVisiting.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1StopVisiting.png
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1VariableImportanceVisitor-members.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1VariableImportanceVisitor.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1VariableImportanceVisitor.png
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1VisitorBase-members.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1VisitorBase.html
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1VisitorBase.png
+share/doc/vigra/classvigra_1_1rf_1_1visitors_1_1detail_1_1VisitorNode-members.html
+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/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/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
+share/doc/vigra/documents/pfeil.gif
+share/doc/vigra/documents/pfeilGross.gif
+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/files.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
+share/doc/vigra/form_11.png
+share/doc/vigra/form_12.png
+share/doc/vigra/form_13.png
+share/doc/vigra/form_14.png
+share/doc/vigra/form_15.png
+share/doc/vigra/form_16.png
+share/doc/vigra/form_17.png
+share/doc/vigra/form_18.png
+share/doc/vigra/form_19.png
+share/doc/vigra/form_2.png
+share/doc/vigra/form_20.png
+share/doc/vigra/form_21.png
+share/doc/vigra/form_22.png
+share/doc/vigra/form_23.png
+share/doc/vigra/form_24.png
+share/doc/vigra/form_25.png
+share/doc/vigra/form_26.png
+share/doc/vigra/form_27.png
+share/doc/vigra/form_28.png
+share/doc/vigra/form_29.png
+share/doc/vigra/form_3.png
+share/doc/vigra/form_30.png
+share/doc/vigra/form_31.png
+share/doc/vigra/form_32.png
+share/doc/vigra/form_33.png
+share/doc/vigra/form_34.png
+share/doc/vigra/form_35.png
+share/doc/vigra/form_36.png
+share/doc/vigra/form_37.png
+share/doc/vigra/form_38.png
+share/doc/vigra/form_39.png
+share/doc/vigra/form_4.png
+share/doc/vigra/form_40.png
+share/doc/vigra/form_41.png
+share/doc/vigra/form_42.png
+share/doc/vigra/form_43.png
+share/doc/vigra/form_44.png
+share/doc/vigra/form_45.png
+share/doc/vigra/form_46.png
+share/doc/vigra/form_47.png
+share/doc/vigra/form_48.png
+share/doc/vigra/form_49.png
+share/doc/vigra/form_5.png
+share/doc/vigra/form_50.png
+share/doc/vigra/form_51.png
+share/doc/vigra/form_52.png
+share/doc/vigra/form_53.png
+share/doc/vigra/form_54.png
+share/doc/vigra/form_55.png
+share/doc/vigra/form_56.png
+share/doc/vigra/form_57.png
+share/doc/vigra/form_58.png
+share/doc/vigra/form_59.png
+share/doc/vigra/form_6.png
+share/doc/vigra/form_60.png
+share/doc/vigra/form_61.png
+share/doc/vigra/form_62.png
+share/doc/vigra/form_63.png
+share/doc/vigra/form_64.png
+share/doc/vigra/form_65.png
+share/doc/vigra/form_66.png
+share/doc/vigra/form_67.png
+share/doc/vigra/form_68.png
+share/doc/vigra/form_69.png
+share/doc/vigra/form_7.png
+share/doc/vigra/form_70.png
+share/doc/vigra/form_71.png
+share/doc/vigra/form_72.png
+share/doc/vigra/form_73.png
+share/doc/vigra/form_74.png
+share/doc/vigra/form_75.png
+share/doc/vigra/form_76.png
+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_9.png
+share/doc/vigra/formula.repository
+share/doc/vigra/functionindex.html
+share/doc/vigra/functions.html
+share/doc/vigra/functions_0x62.html
+share/doc/vigra/functions_0x63.html
+share/doc/vigra/functions_0x64.html
+share/doc/vigra/functions_0x65.html
+share/doc/vigra/functions_0x66.html
+share/doc/vigra/functions_0x67.html
+share/doc/vigra/functions_0x68.html
+share/doc/vigra/functions_0x69.html
+share/doc/vigra/functions_0x6b.html
+share/doc/vigra/functions_0x6c.html
+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_0x72.html
+share/doc/vigra/functions_0x73.html
+share/doc/vigra/functions_0x74.html
+share/doc/vigra/functions_0x75.html
+share/doc/vigra/functions_0x76.html
+share/doc/vigra/functions_0x77.html
+share/doc/vigra/functions_0x78.html
+share/doc/vigra/functions_0x79.html
+share/doc/vigra/functions_0x7e.html
+share/doc/vigra/functions_enum.html
+share/doc/vigra/functions_eval.html
+share/doc/vigra/functions_func.html
+share/doc/vigra/functions_func_0x62.html
+share/doc/vigra/functions_func_0x63.html
+share/doc/vigra/functions_func_0x64.html
+share/doc/vigra/functions_func_0x65.html
+share/doc/vigra/functions_func_0x66.html
+share/doc/vigra/functions_func_0x67.html
+share/doc/vigra/functions_func_0x68.html
+share/doc/vigra/functions_func_0x69.html
+share/doc/vigra/functions_func_0x6b.html
+share/doc/vigra/functions_func_0x6c.html
+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_0x72.html
+share/doc/vigra/functions_func_0x73.html
+share/doc/vigra/functions_func_0x74.html
+share/doc/vigra/functions_func_0x75.html
+share/doc/vigra/functions_func_0x76.html
+share/doc/vigra/functions_func_0x77.html
+share/doc/vigra/functions_func_0x78.html
+share/doc/vigra/functions_func_0x79.html
+share/doc/vigra/functions_func_0x7e.html
+share/doc/vigra/functions_rela.html
+share/doc/vigra/functions_type.html
+share/doc/vigra/functions_type_0x62.html
+share/doc/vigra/functions_type_0x63.html
+share/doc/vigra/functions_type_0x64.html
+share/doc/vigra/functions_type_0x65.html
+share/doc/vigra/functions_type_0x66.html
+share/doc/vigra/functions_type_0x69.html
+share/doc/vigra/functions_type_0x6c.html
+share/doc/vigra/functions_type_0x6d.html
+share/doc/vigra/functions_type_0x6e.html
+share/doc/vigra/functions_type_0x70.html
+share/doc/vigra/functions_type_0x72.html
+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/group__ColorConversions.html
+share/doc/vigra/group__CombineAlgo.html
+share/doc/vigra/group__CombineFunctor.html
+share/doc/vigra/group__CommonConvolutionFilters.html
+share/doc/vigra/group__CopyAlgo.html
+share/doc/vigra/group__CornerDetection.html
+share/doc/vigra/group__DataAccessors.html
+share/doc/vigra/group__DistanceTransform.html
+share/doc/vigra/group__EdgeDetection.html
+share/doc/vigra/group__FFTWComplexAccessors.html
+share/doc/vigra/group__FFTWComplexOperators.html
+share/doc/vigra/group__FixedPoint16Operations.html
+share/doc/vigra/group__FixedPointOperations.html
+share/doc/vigra/group__FixedSizeInt.html
+share/doc/vigra/group__FourierTransform.html
+share/doc/vigra/group__Functors.html
+share/doc/vigra/group__GaborFilter.html
+share/doc/vigra/group__GeometricTransformations.html
+share/doc/vigra/group__ImageContainers.html
+share/doc/vigra/group__ImageIteratorAdapters.html
+share/doc/vigra/group__ImageIterators.html
+share/doc/vigra/group__InitAlgo.html
+share/doc/vigra/group__InspectAlgo.html
+share/doc/vigra/group__InspectFunctor.html
+share/doc/vigra/group__Labeling.html
+share/doc/vigra/group__LinearAlgebraFunctions.html
+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
+share/doc/vigra/group__MultiArrayDistanceTransform.html
+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__MultiPointoperators.html
+share/doc/vigra/group__NoiseNormalization.html
+share/doc/vigra/group__NonLinearDiffusion.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__RGBValueAccessors.html
+share/doc/vigra/group__RGBValueOperators.html
+share/doc/vigra/group__RandomNumberGeneration.html
+share/doc/vigra/group__RangesAndPoints.html
+share/doc/vigra/group__RationalOperations.html
+share/doc/vigra/group__RecursiveConvolution.html
+share/doc/vigra/group__Registration.html
+share/doc/vigra/group__ResamplingConvolutionFilters.html
+share/doc/vigra/group__SeededRegionGrowing.html
+share/doc/vigra/group__SeparableConvolution.html
+share/doc/vigra/group__SlantedEdgeMTF.html
+share/doc/vigra/group__StandardConvolution.html
+share/doc/vigra/group__StandardImageTypes.html
+share/doc/vigra/group__SymmetryDetection.html
+share/doc/vigra/group__TIFFImpex.html
+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__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/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/impex_8hxx.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/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/namespacemembers.html
+share/doc/vigra/namespacemembers_0x62.html
+share/doc/vigra/namespacemembers_0x63.html
+share/doc/vigra/namespacemembers_0x64.html
+share/doc/vigra/namespacemembers_0x65.html
+share/doc/vigra/namespacemembers_0x66.html
+share/doc/vigra/namespacemembers_0x67.html
+share/doc/vigra/namespacemembers_0x68.html
+share/doc/vigra/namespacemembers_0x69.html
+share/doc/vigra/namespacemembers_0x6a.html
+share/doc/vigra/namespacemembers_0x6c.html
+share/doc/vigra/namespacemembers_0x6d.html
+share/doc/vigra/namespacemembers_0x6e.html
+share/doc/vigra/namespacemembers_0x6f.html
+share/doc/vigra/namespacemembers_0x70.html
+share/doc/vigra/namespacemembers_0x71.html
+share/doc/vigra/namespacemembers_0x72.html
+share/doc/vigra/namespacemembers_0x73.html
+share/doc/vigra/namespacemembers_0x74.html
+share/doc/vigra/namespacemembers_0x75.html
+share/doc/vigra/namespacemembers_0x76.html
+share/doc/vigra/namespacemembers_0x77.html
+share/doc/vigra/namespacemembers_0x79.html
+share/doc/vigra/namespacemembers_enum.html
+share/doc/vigra/namespacemembers_eval.html
+share/doc/vigra/namespacemembers_func.html
+share/doc/vigra/namespacemembers_func_0x62.html
+share/doc/vigra/namespacemembers_func_0x63.html
+share/doc/vigra/namespacemembers_func_0x64.html
+share/doc/vigra/namespacemembers_func_0x65.html
+share/doc/vigra/namespacemembers_func_0x66.html
+share/doc/vigra/namespacemembers_func_0x67.html
+share/doc/vigra/namespacemembers_func_0x68.html
+share/doc/vigra/namespacemembers_func_0x69.html
+share/doc/vigra/namespacemembers_func_0x6a.html
+share/doc/vigra/namespacemembers_func_0x6c.html
+share/doc/vigra/namespacemembers_func_0x6d.html
+share/doc/vigra/namespacemembers_func_0x6e.html
+share/doc/vigra/namespacemembers_func_0x6f.html
+share/doc/vigra/namespacemembers_func_0x70.html
+share/doc/vigra/namespacemembers_func_0x71.html
+share/doc/vigra/namespacemembers_func_0x72.html
+share/doc/vigra/namespacemembers_func_0x73.html
+share/doc/vigra/namespacemembers_func_0x74.html
+share/doc/vigra/namespacemembers_func_0x76.html
+share/doc/vigra/namespacemembers_func_0x77.html
+share/doc/vigra/namespacemembers_func_0x79.html
+share/doc/vigra/namespacemembers_type.html
+share/doc/vigra/namespacemembers_vars.html
+share/doc/vigra/namespaces.html
+share/doc/vigra/namespacevigra.html
+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_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/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/structvigra_1_1IteratorTraits-members.html
+share/doc/vigra/structvigra_1_1IteratorTraits.html
+share/doc/vigra/structvigra_1_1MeshGridAccessor-members.html
+share/doc/vigra/structvigra_1_1MeshGridAccessor.html
+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/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/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/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/vigranumpy/.buildinfo
+share/doc/vigranumpy/_sources/index.txt
+share/doc/vigranumpy/_static/basic.css
+share/doc/vigranumpy/_static/default.css
+share/doc/vigranumpy/_static/doctools.js
+share/doc/vigranumpy/_static/file.png
+share/doc/vigranumpy/_static/jquery.js
+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/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
+share/doc/vigranumpy/searchindex.js
diff --git a/graphics/vigra/buildlink3.mk b/graphics/vigra/buildlink3.mk
index 95c62fa1f14..2a847a10c7a 100644
--- a/graphics/vigra/buildlink3.mk
+++ b/graphics/vigra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2011/01/13 13:36:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2011/01/29 16:29:03 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.7.0nb1
 BUILDLINK_PKGSRCDIR.vigra?=	../../graphics/vigra
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/vigra/distinfo b/graphics/vigra/distinfo
index 5486ce879eb..d1a44deec11 100644
--- a/graphics/vigra/distinfo
+++ b/graphics/vigra/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2011/01/15 16:31:18 wiz Exp $
+$NetBSD: distinfo,v 1.5 2011/01/29 16:29:03 adam Exp $
 
-SHA1 (vigra-1.7.0-src.tar.gz) = 31875646cbb1928d93c96fc4da4fda31772cf8f6
-RMD160 (vigra-1.7.0-src.tar.gz) = 496479bcf133c3352ffad146308b7496f2fa4d9b
-Size (vigra-1.7.0-src.tar.gz) = 26637626 bytes
-SHA1 (patch-ab) = e9104d7804bfe51cd2abca29a6d4850f578cd5fc
+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
diff --git a/graphics/vigra/patches/patch-ab b/graphics/vigra/patches/patch-ab
index 7ee45b576d6..daa187a7150 100644
--- a/graphics/vigra/patches/patch-ab
+++ b/graphics/vigra/patches/patch-ab
@@ -1,227 +1,22 @@
-$NetBSD: patch-ab,v 1.3 2011/01/15 16:31:18 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2011/01/29 16:29:03 adam Exp $
 
-Fix compilation with png-1.4, already included upstream.
-Fix build with png-1.5.
-
---- src/impex/png.cxx.orig	2010-04-20 16:29:02.000000000 +0000
+--- src/impex/png.cxx.orig	2011-01-29 15:14:21.000000000 +0000
 +++ src/impex/png.cxx
-@@ -75,7 +75,11 @@ extern "C" {
- static void PngError( png_structp png_ptr, png_const_charp error_msg )
- {
-     png_error_message = std::string(error_msg);
-+#if (PNG_LIBPNG_VER < 10500)
-     longjmp( png_ptr->jmpbuf, 1 );
-+#else
-+    png_longjmp( png_ptr, 1 );
-+#endif
- }
- 
- // called on non-fatal errors
-@@ -207,7 +211,7 @@ namespace vigra {
-         vigra_postcondition( png != 0, "could not create the read struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf(png))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
-         }
-@@ -215,14 +219,14 @@ namespace vigra {
-         vigra_postcondition( info != 0, "could not create the info struct." );
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf(png))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-         png_init_io( png, file.get() );
- 
-         // specify that the signature was already read
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf(png))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
-         }
-@@ -238,13 +242,13 @@ namespace vigra {
-     void PngDecoderImpl::init()
-     {
-         // read all chunks up to the image data
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf(png)))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
-         png_read_info( png, info );
- 
-         // pull over the header fields
-         int interlace_method, compression_method, filter_method;
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf(png)))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
-         png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
-                       &interlace_method, &compression_method, &filter_method );
-@@ -258,7 +262,7 @@ namespace vigra {
- 
-         // transform palette to rgb
-         if ( color_type == PNG_COLOR_TYPE_PALETTE) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf(png)))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
-             png_set_palette_to_rgb(png);
-             color_type = PNG_COLOR_TYPE_RGB;
-@@ -267,9 +271,9 @@ namespace vigra {
- 
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
--            if (setjmp(png->jmpbuf))
--                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
--            png_set_gray_1_2_4_to_8(png);
-+            if (setjmp(png_jmpbuf(png)))
-+                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+            png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-         }
- 
-@@ -277,7 +281,7 @@ namespace vigra {
- #if 0
-         // strip alpha channel
-         if ( color_type & PNG_COLOR_MASK_ALPHA ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf(png)))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
-             png_set_strip_alpha(png);
-             color_type ^= PNG_COLOR_MASK_ALPHA;
-@@ -319,9 +323,9 @@ namespace vigra {
+@@ -320,7 +320,7 @@ namespace vigra {
  #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
          char * dummyName;
          int dummyCompType;
 -        char * profilePtr;
-+        png_byte * profilePtr;
++        png_bytep profilePtr;
          png_uint_32 profileLen;
--        if (info->valid & PNG_INFO_iCCP) {
-+        if (png_get_valid(png, info, PNG_INFO_iCCP)) {
+         if (png_get_valid( png, info, PNG_INFO_iCCP )) {
              png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
-             iccProfilePtr = (unsigned char *) profilePtr;
-             iccProfileLength = profileLen;
-@@ -334,7 +338,7 @@ namespace vigra {
-         // image gamma
-         double image_gamma = 0.45455;
-         if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf(png)))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
-             png_get_gAMA( png, info, &image_gamma );
-         }
-@@ -343,26 +347,26 @@ namespace vigra {
-         double screen_gamma = 2.2;
- 
-         // set gamma correction
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf(png)))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
-         png_set_gamma( png, screen_gamma, image_gamma );
- #endif
- 
-         // interlace handling, get number of read passes needed
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf(png)))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
-         n_interlace_passes = png_set_interlace_handling(png);
- 
-         // update png library state to reflect any changes that were made
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf(png)))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
-         png_read_update_info( png, info );
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf(png)))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
-         n_channels = png_get_channels(png, info);
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf(png)))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
-         rowsize = png_get_rowbytes(png, info);
- 
-@@ -373,7 +377,7 @@ namespace vigra {
-     void PngDecoderImpl::nextScanline()
-     {
-         for (int i=0; i < n_interlace_passes; i++) {
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf(png)))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-             png_read_row(png, row_data.begin(), NULL);
-         }
-@@ -539,7 +543,7 @@ namespace vigra {
-         vigra_postcondition( png != 0, "could not create the write struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf(png))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
-         }
-@@ -550,7 +554,7 @@ namespace vigra {
-         }
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf(png))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-@@ -565,7 +569,7 @@ namespace vigra {
-     void PngEncoderImpl::finalize()
-     {
-         // write the IHDR
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf(png)))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
-         png_set_IHDR( png, info, width, height, bit_depth, color_type,
-                       PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-@@ -573,7 +577,7 @@ namespace vigra {
- 
-         // set resolution
-         if (x_resolution > 0 && y_resolution > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf(png)))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
-             png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
-                          (png_uint_32) (y_resolution / 0.0254 + 0.5),
-@@ -582,7 +586,7 @@ namespace vigra {
- 
-         // set offset
-         if (position.x > 0 && position.y > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf(png)))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
-             png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
-         }
-@@ -591,12 +595,12 @@ namespace vigra {
+@@ -592,7 +592,7 @@ namespace vigra {
          // set icc profile
          if (iccProfile.size() > 0) {
-             png_set_iCCP(png, info, const_cast<char*>("icc"), 0,
--                         (char *)iccProfile.begin(), (png_uint_32)iccProfile.size());
+             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
  
-         // write the info struct
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf(png)))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
-         png_write_info( png, info );
- 
-@@ -628,10 +632,10 @@ namespace vigra {
-         }
- 
-         // write the whole image
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf(png)))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
-         png_write_image( png, row_pointers.begin() );
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf(png)))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
-         png_write_end(png, info);
-     }