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:
bee4c34
)
Fixed bug in the operator of cv::Ranges-s intersection (operator &).
author
Leonid Beynenson
<no@email>
Tue, 12 Jul 2011 16:33:26 +0000
(16:33 +0000)
committer
Leonid Beynenson
<no@email>
Tue, 12 Jul 2011 16:33:26 +0000
(16:33 +0000)
modules/core/include/opencv2/core/operations.hpp
patch
|
blob
|
history
diff --git
a/modules/core/include/opencv2/core/operations.hpp
b/modules/core/include/opencv2/core/operations.hpp
index
60b4926
..
94d3df3
100644
(file)
--- a/
modules/core/include/opencv2/core/operations.hpp
+++ b/
modules/core/include/opencv2/core/operations.hpp
@@
-2000,7
+2000,7
@@
static inline bool operator !(const Range& r)
static inline Range operator & (const Range& r1, const Range& r2)
{
- Range r(std::max(r1.start, r2.start), std::min(r
2.start
, r2.end));
+ Range r(std::max(r1.start, r2.start), std::min(r
1.end
, r2.end));
r.end = std::max(r.end, r.start);
return r;
}