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

fixed gpu module compilation

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-03-27 13:07:58 +04:00
parent 20534c9beb
commit 15f09f8068
18 changed files with 97 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gpu/src/error.cpp
View File

@@ -54,7 +54,7 @@ namespace
struct ErrorEntry
{
int code;
String str;
const char* str;
};
struct ErrorEntryComparer
@@ -68,12 +68,10 @@ namespace
{
size_t idx = std::find_if(errors, errors + n, ErrorEntryComparer(code)) - errors;
const String& msg = (idx != n) ? errors[idx].str : String("Unknown error code");
const char* msg = (idx != n) ? errors[idx].str : "Unknown error code";
String str = cv::format("%s [Code = %d]", msg, code);
std::ostringstream ostr;
ostr << msg << " [Code = " << code << "]";
return ostr.str();
return str;
}
//////////////////////////////////////////////////////////////////////////