Merge pull request opencv#8292 from sovrasov:backport_8267

alalek · alalek · commit 2570a5af388b · 2017-02-28T11:56:25.000Z
diff --git a/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp b/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp
@@ -109,7 +109,7 @@ class Settings
             }
             else
             {
-                if (readStringList(input, imageList))
+                if (isListOfImages(input) && readStringList(input, imageList))
                 {
                     inputType = IMAGE_LIST;
                     nrFrames = (nrFrames < (int)imageList.size()) ? nrFrames : (int)imageList.size();
@@ -190,6 +190,16 @@ class Settings
             l.push_back((string)*it);
         return true;
     }
+
+    static bool isListOfImages( const string& filename)
+    {
+        string s(filename);
+        // Look for file extension
+        if( s.find(".xml") == string::npos && s.find(".yaml") == string::npos && s.find(".yml") == string::npos )
+            return false;
+        else
+            return true;
+    }
 public:
     Size boardSize;              // The size of the board -> Number of items by width and height
     Pattern calibrationPattern;  // One of the Chessboard, circles, or asymmetric circle pattern
