summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-02-28 13:46:39 +0100
committerbartus2020-02-28 13:46:39 +0100
commitc65a0a5977e3542849f6e71d8e96d595249e28f1 (patch)
tree0d9778caf6ad7c42c15d9eb7a14026452cbb6df6
parent130dc7f611a7cc0432d49e36c43aee65d990a5a5 (diff)
downloadaur-c65a0a5977e3542849f6e71d8e96d595249e28f1.tar.gz
Update constexpr.patch
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--constexpr.patch23
3 files changed, 18 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0adf4ce16b2..6e7edf62801 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -34,7 +34,7 @@ pkgbase = cloudcompare-git
md5sums = SKIP
md5sums = 379e09f6996b2b397429c0661c409bd0
md5sums = b6dcb0dee15cc67011166a2fc774c5ef
- md5sums = c1ea23f8a38cf1326196bb42de07e020
+ md5sums = 456526b717c1b47d52990df8f06a04e0
pkgname = cloudcompare-git
diff --git a/PKGBUILD b/PKGBUILD
index cc2619bcd7b..4254d423f45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git"
md5sums=('SKIP'
'379e09f6996b2b397429c0661c409bd0'
'b6dcb0dee15cc67011166a2fc774c5ef'
- 'c1ea23f8a38cf1326196bb42de07e020')
+ '456526b717c1b47d52990df8f06a04e0')
prepare() {
cd ${srcdir}/${name}
diff --git a/constexpr.patch b/constexpr.patch
index 05fcb63c4bc..0e2daf5306c 100644
--- a/constexpr.patch
+++ b/constexpr.patch
@@ -31,15 +31,24 @@ index 4bc29936..1713eceb 100644
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
+index d456f3e8..8433cea2 100644
--- a/libs/qCC_db/ccColorTypes.h
+++ b/libs/qCC_db/ccColorTypes.h
@@ -119,7 +119,7 @@ namespace ccColor
// Predefined colors (default type)
- constexpr Rgb white (MAX, MAX, MAX);
-- constexpr Rgb lightGrey (static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8));
-+ const Rgb lightGrey (static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8));
- constexpr Rgb darkGrey (MAX / 2, MAX / 2, MAX / 2);
- constexpr Rgb red (MAX, 0, 0);
- constexpr Rgb green (0, MAX, 0);
+ constexpr Rgb whiteRGB (MAX, MAX, MAX);
+- constexpr Rgb lightGreyRGB (static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8));
++ const Rgb lightGreyRGB (static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8));
+ constexpr Rgb darkGreyRGB (MAX / 2, MAX / 2, MAX / 2);
+ constexpr Rgb redRGB (MAX, 0, 0);
+ constexpr Rgb greenRGB (0, MAX, 0);
+@@ -133,7 +133,7 @@ namespace ccColor
+
+ // Predefined colors (default type)
+ constexpr Rgba white (MAX, MAX, MAX, MAX);
+- constexpr Rgba lightGrey (static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), MAX);
++ const Rgba lightGrey (static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), MAX);
+ constexpr Rgba darkGrey (MAX / 2, MAX / 2, MAX / 2, MAX);
+ constexpr Rgba red (MAX, 0, 0, MAX);
+ constexpr Rgba green (0, MAX, 0, MAX);