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

fixed failure in Tonemap test

Browse Source
This commit is contained in:
Vadim Pisarevsky
2013-11-19 19:20:24 -05:00
parent d0b3c7a518
commit 677c7f27cb
7 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/src/arithm.cpp
View File

@@ -47,6 +47,7 @@
// */
#include "precomp.hpp"
#include "opencl_kernels.hpp"
namespace cv
{

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

@@ -3038,7 +3038,7 @@ const char* typeToStr(int t)
"?", "?", "?", "?"
};
int cn = CV_MAT_CN(t);
return cn >= 4 ? "?" : tab[CV_MAT_DEPTH(t)*4 + cn-1];
return cn > 4 ? "?" : tab[CV_MAT_DEPTH(t)*4 + cn-1];
}
const char* memopTypeToStr(int t)
@@ -3055,7 +3055,7 @@ const char* memopTypeToStr(int t)
"?", "?", "?", "?"
};
int cn = CV_MAT_CN(t);
return cn >= 4 ? "?" : tab[CV_MAT_DEPTH(t)*4 + cn-1];
return cn > 4 ? "?" : tab[CV_MAT_DEPTH(t)*4 + cn-1];
}
const char* convertTypeStr(int sdepth, int ddepth, int cn, char* buf)

2
modules/core/src/precomp.hpp
View File

@@ -67,8 +67,6 @@
#define GET_OPTIMIZED(func) (func)
#endif
#include "opencl_kernels.hpp"
namespace cv
{

1
modules/core/src/umatrix.cpp
View File

@@ -41,6 +41,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
///////////////////////////////// UMat implementation ///////////////////////////////