diff options
Diffstat (limited to 'include/camera/CameraParameters.h')
| -rw-r--r-- | include/camera/CameraParameters.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 7d92506..7cc3d4e 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -580,8 +580,6 @@ public: static const char KEY_FULL_VIDEO_SNAP_SUPPORTED[]; #ifdef QCOM_HARDWARE - static const char KEY_ISO_MODE[]; - static const char KEY_SUPPORTED_ISO_MODES[]; static const char KEY_LENSSHADE[] ; static const char KEY_SUPPORTED_LENSSHADE_MODES[] ; @@ -593,6 +591,10 @@ public: static const char KEY_GPS_ALTITUDE_REF[]; static const char KEY_GPS_STATUS[]; static const char KEY_EXIF_DATETIME[]; +#ifndef SAMSUNG_CAMERA_HARDWARE + static const char KEY_ISO_MODE[]; + static const char KEY_SUPPORTED_ISO_MODES[]; +#endif #endif // The state of the video stabilization. If set to true, both the @@ -656,9 +658,11 @@ public: #endif #ifdef SAMSUNG_CAMERA_HARDWARE - static const char KEY_METERING[]; - static const char KEY_WDR[]; - static const char KEY_ANTI_SHAKE_MODE[]; + static const char KEY_METERING[]; + static const char KEY_WDR[]; + static const char KEY_ANTI_SHAKE_MODE[]; + static const char KEY_ISO_MODE[]; + static const char KEY_SUPPORTED_ISO_MODES[]; #endif // Values for white balance settings. |