X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=e6c0523913c1334044bf7642b851d055611517b4;hb=029ba8b100584e6ee9d963589e3a1d36205f25c4;hp=c0a9feda473503536eadf2ae8fc2bde204dae925;hpb=4e76d11878c6f2e79d06953202a72d3208be679b;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index c0a9feda..e6c05239 100644 --- a/src/gdcmDirList.cxx +++ b/src/gdcmDirList.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDirList.cxx,v $ Language: C++ - Date: $Date: 2005/12/13 13:37:50 $ - Version: $Revision: 1.57 $ + Date: $Date: 2006/01/10 15:54:03 $ + Version: $Revision: 1.58 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -65,7 +65,9 @@ DirList::~DirList() bool DirList::IsDirectory(std::string const &dirName) { struct stat fs; - assert( dirName[dirName.size()-1] != '/' ); + // std::cout << "dirName[dirName.size()-1] [" << dirName[dirName.size()-1] << "]" + // << std::endl; + //assert( dirName[dirName.size()-1] != GDCM_FILESEPARATOR ); if ( stat(dirName.c_str(), &fs) == 0 ) { #if _WIN32 @@ -100,7 +102,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive) std::string dirName = Util::NormalizePath(dirpath); #ifdef _MSC_VER WIN32_FIND_DATA fileData; - assert( dirName[dirName.size()-1] == '/' ); + //assert( dirName[dirName.size()-1] == '' ); HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData); for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b;