diff options
| author | Igor Murashkin <iam@google.com> | 2013-05-08 15:03:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-08 15:03:32 -0700 |
| commit | 64172e8fe4296cab9b58136f6e1d06c00b8018e9 (patch) | |
| tree | e0d61f631c635ae571d466d196fbb5e348001558 | |
| parent | 57759e52cacc80185c9b3a933aab661ed880af4f (diff) | |
| parent | 7cb4045b1bea882813f6f1abc38521821b5a5d8c (diff) | |
| download | device_generic_goldfish-64172e8fe4296cab9b58136f6e1d06c00b8018e9.tar.gz device_generic_goldfish-64172e8fe4296cab9b58136f6e1d06c00b8018e9.tar.bz2 device_generic_goldfish-64172e8fe4296cab9b58136f6e1d06c00b8018e9.zip | |
am 7cb4045b: am 4a0a02be: camera: Fix availableMaxDigitalZoom property to be float
* commit '7cb4045b1bea882813f6f1abc38521821b5a5d8c':
camera: Fix availableMaxDigitalZoom property to be float
| -rw-r--r-- | camera/EmulatedFakeCamera3.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp index b82c4c0b..adcde88c 100644 --- a/camera/EmulatedFakeCamera3.cpp +++ b/camera/EmulatedFakeCamera3.cpp @@ -1150,7 +1150,7 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { (int64_t*)kAvailableJpegMinDurations, sizeof(kAvailableJpegMinDurations)/sizeof(uint64_t)); - static const int32_t maxZoom = 10; + static const float maxZoom = 10; info.update(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM, &maxZoom, 1); |