cuda-geek
b9ab5939a4
Merge pull request #607 from cuda-geek:auto-compile-cuda
2013-03-05 13:50:29 +04:00
cuda-geek
fcde059ca4
Merge pull request #618 from caotto:master
2013-03-05 13:12:39 +04:00
cuda-geek
c0ba0c9099
Merge pull request #596 from ArtanisCV:master
2013-03-05 08:57:58 +04:00
Charles Otto
c02f94392b
Add version checks to previous modifications to ffmpeg_cap_impl.hpp
...
Add version checks around uses of AVCodecID and av_opt_set, since these aren't
defined for older versions of ffmpeg.
2013-03-04 22:14:52 -05:00
Charles Otto
52137ceed0
Allow encoding with libx264 via ffmpeg to work
...
Add a call to avcodec_get_context_defaults3, this sets per-codec default values
and in the case of libx264 will stop VideoWriter::open (with fourcc=x264) from
failing due to libx264 complaining about broken ffmpeg default settings.
Set some additional libx264 encoder parameters.
2013-03-04 19:29:05 -05:00
Andrey Kamaev
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
cuda-geek
52a45ed191
Merge pull request #606 from cuda-geek:fix-depth-less-2-bug-in-soft-cascade
2013-03-03 08:59:56 +04:00
marina.kolpakova
ac471fadd6
remove unused parameter from softcascade::Octave constructor
2013-03-02 13:06:29 +04:00
marina.kolpakova
d539dae6d0
fix typo in integral buffer initialization
2013-03-02 09:33:17 +04:00
marina.kolpakova
1bf696f392
fixes for soft cascade training app
2013-03-02 09:24:13 +04:00
marina.kolpakova
19f863ec13
add possibility to create CUDA powered modules with ocv_define_module macro
2013-03-02 00:17:46 +04:00
marina.kolpakova
445f39a4a3
fix uninitialized magnitude channel bug
2013-03-01 23:40:32 +04:00
marina.kolpakova
12d23aae02
refactor channel builder
...
fix condition for sample index in assert
2013-03-01 23:39:32 +04:00
marina.kolpakova
1c3c11a4cc
fix import in scale_caltech python script
2013-03-01 23:33:28 +04:00
marina.kolpakova
516a6cc59d
fix bug: depth of resulting tree is less then 2.
2013-03-01 23:21:25 +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
Artanis
993522598b
Add implementations for Mat::zeros() and Mat::ones()
...
In class Mat, "static MatExpr Mat::zeros(int ndims, const int* sz, int
type)" and "static MatExpr Mat::ones(int ndims, const int* sz, int
type)" are declared but never implemented. That means we can see their
manuals from
"http://docs.opencv.org/modules/core/doc/basic_structures.html " but we
can't use them. Here I tried to finish their implementation.
I have also changed MatOp_Initializer::assign to make it support
multi-dimension Mat.
Test cases are added in test_math.cpp as well.
2013-03-01 13:18:44 +08:00
yao
82b9854837
fix compile warnings
2013-03-01 08:47:20 +08:00
Andrey Kamaev
c865b28243
Merge pull request #591 from jet47:gpu-sanity-tests
2013-02-28 18:08:11 +04:00
Andrey Kamaev
79cf292d78
Merge pull request #590 from apavlenko:java_fixes
2013-02-28 18:07:33 +04: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 Pavlenko
d18b2c2502
patch -> revision
2013-02-28 17:19:52 +04:00
Andrey Pavlenko
c24d7cc066
adding more version-related variables
2013-02-28 16:56:53 +04:00
Vladislav Vinogradov
f533f0dca9
fixed gpu sanity tests
2013-02-28 16:54:37 +04:00
Andrey Pavlenko
5321da92cb
adding/fixing version suffix for desktop java library on all OSes
2013-02-28 16:12:44 +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
831580ef31
Merge pull request #578 from jet47:nmake-ffmpeg-copy
2013-02-28 12:56:26 +04:00
cuda-geek
0771fd82c0
Merge pull request #557 from jet47:gpu-sanity
2013-02-28 11:17:12 +04: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
Vladislav Vinogradov
df456245e7
fixed ffmpeg destination folder for NMake generator
2013-02-28 10:16:41 +04: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
c5e979ceb7
Merge pull request #581 from vpisarev:ios_fix
2013-02-28 01:58:13 +04:00
Georgios Evangelidis
f40725bb50
Add ECC algorithm
...
Evangelidis, G.D. and Psarakis E.Z. "Parametric Image Alignment using Enhanced
Correlation Coefficient Maximization", IEEE Transactions on PAMI, vol. 32, no.
10, 2008
2013-02-28 01:48:00 +04:00
Vadim Pisarevsky
11ba220e02
fixed iOS framework compile errors after recent changes
2013-02-28 00:54:01 +04:00
Andrey Kamaev
a5d2253be8
Merge pull request #544 from AnnaKogan8:added-regressions-only-option
2013-02-28 00:38:47 +04:00
Andrey Kamaev
68bb317ce1
Merge pull request #462 from kobigurk:master
2013-02-28 00:38:20 +04:00
Andrey Kamaev
d620ef0d55
Merge pull request #577 from ilya-lavrenov:BilateralFilter
2013-02-27 19:44:56 +04: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
Andrey Kamaev
7b79eaf5be
Merge pull request #511 from aritzlc:master
2013-02-27 19:33:01 +04:00
yao
cbff75db9e
fix build errors
2013-02-27 21:56:03 +08:00
Ilya Lavrenov
3eed5d8c72
additional improvements for 32f
2013-02-27 17:54:22 +04:00
Ilya Lavrenov
efad6942e2
some improvements of existing sse3 optimization of bilateral filter in case of 8uc3. Now perf tests take 6120ms instead of previous 7250ms (1.18x speed-up)
2013-02-27 16:53:09 +04:00
yao
9ccf27c7f5
add interfaces enable custom oclMat device memory type
2013-02-27 17:32:32 +08:00
