diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-08-02 17:04:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-02 17:04:06 -0700 |
| commit | 76a794f66595390c21639b6af89a6efbfd564e06 (patch) | |
| tree | 90c4ca73164311eeb3b45603960080d0a19a369a /services/camera/libcameraservice | |
| parent | 4d6a71d41a6bef57cc9ab81a95cfa975241486c8 (diff) | |
| parent | 22c875ae3b06597dabf82e6464a36a82967a4e83 (diff) | |
| download | frameworks_av-76a794f66595390c21639b6af89a6efbfd564e06.zip frameworks_av-76a794f66595390c21639b6af89a6efbfd564e06.tar.gz frameworks_av-76a794f66595390c21639b6af89a6efbfd564e06.tar.bz2 | |
am 22c875ae: am 15d7245e: Merge "Camera2: Fix exposure compensation step value." into jb-mr1-dev
* commit '22c875ae3b06597dabf82e6464a36a82967a4e83':
Camera2: Fix exposure compensation step value.
Diffstat (limited to 'services/camera/libcameraservice')
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 2 |
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; |