From e6a15ee3d0c78eb3f2551d73a7d238c3d8d2f075 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Tue, 7 Jul 2015 18:42:17 -0700 Subject: Remove all usage of fmin and fmax bug:22208220 Removes needless call, and upconversion to doubles in multiple places. Change-Id: I1b949fa5f206446ac34de800154c0147d6bd8034 --- libs/hwui/Properties.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libs/hwui/Properties.cpp') diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp index 7dbe3b78839c..2e63793f6ffe 100644 --- a/libs/hwui/Properties.cpp +++ b/libs/hwui/Properties.cpp @@ -17,7 +17,7 @@ #include "Debug.h" -#include +#include #include namespace android { @@ -117,19 +117,19 @@ void Properties::overrideProperty(const char* name, const char* value) { 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")) { -- cgit v1.2.3-59-g8ed1b