fix for opencv plugin

diff --git a/plugins/examplesink.cpp b/plugins/examplesink.cpp
index 659771c..86b3a8d 100644 (file)
--- a/plugins/examplesink.cpp
+++ b/plugins/examplesink.cpp
@@ -54,7 +54,8 @@ void ExampleSink::supportedChanged(PropertyList supportedProperties)
        velocityRequest.property = VehicleProperty::VehicleSpeed;
        velocityRequest.completed = [](AsyncPropertyReply* reply)
        {
-               DebugOut()<<"Velocity Async request completed: "<<reply->value->toString()<<endl; delete reply;
+               DebugOut()<<"Velocity Async request completed: "<<reply->value->toString()<<endl;
+               delete reply;
        };
 
        routingEngine->getPropertyAsync(velocityRequest);

diff --git a/plugins/opencvlux/opencvluxplugin.cpp b/plugins/opencvlux/opencvluxplugin.cpp
index 18f231c..e5ee9fc 100644 (file)
--- a/plugins/opencvlux/opencvluxplugin.cpp
+++ b/plugins/opencvlux/opencvluxplugin.cpp
@@ -186,15 +186,15 @@ static int grabImage(void *data)
 {
        OpenCvLuxPlugin::Shared* shared = static_cast<OpenCvLuxPlugin::Shared*>(data);
 
-/*     if(kinect)
+       cv::Mat m_image;
+
+       if(shared->kinect)
        {
-               m_capture->grab();
-               m_capture->retrieve( m_image, CV_CAP_OPENNI_GRAY_IMAGE );
+               shared->m_capture->grab();
+               shared->m_capture->retrieve( m_image, CV_CAP_OPENNI_GRAY_IMAGE );
        }
-       else*/
+       else
        {
-               cv::Mat m_image;
-
                *(shared->m_capture) >> m_image;
 
                uint lux = evalImage(m_image,shared);
@@ -218,7 +218,7 @@ static uint evalImage(cv::Mat qImg, OpenCvLuxPlugin::Shared *shared)
        cv::Scalar avgPixelIntensity;
 
 
-       if(useOpenCl)
+       if(shared->useOpenCl)
        {
 #ifdef OPENCL
                cv::Scalar stdDev;
@@ -227,7 +227,7 @@ static uint evalImage(cv::Mat qImg, OpenCvLuxPlugin::Shared *shared)
        }
        else
        {
-               cv::Scalar avgPixelIntensity = cv::mean(qImg);
+               avgPixelIntensity = cv::mean(qImg);
        }