Another little fix for Monocrome frame
This commit is contained in:
parent
3499703ede
commit
1c7297f5be
@ -254,9 +254,10 @@ 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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user