From 3499703ede3392e7f1e2ed399c5cf3d08081e081 Mon Sep 17 00:00:00 2001 From: Stefano Fabri Date: Tue, 13 Jul 2010 18:08:20 +0000 Subject: [PATCH] Fixed a typo --- modules/highgui/src/cap_pvapi.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/highgui/src/cap_pvapi.cpp b/modules/highgui/src/cap_pvapi.cpp index 6b2f5b13d0..5cf54873ca 100644 --- a/modules/highgui/src/cap_pvapi.cpp +++ b/modules/highgui/src/cap_pvapi.cpp @@ -255,7 +255,8 @@ IplImage* CvCaptureCAM_PvAPI::retrieveFrame(int) if (PvCaptureWaitForFrameDone(Camera.Handle, &(Camera.Frame), 1000) == ePvErrSuccess) { if (!monocrome) - cvMerge(grayframe,grayframe,grayframe,NULL,frame); + cvMerge(grayframe,grayframe,grayframe,NULL,frame); + return frame; return grayframe; } else return NULL;