Andrey Kamaev
9f888fdb97
Merge pull request #490 from mschoeler:master
2013-02-26 18:33:05 +04:00
cuda-geek
37568b26ed
Merge pull request #545 from cuda-geek:fix_lying_assertation
2013-02-25 23:11:02 +04:00
marina.kolpakova
9e5698b967
fix lying assertation and hard-coded shrinkage
2013-02-25 19:49:12 +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
620c699456
Merge pull request #538 from NCBee:patch-2
2013-02-24 15:27:01 +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
Andrey Kamaev
3b1fc16f36
Merge pull request #536 from bitwangyaoyao:2.4_fixHaar
2013-02-24 15:26:06 +04:00
NCBee
7249457771
Update doc/tutorials/core/adding_images/adding_images.rst
...
Quick fix for: http://code.opencv.org/issues/2803
2013-02-23 10:28:24 -05: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
Markus Schoeler
5484a41960
Corrected a mistake in CHI2 kernel in line 354 and line 362 svm.cpp
...
Added new kernels to documentation
2013-02-22 15:43:41 +01:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
OpenCV Buildbot
e6dd4e840d
Update FFMPEG wrapper binaries
2013-02-22 16:56:01 +04:00
Andrey Kamaev
dfbd5f6a02
Merge pull request #506 from asmorkalov:crosscompile_tutorial
2013-02-22 16:41:16 +04:00
Andrey Kamaev
9bbb0ed060
Merge pull request #531 from asmorkalov:android_mips_fix
2013-02-22 16:40:20 +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
Alexander Smorkalov
4bbdfbc9e7
Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.
...
Native camera libs for MIPS installation fixed.
2013-02-22 11:57:42 +04: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
cuda-geek
dea6148a1a
Merge pull request #526 from taka-no-me:fix_compatibility
2013-02-22 09:18:19 +04: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
Andrey Kamaev
ff0d23e55b
Merge pull request #519 from bitwangyaoyao:2.4_findOCL
2013-02-21 13:30:20 +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
