summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2019-02-18 15:42:16 +0100
committerbartus2019-02-18 15:42:16 +0100
commit8ae5ddf865dbab811fbddf149f9b698b748dea78 (patch)
treeff6af5bf4c17ff13e8835d5b93b4f81c1a069116
parent25db22cf040c00119fb47200a8593ef2a60ee0cc (diff)
downloadaur-8ae5ddf865dbab811fbddf149f9b698b748dea78.tar.gz
update constexpr.patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--constexpr.patch15
3 files changed, 19 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c95d56903ff..fff5ea11c12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cloudcompare-git
pkgdesc = A 3D point cloud (and triangular mesh) processing software
- pkgver = 2.10.1.r33.gf84d3cd4
+ pkgver = 2.10.1.r69.ga98751c4
pkgrel = 1
url = http://www.danielgm.net/cc/
arch = i686
@@ -28,7 +28,7 @@ pkgbase = cloudcompare-git
source = cloudcompare::git+https://github.com/CloudCompare/CloudCompare.git
source = constexpr.patch
md5sums = SKIP
- md5sums = 46bbc5406f18045433ad2bead593294c
+ md5sums = c1ea23f8a38cf1326196bb42de07e020
pkgname = cloudcompare-git
diff --git a/PKGBUILD b/PKGBUILD
index c9130abc15b..39a270eaf2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
name=cloudcompare
pkgname=${name}-git
-pkgver=2.10.1.r33.gf84d3cd4
+pkgver=2.10.1.r69.ga98751c4
pkgrel=1
pkgdesc="A 3D point cloud (and triangular mesh) processing software"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git"
"constexpr.patch"
)
md5sums=('SKIP'
- '46bbc5406f18045433ad2bead593294c')
+ 'c1ea23f8a38cf1326196bb42de07e020')
prepare() {
cd ${srcdir}/${name}
diff --git a/constexpr.patch b/constexpr.patch
index 81ea4b770b6..05fcb63c4bc 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