 Andrey Kamaev
|
a42a0f5fca
|
Added compatibility headers
|
2013-03-13 17:26:56 +04:00 |
|
|
Andrey Kamaev
|
ad5cddc007
|
Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
|
2013-03-13 17:26:56 +04:00 |
|
|
Andrey Kamaev
|
9e12b7c3c2
|
Merge release 2.4.4
|
2013-03-04 19:43:49 +04:00 |
|
|
yao
|
65bb4250a4
|
Fix a bug in addWeighted x64 mode
And a potential problem in remap
|
2013-03-01 18:08:53 +08:00 |
|
|
Vadim Pisarevsky
|
a910360689
|
Merge pull request #586 from bitwangyaoyao:2.4_FixBFMatcher
|
2013-03-01 10:55:11 +04:00 |
|
|
yao
|
82b9854837
|
fix compile warnings
|
2013-03-01 08:47:20 +08:00 |
|
|
Andrey Kamaev
|
fba0e6fc5c
|
Merge pull request #587 from bitwangyaoyao:2.4_fixHog
|
2013-02-28 18:06:28 +04:00 |
|
|
Andrey Kamaev
|
4811988caf
|
Merge pull request #585 from bitwangyaoyao:2.4_SURF
|
2013-02-28 18:06:14 +04:00 |
|
|
Andrey Kamaev
|
d0e340bc80
|
Merge pull request #582 from bitwangyaoyao:2.4_fixBlend
|
2013-02-28 15:43:51 +04:00 |
|
|
yao
|
f12369a53c
|
Fix ocl::HOG crash on Intel OCL
|
2013-02-28 16:56:39 +08:00 |
|
|
Andrey Kamaev
|
891d7da6ee
|
Merge branch '2.4'
|
2013-02-28 11:17:06 +04:00 |
|
|
yao
|
f791344810
|
linux warning fix
|
2013-02-28 14:37:37 +08:00 |
|
|
yao
|
504008dbe0
|
Fix ocl::bruteforcematcher crash on Intel OCL
|
2013-02-28 14:31:08 +08:00 |
|
|
yao
|
7c1f1d8837
|
fix bug #2787
|
2013-02-28 14:05:36 +08:00 |
|
|
yao
|
69eebdd608
|
fix the blend crash in some cases
|
2013-02-28 09:03:10 +08:00 |
|
|
Andrey Kamaev
|
0a8711d76b
|
Merge pull request #576 from bitwangyaoyao:2.4_customMat2
|
2013-02-27 19:33:54 +04:00 |
|
|
Andrey Kamaev
|
af13c8604d
|
Merge pull request #568 from bitwangyaoyao:2.4_moments
|
2013-02-27 19:33:26 +04:00 |
|
|
yao
|
cbff75db9e
|
fix build errors
|
2013-02-27 21:56:03 +08:00 |
|
|
yao
|
9ccf27c7f5
|
add interfaces enable custom oclMat device memory type
|
2013-02-27 17:32:32 +08:00 |
|
|
Andrey Kamaev
|
b836e3c65b
|
Merge pull request #556 from bitwangyaoyao:2.4_SURF
|
2013-02-27 11:37:04 +04:00 |
|
|
Andrey Kamaev
|
f03c04c151
|
Merge pull request #554 from bitwangyaoyao:2.4_impvInterFrame
|
2013-02-27 11:36:40 +04:00 |
|
|
Andrey Kamaev
|
c54c7c8b2c
|
Merge pull request #553 from bitwangyaoyao:2.4_perfTest
|
2013-02-27 11:36:23 +04:00 |
|
|
yao
|
dba2ec0539
|
remove the compile warnings
|
2013-02-27 14:53:27 +08:00 |
|
|
yao
|
6df23428af
|
Add moments function
|
2013-02-27 13:45:16 +08:00 |
|
|
yao
|
9ec5333a9b
|
pyrlk also take advantages of cl_image support detection
|
2013-02-27 10:45:07 +08:00 |
|
|
yao
|
da47ccec9c
|
Put the cl_image support detection in utils
|
2013-02-27 10:24:03 +08:00 |
|
|
Andrey Kamaev
|
dcf7a69430
|
Merge pull request #555 from bitwangyaoyao:2.4_fixFft
|
2013-02-26 18:31:17 +04:00 |
|
|
yao
|
04faaa9e35
|
Fix ocl::dft the compile warning on Linux
|
2013-02-26 21:18:51 +08:00 |
|
|
yao
|
3ff5689fe5
|
Merge branch '2.4_fixFft' of https://github.com/bitwangyaoyao/opencv into 2.4
|
2013-02-26 20:30:42 +08:00 |
|
|
yao
|
ea433cc496
|
remove the device specific logic
|
2013-02-26 17:53:08 +08:00 |
|
|
yao
|
62f8b0fc48
|
Fix ocl::dft error when program end on Linux
|
2013-02-26 17:44:19 +08:00 |
|
|
yao
|
0ac7f0d374
|
Simplify the bind texture logic of interpolate frame function
|
2013-02-26 17:12:03 +08:00 |
|
|
yao
|
e3a715882e
|
fix the mismatch of perf_test, add a performance sample for ocl module
|
2013-02-26 16:52:30 +08:00 |
|
|
Andrey Kamaev
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
2013-02-25 15:04:17 +04:00 |
|
|
Andrey Kamaev
|
6082f351ab
|
Merge pull request #541 from bitwangyaoyao:2.4_fixCvtColor
|
2013-02-25 14:04:02 +04:00 |
|
|
Andrey Kamaev
|
b6cdc849db
|
Merge pull request #540 from hgaspar:244
|
2013-02-25 14:03:36 +04:00 |
|
|
yao
|
59ebf4ed9f
|
Fix the ocl::cvtColor mismatch on some devices
|
2013-02-25 15:19:39 +08:00 |
|
|
hgaspar
|
60981565fa
|
updated the ocl module introduction
|
2013-02-24 22:34:44 -05:00 |
|
|
Andrey Kamaev
|
dddd285d3b
|
Merge branch 2.4
|
2013-02-24 20:16:53 +04:00 |
|
|
Andrey Kamaev
|
cfd019e2a2
|
Merge pull request #537 from bitwangyaoyao:2.4_fixWarpAffine
|
2013-02-24 15:26:42 +04:00 |
|
|
Andrey Kamaev
|
7047c23489
|
Merge pull request #535 from bitwangyaoyao:2.4_clean
|
2013-02-24 15:26:24 +04:00 |
|
|
yao
|
f1a5c1328c
|
remove the empty implementation when HAVE_OPENCL not defined
|
2013-02-23 20:50:03 +08:00 |
|
|
yao
|
b7ebedc23e
|
fix mismatch of WarpAffine
|
2013-02-23 17:43:10 +08:00 |
|
|
yao
|
9bbf170054
|
some cleanup
|
2013-02-23 15:34:43 +08:00 |
|
|
yao
|
720eaf1e1a
|
fix the haar kernel problems on Nvidia and Intel OCL
|
2013-02-23 15:19:46 +08:00 |
|
|
yao
|
d050159f07
|
Remove the perf running from ocl::matchTemplate accuracy tests
|
2013-02-23 14:30:04 +08:00 |
|
|
Andrey Kamaev
|
0b8a6da817
|
Merge branch '2.4'
|
2013-02-22 17:33:30 +04:00 |
|
|
Andrey Kamaev
|
051aa4cb98
|
Merge pull request #530 from bitwangyaoyao:2.4_fixEqHist
|
2013-02-22 16:40:06 +04:00 |
|
|
Andrey Kamaev
|
58f546dd93
|
Merge pull request #529 from bitwangyaoyao:2.4_fixGemm
|
2013-02-22 16:39:50 +04:00 |
|
|
Andrey Kamaev
|
3406832aa2
|
Merge pull request #528 from bitwangyaoyao:2.4_fixPyrLK
|
2013-02-22 16:35:30 +04:00 |
|