Vladislav Vinogradov
564fd21e87
fixed documentation build
2013-06-10 15:52:01 +04:00
Roman Donchenko
bae85660da
Merge remote-tracking branch 'origin/2.4'
...
Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix
Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
Alexander Smorkalov
20fef00a77
android -> plarforms/android
2013-05-27 11:10:38 +04:00
Jordi Villar
ee29b0454c
fix parenthesis
2013-05-22 13:57:43 +03:00
alexandre benoit
9c26387ce0
updated sources to correct buildbot warnings
2013-04-30 17:32:47 +02:00
alexandre benoit
80e65e08b5
updated doc and interface code to solve compile warnings and errors
2013-04-30 14:40:03 +02:00
alexandre benoit
1976b3d9b6
updated doc
2013-04-29 20:08:13 +02:00
alexandre benoit
72742f5316
resolved conflicts, updated retina class interface and optimized a heavy retinacolor process
2013-04-29 19:06:35 +02:00
alexandre benoit
9549949228
minor chnges for conflict removal
2013-04-29 15:12:44 +02:00
alexandre benoit
16dea7b90d
updated comments and new retina interface use
2013-04-27 23:18:47 +02:00
Andrey Kamaev
8f32902ce6
Minimize usages of legacy C API inside the library
2013-04-16 12:00:02 +04:00
Andrey Kamaev
8b294c6c90
Remove documentation for old python wrapper
2013-04-12 19:37:40 +04:00
Andrey Kamaev
3b364330ad
Merge branch '2.4'
2013-04-12 15:35:38 +04:00
Roman Donchenko
57d4c86b2b
Fixed the shebang lines on the Python scripts.
...
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
2013-04-11 18:37:23 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Andrey Kamaev
5163986e7d
Merge pull request #772 from gpsinghsandhu:featureDescriptionTutorials
2013-04-05 11:46:06 +04:00
Gurpinder Singh Sandhu
87b84a4197
another update
2013-04-04 23:13:03 +05:30
Gurpinder Singh Sandhu
d51d05fc44
Feature description tutorials made in sync with sample code
...
sample code : https://github.com/Itseez/opencv/blob/master/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
Bug #2888
2013-04-04 23:12:18 +05:30
Andrey Kamaev
80fed87d53
Merge pull request #760 from alekcac:2.4
2013-04-04 18:44:35 +04:00
Alexander Smorkalov
1e332d690f
OpenCV verison incremented
...
OpenCV Manager verison incremeneted;
Docs and tests updated accordingly;
COnstant for Manager initialization added.
2013-04-04 15:50:36 +04:00
Alexander Shishkov
382695ba5a
removed links to the http://opencv.willowgarage.com/
2013-04-04 13:44:28 +04:00
Andrey Kamaev
6ce050d264
Update docs
2013-04-03 14:10:03 +04:00
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Vadim Pisarevsky
2be7d9b4d5
added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio
2013-03-24 23:48:35 +04:00
cuda-geek
d8755fd1c0
Merge pull request #653 from jbohren-forks:master
2013-03-18 13:10:25 +04:00
Jonathan Bohren
221d610d55
calib3d model superscript should be subscript
2013-03-15 00:29:46 -03:00
marina.kolpakova
157a98edf7
refactored cuda error handling; remove optional dependancies in soft cascade training app
2013-03-14 23:43:03 +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
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00
Andrey Pavlenko
de3767df0a
minor formatting
2013-03-06 12:59:38 +04:00
Andrey Pavlenko
aaefd31844
more formatting
2013-03-05 19:03:36 +04:00
Andrey Pavlenko
23fb570cbd
updating JNI lib location for Unix; formatting update
2013-03-05 18:42:14 +04:00
Andrey Kamaev
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
cuda-geek
a706de2446
Merge pull request #601 from apavlenko:android_tutorial_update
2013-03-01 16:09:25 +04:00
Andrey Pavlenko
07b1ccdeb0
removing redundant picture resize
2013-03-01 13:56:50 +04:00
Andrey Pavlenko
978132edc1
minor Android tutorial fixes
2013-03-01 13:52:14 +04:00
Andrey Pavlenko
af2552d72c
fixing issues from http://www.code.opencv.org/issues/2807
2013-02-28 19:11:24 +04:00
Andrey Kamaev
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
Alexander Smorkalov
8458f5c489
Android tutorial updated
...
OpenCV version incremented;
New CvCameraViewListener interface description added.
2013-02-26 16:35:02 +04:00
Andrey Kamaev
dddd285d3b
Merge branch 2.4
2013-02-24 20:16:53 +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
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
Andrey Kamaev
dfbd5f6a02
Merge pull request #506 from asmorkalov:crosscompile_tutorial
2013-02-22 16:41:16 +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
Alexander Smorkalov
637b48eec8
Tutorial for ARM Linux cross compilation added.
2013-02-20 12:48:30 +04:00
Andrey Kamaev
637397f621
Merge branch '2.4'
2013-02-20 12:31:16 +04:00
Andrey Kamaev
60f7b1d98d
Whitelist functions/structs in check_docs2 that are impossible to fix in 2.4
2013-02-19 16:22:20 +04:00
Andrey Kamaev
2fe7482b73
Add support for enums into rst ocv domain
2013-02-19 16:22:20 +04:00
Andrey Kamaev
535f1fb2e2
Hack to stop parsing of problematic CvStatModel::train definition
2013-02-19 10:39:31 +04:00
