diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2018-01-10 11:48:06 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-01-10 13:45:00 -0800 |
commit | cedda5ef4f73fccfc795e6bc48b368e48f11ad8d (patch) | |
tree | f695cb615da4e023017d44fad8ded4259efab0fd /src/mbgl/style/expression/value.cpp | |
parent | ecbb0baf60138cea2c72ec4e75b788ca59d86e14 (diff) | |
download | qtlocation-mapboxgl-cedda5ef4f73fccfc795e6bc48b368e48f11ad8d.tar.gz |
[core] Handle NaN input to interpolate and step
Diffstat (limited to 'src/mbgl/style/expression/value.cpp')
-rw-r--r-- | src/mbgl/style/expression/value.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mbgl/style/expression/value.cpp b/src/mbgl/style/expression/value.cpp index b75f471ce3..ef4769df02 100644 --- a/src/mbgl/style/expression/value.cpp +++ b/src/mbgl/style/expression/value.cpp @@ -108,13 +108,9 @@ Value ValueConverter<float>::toExpressionValue(const float value) { } optional<float> ValueConverter<float>::fromExpressionValue(const Value& value) { - if (value.template is<double>()) { - double v = value.template get<double>(); - if (v <= std::numeric_limits<float>::max()) { - return static_cast<float>(v); - } - } - return optional<float>(); + return value.template is<double>() + ? static_cast<float>(value.template get<double>()) + : optional<float>(); } |