From 3319afc42557c4b0fd86d3a314a47e563dd49b07 Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Wed, 1 Jul 2015 00:01:47 -0400 Subject: [PATCH] Fixed prepchars utility so that it runs even if non-images are in the folder --- src/misc_utilities/prepcharsfortraining.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/misc_utilities/prepcharsfortraining.cpp b/src/misc_utilities/prepcharsfortraining.cpp index 46aecb7..e905aa3 100644 --- a/src/misc_utilities/prepcharsfortraining.cpp +++ b/src/misc_utilities/prepcharsfortraining.cpp @@ -98,20 +98,17 @@ int main( int argc, const char** argv ) const int FIXED_CHAR_HEIGHT = 40; // RESIZE all characters to this height - vector files = getFilesInDir(inDir.c_str()); + vector all_files = getFilesInDir(inDir.c_str()); - sort( files.begin(), files.end(), stringCompare ); - - for (int i = 0; i< files.size(); i++) + sort( all_files.begin(), all_files.end(), stringCompare ); + + vector files; + + for (int i = 0; i< all_files.size(); i++) { - if (hasEnding(files[i], ".png") || hasEnding(files[i], ".jpg")) + if (hasEnding(all_files[i], ".png") || hasEnding(all_files[i], ".jpg")) { - - } - else - { - std::cerr << "Non-image file detected in this directory. This must be removed first" << std::endl; - return 1; + files.push_back(all_files[i]); } }