Andrey Kamaev
d586f4a103
Fix x64 build warnings
2013-02-25 15:04:19 +04: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
f783f34e0b
Merge pull request #534 from emchristiansen:c++11
2013-02-24 23:31:12 +04:00
marina.kolpakova
ef6c236655
restore missed gpu functionality after merge #dddd285d
2013-02-24 22:14:57 +04: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
Eric Christiansen
a66f7cb9bc
allows building with -std=c++11 under G++
2013-02-22 13:28:20 -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
Andrey Kamaev
b1975fb13d
Merge pull request #527 from bitwangyaoyao:2.4_fixMeanShift
2013-02-22 16:35:18 +04:00
Andrey Kamaev
e68901bbce
Merge pull request #523 from taka-no-me:fix_2815
2013-02-22 16:34:28 +04:00
Andrey Kamaev
7cd4edd695
Merge pull request #518 from asmorkalov:ts_refactor
2013-02-22 16:34:14 +04:00
yao
1a488c0542
fix the warning on Linux when OpenCL 1.2 not supported
2013-02-22 18:33:16 +08:00
yao
7810254198
Fix ocl::equalizeHist mismatch
2013-02-22 15:48:31 +08:00
yao
3316d0bfb2
Fix the compiling errors of gemm on Linux
2013-02-22 15:05:49 +08:00
yao
2e3f4fdada
fix pyrLK's mismatch on Linux
2013-02-22 11:23:43 +08:00
yao
f4ef0c1598
fix meanShift mismatch on none-double GPUs
2013-02-22 10:13:20 +08:00
Andrey Kamaev
c17e9ef7ba
Repair binary compatibility of ocl module
2013-02-22 01:58:01 +04:00
Andrey Kamaev
995154d10d
Fix binary compatibility of gpu module
2013-02-22 00:14:58 +04:00
Andrey Kamaev
eda2a76ee9
Merge pull request #520 from jet47:gpu-updates
2013-02-21 18:03:06 +04:00
gferry
e3803f9985
fix for OpenCV issue #2815
...
- libavcodec issue
- some decoders alter AVCodecContext width/height values, in a wrong way
- eg. in issue 2815, vp6f decoder changes these values, resulting in distorted / invalid frames
- this patch forces default AVCodecContext values
2013-02-21 17:37:24 +04:00
Andrey Kamaev
f0dce1fa35
Merge pull request #521 from asmorkalov:2.4.4_preparation
2013-02-21 17:25:21 +04:00
Vladislav Vinogradov
73ffd71a22
Fixed documentation build
2013-02-21 17:06:53 +04:00
Vladislav Vinogradov
8b1f88c40f
updated gpu module API
2013-02-21 16:12:33 +04:00
Andrey Kamaev
afa993316f
Merge pull request #502 from jet47:opengl-updates
2013-02-21 15:12:43 +04:00
Alexander Smorkalov
9f39c8eaa1
OpenCV 2.4.4 preparation
...
Manager verison incremented;
Additional constatnt for library intialization added;
Documents updated.
2013-02-21 14:42:28 +04:00
Andrey Kamaev
16461247ce
Merge pull request #498 from asmorkalov:doc_ptr
2013-02-21 13:30:34 +04:00
Vladislav Vinogradov
21f95a3b11
restored source compatibility
2013-02-21 12:38:12 +04:00
Andrey Kamaev
d4e7bec29a
Merge pull request #440 from AnnaKogan8:fixed-perfomance-tests
2013-02-21 12:29:57 +04:00
Andrey Kamaev
decf04dfec
Merge pull request #512 from jet47:core-gpu-updates
2013-02-21 12:22:04 +04:00
Vladislav Vinogradov
a938534a7e
restored binary compatibility
2013-02-21 12:18:08 +04:00
Alexander
4091eab45e
cv::Ptr description extended.
2013-02-21 12:14:42 +04:00
Alexander Smorkalov
e21a1d3124
Test system refactoring
...
cmpEps replaced on cmpEps2 to reduce code dublication;
Constants for cmpEps return values added.
2013-02-21 12:07:04 +04:00
Vladislav Vinogradov
ce2559b332
optimized DeviceInfo class and ensureSizeIsEnough
2013-02-20 19:30:57 +04:00
Anna Kogan
f6e0d327b0
Increased time limits
2013-02-20 17:34:00 +04:00
Anna Kogan
a567c03fdf
Switched to TEST_CYCLE_MULTIRUN for fast tests
2013-02-20 17:05:54 +04:00
Andrey Kamaev
11bd936f0b
Fix warnings from documentation build
2013-02-20 15:07:13 +04:00
Andrey Kamaev
9498856b22
Fix documentation problems found by check_docs2 script
2013-02-20 15:07:13 +04:00
yao
429ae44ae3
add openCLExecuteKernelInterop method
2013-02-20 17:46:43 +08:00
Andrey Kamaev
637397f621
Merge branch '2.4'
2013-02-20 12:31:16 +04:00
Andrey Kamaev
5691fd3abe
Merge pull request #503 from taka-no-me:fix_docs
2013-02-19 18:01:51 +04:00
Andrey Kamaev
5cc2a6bdbf
Merge pull request #500 from nielsgm:predict_python_wrapper_to_docs
2013-02-19 18:01:30 +04:00