diff options
Diffstat (limited to 'constexpr.patch')
| -rw-r--r-- | constexpr.patch | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/constexpr.patch b/constexpr.patch index 05fcb63c4bc2..0e2daf5306cb 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); |