Commit Graph

7700 Commits

Author SHA1 Message Date
Andrey Kamaev
6569a58518 Merge pull request #592 from vpisarev:c2cpp_calib3d_ptsetreg 2013-03-05 17:39:53 +04:00
Andrey Kamaev
816adcfdac Merge pull request #605 from vpisarev:c2cpp_calib3d_stereo 2013-03-05 15:26:51 +04:00
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
marina.kolpakova
39ecd94010 forbid recursive globbing for OpenCV modules sources 2013-03-05 11:34:46 +04:00
cuda-geek
c0ba0c9099 Merge pull request #596 from ArtanisCV:master 2013-03-05 08:57:58 +04:00
cuda-geek
7e9f1c33d0 Merge pull request #617 from moshekaplan:master 2013-03-05 08:56: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
Vadim Pisarevsky
f303de12d8 mask.create() re-converted to new style 2013-03-05 00:03:37 +04:00
Vadim Pisarevsky
0c61a8887e reverting changes in Homography kernel function. For some reason GCC on Linux does not like it. 2013-03-05 00:00:21 +04:00
Moshe Kaplan
facd580f28 Small changes to Python samples
Update find_obj.py:
    Added additional error checking for the loaded files and modified the detector check to be more pythonic (is versus ==).

    Update common.py:
    Fixed a typo (contais -> contains)
2013-03-04 12:25:35 -05:00
Andrey Kamaev
9e12b7c3c2 Merge release 2.4.4 2013-03-04 19:43:49 +04:00
Vadim Pisarevsky
7fd1d75738 some more minor fixes 2013-03-04 16:02:15 +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
cuda-geek
1c3cde110d Merge pull request #608 from cuda-geek:soft-cascade-hot-fixes 2013-03-03 08:59:37 +04:00
Vadim Pisarevsky
8a6d2bbd3d several minor fixes proposed by Andrey 2013-03-03 00:54:46 +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
Vadim Pisarevsky
df89f30b4a removed preset parameter in createStereoBM, updated stereo_match sample 2013-03-02 02:17:49 +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
Andrey Kamaev
facab40745 Disable -fomit-frame-pointer for OS X Clang as it leads to crash on exception thrown 2013-03-01 19:44:17 +04:00
Andrey Kamaev
08545b8f96 Merge pull request #603 from taka-no-me:avoid_deps_on_missing_lib 2013-03-01 17:10:46 +04:00
Andrey Kamaev
f22ee8fc19 Merge pull request #602 from bitwangyaoyao:2.4_fixAdd 2013-03-01 17:10:11 +04:00
Andrey Kamaev
e6cb44edc3 Merge pull request #600 from taka-no-me:fix_build_warnings 2013-03-01 17:09:56 +04:00
Andrey Kamaev
1094179155 Avoid build falure in armeabi build with Android SDK 2013-03-01 16:50:42 +04:00
cuda-geek
a706de2446 Merge pull request #601 from apavlenko:android_tutorial_update 2013-03-01 16:09: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
Andrey Pavlenko
07b1ccdeb0 removing redundant picture resize 2013-03-01 13:56:50 +04:00
Andrey Kamaev
2128b82c6b Merge pull request #598 from asmorkalov:lib_info_fix 2013-03-01 13:52:57 +04:00
Andrey Pavlenko
978132edc1 minor Android tutorial fixes 2013-03-01 13:52:14 +04:00
Andrey Kamaev
22d33373fa Fix build warnings on MSVC x64 and OS X clang 2013-03-01 13:29:43 +04:00
Andrey Kamaev
eaaba1336a Merge pull request #595 from bitwangyaoyao:2.4_perfTest 2013-03-01 12:49:43 +04:00
Andrey Kamaev
85c7a36f93 Merge pull request #594 from asmorkalov:android_all_build_fix 2013-03-01 12:49:27 +04:00
Andrey Kamaev
6be6adbbed Merge pull request #593 from apavlenko:java_tutorial_fixes 2013-03-01 12:49:15 +04:00
Alexander Smorkalov
da455efc26 Full package version fixed. 2013-03-01 12:44:14 +04:00
Artanis
11f8c74c51 Remove "build/" from .gitignore 2013-03-01 15:43:12 +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
8f3883a28d fix a compile warning 2013-03-01 10:06:51 +08:00
Artanis
0532a521a2 Add "build\" into .gitignore 2013-03-01 09:47:46 +08:00
yao
82b9854837 fix compile warnings 2013-03-01 08:47:20 +08:00
Vadim Pisarevsky
b6efe30527 new API for StereoMatchers 2013-03-01 02:24:46 +04:00
Vadim Pisarevsky
d925879366 reverted dangerous change in _InputArray::size() 2013-02-28 23:02:04 +04:00
Alexander
3cfd3d3ee0 Build with OpenCV.mk for all terget fixed. 2013-02-28 21:43:57 +04:00