pull/2228/head
Ilya Lavrenov 11 years ago
parent 372cdac07c
commit 1ab1594d00
  1. 11
      modules/core/src/ocl.cpp
  2. 1
      modules/imgproc/src/opencl/filterSepCol.cl
  3. 1
      modules/imgproc/src/opencl/filterSepRow.cl

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

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

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

Loading…
Cancel
Save