projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
183f230
)
Removed a debug print
author
Stefano Fabri
<no@email>
Thu, 24 Jun 2010 18:23:57 +0000
(18:23 +0000)
committer
Stefano Fabri
<no@email>
Thu, 24 Jun 2010 18:23:57 +0000
(18:23 +0000)
modules/highgui/src/cap_pvapi.cpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/cap_pvapi.cpp
b/modules/highgui/src/cap_pvapi.cpp
index
7b55531
..
b1e680d
100644
(file)
--- a/
modules/highgui/src/cap_pvapi.cpp
+++ b/
modules/highgui/src/cap_pvapi.cpp
@@
-254,8
+254,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");
+ cvMerge(grayframe,grayframe,grayframe,NULL,frame);
return frame;
}
else return NULL;