From b8c590b3b14121114ccc044c8f036807557a119d Mon Sep 17 00:00:00 2001
From: Kevron Rees <kevron.m.rees@intel.com>
Date: Mon, 6 Jan 2014 14:00:30 -0800
Subject: [PATCH] some opencl tweaks inside the opencv plugin

---
 plugins/opencvlux/opencvluxplugin.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/plugins/opencvlux/opencvluxplugin.cpp b/plugins/opencvlux/opencvluxplugin.cpp
index d230da7..55d0105 100644
--- a/plugins/opencvlux/opencvluxplugin.cpp
+++ b/plugins/opencvlux/opencvluxplugin.cpp
@@ -111,6 +111,22 @@ OpenCvLuxPlugin::OpenCvLuxPlugin(AbstractRoutingEngine* re, map<string, string>
 	{
 		std::vector<cv::ocl::Info> info;
 		cv::ocl::getDevice(info);
+
+		DebugOut()<<"There are "<<info.size()<<" OpenCL devices on this system"<<endl;
+
+		if(!info.size())
+		{
+			DebugOut()<<"No CL devices.  Disabling OpenCL"<<endl;
+			shared->useOpenCl = false;
+		}
+
+		for(cv::ocl::Info i : info)
+		{
+			for(auto name : i.DeviceName)
+			{
+				DebugOut()<<"DeviceName: "<<name<<endl;
+			}
+		}
 	}
 #endif
 
@@ -261,7 +277,8 @@ static uint evalImage(cv::Mat qImg, OpenCvLuxPlugin::Shared *shared)
 	{
 #ifdef OPENCL
 		cv::Scalar stdDev;
-		cv::ocl::meanStdDev(qImg, avgPixelIntensity, stdDev);
+		cv::ocl::oclMat src(qImg);
+		cv::ocl::meanStdDev(src, avgPixelIntensity, stdDev);
 #endif
 	}
 	else if(shared->useCuda)
-- 
2.7.4