Skip to content

Commit c28e501

Browse files
Merge pull request #2039 from Exiv2/mergify/bp/main/pr-2037
Fix bug in loop. It wasn't iterating over the elements of dateStrings as intended (backport #2037)
2 parents bea66d6 + 891f58a commit c28e501

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

samples/geotag.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -613,9 +613,9 @@ time_t readImageTime(const std::string& path, std::string* pS = nullptr)
613613

614614
const char* dateStrings[] = {"Exif.Photo.DateTimeOriginal", "Exif.Photo.DateTimeDigitized", "Exif.Image.DateTime",
615615
nullptr};
616-
const char* dateString = dateStrings[0] ;
617616

618-
do {
617+
for (size_t i = 0; !result && dateStrings[i]; i++) {
618+
const char* dateString = dateStrings[i] ;
619619
try {
620620
Image::UniquePtr image = ImageFactory::open(path);
621621
if ( image.get() ) {
@@ -626,7 +626,7 @@ time_t readImageTime(const std::string& path, std::string* pS = nullptr)
626626
if ( result && pS ) *pS = exifData[dateString].toString();
627627
}
628628
} catch ( ... ) {};
629-
} while ( !result && ++dateString );
629+
}
630630

631631
return result ;
632632
}

0 commit comments

Comments
 (0)