Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use OpenCV logging instead of std::cerr.

Browse Source
pull/23999/head
Alexander Smorkalov 2 years ago
parent 1920993525
commit 23f27d8dbe
7 changed files with 47 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      modules/core/src/ocl.cpp
  2. 6
      modules/core/src/system.cpp
  3. 18
      modules/dnn/src/layers/max_unpooling_layer.cpp
  4. 16
      modules/dnn/src/net_impl.cpp
  5. 2
      modules/highgui/src/window_wayland.cpp
  6. 6
      modules/imgcodecs/src/grfmt_pxm.cpp
  7. 51
      modules/imgcodecs/src/loadsave.cpp

1
modules/core/src/ocl.cpp
Unescape View File

@ -51,7 +51,6 @@
#include <set> #include <set>
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <iostream> // std::cerr
#include <fstream> #include <fstream>
#if !(defined _MSC_VER) || (defined _MSC_VER && _MSC_VER > 1700) #if !(defined _MSC_VER) || (defined _MSC_VER && _MSC_VER > 1700)
#include <inttypes.h> #include <inttypes.h>

6
modules/core/src/system.cpp
Unescape View File

@ -2574,7 +2574,7 @@ public:
ippStatus = ippGetCpuFeatures(&cpuFeatures, NULL); ippStatus = ippGetCpuFeatures(&cpuFeatures, NULL);
if(ippStatus < 0) if(ippStatus < 0)
{ {
std::cerr << "ERROR: IPP cannot detect CPU features, IPP was disabled " << std::endl; CV_LOG_ERROR(NULL, "ERROR: IPP cannot detect CPU features, IPP was disabled");
useIPP = false; useIPP = false;
return; return;
} }
@ -2612,7 +2612,7 @@ public:
if(env == "disabled") if(env == "disabled")
{ {
std::cerr << "WARNING: IPP was disabled by OPENCV_IPP environment variable" << std::endl; CV_LOG_WARNING(NULL, "WARNING: IPP was disabled by OPENCV_IPP environment variable");
useIPP = false; useIPP = false;
} }
else if(env == "sse42") else if(env == "sse42")
@ -2626,7 +2626,7 @@ public:
#endif #endif
#endif #endif
else else
std::cerr << "ERROR: Improper value of OPENCV_IPP: " << env.c_str() << ". Correct values are: disabled, sse42, avx2, avx512 (Intel64 only)" << std::endl; CV_LOG_ERROR(NULL, "ERROR: Improper value of OPENCV_IPP: " << env.c_str() << ". Correct values are: disabled, sse42, avx2, avx512 (Intel64 only)");
// Trim unsupported features // Trim unsupported features
ippFeatures &= cpuFeatures; ippFeatures &= cpuFeatures;

18
modules/dnn/src/layers/max_unpooling_layer.cpp
Unescape View File

@ -14,6 +14,7 @@ Implementation of Batch Normalization layer.
#include "../op_cuda.hpp" #include "../op_cuda.hpp"
#include "../op_halide.hpp" #include "../op_halide.hpp"
#include <opencv2/dnn/shape_utils.hpp> #include <opencv2/dnn/shape_utils.hpp>
#include <opencv2/core/utils/logger.hpp>
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
#include "../cuda4dnn/primitives/max_unpooling.hpp" #include "../cuda4dnn/primitives/max_unpooling.hpp"
@ -110,17 +111,12 @@ public:
int index = idxptr[i_wh]; int index = idxptr[i_wh];
if (!(0 <= index && index < outPlaneTotal)) if (!(0 <= index && index < outPlaneTotal))
{ {
std::cerr CV_LOG_ERROR(NULL, cv::format(
<< "i_n=" << i_n << std::endl "i_n=%d\ni_c=%d\ni_wh=%d\nindex=%d\nmaxval=%lf\noutPlaneTotal=%d\n",
<< "i_c=" << i_c << std::endl i_n, i_c, i_wh, index, inptr[i_wh], outPlaneTotal));
<< "i_wh=" << i_wh << std::endl CV_LOG_ERROR(NULL, "input.size=" << input.size);
<< "index=" << index << std::endl CV_LOG_ERROR(NULL, "indices.size=" << indices.size);
<< "maxval=" << inptr[i_wh] << std::endl CV_LOG_ERROR(NULL, "outBlob=" << outBlob.size);
<< "outPlaneTotal=" << outPlaneTotal << std::endl
<< "input.size=" << input.size << std::endl
<< "indices.size=" << indices.size << std::endl
<< "outBlob=" << outBlob.size << std::endl
;
CV_Assert(0 <= index && index < outPlaneTotal); CV_Assert(0 <= index && index < outPlaneTotal);
} }
outptr[index] = inptr[i_wh]; outptr[index] = inptr[i_wh];

16
modules/dnn/src/net_impl.cpp
Unescape View File

@ -662,14 +662,14 @@ void Net::Impl::forwardLayer(LayerData& ld)
m = u.getMat(ACCESS_READ); m = u.getMat(ACCESS_READ);
if (!checkRange(m)) if (!checkRange(m))
{ {
std::cerr << "WARNING: NaN detected in layer output: id=" << ld.id << " name=" << layer->name << std::endl; CV_LOG_WARNING(NULL, "NaN detected in layer output: id=" << ld.id << " name=" << layer->name
std::cerr << "output id=" << i << " output shape=" << shape(m) << std::endl; << " output id=" << i << " output shape=" << shape(m));
fail = true; fail = true;
} }
else if (!checkRange(m, true, NULL, -1e6, 1e6)) else if (!checkRange(m, true, NULL, -1e6, 1e6))
{ {
std::cerr << "WARNING: Inf detected in layer output: id=" << ld.id << " name=" << layer->name << std::endl; CV_LOG_WARNING(NULL, "Inf detected in layer output: id=" << ld.id << " name=" << layer->name
std::cerr << "output id=" << i << " output shape=" << shape(m) << std::endl; << " output id=" << i << " output shape=" << shape(m));
fail = true; fail = true;
} }
} }
@ -738,14 +738,14 @@ void Net::Impl::forwardLayer(LayerData& ld)
const Mat& m = ld.outputBlobs[i]; const Mat& m = ld.outputBlobs[i];
if (!checkRange(m)) if (!checkRange(m))
{ {
std::cerr << "WARNING: NaN detected in layer output: id=" << ld.id << " name=" << layer->name << std::endl; CV_LOG_WARNING(NULL, "NaN detected in layer output: "
std::cerr << "output id=" << i << " output shape=" << shape(m) << std::endl; << cv::format("id=%d name=%s output id=%zu output shape=", ld.id, layer->name.c_str(), i) << shape(m));
fail = true; fail = true;
} }
else if (!checkRange(m, true, NULL, -1e6, 1e6)) else if (!checkRange(m, true, NULL, -1e6, 1e6))
{ {
std::cerr << "WARNING: Inf detected in layer output: id=" << ld.id << " name=" << layer->name << std::endl; CV_LOG_WARNING(NULL, "Inf detected in layer output: "
std::cerr << "output id=" << i << " output shape=" << shape(m) << std::endl; << cv::format("id=%d name=%s output id=%zu output shape=", ld.id, layer->name.c_str(), i) << shape(m));
fail = true; fail = true;
} }
} }

2
modules/highgui/src/window_wayland.cpp
Unescape View File

@ -1055,7 +1055,7 @@ void cv_wl_keyboard::handle_kb_keymap(void *data, struct wl_keyboard *kb, uint32
} catch (std::exception &e) { } catch (std::exception &e) {
if (keyboard->xkb_.keymap) if (keyboard->xkb_.keymap)
xkb_keymap_unref(keyboard->xkb_.keymap); xkb_keymap_unref(keyboard->xkb_.keymap);
std::cerr << "OpenCV Error: " << e.what() << std::endl; CV_LOG_ERROR(NULL, "OpenCV Error: " << e.what());
} }
close(fd); close(fd);

6
modules/imgcodecs/src/grfmt_pxm.cpp
Unescape View File

@ -43,7 +43,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "utils.hpp" #include "utils.hpp"
#include "grfmt_pxm.hpp" #include "grfmt_pxm.hpp"
#include <iostream> #include <opencv2/core/utils/logger.hpp>
#ifdef HAVE_IMGCODEC_PXM #ifdef HAVE_IMGCODEC_PXM
@ -191,7 +191,7 @@ bool PxMDecoder::readHeader()
} }
catch (...) catch (...)
{ {
std::cerr << "PXM::readHeader(): unknown C++ exception" << std::endl << std::flush; CV_LOG_ERROR(NULL, "PXM::readHeader(): unknown C++ exception");
throw; throw;
} }
@ -364,7 +364,7 @@ bool PxMDecoder::readData( Mat& img )
} }
catch (...) catch (...)
{ {
std::cerr << "PXM::readData(): unknown exception" << std::endl << std::flush; CV_LOG_ERROR(NULL, "PXM::readData(): unknown exception");
throw; throw;
} }

51
modules/imgcodecs/src/loadsave.cpp
Unescape View File

@ -437,12 +437,12 @@ imread_( const String& filename, int flags, Mat& mat )
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
std::cerr << "imread_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush; CV_LOG_ERROR(NULL, "imread_('" << filename << "'): can't read header: " << e.what());
return 0; return 0;
} }
catch (...) catch (...)
{ {
std::cerr << "imread_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush; CV_LOG_ERROR(NULL, "imread_('" << filename << "'): can't read header: unknown exception");
return 0; return 0;
} }
@ -475,11 +475,11 @@ imread_( const String& filename, int flags, Mat& mat )
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
std::cerr << "imread_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush; CV_LOG_ERROR(NULL, "imread_('" << filename << "'): can't read data: " << e.what());
} }
catch (...) catch (...)
{ {
std::cerr << "imread_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush; CV_LOG_ERROR(NULL, "imread_('" << filename << "'): can't read data: unknown exception");
} }
if (!success) if (!success)
{ {
@ -542,12 +542,12 @@ imreadmulti_(const String& filename, int flags, std::vector<Mat>& mats, int star
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
std::cerr << "imreadmulti_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush; CV_LOG_ERROR(NULL, "imreadmulti_('" << filename << "'): can't read header: " << e.what());
return 0; return 0;
} }
catch (...) catch (...)
{ {
std::cerr << "imreadmulti_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush; CV_LOG_ERROR(NULL, "imreadmulti_('" << filename << "'): can't read header: unknown exception");
return 0; return 0;
} }
@ -591,11 +591,11 @@ imreadmulti_(const String& filename, int flags, std::vector<Mat>& mats, int star
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
std::cerr << "imreadmulti_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush; CV_LOG_ERROR(NULL, "imreadmulti_('" << filename << "'): can't read data: " << e.what());
} }
catch (...) catch (...)
{ {
std::cerr << "imreadmulti_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush; CV_LOG_ERROR(NULL, "imreadmulti_('" << filename << "'): can't read data: unknown exception");
} }
if (!success) if (!success)
break; break;
@ -672,7 +672,7 @@ size_t imcount_(const String& filename, int flags)
return collection.size(); return collection.size();
} catch(cv::Exception const& e) { } catch(cv::Exception const& e) {
// Reading header or finding decoder for the filename is failed // Reading header or finding decoder for the filename is failed
std::cerr << "imcount_('" << filename << "'): can't read header or can't find decoder: " << e.what() << std::endl << std::flush; CV_LOG_ERROR(NULL, "imcount_('" << filename << "'): can't read header or can't find decoder: " << e.what());
} }
return 0; return 0;
} }
@ -768,14 +768,13 @@ static bool imwrite_( const String& filename, const std::vector<Mat>& img_vec,
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
std::cerr << "imwrite_('" << filename << "'): can't write data: " << e.what() << std::endl << std::flush; CV_LOG_ERROR(NULL, "imwrite_('" << filename << "'): can't write data: " << e.what());
} }
catch (...) catch (...)
{ {
std::cerr << "imwrite_('" << filename << "'): can't write data: unknown exception" << std::endl << std::flush; CV_LOG_ERROR(NULL, "imwrite_('" << filename << "'): can't write data: unknown exception");
} }
// CV_Assert( code );
return code; return code;
} }
@ -851,11 +850,11 @@ imdecode_( const Mat& buf, int flags, Mat& mat )
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
std::cerr << "imdecode_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush; CV_LOG_ERROR(NULL, "imdecode_('" << filename << "'): can't read header: " << e.what());
} }
catch (...) catch (...)
{ {
std::cerr << "imdecode_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush; CV_LOG_ERROR(NULL, "imdecode_('" << filename << "'): can't read header: unknown exception");
} }
if (!success) if (!success)
{ {
@ -864,7 +863,7 @@ imdecode_( const Mat& buf, int flags, Mat& mat )
{ {
if (0 != remove(filename.c_str())) if (0 != remove(filename.c_str()))
{ {
std::cerr << "unable to remove temporary file:" << filename << std::endl << std::flush; CV_LOG_WARNING(NULL, "unable to remove temporary file:" << filename);
} }
} }
return 0; return 0;
@ -896,18 +895,18 @@ imdecode_( const Mat& buf, int flags, Mat& mat )
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
std::cerr << "imdecode_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush; CV_LOG_ERROR(NULL, "imdecode_('" << filename << "'): can't read data: " << e.what());
} }
catch (...) catch (...)
{ {
std::cerr << "imdecode_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush; CV_LOG_ERROR(NULL, "imdecode_('" << filename << "'): can't read data: unknown exception");
} }
if (!filename.empty()) if (!filename.empty())
{ {
if (0 != remove(filename.c_str())) if (0 != remove(filename.c_str()))
{ {
std::cerr << "unable to remove temporary file:" << filename << std::endl << std::flush; CV_LOG_WARNING(NULL, "unable to remove temporary file: " << filename);
} }
} }
@ -1000,11 +999,11 @@ imdecodemulti_(const Mat& buf, int flags, std::vector<Mat>& mats, int start, int
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
std::cerr << "imreadmulti_('" << filename << "'): can't read header: " << e.what() << std::endl << std::flush; CV_LOG_ERROR(NULL, "imreadmulti_('" << filename << "'): can't read header: " << e.what());
} }
catch (...) catch (...)
{ {
std::cerr << "imreadmulti_('" << filename << "'): can't read header: unknown exception" << std::endl << std::flush; CV_LOG_ERROR(NULL, "imreadmulti_('" << filename << "'): can't read header: unknown exception");
} }
int current = start; int current = start;
@ -1025,7 +1024,7 @@ imdecodemulti_(const Mat& buf, int flags, std::vector<Mat>& mats, int start, int
{ {
if (0 != remove(filename.c_str())) if (0 != remove(filename.c_str()))
{ {
std::cerr << "unable to remove temporary file:" << filename << std::endl << std::flush; CV_LOG_WARNING(NULL, "unable to remove temporary file: " << filename);
} }
} }
return 0; return 0;
@ -1060,11 +1059,11 @@ imdecodemulti_(const Mat& buf, int flags, std::vector<Mat>& mats, int start, int
} }
catch (const cv::Exception& e) catch (const cv::Exception& e)
{ {
std::cerr << "imreadmulti_('" << filename << "'): can't read data: " << e.what() << std::endl << std::flush; CV_LOG_ERROR(NULL, "imreadmulti_('" << filename << "'): can't read data: " << e.what());
} }
catch (...) catch (...)
{ {
std::cerr << "imreadmulti_('" << filename << "'): can't read data: unknown exception" << std::endl << std::flush; CV_LOG_ERROR(NULL, "imreadmulti_('" << filename << "'): can't read data: unknown exception");
} }
if (!success) if (!success)
break; break;
@ -1087,7 +1086,7 @@ imdecodemulti_(const Mat& buf, int flags, std::vector<Mat>& mats, int start, int
{ {
if (0 != remove(filename.c_str())) if (0 != remove(filename.c_str()))
{ {
std::cerr << "unable to remove temporary file:" << filename << std::endl << std::flush; CV_LOG_WARNING(NULL, "unable to remove temporary file: " << filename);
} }
} }
@ -1317,10 +1316,10 @@ Mat ImageCollection::Impl::readData() {
success = true; success = true;
} }
catch (const cv::Exception &e) { catch (const cv::Exception &e) {
std::cerr << "ImageCollection class: can't read data: " << e.what() << std::endl << std::flush; CV_LOG_ERROR(NULL, "ImageCollection class: can't read data: " << e.what());
} }
catch (...) { catch (...) {
std::cerr << "ImageCollection class:: can't read data: unknown exception" << std::endl << std::flush; CV_LOG_ERROR(NULL, "ImageCollection class:: can't read data: unknown exception");
} }
if (!success) if (!success)
return cv::Mat(); return cv::Mat();

Write Preview
Loading…
Cancel
Save