summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-05-07 16:57:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-07 16:57:52 -0700
commit7cb4045b1bea882813f6f1abc38521821b5a5d8c (patch)
treee0d61f631c635ae571d466d196fbb5e348001558
parent00d084804bbbbbe96ae0acf64c7fd2d74fb1cde3 (diff)
parent4a0a02bebf7c3b0b79df6635b8129d7a54b38da2 (diff)
downloadandroid_device_generic_goldfish-7cb4045b1bea882813f6f1abc38521821b5a5d8c.tar.gz
android_device_generic_goldfish-7cb4045b1bea882813f6f1abc38521821b5a5d8c.tar.bz2
android_device_generic_goldfish-7cb4045b1bea882813f6f1abc38521821b5a5d8c.zip
am 4a0a02be: camera: Fix availableMaxDigitalZoom property to be float
* commit '4a0a02bebf7c3b0b79df6635b8129d7a54b38da2': camera: Fix availableMaxDigitalZoom property to be float
-rw-r--r--camera/EmulatedFakeCamera3.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp
index b82c4c0..adcde88 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);