summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-08-02 17:01:07 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-02 17:01:07 -0700
commit15d7245ed2193e4956ea87998321cbc16a3b0a46 (patch)
tree18f36b8fc450f4a0784bade5771b5bc20fbe9c94 /services
parent1bf1c000be916b5e3388ef9039beedda01fa2bdd (diff)
parentd6f8e08a9ca7f2fe41717acd351426a7ecb0c175 (diff)
downloadframeworks_av-15d7245ed2193e4956ea87998321cbc16a3b0a46.zip
frameworks_av-15d7245ed2193e4956ea87998321cbc16a3b0a46.tar.gz
frameworks_av-15d7245ed2193e4956ea87998321cbc16a3b0a46.tar.bz2
Merge "Camera2: Fix exposure compensation step value." into jb-mr1-dev
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/Camera2Client.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index 7e08907..3f1a677 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -2350,7 +2350,7 @@ status_t Camera2Client::buildDefaultParameters() {
if (!exposureCompensationStep.count) return NO_INIT;
params.setFloat(CameraParameters::KEY_EXPOSURE_COMPENSATION_STEP,
- exposureCompensationStep.data.r[0].numerator /
+ (float)exposureCompensationStep.data.r[0].numerator /
exposureCompensationStep.data.r[0].denominator);
k.mParameters.autoExposureLock = false;