pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/hugin
Module Name: pkgsrc
Committed By: wiz
Date: Sun Jan 4 10:15:27 UTC 2026
Modified Files:
pkgsrc/graphics/hugin: distinfo
Added Files:
pkgsrc/graphics/hugin/patches:
patch-src_hugin1_base__wx_wxImageCache.cpp
patch-src_hugin1_hugin_PreviewPanel.cpp
patch-src_hugin__base_huginapp_ImageCache.cpp
patch-src_hugin__cpfind_cpfind_PanoDetectorLogic.cpp
patch-src_tools_linefind.cpp
Log Message:
hugin: fix build on NetBSD-current
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/graphics/hugin/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/hugin/patches/patch-src_hugin1_base__wx_wxImageCache.cpp \
pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_PreviewPanel.cpp \
pkgsrc/graphics/hugin/patches/patch-src_hugin__base_huginapp_ImageCache.cpp \
pkgsrc/graphics/hugin/patches/patch-src_hugin__cpfind_cpfind_PanoDetectorLogic.cpp \
pkgsrc/graphics/hugin/patches/patch-src_tools_linefind.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/hugin/distinfo
diff -u pkgsrc/graphics/hugin/distinfo:1.37 pkgsrc/graphics/hugin/distinfo:1.38
--- pkgsrc/graphics/hugin/distinfo:1.37 Sun Dec 21 21:19:02 2025
+++ pkgsrc/graphics/hugin/distinfo Sun Jan 4 10:15:27 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2025/12/21 21:19:02 adam Exp $
+$NetBSD: distinfo,v 1.38 2026/01/04 10:15:27 wiz Exp $
BLAKE2s (hugin-2025.0.1.tar.bz2) = bdf918d757a5879a54e60ac97056afa6e48d89c02865b5d52cfa7077e05b831a
SHA512 (hugin-2025.0.1.tar.bz2) = ce935c0c4ff5952013a81c5b986f34a8f94a74d15d541dd82747c6d4f4f48094a97cd3c460123bdbd460cbdf4b6d7cea302dc60c9626dc88e631484b36e0dfa0
@@ -6,7 +6,12 @@ Size (hugin-2025.0.1.tar.bz2) = 10229525
SHA1 (patch-CMakeLists.txt) = 474d8a477d81b2446bb46cc4921e7a6e8d9aef4d
SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc
SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f
+SHA1 (patch-src_hugin1_base__wx_wxImageCache.cpp) = 562102bbc5399611d48559067f6efc8f6495cdb3
+SHA1 (patch-src_hugin1_hugin_PreviewPanel.cpp) = f98e7b0f567cb5ff90d2e46c640be841f88cfbaa
SHA1 (patch-src_hugin1_toolbox_CMakeLists.txt) = 0b2d32fea8c37042f16600830ccf3bd0c17f4e99
+SHA1 (patch-src_hugin__base_huginapp_ImageCache.cpp) = 3f921a3a5b4c609dbc3cd7501bee7896a76520fb
+SHA1 (patch-src_hugin__cpfind_cpfind_PanoDetectorLogic.cpp) = d1df35f8f8d06490a5cb78776607bf2d8c482782
SHA1 (patch-src_hugin__script__interface_hsi.i) = b11a52579fd12fdf7c51fef63049d285cb2b52e1
SHA1 (patch-src_tools_align_image_stack.cpp) = fc2759f0722365d4c5339c5c8bc1eda1a6bf7a71
+SHA1 (patch-src_tools_linefind.cpp) = 480b718d3168b23d48f50cb8e87279f7e0d98415
SHA1 (patch-src_tools_tca__correct.cpp) = 73a86d3086336f168de5fb1cc02378a3ecc43104
Added files:
Index: pkgsrc/graphics/hugin/patches/patch-src_hugin1_base__wx_wxImageCache.cpp
diff -u /dev/null pkgsrc/graphics/hugin/patches/patch-src_hugin1_base__wx_wxImageCache.cpp:1.1
--- /dev/null Sun Jan 4 10:15:27 2026
+++ pkgsrc/graphics/hugin/patches/patch-src_hugin1_base__wx_wxImageCache.cpp Sun Jan 4 10:15:27 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_hugin1_base__wx_wxImageCache.cpp,v 1.1 2026/01/04 10:15:27 wiz Exp $
+
+error: no matching function for call to 'max(double, float)'
+
+--- src/hugin1/base_wx/wxImageCache.cpp.orig 2026-01-04 10:09:55.589779097 +0000
++++ src/hugin1/base_wx/wxImageCache.cpp
+@@ -41,7 +41,7 @@ wxImage imageCacheEntry2wxImage(ImageCac
+ // create temporary image with remapped tone scale
+ vigra::BRGBImage mappedImg(e->imageFloat->size());
+ // scale image to (mean - 3 * std deviation) - (mean + 3 * std deviation),
+- vigra_ext::applyMapping(srcImageRange(*(e->imageFloat)), destImage(mappedImg), std::max(mean.average() - 3 * sqrt(mean.variance()), 1e-6f), mean.average() + 3 * sqrt(mean.variance()),
mapping);
++ vigra_ext::applyMapping(srcImageRange(*(e->imageFloat)), destImage(mappedImg), std::max(mean.average() - 3 * sqrt(mean.variance()), 1e-6), mean.average() + 3 * sqrt(mean.variance()),
mapping);
+ // convert to wxImage
+ wxImage mappedwxImg(mappedImg.width(), mappedImg.height(), (unsigned char *)mappedImg.data(), true);
+ return mappedwxImg.Copy();
Index: pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_PreviewPanel.cpp
diff -u /dev/null pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_PreviewPanel.cpp:1.1
--- /dev/null Sun Jan 4 10:15:27 2026
+++ pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_PreviewPanel.cpp Sun Jan 4 10:15:27 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_hugin1_hugin_PreviewPanel.cpp,v 1.1 2026/01/04 10:15:27 wiz Exp $
+
+error: no matching function for call to 'max(double, float)'
+
+--- src/hugin1/hugin/PreviewPanel.cpp.orig 2026-01-04 10:11:42.853636201 +0000
++++ src/hugin1/hugin/PreviewPanel.cpp
+@@ -320,7 +320,7 @@ void PreviewPanel::updatePreview()
+ // find min and max
+ vigra::FindAverageAndVariance<float> mean; // init functor
+ vigra::inspectImageIf(vigra::srcImageRange(panoImg, vigra::RGBToGrayAccessor<vigra::RGBValue<float>>()), vigra::srcImage(alpha), mean);
+- double min = std::max(mean.average()-3*sqrt(mean.variance()), 1e-6f);
++ double min = std::max(mean.average()-3*sqrt(mean.variance()), 1e-6);
+ double max = mean.average() + 3 * sqrt(mean.variance());
+
+ int mapping = wxConfigBase::Get()->Read("/ImageCache/Mapping", HUGIN_IMGCACHE_MAPPING_FLOAT);
Index: pkgsrc/graphics/hugin/patches/patch-src_hugin__base_huginapp_ImageCache.cpp
diff -u /dev/null pkgsrc/graphics/hugin/patches/patch-src_hugin__base_huginapp_ImageCache.cpp:1.1
--- /dev/null Sun Jan 4 10:15:27 2026
+++ pkgsrc/graphics/hugin/patches/patch-src_hugin__base_huginapp_ImageCache.cpp Sun Jan 4 10:15:27 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_hugin__base_huginapp_ImageCache.cpp,v 1.1 2026/01/04 10:15:27 wiz Exp $
+
+error: no matching function for call to 'max(double, float)'
+
+--- src/hugin_base/huginapp/ImageCache.cpp.orig 2026-01-04 10:05:46.860282953 +0000
++++ src/hugin_base/huginapp/ImageCache.cpp
+@@ -59,7 +59,7 @@ void convertTo8Bit(SrcIMG& src, const st
+ vigra::RGBToGrayAccessor<vigra::RGBValue<float> > ga;
+ vigra::FindAverageAndVariance<float> mean; // init functor
+ vigra::inspectImage(srcImageRange(src, ga), mean);
+- min = std::max(mean.average() - 3 * sqrt(mean.variance()), 1e-6f);
++ min = std::max(mean.average() - 3 * sqrt(mean.variance()), 1e-6);
+ max = mean.average() + 3 * sqrt(mean.variance());
+ mapping = desiredMapping != -1 ? desiredMapping : HUGIN_IMGCACHE_MAPPING_FLOAT;
+ }
Index: pkgsrc/graphics/hugin/patches/patch-src_hugin__cpfind_cpfind_PanoDetectorLogic.cpp
diff -u /dev/null pkgsrc/graphics/hugin/patches/patch-src_hugin__cpfind_cpfind_PanoDetectorLogic.cpp:1.1
--- /dev/null Sun Jan 4 10:15:27 2026
+++ pkgsrc/graphics/hugin/patches/patch-src_hugin__cpfind_cpfind_PanoDetectorLogic.cpp Sun Jan 4 10:15:27 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_hugin__cpfind_cpfind_PanoDetectorLogic.cpp,v 1.1 2026/01/04 10:15:27 wiz Exp $
+
+error: no matching function for call to 'max(double, float)'
+
+--- src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp.orig 2026-01-04 10:10:49.755602839 +0000
++++ src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp
+@@ -302,7 +302,7 @@ bool PanoDetector::AnalyzeImage(ImgData&
+ {
+ vigra::FindAverageAndVariance<float> mean; // init functor
+ vigra::inspectImage(vigra::srcImageRange(*image), mean);
+- minVal = std::max(mean.average() - 3 * sqrt(mean.variance()), 1e-6f);
++ minVal = std::max(mean.average() - 3 * sqrt(mean.variance()), 1e-6);
+ maxVal = mean.average() + 3 * sqrt(mean.variance());;
+ }
+ else
+@@ -560,7 +560,7 @@ bool PanoDetector::AnalyzeImage(ImgData&
+ {
+ vigra::FindAverageAndVariance<float> mean; // init functor
+ vigra::inspectImage(vigra::srcImageRange(*rgbImage, vigra::RGBToGrayAccessor<vigra::RGBValue<double> >()), mean);
+- minVal = std::max(mean.average() - 3 * sqrt(mean.variance()), 1e-6f);
++ minVal = std::max(mean.average() - 3 * sqrt(mean.variance()), 1e-6);
+ maxVal = mean.average() + 3 * sqrt(mean.variance());;
+ }
+ else
Index: pkgsrc/graphics/hugin/patches/patch-src_tools_linefind.cpp
diff -u /dev/null pkgsrc/graphics/hugin/patches/patch-src_tools_linefind.cpp:1.1
--- /dev/null Sun Jan 4 10:15:27 2026
+++ pkgsrc/graphics/hugin/patches/patch-src_tools_linefind.cpp Sun Jan 4 10:15:27 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_tools_linefind.cpp,v 1.1 2026/01/04 10:15:27 wiz Exp $
+
+error: no matching function for call to 'max(double, float)'
+
+--- src/tools/linefind.cpp.orig 2026-01-04 10:08:44.474110831 +0000
++++ src/tools/linefind.cpp
+@@ -87,7 +87,7 @@ void convertToUInt8(SrcIMG& src, const s
+ */
+ vigra::FindAverageAndVariance<float> mean; // init functor
+ vigra::inspectImage(srcImageRange(src, vigra::RGBToGrayAccessor<typename SrcIMG::PixelType>()), mean);
+- const double minVal = std::max(mean.average() - 3 * sqrt(mean.variance()), 1e-6f);
++ const double minVal = std::max(mean.average() - 3 * sqrt(mean.variance()), 1e-6);
+ const double maxVal = mean.average() + 3 * sqrt(mean.variance());
+ vigra_ext::applyMapping(srcImageRange(src), destImage(dest), minVal, maxVal, 1);
+ }
+@@ -111,7 +111,7 @@ void convertGrayToUInt8(SrcIMG& src, con
+ */
+ vigra::FindAverageAndVariance<float> mean; // init functor
+ vigra::inspectImage(srcImageRange(src), mean);
+- const double minVal = std::max(mean.average() - 3 * sqrt(mean.variance()), 1e-6f);
++ const double minVal = std::max(mean.average() - 3 * sqrt(mean.variance()), 1e-6);
+ const double maxVal = mean.average() + 3 * sqrt(mean.variance());
+ vigra_ext::applyMapping(srcImageRange(src), destImage(dest), minVal, maxVal, 1);
+ }
Home |
Main Index |
Thread Index |
Old Index