Revision 7b498bcd
Added by David Sorber almost 8 years ago
| software/photo_compress_archiver/PhotoCompressArchiver.cc | ||
|---|---|---|
|
// Found directory recurse
|
||
|
find_files(dir_iter->path(), file_regex);
|
||
|
}
|
||
|
else if (boost::regex_match(dir_iter->path().filename().string(), file_regex))
|
||
|
else if (boost::regex_match(dir_iter->path().filename().string(), file_regex) &&
|
||
|
bfs::is_regular_file(dir_iter->path()))
|
||
|
{
|
||
|
// Found file match
|
||
|
|
||
| ... | ... | |
|
std::ios::binary | std::ios::in);
|
||
|
if (! input_stream)
|
||
|
{
|
||
|
WRKR_OUT_ERR("unable to read from \"" << work_unit->m_path
|
||
|
<< "\"\n")
|
||
|
WRKR_OUT_ERR("unable to read from " << work_unit->m_path << "\n")
|
||
|
m_errors.push_back(work_unit);
|
||
|
continue;
|
||
|
}
|
||
| ... | ... | |
|
}
|
||
|
else
|
||
|
{
|
||
|
WRKR_OUT_ERR("the input file \"" << work_unit->m_path
|
||
|
<< "\" does not appear to be a valid "
|
||
|
WRKR_OUT_ERR("the input file " << work_unit->m_path
|
||
|
<< " does not appear to be a valid "
|
||
|
"packjpg (.pjg) file even though its filename "
|
||
|
"suggests it is!")
|
||
|
m_errors.push_back(work_unit);
|
||
| ... | ... | |
|
}
|
||
|
else
|
||
|
{
|
||
|
WRKR_OUT_ERR("the input file \"" << work_unit->m_path
|
||
|
<< "\" does not appear to be a valid "
|
||
|
WRKR_OUT_ERR("the input file " << work_unit->m_path
|
||
|
<< " does not appear to be a valid "
|
||
|
"JPEG (.jpg) file even though its filename "
|
||
|
"suggests it is!")
|
||
|
m_errors.push_back(work_unit);
|
||
Reformat CMakeLists.txt, use gold linker, reformat several error
messages to remove extra double quotes, and confirm path is regular file
before adding to the input file list.