From 1c7297f5be7c7a9d7f4b38d1c739760156736628 Mon Sep 17 00:00:00 2001 From: Stefano Fabri Date: Tue, 13 Jul 2010 18:11:45 +0000 Subject: [PATCH] Another little fix for Monocrome frame --- modules/highgui/src/cap_pvapi.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/highgui/src/cap_pvapi.cpp b/modules/highgui/src/cap_pvapi.cpp index 5cf54873ca..ddb05e1d33 100644 --- a/modules/highgui/src/cap_pvapi.cpp +++ b/modules/highgui/src/cap_pvapi.cpp @@ -254,12 +254,13 @@ IplImage* CvCaptureCAM_PvAPI::retrieveFrame(int) { if (PvCaptureWaitForFrameDone(Camera.Handle, &(Camera.Frame), 1000) == ePvErrSuccess) { - if (!monocrome) + if (!monocrome) { cvMerge(grayframe,grayframe,grayframe,NULL,frame); return frame; + } return grayframe; - } - else return NULL; + } + else return NULL; } double CvCaptureCAM_PvAPI::getProperty( int property_id )