diff options
| author | James Dong <jdong@google.com> | 2011-11-22 10:29:35 -0800 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2011-11-22 10:29:35 -0800 |
| commit | 3554540d82ae3c71f1f1551ae85e68ac21cfd9da (patch) | |
| tree | 30f5c75470b4a9814ebcea4d401803c3913ae9af /libcamera/SecCamera.h | |
| parent | 536345b6a234c289183feb0483c32a8ef9eacdbf (diff) | |
| parent | 98591897b371e32a9774c7f12721018331307b43 (diff) | |
| download | device_samsung_crespo-3554540d82ae3c71f1f1551ae85e68ac21cfd9da.zip device_samsung_crespo-3554540d82ae3c71f1f1551ae85e68ac21cfd9da.tar.gz device_samsung_crespo-3554540d82ae3c71f1f1551ae85e68ac21cfd9da.tar.bz2 | |
resolved conflicts for merge of 98591897 to master
Change-Id: I98e9ae59b25243c0dd94d42e8066c906e7e6e128
Diffstat (limited to 'libcamera/SecCamera.h')
| -rwxr-xr-x | libcamera/SecCamera.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libcamera/SecCamera.h b/libcamera/SecCamera.h index 5c62782..ec0e470 100755 --- a/libcamera/SecCamera.h +++ b/libcamera/SecCamera.h @@ -522,9 +522,10 @@ private: int m_object_tracking_start_stop; int m_recording_width; int m_recording_height; - long m_gps_latitude; - long m_gps_longitude; - long m_gps_altitude; + bool m_gps_enabled; + long m_gps_latitude; /* degrees * 1e7 */ + long m_gps_longitude; /* degrees * 1e7 */ + long m_gps_altitude; /* metres * 100 */ long m_gps_timestamp; int m_vtmode; int m_sensor_mode; /*Camcorder fix fps */ |