Merge pull request #1786 from SpecLad:cap-images-file-pattern

2013-11-13 17:00:20 +04:00 · 2013-11-13 17:00:20 +04:00 · 411629a57d
commit 411629a57d
parent 54ea5bbac7 b8e3d3f791
1 changed files with 12 additions and 2 deletions
--- a/modules/highgui/src/cap_images.cpp
+++ b/modules/highgui/src/cap_images.cpp
@ -200,8 +200,18 @@ static char* icvExtractPattern(const char *filename, unsigned *offset)
    }
    else // no pattern filename was given - extract the pattern
    {
-        for(at = name; *at && !isdigit(*at); at++)
-            ;
+        at = name;
+
+        // ignore directory names
+        char *slash = strrchr(at, '/');
+        if (slash) at = slash + 1;
+
+#ifdef _WIN32
+        slash = strrchr(at, '\\');
+        if (slash) at = slash + 1;
+#endif
+
+        while (*at && !isdigit(*at)) at++;

        if(!*at)
            return 0;