projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b5534a
)
Restored missed }
author
Andrey Kamaev
<no@email>
Fri, 24 Feb 2012 12:45:23 +0000
(12:45 +0000)
committer
Andrey Kamaev
<no@email>
Fri, 24 Feb 2012 12:45:23 +0000
(12:45 +0000)
modules/highgui/src/cap_dc1394_v2.cpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/cap_dc1394_v2.cpp
b/modules/highgui/src/cap_dc1394_v2.cpp
index
a88d9ca
..
81b2916
100644
(file)
--- a/
modules/highgui/src/cap_dc1394_v2.cpp
+++ b/
modules/highgui/src/cap_dc1394_v2.cpp
@@
-795,9
+795,9
@@
bool CvCaptureCAM_DC1394_v2_CPP::setProperty(int propId, double value)
//first: check boundaries
if (value < act_feature->min)
{
-
value = act_feature->min;
-
}
-
else if (value > act_feature->max)
+ value = act_feature->min;
+ }
+ else if (value > act_feature->max)
{
value = act_feature->max;
}
@@
-806,7
+806,8
@@
bool CvCaptureCAM_DC1394_v2_CPP::setProperty(int propId, double value)
{
act_feature->value = value;
return true;
- }
+ }
+ }
return false;
}
return true;