From 61094d350b58006dc5154cb85e05a8844ed1ec82 Mon Sep 17 00:00:00 2001 From: cuda_geek Date: Sat, 9 Mar 2013 22:43:34 +0400 Subject: [PATCH] add dlobbing for Windows --- modules/core/src/glob.cpp | 119 +++++++++++++++++++++++++++++++++----- 1 file changed, 106 insertions(+), 13 deletions(-) diff --git a/modules/core/src/glob.cpp b/modules/core/src/glob.cpp index e91d856d8..4659c21d8 100644 --- a/modules/core/src/glob.cpp +++ b/modules/core/src/glob.cpp @@ -1,31 +1,122 @@ +/*M/////////////////////////////////////////////////////////////////////////////////////// +// +// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. +// +// By downloading, copying, installing or using the software you agree to this license. +// If you do not agree to this license, do not download, install, +// copy or use the software. +// +// +// License Agreement +// For Open Source Computer Vision Library +// +// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. +// Copyright (C) 2008-2013, Willow Garage Inc., all rights reserved. +// Third party copyrights are property of their respective owners. +// +// Redistribution and use in source and binary forms, with or without modification, +// are permitted provided that the following conditions are met: +// +// * Redistribution's of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// * Redistribution's in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and / or other materials provided with the distribution. +// +// * The name of the copyright holders may not be used to endorse or promote products +// derived from this software without specific prior written permission. +// +// This software is provided by the copyright holders and contributors "as is" and +// any express or implied warranties, including, but not limited to, the implied +// warranties of merchantability and fitness for a particular purpose are disclaimed. +// In no event shall the Intel Corporation or contributors be liable for any direct, +// indirect, incidental, special, exemplary, or consequential damages +// (including, but not limited to, procurement of substitute goods or services; +// loss of use, data, or profits; or business interruption) however caused +// and on any theory of liability, whether in contract, strict liability, +// or tort (including negligence or otherwise) arising in any way out of +// the use of this software, even if advised of the possibility of such damage. +// +//M*/ + #include "precomp.hpp" #if defined WIN32 || defined _WIN32 || defined WINCE # include const char dir_separators[] = "/\\"; const char native_separator = '\\'; + +namespace +{ + struct dirent + { + const char* d_name; + }; + + struct DIR + { + WIN32_FIND_DATA data; + HANDLE handle; + dirent ent; + }; + + DIR* opendir(const char* path) + { + DIR* dir = new DIR; + dir->ent.d_name = 0; + dir->handle = ::FindFirstFileA((std::string(path) + "\\*").c_str(), &dir->data); + if(dir->handle == INVALID_HANDLE_VALUE) + { + /*closedir will do all cleanup*/ + return 0; + } + return dir; + } + + dirent* readdir(DIR* dir) + { + if (dir->ent.d_name != 0) + { + if (::FindNextFile(dir->handle, &dir->data) != TRUE) + return 0; + } + dir->ent.d_name = dir->data.cFileName; + return &dir->ent; + } + + void closedir(DIR* dir) + { + ::FindClose(dir->handle); + delete dir; + } + + +} #else # include +# include const char dir_separators[] = "/"; const char native_separator = '/'; #endif -#ifndef _WIN32_WCE -# include -#endif - - -static bool isDir(std::string path) +static bool isDir(const std::string& path, DIR* dir) { -#ifndef _WIN32_WCE +#if defined WIN32 || defined _WIN32 || defined WINCE + DWORD attributes; + if (dir) + attributes = dir->data.dwFileAttributes; + else + attributes = ::GetFileAttributes(path.c_str()); + + return (attributes != INVALID_FILE_ATTRIBUTES) && ((attributes & FILE_ATTRIBUTE_DIRECTORY) != 0); +#else struct stat stat_buf; stat( path.c_str(), &stat_buf); int is_dir = S_ISDIR( stat_buf.st_mode); + (void)dir; return is_dir != 0; -#else - /* unsupported */ - return false; #endif } @@ -94,7 +185,7 @@ static void glob_rec(const std::string& directory, const std::string& wildchart, std::string path = directory + native_separator + name; - if (isDir(path)) + if (isDir(path, dir)) { if (recursive) glob_rec(path, wildchart, result, recursive); @@ -113,7 +204,7 @@ static void glob_rec(const std::string& directory, const std::string& wildchart, } closedir(dir); } - else CV_Error(CV_StsObjectNotFound, "could not open directory"); + else CV_Error(CV_StsObjectNotFound, cv::format("could not open directory: %s", directory.c_str())); } void cv::glob(std::string pattern, std::vector& result, bool recursive) @@ -121,8 +212,9 @@ void cv::glob(std::string pattern, std::vector& result, bool recurs result.clear(); std::string path, wildchart; - if (isDir(pattern)) + if (isDir(pattern, 0)) { + printf("WE ARE HERE: %s\n", pattern.c_str()); if(strchr(dir_separators, pattern[pattern.size() - 1]) != 0) { path = pattern.substr(0, pattern.size() - 1); @@ -148,4 +240,5 @@ void cv::glob(std::string pattern, std::vector& result, bool recurs } glob_rec(path, wildchart, result, recursive); + std::sort(result.begin(), result.end()); } \ No newline at end of file