generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some little fix in pvapi backend

Browse Source
This commit is contained in:
Stefano Fabri 2010-07-13 17:58:08 +00:00
parent 4a734f774a
commit 22d22fd925
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/highgui/src/cap_pvapi.cpp
View File

@ -136,8 +136,9 @@ bool CvCaptureCAM_PvAPI::open( int index )
tPvIpSettings ipSettings; tPvIpSettings ipSettings;
if (PvInitialize()) if (PvInitialize()) {
return false; }
//return false;
Sleep(1000); Sleep(1000);
@ -178,7 +179,8 @@ bool CvCaptureCAM_PvAPI::open( int index )
return NULL; return NULL;
} }
*/ */
tPvUint32 frameWidth, frameHeight, frameSize, maxSize; tPvUint32 frameWidth, frameHeight, frameSize;
unsigned long maxSize;
char pixelFormat[256]; char pixelFormat[256];
PvAttrUint32Get(Camera.Handle, "TotalBytesPerFrame", &frameSize); PvAttrUint32Get(Camera.Handle, "TotalBytesPerFrame", &frameSize);
PvAttrUint32Get(Camera.Handle, "Width", &frameWidth); PvAttrUint32Get(Camera.Handle, "Width", &frameWidth);
@ -188,7 +190,6 @@ bool CvCaptureCAM_PvAPI::open( int index )
//PvAttrUint32Get(Camera.Handle,"PacketSize",&maxSize); //PvAttrUint32Get(Camera.Handle,"PacketSize",&maxSize);
if (PvCaptureAdjustPacketSize(Camera.Handle,maxSize)!=ePvErrSuccess) if (PvCaptureAdjustPacketSize(Camera.Handle,maxSize)!=ePvErrSuccess)
return false; return false;
//printf ("Pixel Format %s %d %d\n ", pixelFormat,frameWidth,frameHeight);
if (strncmp(pixelFormat, "Mono8",NULL)==0) { if (strncmp(pixelFormat, "Mono8",NULL)==0) {
grayframe = cvCreateImage(cvSize((int)frameWidth, (int)frameHeight), IPL_DEPTH_8U, 1); grayframe = cvCreateImage(cvSize((int)frameWidth, (int)frameHeight), IPL_DEPTH_8U, 1);
grayframe->widthStep = (int)frameWidth; grayframe->widthStep = (int)frameWidth;
@ -255,7 +256,7 @@ 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 grayframe;
} }
else return NULL; else return NULL;
} }