| Index: media/capture/video/android/photo_capabilities.cc
|
| diff --git a/media/capture/video/android/photo_capabilities.cc b/media/capture/video/android/photo_capabilities.cc
|
| index 29a3f198537e8e6a58f218a835cfcd4d374979c2..6f37777369a8366ec3fb197e08f7ffa92b38b48c 100644
|
| --- a/media/capture/video/android/photo_capabilities.cc
|
| +++ b/media/capture/video/android/photo_capabilities.cc
|
| @@ -80,22 +80,22 @@ int PhotoCapabilities::getStepWidth() const {
|
| return Java_PhotoCapabilities_getStepWidth(AttachCurrentThread(), object_);
|
| }
|
|
|
| -int PhotoCapabilities::getMinZoom() const {
|
| +float PhotoCapabilities::getMinZoom() const {
|
| DCHECK(!object_.is_null());
|
| return Java_PhotoCapabilities_getMinZoom(AttachCurrentThread(), object_);
|
| }
|
|
|
| -int PhotoCapabilities::getMaxZoom() const {
|
| +float PhotoCapabilities::getMaxZoom() const {
|
| DCHECK(!object_.is_null());
|
| return Java_PhotoCapabilities_getMaxZoom(AttachCurrentThread(), object_);
|
| }
|
|
|
| -int PhotoCapabilities::getCurrentZoom() const {
|
| +float PhotoCapabilities::getCurrentZoom() const {
|
| DCHECK(!object_.is_null());
|
| return Java_PhotoCapabilities_getCurrentZoom(AttachCurrentThread(), object_);
|
| }
|
|
|
| -int PhotoCapabilities::getStepZoom() const {
|
| +float PhotoCapabilities::getStepZoom() const {
|
| DCHECK(!object_.is_null());
|
| return Java_PhotoCapabilities_getStepZoom(AttachCurrentThread(), object_);
|
| }
|
| @@ -113,25 +113,25 @@ PhotoCapabilities::AndroidMeteringMode PhotoCapabilities::getExposureMode()
|
| Java_PhotoCapabilities_getExposureMode(AttachCurrentThread(), object_));
|
| }
|
|
|
| -int PhotoCapabilities::getMinExposureCompensation() const {
|
| +float PhotoCapabilities::getMinExposureCompensation() const {
|
| DCHECK(!object_.is_null());
|
| return Java_PhotoCapabilities_getMinExposureCompensation(
|
| AttachCurrentThread(), object_);
|
| }
|
|
|
| -int PhotoCapabilities::getMaxExposureCompensation() const {
|
| +float PhotoCapabilities::getMaxExposureCompensation() const {
|
| DCHECK(!object_.is_null());
|
| return Java_PhotoCapabilities_getMaxExposureCompensation(
|
| AttachCurrentThread(), object_);
|
| }
|
|
|
| -int PhotoCapabilities::getCurrentExposureCompensation() const {
|
| +float PhotoCapabilities::getCurrentExposureCompensation() const {
|
| DCHECK(!object_.is_null());
|
| return Java_PhotoCapabilities_getCurrentExposureCompensation(
|
| AttachCurrentThread(), object_);
|
| }
|
|
|
| -int PhotoCapabilities::getStepExposureCompensation() const {
|
| +float PhotoCapabilities::getStepExposureCompensation() const {
|
| DCHECK(!object_.is_null());
|
| return Java_PhotoCapabilities_getStepExposureCompensation(
|
| AttachCurrentThread(), object_);
|
|
|