Merge 15f6a2c into 6833eca

Exiv2 · Dec 20, 2021 · 89e50e5 · 89e50e5
2 parents 6833eca + 15f6a2c
commit 89e50e5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/samples/geotag.cpp b/samples/geotag.cpp
@@ -636,9 +636,9 @@ time_t readImageTime(const std::string& path,std::string* pS=NULL)
     , "Exif.Image.DateTime"
     , NULL
     };
-    const char* dateString = dateStrings[0] ;
 
-    do {
+    for (size_t i = 0; !result && dateStrings[i]; i++) {
+        const char* dateString = dateStrings[i] ;
         try {
             Image::AutoPtr image = ImageFactory::open(path);
             if ( image.get() ) {
@@ -649,7 +649,7 @@ time_t readImageTime(const std::string& path,std::string* pS=NULL)
                 if ( result && pS ) *pS = exifData[dateString].toString();
             }
         } catch ( ... ) {};
-    } while ( !result && ++dateString );
+    }
 
     return result ;
 }