projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2431c72
ec3f22c
)
converted old haar cascades to the new format; added the conversion function; added...
author
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Thu, 19 Dec 2013 10:48:42 +0000
(14:48 +0400)
committer
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Thu, 19 Dec 2013 10:48:42 +0000
(14:48 +0400)
1
2
modules/core/include/opencv2/core/ocl.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/imgproc/include/opencv2/imgproc.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/imgproc/src/smooth.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/core/include/opencv2/core/ocl.hpp
Simple merge
diff --cc
modules/imgproc/include/opencv2/imgproc.hpp
Simple merge
diff --cc
modules/imgproc/src/smooth.cpp
Simple merge