workaround

This commit is contained in:
Ilya Lavrenov 2014-01-30 17:23:56 +04:00
parent 372cdac07c
commit 1ab1594d00
3 changed files with 8 additions and 5 deletions

View File

@ -3826,20 +3826,21 @@ static std::string kerToStr(const Mat & k)
if (depth <= CV_8S) if (depth <= CV_8S)
{ {
for (int i = 0; i < width; ++i) for (int i = 0; i < width; ++i)
stream << (int)data[i] << ", "; stream << "DIG(" << (int)data[i] << ")";
stream << (int)data[width]; stream << "DIG(" << (int)data[width] << ")";
} }
else if (depth == CV_32F) else if (depth == CV_32F)
{ {
stream.setf(std::ios_base::showpoint); stream.setf(std::ios_base::showpoint);
for (int i = 0; i < width; ++i) for (int i = 0; i < width; ++i)
stream << data[i] << "f, "; stream << "DIG(" << data[i] << "f)";
stream << data[width] << "f"; stream << "DIG(" << data[width] << "f)";
} }
else else
{ {
for (int i = 0; i < width; ++i) for (int i = 0; i < width; ++i)
stream << data[i] << ", "; stream << "DIG(" << data[i] << ")";
stream << "DIG(" << data[width] << ")";
} }
return stream.str(); return stream.str();

View File

@ -60,6 +60,7 @@ Niko
The info above maybe obsolete. The info above maybe obsolete.
***********************************************************************************/ ***********************************************************************************/
#define DIG(a) a,
__constant float mat_kernel[] = { COEFF }; __constant float mat_kernel[] = { COEFF };
__kernel __attribute__((reqd_work_group_size(LSIZE0,LSIZE1,1))) void col_filter __kernel __attribute__((reqd_work_group_size(LSIZE0,LSIZE1,1))) void col_filter

View File

@ -144,6 +144,7 @@ Niko
The info above maybe obsolete. The info above maybe obsolete.
***********************************************************************************/ ***********************************************************************************/
#define DIG(a) a,
__constant float mat_kernel[] = { COEFF }; __constant float mat_kernel[] = { COEFF };
__kernel __attribute__((reqd_work_group_size(LSIZE0,LSIZE1,1))) void row_filter_C1_D0 __kernel __attribute__((reqd_work_group_size(LSIZE0,LSIZE1,1))) void row_filter_C1_D0