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

Merge pull request #1581 from SpecLad:merge-2.4

Browse Source
This commit is contained in:
Roman Donchenko
2013-10-09 12:33:49 +04:00
committed by OpenCV Buildbot
parent 685eceb68a 076eeffd4d
commit dfb698dc64
128 changed files with 9431 additions and 3900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/highgui/src/cap_libv4l.cpp
View File

@@ -856,8 +856,7 @@ static int _capture_V4L (CvCaptureCAM_V4L *capture, char *deviceName)
detect_v4l = try_init_v4l(capture, deviceName);
if ((detect_v4l == -1)
)
if (detect_v4l == -1)
{
fprintf (stderr, "HIGHGUI ERROR: V4L"
": device %s: Unable to open for READ ONLY\n", deviceName);
@@ -865,8 +864,7 @@ static int _capture_V4L (CvCaptureCAM_V4L *capture, char *deviceName)
return -1;
}
if ((detect_v4l <= 0)
)
if (detect_v4l <= 0)
{
fprintf (stderr, "HIGHGUI ERROR: V4L"
": device %s: Unable to query number of channels\n", deviceName);

6
modules/highgui/src/cap_openni.cpp
View File

@@ -309,15 +309,15 @@ private:
class TBBApproximateSynchronizer: public ApproximateSynchronizerBase
{
public:
TBBApproximateSynchronizer( ApproximateSyncGrabber& approxSyncGrabber ) :
ApproximateSynchronizerBase(approxSyncGrabber)
TBBApproximateSynchronizer( ApproximateSyncGrabber& _approxSyncGrabber ) :
ApproximateSynchronizerBase(_approxSyncGrabber)
{
setMaxBufferSize();
}
void setMaxBufferSize()
{
int maxBufferSize = ApproximateSynchronizerBase::approxSyncGrabber.getMaxBufferSize();
int maxBufferSize = approxSyncGrabber.getMaxBufferSize();
if( maxBufferSize >= 0 )
{
depthQueue.set_capacity( maxBufferSize );