diff --git a/DescriptorManager.cpp b/DescriptorManager.cpp index 6b004f0..88d0c82 100644 --- a/DescriptorManager.cpp +++ b/DescriptorManager.cpp @@ -46,15 +46,16 @@ void DescriptorManager::Init() { } fs::ifstream ifs; fs::ofstream ofs; - int cnt = std::count_if( + numImages = std::count_if( fs::directory_iterator(img_path), fs::directory_iterator(), static_cast(fs::is_regular_file)); //foreach image in directory (non-recursive) int filecount = 0; for (fs::directory_iterator itr(img_path); itr != fs::directory_iterator(); ++itr) { - cout << "\r" << "Progress: " << filecount++*100/cnt << "% - (" << filecount << "/" << cnt << ")" << flush; + cout << "\r" << "Progress: " << filecount*100/numImages << "% - (" << filecount << "/" << numImages << ")" << flush; if (!itr->path().has_extension()) continue; //skip directories and such + filecount++; string image_name = itr->path().filename().generic_string(); Image* image = new Image; image->read(itr->path().string()); diff --git a/DescriptorManager.h b/DescriptorManager.h index f0673ba..3ebbd13 100644 --- a/DescriptorManager.h +++ b/DescriptorManager.h @@ -39,6 +39,7 @@ private: //TODO: automagically update this? bool initialized = false; + int numImages; map> features[numDescriptors]; //array of maps that will hold the descriptors map> mutatedFeatures[numDescriptors][numMutations];