summaryrefslogtreecommitdiff
path: root/src/csscolorparser/csscolorparser.cpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2017-01-13 14:50:01 +0100
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-01-16 19:01:22 -0600
commit7983e3a67c557a0fcf118984404ea1756416b521 (patch)
tree37c4751a5750381b4012ded35e8d005962f59176 /src/csscolorparser/csscolorparser.cpp
parentcf166717b8e616a3599038ffff440b50251ed7b8 (diff)
downloadqtlocation-mapboxgl-7983e3a67c557a0fcf118984404ea1756416b521.tar.gz
[core] update CSSColorParser
Diffstat (limited to 'src/csscolorparser/csscolorparser.cpp')
-rw-r--r--src/csscolorparser/csscolorparser.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/csscolorparser/csscolorparser.cpp b/src/csscolorparser/csscolorparser.cpp
index 592f10f025..eb75523f18 100644
--- a/src/csscolorparser/csscolorparser.cpp
+++ b/src/csscolorparser/csscolorparser.cpp
@@ -1,5 +1,5 @@
// (c) Dean McNamee <dean@gmail.com>, 2012.
-// C++ port by Konstantin Käfer <mail@kkaefer.com>, 2014.
+// C++ port by Mapbox, Konstantin Käfer <mail@kkaefer.com>, 2014-2017.
//
// https://github.com/deanm/css-color-parser-js
// https://github.com/kkaefer/css-color-parser-cpp
@@ -27,7 +27,6 @@
#include <cstdint>
#include <vector>
#include <sstream>
-#include <cmath>
#include <algorithm>
namespace CSSColorParser {
@@ -117,12 +116,12 @@ const size_t namedColorCount = sizeof (namedColors) / sizeof (NamedColor);
template <typename T>
uint8_t clamp_css_byte(T i) { // Clamp to integer 0 .. 255.
i = ::round(i); // Seems to be what Chrome does (vs truncation).
- return i < 0 ? 0 : i > 255 ? 255 : i;
+ return i < 0 ? 0 : i > 255 ? 255 : uint8_t(i);
}
template <typename T>
float clamp_css_float(T f) { // Clamp to float 0.0 .. 1.0.
- return f < 0 ? 0 : f > 1 ? 1 : f;
+ return f < 0 ? 0 : f > 1 ? 1 : float(f);
}
float parseFloat(const std::string& str) {
@@ -163,7 +162,7 @@ float css_hue_to_rgb(float m1, float m2, float h) {
return m2;
}
if (h * 3.0f < 2.0f) {
- return m1 + (m2 - m1) * (2.0 / 3.0 - h) * 6.0f;
+ return m1 + (m2 - m1) * (2.0f / 3.0f - h) * 6.0f;
}
return m1;
}