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

pull/1788/merge
Roman Donchenko 11 years ago committed by OpenCV Buildbot
commit 411629a57d
  1. 14
      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;

Loading…
Cancel
Save