head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.96 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.94 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.92 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.90 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.88 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.86 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.84 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.82 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.80 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.78 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.76 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.74 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.72 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.70 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.68 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.66 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.64 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.62 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.60 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.58 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.56 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.54 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.52 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.48 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.28 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.50 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.46 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.44 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.42 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.40 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.38 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.36 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.34 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.32 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.30 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.26 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.24 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.22 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.20 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.18 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.16 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.14 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.12 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.10 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.8 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.6 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.4 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.2 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.3.0.18 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.16 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.14 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.12 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.10 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.8 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.6 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.4 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.2 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.2.0.2 pkgsrc-2011Q4-base:1.2; locks; strict; comment @// @; 1.4 date 2014.05.18.11.31.09; author adam; state Exp; branches; next 1.3; commitid pi7xh7WTJNY1Q0Bx; 1.3 date 2012.02.26.08.38.21; author obache; state Exp; branches; next 1.2; 1.2 date 2011.12.15.18.48.02; author marino; state Exp; branches; next 1.1; 1.1 date 2011.12.15.08.33.44; author marino; state Exp; branches; next ; desc @@ 1.4 log @Changes 1.10.0: * VIGRA got a tutorial. * Significant simplification of the API: MultiArrayView arguments can now be passed to functions directly. The old syntax with Argument Object Factories (srcImageRange(), srcMultiArray() and relatives) remains valid, but is only required when the arguments are old-style BasicImages. * Made StridedArrayTag the default for vigra::MultiArrayView . * Added an efficient multi-dimensional vigra::GridGraph class which support both the LEMON and boost::graph APIs. * Generalized various algorithms to arbitrary dimensions (gaussianGradientMultiArray(), hessianOfGaussianMultiArray(), gaussianDivergenceMultiArray(), localMinima(), localMaxima(), labelMultiArray(), watershedsMultiArray()). * Added slicSuperpixels() for arbitrary dimensions. * Added automatic differentiation (see vigra::autodiff::DualVector). * Added nonlinearLeastSquares() using the Levenberg-Marquardt algorithm and automatic differentiation. More information about the changes can be found on the changelog page. @ text @$NetBSD: patch-include-vigra-mathutil.hxx,v 1.3 2012/02/26 08:38:21 obache Exp $ * missing abs(signed long long) in old GCC. * Fix ambiguous math functions for DragonFly. --- include/vigra/mathutil.hxx.orig 2013-11-18 16:48:16.000000000 +0000 +++ include/vigra/mathutil.hxx @@@@ -153,7 +153,7 @@@@ VIGRA_DEFINE_UNSIGNED_ABS(unsigned long VIGRA_DEFINE_MISSING_ABS(signed char) VIGRA_DEFINE_MISSING_ABS(signed short) -#if defined(_MSC_VER) && _MSC_VER < 1600 +#if defined(_MSC_VER) && _MSC_VER < 1600 || defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 2) VIGRA_DEFINE_MISSING_ABS(signed long long) #endif @@@@ -637,7 +637,12 @@@@ VIGRA_DEFINE_NORM(int) VIGRA_DEFINE_NORM(unsigned int) VIGRA_DEFINE_NORM(long) VIGRA_DEFINE_NORM(unsigned long) +#if defined(__DragonFly__) +inline NormTraits::SquaredNormType squaredNorm(long long t) { return sq((long int) t); } +inline NormTraits::NormType norm(long long t) { return abs((long int) t); } +#else VIGRA_DEFINE_NORM(long long) +#endif VIGRA_DEFINE_NORM(unsigned long long) VIGRA_DEFINE_NORM(float) VIGRA_DEFINE_NORM(double) @ 1.3 log @At least, gcc-4.1.3 does not have abs(signed long long). PR 45922. @ text @d1 1 a1 1 $NetBSD: patch-include-vigra-mathutil.hxx,v 1.2 2011/12/15 18:48:02 marino Exp $ d6 1 a6 1 --- include/vigra/mathutil.hxx.orig 2011-09-20 18:38:36.000000000 +0000 d8 1 a8 1 @@@@ -149,7 +149,7 @@@@ VIGRA_DEFINE_UNSIGNED_ABS(unsigned long d17 1 a17 1 @@@@ -553,7 +553,12 @@@@ VIGRA_DEFINE_NORM(int) @ 1.2 log @graphics/vigra: Fix copy/paste error on DragonFly patch @ text @d1 1 a1 1 $NetBSD: patch-include-vigra-mathutil.hxx,v 1.1 2011/12/15 08:33:44 marino Exp $ d3 4 a6 1 --- include/vigra/mathutil.hxx.orig 2011-12-15 07:07:07.573857000 +0000 d8 9 @ 1.1 log @graphics/vigra: Fix ambiguous math functions for DragonFly @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 +inline NormTraits::SquaredNormType squaredNorm(long long t) { return sq((long int) t); } \ @