summarylogtreecommitdiffstats
path: root/constexpr.patch
diff options
context:
space:
mode:
Diffstat (limited to 'constexpr.patch')
-rw-r--r--constexpr.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/constexpr.patch b/constexpr.patch
index 81ea4b770b63..05fcb63c4bc2 100644
--- a/constexpr.patch
+++ b/constexpr.patch
@@ -15,6 +15,21 @@ index 8ab70a93..33808059 100644
//! Numerical threshold for considering a value as "zero"
constexpr double ZERO_TOLERANCE = static_cast<double>(FLT_EPSILON);
+diff --git a/libs/qCC_db/ccCameraSensor.cpp b/libs/qCC_db/ccCameraSensor.cpp
+index 4bc29936..1713eceb 100644
+--- a/libs/qCC_db/ccCameraSensor.cpp
++++ b/libs/qCC_db/ccCameraSensor.cpp
+@@ -53,8 +53,8 @@ void ccCameraSensor::IntrinsicParameters::GetKinectDefaults(IntrinsicParameters&
+ //default Kinect parameters from:
+ // "Accuracy and Resolution of Kinect Depth Data for Indoor Mapping Applications"
+ // Kourosh Khoshelham and Sander Oude Elberink
+- constexpr float focal_mm = static_cast<float>(5.45 * 1.0e-3); // focal length (real distance in meter)
+- constexpr float pixelSize_mm = static_cast<float>(9.3 * 1.0e-6); // pixel size (real distance in meter)
++ const float focal_mm = static_cast<float>(5.45 * 1.0e-3); // focal length (real distance in meter)
++ const float pixelSize_mm = static_cast<float>(9.3 * 1.0e-6); // pixel size (real distance in meter)
+
+ params.vertFocal_pix = ConvertFocalMMToPix(focal_mm, pixelSize_mm);
+ params.pixelSize_mm[0] = pixelSize_mm;
diff --git a/libs/qCC_db/ccColorTypes.h b/libs/qCC_db/ccColorTypes.h
index f70025cb..3e3a3b79 100644
--- a/libs/qCC_db/ccColorTypes.h