summaryrefslogtreecommitdiffstats
path: root/libcamera
diff options
context:
space:
mode:
authorSimon Wilson <simonwilson@google.com>2010-12-01 09:20:53 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-01 09:20:53 -0800
commit5aa04db3766cf5ec4544acd16a4ec7eee4bbc48b (patch)
treef376e49f2b4e6c48a7ffded9311cd963e4b3d463 /libcamera
parent9fda63ad7e4a36ccea7b52652d5bff3da3a27854 (diff)
parent3f7ec3645a6efb05234fb9fcd48f65dd67dfc02e (diff)
downloaddevice_samsung_crespo-5aa04db3766cf5ec4544acd16a4ec7eee4bbc48b.zip
device_samsung_crespo-5aa04db3766cf5ec4544acd16a4ec7eee4bbc48b.tar.gz
device_samsung_crespo-5aa04db3766cf5ec4544acd16a4ec7eee4bbc48b.tar.bz2
am 3f7ec364: am 1b7e599f: Merge "libcamera: add 1900 to tm_year to fix gps date" into gingerbread
* commit '3f7ec3645a6efb05234fb9fcd48f65dd67dfc02e': libcamera: add 1900 to tm_year to fix gps date
Diffstat (limited to 'libcamera')
-rw-r--r--libcamera/SecCamera.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp
index b71a2ce..a5191d3 100644
--- a/libcamera/SecCamera.cpp
+++ b/libcamera/SecCamera.cpp
@@ -3542,7 +3542,7 @@ void SecCamera::setExifChangedAttribute()
mExifInfo.gps_timestamp[2].num = tm_data.tm_sec;
mExifInfo.gps_timestamp[2].den = 1;
snprintf((char*)mExifInfo.gps_datestamp, sizeof(mExifInfo.gps_datestamp),
- "%04d:%02d:%02d", tm_data.tm_year, tm_data.tm_mon, tm_data.tm_mday);
+ "%04d:%02d:%02d", tm_data.tm_year + 1900, tm_data.tm_mon, tm_data.tm_mday);
mExifInfo.enableGps = true;
} else {