Remove all usage of fmin and fmax
bug:22208220
Removes needless call, and upconversion to doubles in multiple places.
Change-Id: I1b949fa5f206446ac34de800154c0147d6bd8034
diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp
index 7dbe3b7..2e63793 100644
--- a/libs/hwui/Properties.cpp
+++ b/libs/hwui/Properties.cpp
@@ -17,7 +17,7 @@
#include "Debug.h"
-#include <cmath>
+#include <algorithm>
#include <cutils/log.h>
namespace android {
@@ -117,19 +117,19 @@
ALOGD("profile bars %s", sDisableProfileBars ? "disabled" : "enabled");
return;
} else if (!strcmp(name, "ambientRatio")) {
- overrideAmbientRatio = fmin(fmax(atof(value), 0.0), 10.0);
+ overrideAmbientRatio = std::min(std::max(atof(value), 0.0), 10.0);
ALOGD("ambientRatio = %.2f", overrideAmbientRatio);
return;
} else if (!strcmp(name, "lightRadius")) {
- overrideLightRadius = fmin(fmax(atof(value), 0.0), 3000.0);
+ overrideLightRadius = std::min(std::max(atof(value), 0.0), 3000.0);
ALOGD("lightRadius = %.2f", overrideLightRadius);
return;
} else if (!strcmp(name, "lightPosY")) {
- overrideLightPosY = fmin(fmax(atof(value), 0.0), 3000.0);
+ overrideLightPosY = std::min(std::max(atof(value), 0.0), 3000.0);
ALOGD("lightPos Y = %.2f", overrideLightPosY);
return;
} else if (!strcmp(name, "lightPosZ")) {
- overrideLightPosZ = fmin(fmax(atof(value), 0.0), 3000.0);
+ overrideLightPosZ = std::min(std::max(atof(value), 0.0), 3000.0);
ALOGD("lightPos Z = %.2f", overrideLightPosZ);
return;
} else if (!strcmp(name, "ambientShadowStrength")) {