commit 7cb87e43550cae1e051530994a2c30e89a268862
author Eino-Ville Talvala <etalvala@google.com> Thu May 09 17:13:33 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 09 17:13:33 2013 +0000
tree 70ff436d6b93b594d9fa87c966efc899e53dbaf1
parent 4a0a02bebf7c3b0b79df6635b8129d7a54b38da2
parent ec38324c23d4865ec4b6f368f12814328771b4af

Merge "Gralloc/Camera3: Support new HAL_PIXEL_FORMAT_YCbCr_420_888 format" into jb-mr2-dev

camera/EmulatedFakeCamera3.cpp

diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp
index 2513c19..a321218 100644
--- a/camera/EmulatedFakeCamera3.cpp
+++ b/camera/EmulatedFakeCamera3.cpp
@@ -1187,7 +1187,7 @@
             (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);