Skip to content

O
opencv
Commit 1c7297f5 authored by Stefano Fabri's avatar Stefano Fabri
Browse files
Options

Another little fix for Monocrome frame

parent 3499703e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
modules/highgui/src/cap_pvapi.cpp
View file @ 1c7297f5
...@@ -254,12 +254,13 @@ IplImage* CvCaptureCAM_PvAPI::retrieveFrame(int) ...@@ -254,12 +254,13 @@ IplImage* CvCaptureCAM_PvAPI::retrieveFrame(int)
{ {
if (PvCaptureWaitForFrameDone(Camera.Handle, &(Camera.Frame), 1000) == ePvErrSuccess) { if (PvCaptureWaitForFrameDone(Camera.Handle, &(Camera.Frame), 1000) == ePvErrSuccess) {
if (!monocrome) if (!monocrome) {
cvMerge(grayframe,grayframe,grayframe,NULL,frame); cvMerge(grayframe,grayframe,grayframe,NULL,frame);
return frame; return frame;
}
return grayframe; return grayframe;
} }
else return NULL; else return NULL;
} }
double CvCaptureCAM_PvAPI::getProperty( int property_id ) double CvCaptureCAM_PvAPI::getProperty( int property_id )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment