5ce6f448ae
New versions of libstdc++ provide lerp() in the global namespace, older ones don't, but it depends on the libstdc++ version and not the c++ version. Since the function is local, just "rename" it. Change-Id: I37896190c620350739fba9b8ce6544f945519244
12 lines
432 B
Diff
12 lines
432 B
Diff
diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
|
|
index 812dc1694f..60b8d617c6 100644
|
|
--- a/src/shaders/SkPerlinNoiseShader.cpp
|
|
+++ b/src/shaders/SkPerlinNoiseShader.cpp
|
|
@@ -573,6 +573,7 @@ static SkScalar fade(SkScalar t) {
|
|
return t * t * t * (t * (t * 6 - 15) + 10);
|
|
}
|
|
|
|
+#define lerp skia_lerp
|
|
static SkScalar lerp(SkScalar t, SkScalar a, SkScalar b) {
|
|
return a + t * (b - a);
|
|
}
|