mirror of
https://github.com/opencv/opencv.git
synced 2024-11-24 03:00:14 +08:00
Initializaed monocrom variable on costructor
This commit is contained in:
parent
c7cf80fd59
commit
183f2306c8
@ -107,7 +107,7 @@ protected:
|
||||
|
||||
CvCaptureCAM_PvAPI::CvCaptureCAM_PvAPI()
|
||||
{
|
||||
|
||||
monocrome=false;
|
||||
}
|
||||
void CvCaptureCAM_PvAPI::Sleep(unsigned int time)
|
||||
{
|
||||
@ -255,6 +255,7 @@ IplImage* CvCaptureCAM_PvAPI::retrieveFrame(int)
|
||||
if (PvCaptureWaitForFrameDone(Camera.Handle, &(Camera.Frame), 1000) == ePvErrSuccess) {
|
||||
if (!monocrome)
|
||||
cvMerge(grayframe,grayframe,grayframe,NULL,frame);
|
||||
printf("Frame ok\n");
|
||||
return frame;
|
||||
}
|
||||
else return NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user