Merge pull request #88 from berak/glob_xobjdetect

removed wildcards from fg/bg path in ICFDetector::train

modules/xobjdetect/doc/integral_channel_features.rst

@@ -183,7 +183,7 @@ Train detector.
 
 .. ocv:function:: void ICFDetector::train(const String& pos_path, const String& bg_path, ICFDetectorParams params = ICFDetectorParams())
 
-    :param pos_path: path to folder with images of objects
+    :param pos_path: path to folder with images of objects (wildcards like ``/my/path/*.png`` are allowed)
     :param bg_path: path to folder with background images
     :param params: parameters for detector training
 

modules/xobjdetect/src/icfdetector.cpp

@@ -68,10 +68,10 @@ void ICFDetector::train(const String& pos_path,
                         ICFDetectorParams params)
 {
     vector<String> pos_filenames;
-    glob(pos_path + "/*.png", pos_filenames);
+    glob(pos_path, pos_filenames);
 
     vector<String> bg_filenames;
-    glob(bg_path + "/*.jpg", bg_filenames);
+    glob(bg_path, bg_filenames);
 
     model_n_rows_ = params.model_n_rows;
     model_n_cols_ = params.model_n_cols;