generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implementation of cv::Matx and cv::Vec is almost moved to matx.hpp

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-27 18:43:06 +04:00
parent d2192c0759
commit 969a7133a9
8 changed files with 1232 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/gl_core_3_1.cpp
View File

@@ -136,14 +136,14 @@
void* func = (void*) CV_GL_GET_PROC_ADDRESS(name);
if (!func)
{
CV_Error(CV_OpenGlApiCallError, cv::format("Can't load OpenGL extension [%s]", name) );
CV_Error(cv::Error::OpenGlApiCallError, cv::format("Can't load OpenGL extension [%s]", name) );
}
return func;
}
#else
static void* IntGetProcAddress(const char*)
{
CV_Error(CV_OpenGlNotSupported, "The library is compiled without OpenGL support");
CV_Error(cv::Error::OpenGlNotSupported, "The library is compiled without OpenGL support");
return 0;
}
#endif

5
modules/core/src/system.cpp
View File

@@ -465,6 +465,11 @@ void error( const Exception& exc )
throw exc;
}
void error(int _code, const String& _err, const char* _func, const char* _file, int _line)
{
error(cv::Exception(_code, _err, _func, _file, _line));
}
CvErrorCallback
redirectError( CvErrorCallback errCallback, void* userdata, void** prevUserdata)
{