uncommented the samples parts compiled under MSVC

This commit is contained in:
Maria Dimashova 2011-10-04 06:32:18 +00:00
parent b71bfef702
commit ea454e6ee4

View File

@ -4,7 +4,7 @@
#include "opencv2/contrib/contrib.hpp" #include "opencv2/contrib/contrib.hpp"
#ifdef WIN32 #ifdef WIN32
//#include <io.h> #include <io.h>
#else #else
#include <dirent.h> #include <dirent.h>
#endif #endif
@ -62,22 +62,22 @@ void readDirectory( const string& directoryName, vector<string>& filenames, bool
filenames.clear(); filenames.clear();
#ifdef WIN32 #ifdef WIN32
// struct _finddata_t s_file; struct _finddata_t s_file;
// string str = directoryName + "\\*.*"; string str = directoryName + "\\*.*";
// intptr_t h_file = _findfirst( str.c_str(), &s_file ); intptr_t h_file = _findfirst( str.c_str(), &s_file );
// if( h_file == -1L ) if( h_file != static_cast<intptr_t>(-1.0) )
// { {
// do do
// { {
// if( addDirectoryName ) if( addDirectoryName )
// filenames.push_back(directoryName + "/" + s_file.name); filenames.push_back(directoryName + "\\" + s_file.name);
// else else
// filenames.push_back((string)s_file.name); filenames.push_back((string)s_file.name);
// } }
// while( _findnext( h_file, &s_file ) == 0 ); while( _findnext( h_file, &s_file ) == 0 );
// } }
// _findclose( h_file ); _findclose( h_file );
#else #else
DIR* dir = opendir( directoryName.c_str() ); DIR* dir = opendir( directoryName.c_str() );
if( dir != NULL ) if( dir != NULL )