Use original time if available on image loading

DateTimeOriginal should be used as first option when loading images.
When images are modified, the original time should be retained, but the
DateTime will change to the edit time.

See #495

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2014-04-26 10:56:29 +03:00 committed by Dirk Hohndel
parent 28f4e9b10e
commit cd98e4f6db

View file

@ -240,9 +240,9 @@ time_t ShiftImageTimesDialog::epochFromExiv(EXIFInfo *exif)
int year, month, day, hour, min, sec;
if (strlen(exif->DateTime.c_str()))
sscanf(exif->DateTime.c_str(), "%d:%d:%d %d:%d:%d", &year, &month, &day, &hour, &min, &sec);
else
sscanf(exif->DateTimeOriginal.c_str(), "%d:%d:%d %d:%d:%d", &year, &month, &day, &hour, &min, &sec);
else
sscanf(exif->DateTime.c_str(), "%d:%d:%d %d:%d:%d", &year, &month, &day, &hour, &min, &sec);
tm.tm_year = year;
tm.tm_mon = month - 1;
tm.tm_mday = day;