From 1d6327ba2a64f8752e436f3b089cdfa5d66afca2 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Mon, 7 Oct 2013 21:01:33 +0400
Subject: [PATCH] ocl: fix Context::CL_* usage
---
modules/ocl/src/imgproc.cpp | 2 +-
modules/ocl/src/svm.cpp | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/modules/ocl/src/imgproc.cpp b/modules/ocl/src/imgproc.cpp
index ff3d95fda..79e197c76 100644
--- a/modules/ocl/src/imgproc.cpp
+++ b/modules/ocl/src/imgproc.cpp
@@ -1301,7 +1301,7 @@ namespace cv
if( src.depth() != CV_8U || src.oclchannels() != 4 )
CV_Error( CV_StsUnsupportedFormat, "Only 8-bit, 4-channel images are supported" );
- // if(!src.clCxt->supportsFeature(Context::CL_DOUBLE))
+ // if(!src.clCxt->supportsFeature(FEATURE_CL_DOUBLE))
// {
// CV_Error( CV_GpuNotSupported, "Selected device doesn't support double, so a deviation exists.\nIf the accuracy is acceptable, the error can be ignored.\n");
// }
diff --git a/modules/ocl/src/svm.cpp b/modules/ocl/src/svm.cpp
index 311bd7d98..cebd13496 100644
--- a/modules/ocl/src/svm.cpp
+++ b/modules/ocl/src/svm.cpp
@@ -472,7 +472,7 @@ static void matmul_sigmod(oclMat & src, oclMat & src2, oclMat & dst, int src_row
args.push_back(make_pair(sizeof(cl_int), (void* )&width));
float alpha = 0.0f, beta = 0.0f;
- if(!Context::getContext()->supportsFeature(Context::CL_DOUBLE))
+ if(!Context::getContext()->supportsFeature(FEATURE_CL_DOUBLE))
{
alpha = (float)alpha1;
beta = (float)beta1;
@@ -517,7 +517,7 @@ static void matmul_poly(oclMat & src, oclMat & src2, oclMat & dst, int src_rows,
args.push_back(make_pair(sizeof(cl_int), (void* )&width));
float alpha = 0.0f, beta = 0.0f, degree = 0.0f;
- if(!Context::getContext()->supportsFeature(Context::CL_DOUBLE))
+ if(!Context::getContext()->supportsFeature(FEATURE_CL_DOUBLE))
{
alpha = (float)alpha1;
beta = (float)beta1;
@@ -559,7 +559,7 @@ static void matmul_linear(oclMat & src, oclMat & src2, oclMat & dst, int src_row
args.push_back(make_pair(sizeof(cl_int), (void* )&width));
float alpha = 0.0f, beta = 0.0f;
- if(!Context::getContext()->supportsFeature(Context::CL_DOUBLE))
+ if(!Context::getContext()->supportsFeature(FEATURE_CL_DOUBLE))
{
alpha = (float)alpha1;
beta = (float)beta1;
@@ -708,7 +708,7 @@ float CvSVM_OCL::predict(const CvMat* samples, CV_OUT CvMat* results) const
#else
- if(!Context::getContext()->supportsFeature(Context::CL_DOUBLE))
+ if(!Context::getContext()->supportsFeature(FEATURE_CL_DOUBLE))
{
dst = oclMat(sample_count, sv_total, CV_32FC1);
}
@@ -845,7 +845,7 @@ bool CvSVMSolver_ocl::solve_generic( CvSVMSolutionInfo& si )
}
#else
- if(!Context::getContext()->supportsFeature(Context::CL_DOUBLE))
+ if(!Context::getContext()->supportsFeature(FEATURE_CL_DOUBLE))
{
dst = oclMat(sample_count, sample_count, CV_32FC1);
}
@@ -1093,7 +1093,7 @@ void CvSVMKernel_ocl::calc_non_rbf_base( int vcount, const int row_idx, Qfloat*
results[i] = (Qfloat) * src.ptr<float>(row_idx, i);
}
#else
- if(!Context::getContext()->supportsFeature(Context::CL_DOUBLE))
+ if(!Context::getContext()->supportsFeature(FEATURE_CL_DOUBLE))
{
for(int i = 0; i < vcount; i++)
{