Fix bug in loop. It wasn't iterating over the elements of dateStrings as intended.

main
Kevin Backhouse 4 years ago
parent d508e093dd
commit 891f58aa85
No known key found for this signature in database
GPG Key ID: 9DD01852EE40366E

@ -613,9 +613,9 @@ time_t readImageTime(const std::string& path, std::string* pS = nullptr)
const char* dateStrings[] = {"Exif.Photo.DateTimeOriginal", "Exif.Photo.DateTimeDigitized", "Exif.Image.DateTime", const char* dateStrings[] = {"Exif.Photo.DateTimeOriginal", "Exif.Photo.DateTimeDigitized", "Exif.Image.DateTime",
nullptr}; nullptr};
const char* dateString = dateStrings[0] ;
do { for (size_t i = 0; !result && dateStrings[i]; i++) {
const char* dateString = dateStrings[i] ;
try { try {
Image::UniquePtr image = ImageFactory::open(path); Image::UniquePtr image = ImageFactory::open(path);
if ( image.get() ) { if ( image.get() ) {
@ -626,7 +626,7 @@ time_t readImageTime(const std::string& path, std::string* pS = nullptr)
if ( result && pS ) *pS = exifData[dateString].toString(); if ( result && pS ) *pS = exifData[dateString].toString();
} }
} catch ( ... ) {}; } catch ( ... ) {};
} while ( !result && ++dateString ); }
return result ; return result ;
} }

Loading…
Cancel
Save