diff options
| author | Kyle Repinski <repinski23@gmail.com> | 2015-01-09 13:02:09 -0600 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2015-04-11 20:24:53 +0200 |
| commit | 55d21caa69a85f1e9b909ed699282b041a2bcec5 (patch) | |
| tree | bf9b74c9b1fcde8c11c49b865bb94ec8dea8e9d1 /camera/inc/CameraProperties.h | |
| parent | 48d5c7c1d27835ae882ade0bb92a14e7874f5558 (diff) | |
| download | device_samsung_tuna-55d21caa69a85f1e9b909ed699282b041a2bcec5.zip device_samsung_tuna-55d21caa69a85f1e9b909ed699282b041a2bcec5.tar.gz device_samsung_tuna-55d21caa69a85f1e9b909ed699282b041a2bcec5.tar.bz2 | |
camera: Fix compiler warnings, remove some S3D stuff.
Signed-off-by: Kyle Repinski <repinski23@gmail.com>
Diffstat (limited to 'camera/inc/CameraProperties.h')
| -rw-r--r-- | camera/inc/CameraProperties.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/camera/inc/CameraProperties.h b/camera/inc/CameraProperties.h index 0b8680e..0b61210 100644 --- a/camera/inc/CameraProperties.h +++ b/camera/inc/CameraProperties.h @@ -51,7 +51,9 @@ enum OperatingMode { MODE_HIGH_QUALITY, MODE_ZEROSHUTTERLAG, MODE_VIDEO, +#ifndef OMAP_TUNA MODE_STEREO, +#endif MODE_CPCAM, MODE_MAX }; @@ -153,10 +155,12 @@ public: static const char PARAMS_DELIMITER []; +#ifndef OMAP_TUNA static const char S3D_PRV_FRAME_LAYOUT[]; static const char S3D_PRV_FRAME_LAYOUT_VALUES[]; static const char S3D_CAP_FRAME_LAYOUT[]; static const char S3D_CAP_FRAME_LAYOUT_VALUES[]; +#endif static const char VSTAB[]; static const char VSTAB_SUPPORTED[]; static const char VNF[]; |