diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-27 18:30:35 +0200 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-04-17 13:36:50 +0300 |
commit | a1e5bffa90b8846d709e49efa80e1293d89d8d16 (patch) | |
tree | fe6381e88953d2c60f7260b5d7b1fd7a77f4bee3 /src/mbgl | |
parent | e688a847a288c1ecee6dbeb85d16bedcce61ecc8 (diff) | |
download | qtlocation-mapboxgl-a1e5bffa90b8846d709e49efa80e1293d89d8d16.tar.gz |
[core] Fix performance-type-promotion-in-math-fn errors in header files
As reported by clang-tidy-8.
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/programs/symbol_program.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/data_driven_property_evaluator.hpp | 12 | ||||
-rw-r--r-- | src/mbgl/renderer/possibly_evaluated_property_value.hpp | 9 |
3 files changed, 15 insertions, 10 deletions
diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index 0a49e5c7ac..848fc0b001 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -213,8 +213,8 @@ public: // combining pos and offset to reduce number of vertex attributes passed to shader (8 max for some devices) {{static_cast<int16_t>(labelAnchor.x), static_cast<int16_t>(labelAnchor.y), - static_cast<int16_t>(::round(o.x * 32)), // use 1/32 pixels for placement - static_cast<int16_t>(::round((o.y + glyphOffsetY) * 32))}}, + static_cast<int16_t>(std::round(o.x * 32)), // use 1/32 pixels for placement + static_cast<int16_t>(std::round((o.y + glyphOffsetY) * 32))}}, {{tx, ty, aSizeMin, aSizeMax}}, {{static_cast<int16_t>(pixelOffset.x * 16), static_cast<int16_t>(pixelOffset.y * 16), diff --git a/src/mbgl/renderer/data_driven_property_evaluator.hpp b/src/mbgl/renderer/data_driven_property_evaluator.hpp index c2e6d9f283..bd476ebe58 100644 --- a/src/mbgl/renderer/data_driven_property_evaluator.hpp +++ b/src/mbgl/renderer/data_driven_property_evaluator.hpp @@ -1,9 +1,11 @@ #pragma once -#include <mbgl/style/property_value.hpp> -#include <mbgl/renderer/property_evaluation_parameters.hpp> -#include <mbgl/renderer/possibly_evaluated_property_value.hpp> #include <mbgl/renderer/cross_faded_property_evaluator.hpp> +#include <mbgl/renderer/possibly_evaluated_property_value.hpp> +#include <mbgl/renderer/property_evaluation_parameters.hpp> +#include <mbgl/style/property_value.hpp> + +#include <cmath> namespace mbgl { @@ -31,7 +33,7 @@ public: returnExpression.useIntegerZoom = true; return ResultType(returnExpression); } - return ResultType(expression.evaluate(floor(parameters.z))); + return ResultType(expression.evaluate(std::floor(parameters.z))); } else { if (!expression.isFeatureConstant() || !expression.isRuntimeConstant()) { return ResultType(expression); @@ -66,7 +68,7 @@ public: if (!expression.isFeatureConstant() || !expression.isRuntimeConstant()) { return ResultType(expression); } else { - const T evaluated = expression.evaluate(floor(parameters.z)); + const T evaluated = expression.evaluate(std::floor(parameters.z)); return ResultType(calculate(evaluated, evaluated, evaluated)); } } diff --git a/src/mbgl/renderer/possibly_evaluated_property_value.hpp b/src/mbgl/renderer/possibly_evaluated_property_value.hpp index 466e042cbc..651c9676fb 100644 --- a/src/mbgl/renderer/possibly_evaluated_property_value.hpp +++ b/src/mbgl/renderer/possibly_evaluated_property_value.hpp @@ -1,10 +1,12 @@ #pragma once -#include <mbgl/style/property_expression.hpp> #include <mbgl/renderer/cross_faded_property_evaluator.hpp> +#include <mbgl/style/property_expression.hpp> #include <mbgl/util/interpolate.hpp> #include <mbgl/util/variant.hpp> +#include <cmath> + namespace mbgl { template <class T> @@ -110,9 +112,10 @@ public: [&] (const Faded<T>& constant_) { return constant_; }, [&] (const style::PropertyExpression<T>& expression) { if (!expression.isZoomConstant()) { - const T min = expression.evaluate(floor(zoom), feature, availableImages, canonical, defaultValue); + const T min = + expression.evaluate(std::floor(zoom), feature, availableImages, canonical, defaultValue); const T max = - expression.evaluate(floor(zoom) + 1, feature, availableImages, canonical, defaultValue); + expression.evaluate(std::floor(zoom) + 1, feature, availableImages, canonical, defaultValue); return Faded<T> {min, max}; } else { const T evaluated = expression.evaluate(feature, availableImages, defaultValue); |