Another little fix for Monocrome frame

1c7297f5 · Stefano Fabri · 3499703e · 1c7297f5
Commit 1c7297f5 authored Jul 13, 2010 by Stefano Fabri
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

cap_pvapi.cpp modules/highgui/src/cap_pvapi.cpp +4 -3

No files found.
--- 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 )