OrgLion-ML
/
darknet
mirror of https://github.com/AlexeyAB/darknet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor fix

This commit is contained in:
AlexeyAB 2019-12-05 16:14:34 +03:00
parent 2207acd9c4
commit 27da7f85c7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/image_opencv.cpp
View File

@ -95,17 +95,15 @@ extern "C" {
mat_cv *load_image_mat_cv(const char *filename, int flag) mat_cv *load_image_mat_cv(const char *filename, int flag)
{ {
cv::Mat *mat_ptr = NULL;
try { try {
cv::Mat *mat_ptr = new cv::Mat(); cv::Mat mat = cv::imread(filename, flag);
cv::Mat &mat = *mat_ptr;
mat = cv::imread(filename, flag);
if (mat.empty()) if (mat.empty())
{ {
delete mat_ptr;
std::string shrinked_filename = filename; std::string shrinked_filename = filename;
if (shrinked_filename.length() > 1024) { if (shrinked_filename.length() > 1024) {
shrinked_filename += "name is too long: ";
shrinked_filename.resize(1024); shrinked_filename.resize(1024);
shrinked_filename = std::string("name is too long: ") + shrinked_filename;
} }
cerr << "Cannot load image " << shrinked_filename << std::endl; cerr << "Cannot load image " << shrinked_filename << std::endl;
std::ofstream bad_list("bad.list", std::ios::out | std::ios::app); std::ofstream bad_list("bad.list", std::ios::out | std::ios::app);
@ -113,14 +111,19 @@ mat_cv *load_image_mat_cv(const char *filename, int flag)
//if (check_mistakes) getchar(); //if (check_mistakes) getchar();
return NULL; return NULL;
} }
if (mat.channels() == 3) cv::cvtColor(mat, mat, cv::COLOR_RGB2BGR); cv::Mat dst;
else if (mat.channels() == 4) cv::cvtColor(mat, mat, cv::COLOR_RGBA2BGRA); if (mat.channels() == 3) cv::cvtColor(mat, dst, cv::COLOR_RGB2BGR);
else if (mat.channels() == 4) cv::cvtColor(mat, dst, cv::COLOR_RGBA2BGRA);
else dst = mat;
mat_ptr = new cv::Mat(dst);
return (mat_cv *)mat_ptr; return (mat_cv *)mat_ptr;
} }
catch (...) { catch (...) {
cerr << "OpenCV exception: load_image_mat_cv \n"; cerr << "OpenCV exception: load_image_mat_cv \n";
} }
if (mat_ptr) delete mat_ptr;
return NULL; return NULL;
} }
// ---------------------------------------- // ----------------------------------------