Maksim Shabunin
220f671655
Doxygen tutorials: some fixes in RST-docs
2014-12-01 16:05:37 +03:00
Maksim Shabunin
03e213ccae
Doxygen documentation: BiB references and fixes
2014-12-01 15:50:55 +03:00
Maksim Shabunin
1523fdcc1c
Doxygen documentation: more fixes and cleanups
2014-12-01 15:50:36 +03:00
Maksim Shabunin
f9a83c28e5
Doxygen documentation: mathbbm support
2014-12-01 15:47:13 +03:00
Maksim Shabunin
6dcafe0c2d
Doxygen documentation: cuda submodules reorganized
2014-12-01 15:47:13 +03:00
Maksim Shabunin
ceb6e8bd94
Doxygen documentation: cuda
2014-12-01 15:47:13 +03:00
Maksim Shabunin
472c210687
Doxygen documentation: flann, photo and stitching modules
2014-12-01 15:47:13 +03:00
Vadim Pisarevsky
02f4f2f96d
Merge pull request #3426 from mshabunin:doxygen-imgproc
2014-12-01 10:43:13 +00:00
burun
c52a3f7634
Update py_colorspaces.rst
...
mask = cv2.inRange(hsv, lower_green, upper_green)
to
mask = cv2.inRange(hsv, lower_blue, upper_blue)
2014-11-27 09:00:40 +02:00
Vadim Pisarevsky
b009e8d0fb
Merge pull request #3411 from eltermann:master
2014-11-19 16:25:12 +00:00
Maksim Shabunin
555fdf893a
Documenting imgproc module
...
- disabled doxygen tree
- enabled doxygen enum listing
- added imgproc reference to main page
- enabled BiB support
- chenged doxygen root page format
2014-11-18 14:00:56 +03:00
Dmitriy Anisimov
28944336d4
updated linux installation documentation
2014-11-14 12:32:42 +03:00
Maksim Shabunin
6aa7a86ae9
Doxygen documentation for core module
2014-11-12 14:21:58 +03:00
eltermann
b3a60b9c22
Documentation fix on py_tutorials/py_feature2d
2014-11-11 17:10:33 -02:00
Vadim Pisarevsky
c91b0e7ac4
Merge pull request #3217 from avdmitry:samples_cpp_data
2014-11-05 14:57:46 +00:00
Maksim Shabunin
ba5f343c38
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
2014-10-22 15:24:15 +04:00
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
2014-10-17 15:02:56 +04:00
Vadim Pisarevsky
a10a7279a8
Merge pull request #3334 from micha137:patch-2
2014-10-15 10:32:16 +00:00
micha137
67b2380d19
Update table_of_content_introduction.rst
2014-10-13 16:31:37 +02:00
micha137
96cd0d82e5
Update tutorials.rst
...
Change some wording
2014-10-13 16:20:47 +02:00
Vadim Pisarevsky
bc7ab6c2df
Merge pull request #3302 from berak:doc_fix_constants_30
2014-10-09 14:48:58 +00:00
eltermann
c87af333b3
Documentation fix on py_tutorials
2014-10-04 19:14:11 -03:00
berak
7cb3f3def7
change remaining c-api CV_ prefixes in constants
2014-10-04 14:10:12 +02:00
Dmitriy Anisimov
71348651eb
fixed display_image tutorial sample
2014-09-23 07:45:52 +04:00
Dmitriy Anisimov
55c799a474
fixed warnings in documents
2014-09-23 07:45:52 +04:00
Vadim Pisarevsky
65744cd87d
Merge pull request #3175 from avdmitry:modern_doc_theme
2014-09-14 20:10:36 +00:00
Vadim Pisarevsky
46718cae28
Merge pull request #3209 from PhilLab:patch-5
2014-09-14 18:47:21 +00:00
Vadim Pisarevsky
8fe18fefdd
Merge pull request #3207 from jamoque:more-better-fixes
2014-09-14 18:41:06 +00:00
Maksim Shabunin
88aea1d52f
Stripped iCCP chunk from png files
2014-09-12 16:30:23 +04:00
Philipp Hasper
ac206ccb05
Visual Studio tutorial: updated library names
2014-09-10 19:12:06 +02:00
jeremy
56091bae1f
changing many instances of the same grammar error in documentation
2014-09-09 17:03:59 -05:00
Dmitriy Anisimov
ad00e0dd43
tt & header background colors changed
2014-09-06 14:15:04 +04:00
Dmitriy Anisimov
e7b3a73b62
fixed all known issues
2014-09-05 21:56:25 +04:00
Dmitriy Anisimov
e7af509c86
different enhancements
2014-09-03 22:25:08 +04:00
Alexander Shishkov
acc2efab50
updated links to the official OpenCV youtube channel
2014-09-01 11:28:43 +04:00
Dmitriy Anisimov
5d4bd700a7
slight changes, theme become more similar with current
2014-08-31 18:12:34 +04:00
Dmitriy Anisimov
3334c06e8b
initial commit
2014-08-30 12:55:45 +04:00
Alexander Shishkov
9dc5c58f62
Update py_setup_in_windows.rst
2014-08-27 11:49:37 +04:00
Ariel Elkin
d06c73861d
Doc: update video processing tutorial code for OpenCV v2.4.9 and v3a
2014-08-25 15:13:13 -03:00
Bence Magyar
1118a7d15a
Update tocDefinitions.rst
...
Second fix in docs needed for https://github.com/Itseez/opencv_contrib/pull/70
http://www.build.opencv.org/buildbot/builders/precommit-contrib_docs/builds/277
2014-08-20 15:32:05 +02:00
Vadim Pisarevsky
b2cd954f24
Merge pull request #3042 from edgarriba:master
2014-08-20 13:18:37 +00:00
Vadim Pisarevsky
a223479107
Merge pull request #3099 from f-morozov:akaze_tutorial
2014-08-19 22:22:23 +00:00
f-morozov
886319c81d
AKAZE fixes and tracking tutorial
2014-08-19 16:35:20 +04:00
edgarriba
7e2bb63378
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-18 22:30:00 +02:00
abidrahmank
7f8e1f480a
Python bindings tutorial
2014-08-16 16:40:18 +05:30
Vadim Pisarevsky
00b2124876
fixing more compile problems with Java bindings etc
2014-08-14 13:48:52 +04:00
mshabunin
3ed89a8879
Merge with master and fix conflicts
2014-08-13 18:24:11 +04:00
edgarriba
1dec1645e5
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-12 16:45:22 +02:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
edgarriba
e2edfecb80
fixed white space
2014-08-09 21:08:46 +02:00
edgarriba
591355d2c8
remove whitespaces
2014-08-09 20:49:44 +02:00
edgarriba
9547110533
Update tutorial
2014-08-09 19:47:42 +02:00
edgarriba
3a2cf37115
fixed conflicts
2014-08-07 12:41:47 +02:00
edgarriba
7b0be9cf8f
Update code
2014-08-05 17:27:20 +02:00
edgarriba
2353436cb5
Removed whitespace
2014-08-05 16:53:30 +02:00
edgarriba
4447dbe265
Removed whitespace
2014-08-05 16:41:07 +02:00
edgarriba
e3afc32693
Removed whitespace
2014-08-05 16:16:05 +02:00
edgarriba
a3e74ec521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
2014-08-05 12:59:47 +02:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
edgarriba
56704b5e95
Update tutorial
2014-07-31 11:47:59 +02:00
edgarriba
08e8f9ca45
Added some definitions
2014-07-31 11:47:26 +02:00
Michael Pratt
c9876c3cd8
Merge branch 'master' into python2and3
2014-07-31 01:13:16 -04:00
edgarriba
9a25cb012d
Update some text
2014-07-30 17:05:06 +02:00
f-morozov
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
edgarriba
0ac84755a0
Update tutorial
2014-07-30 12:10:29 +02:00
Joan Puigcerver
16a82b1747
Added an option to traincascade program to select the maximum number of threads to use during training
2014-07-23 22:47:51 +02:00
vbystricky
d58f736935
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
edgarriba
89246e1a45
Update Ransac documentation
2014-07-09 10:59:00 +02:00
edgarriba
e395e03040
Real Time Pose tutorial
2014-07-08 16:34:49 +02:00
Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Marvin Smith
14548227ca
Adding support for GDAL raster images.
2014-07-01 16:29:11 -07:00
Michael Pratt
cac1218eef
Build both Python 2 and Python 3 bindings
...
If both Python 2 and Python 3 are found, then build bindings for both of
them during the build process. Currently, one version of Python is
detected automatically, and building for the other requires changes the
CMake config.
The largest chunk of this change generalizes OpenCVDetectPython.cmake to
find both a Python 2 and Python 3 version of Python. Secondly, the
opencv_python module is split into two modules, opencv_python2 and
opencv_python3. Both are built from the same source. but for different
versions of Python.
2014-06-29 20:08:13 -04:00
PhilLab
3ece65ad62
Updates python feature matching tutorial
...
The given ORB parameter was misspelled
2014-06-24 11:35:22 +02:00
Neo Alienson
b6e25a9fc7
Fix typos
2014-06-16 18:48:10 +08:00
Roman Donchenko
659d21332e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/spinimages.cpp
2014-06-09 18:03:03 +04:00
StevenPuttemans
7c44a07810
fix typo in linux tutorial
2014-06-02 09:35:19 +02:00
Roman Donchenko
3d7a457c97
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
2014-05-19 18:39:20 +04:00
Vlad Shakhuro
6a93b43cae
Fix svm intro tutorial
2014-05-14 21:24:57 +04:00
Roman Donchenko
0ebde64701
Merge pull request #2743 from StevenPuttemans:bugfix_3549
2014-05-14 19:49:27 +04:00
StevenPuttemans
1d557e6702
adding bugfix 3549
2014-05-13 15:34:30 +02:00
StevenPuttemans
6c59e39f7c
fix bug 3434
2014-05-12 16:41:22 +02:00
Roman Donchenko
313a0ad255
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/internal.hpp
modules/core/src/arithm.cpp
modules/imgproc/src/imgwarp.cpp
modules/objdetect/src/hog.cpp
2014-05-12 17:38:07 +04:00
StevenPuttemans
a9c7db7518
add suggestion of feature 2619
2014-05-09 13:44:12 +02:00
StevenPuttemans
99475e2976
fixed wrong download link in tutorial
2014-05-08 10:45:51 +02:00
PhilLab
897d0a9aaf
Updated documentation: library names
...
updated the library names to OpenCV version 2.4.9
2014-05-05 12:16:48 +02:00
Roman Donchenko
47d903d968
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-04-28 12:08:21 +04:00
Adrian Stratulat
4fb5680d91
Documentation - minor fix-ups
2014-04-23 17:30:27 +00:00
Andrey Pavlenko
9ec823d800
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
2014-04-08 11:05:30 +04:00
Roman Donchenko
4f2b126b7b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/core/src/out.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/generalized_hough.cpp
modules/nonfree/perf/perf_main.cpp
2014-04-07 14:59:34 +04:00
Elena Gvozdeva
037ac27ec8
Added SharedMatrix
2014-04-03 14:53:27 +04:00
Elena Gvozdeva
fa2d79a15b
Added IPP Async converters, doc and sample
2014-04-01 16:47:29 +04:00
Roman Donchenko
a8cb5c3983
Merge pull request #2554 from asmorkalov:ocv_249_version
2014-04-01 12:16:25 +04:00
Alexander Smorkalov
e23f7303a6
OpenCV version++. OpenCV Manager version++.
2014-03-31 15:00:25 -07:00
Ilya Lavrenov
9b9769169f
doc typos
2014-03-31 19:57:05 +04:00
Roman Donchenko
f77c68e0fa
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
Kenaniah Cerny
5005f5e88e
Fixed type gPython -> Python
2014-03-26 23:15:42 -07:00
Kenaniah Cerny
c764e0f114
Added link to main GitHub repo
2014-03-26 23:12:43 -07:00
Kenaniah Cerny
9f1b20a794
Grammar
2014-03-26 23:11:03 -07:00
Roman Donchenko
5effebb5f5
Merge pull request #2498 from dreamworld:fix_tutorial_mat_the_basic_image_container
2014-03-25 12:14:44 +04:00
Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Daniil Osokin
ac19420907
Removed obsolete list from docs
2014-03-24 14:50:20 +01:00
Daniil Osokin
04b1822cff
Fixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.
2014-03-24 12:53:30 +04:00
Kang Liu
9dc51a1aa4
Keep definitions of link aliases consistent
2014-03-21 22:28:48 +01:00
Daniil Osokin
2d3aa3861c
Fixed Load, Modify, and Save an Image tutorial
2014-03-21 16:58:50 +01:00
Kang Liu
dc21e2cc0e
remove highlighting in some function links
...
1. Remove whole-document highlighting in some function links
2. fix the function alias `readwriteimagevideo`
2014-03-21 11:54:35 +01:00
Roman Donchenko
3572ee278e
Merge pull request #2396 from m3d:patch-1
2014-03-21 14:00:12 +04:00
Roman Donchenko
49efc250d3
Merge pull request #2400 from RJ2:Bugfix_2
2014-03-21 13:58:06 +04:00
Roman Donchenko
722c0fea41
Merge pull request #2414 from yashdv:meanshift_tutorial_error
2014-03-21 13:55:35 +04:00
Roman Donchenko
a66018d14d
Merge pull request #2423 from RJ2:bugfix_5
2014-03-21 13:54:52 +04:00
Kang Liu
17713f6831
1. fix an error in sample code
...
2. change an external link to maintain consistency with the previous tutorial
2014-03-19 13:05:38 +01:00
RJ2
0470bb0e29
I have changed one sentence in tutorial, making it more understandable
2014-03-18 08:59:53 +01:00
RJ2
16869225ff
It's will be better
2014-03-18 08:01:18 +01:00
yash
b9cdde6991
edited sample code for mean/cam sihft and fixed an error
2014-03-18 08:44:33 +05:30
Roman Donchenko
a489d86e5f
Merge pull request #2460 from berak:b_3598_24
2014-03-17 15:52:56 +04:00
berak
5f94a205d1
fixed h / s ranges in histogram_calculation tutorial
...
literalinclude
literalinclude, dropped :lines:
2014-03-17 11:01:02 +01:00
Roman Donchenko
db85c35e69
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
Roman Donchenko
af8aa8a2fa
Merge pull request #2433 from ilya-lavrenov:typos
2014-03-03 12:20:35 +04:00
Ilya Lavrenov
eedf86402d
typos
2014-03-02 21:04:17 +04:00
Roman Donchenko
48432502b6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
Martin Dlouhy
8f6ebc2427
fixed rotated rectangle (center instead of corner)
2014-02-24 07:54:08 +01:00
Roman Donchenko
cfc4621587
Merge pull request #2291 from xgvargas:extra-note-for-waitKey
2014-02-19 14:33:58 +04:00
Roman Donchenko
edbff68843
Merge pull request #2355 from alekcac:hough_circles_fix
2014-02-18 13:36:33 +04:00
Roman Donchenko
689589ebaa
Merge pull request #2365 from yashdv:image_tutorial_doc_bug
2014-02-18 11:58:11 +04:00
Roman Donchenko
13182da945
Merge pull request #2363 from alekcac:introduction_tut_fix
2014-02-18 11:56:57 +04:00
Roman Donchenko
a0a4f6c23d
Merge pull request #2362 from alekcac:docs_style_change
2014-02-18 11:56:36 +04:00
yash
017a282c7a
Minor error in the documentation Load and Save Image
2014-02-18 10:34:58 +05:30
Gustavo Vargas
0d199b4048
Update py_image_display.rst
2014-02-17 23:22:18 -03:00
Alexander Shishkov
a8eab26bae
fixed incorrect code in introduction tutorial
2014-02-17 18:10:08 +04:00
Alexander Shishkov
63235f51f0
fixed year in copyright
2014-02-17 17:56:12 +04:00
Roman Donchenko
029ffb7c2d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +04:00
Roman Donchenko
7358b44222
Merge pull request #2343 from yashdv:template_matching_doc_fix
2014-02-17 13:33:29 +04:00
Alexander Shishkov
f60913ddd3
small changes in hough circles tutorial
2014-02-17 12:55:19 +04:00
Roman Donchenko
947fb74c18
Merge pull request #2330 from rohitgirdhar:linux_tutorial_make_j8
2014-02-17 12:22:11 +04:00
yash
cce225f6e9
fixed doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
2014-02-15 12:48:42 +05:30
yash
e2f5001b11
fixed doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
2014-02-14 23:04:03 +05:30
Roman Donchenko
f297ec55ae
Merge pull request #2304 from mattvenn:master
2014-02-13 12:30:20 +04:00
Rohit Girdhar
01b624e359
-j8 in linux_installation tutorial
2014-02-13 13:52:00 +05:30
Roman Donchenko
935e36bc72
Merge pull request #2319 from m3d:patch-1
2014-02-13 12:12:00 +04:00
Matt Venn
7acd28fbea
added imgpoints back
2014-02-13 07:44:29 +00:00
Martin Dlouhy
d9a322f606
undo changes of cv2.cv.* functions/constants
2014-02-12 11:25:03 +01:00
Martin Dlouhy
bbefc101de
removed return images and fixed cv2 names
2014-02-12 07:06:05 +01:00
Elliot Godzich
2806679781
Updated DisplayImage.cpp program to compile
...
CV_WINDOW_AUTOSIZE -> WINDOW_AUTOSIZE
2014-02-11 21:46:14 -08:00
Roman Donchenko
1cef6f9fb1
Merge pull request #2313 from m3d:patch-1
2014-02-11 17:10:23 +04:00
Roman Donchenko
dad536f490
Merge pull request #1851 from dneelyep:patch-1
2014-02-11 16:46:35 +04:00
Martin Dlouhy
47a41449e3
fixed spelling and removed return images
2014-02-10 20:32:54 +01:00
Matt Venn
2d33063a59
removed whitespace at end of line 96
2014-02-10 14:51:29 +00:00
Matt Venn
3170414ca8
fixed whitespace
2014-02-07 22:18:59 +00:00
Matt Venn
a0bfdb9bf1
fixed examples for opencv 2.4.8
2014-02-07 20:53:57 +00:00
Gustavo Vargas
44cc51dfb1
Update py_image_display.rst
...
OS information removed.
2014-02-06 18:21:19 -02:00
Gustavo Vargas
390fa14a2a
Update py_image_display.rst
2014-02-05 21:25:16 -02:00
Vadim Pisarevsky
b8c6adc569
Merge pull request #2178 from Nerei:viz_backport
2014-02-03 16:16:51 +04:00
Roman Donchenko
bbc35d609d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
Andrey Pavlenko
dca5684145
removing duplicated legacy license, the actual instance is in 'opencv/LICENSE'
2014-01-23 17:05:20 +04:00
Roman Donchenko
ee331001f5
Merge pull request #2161 from SpecLad:doc-req
2014-01-22 12:04:48 +04:00
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
2014-01-21 20:34:36 +04:00
Ilya Lavrenov
303c37a175
removed TOC
2014-01-21 18:47:22 +04:00
Ilya Lavrenov
5d206059a8
moved bioinspired to opencv_contrib
2014-01-21 18:02:53 +04:00
Anatoly Baksheev
02ebc4368c
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
2014-01-20 22:51:33 +04:00
Anatoly Baksheev
1449823bcd
implemented showImage
2014-01-19 18:38:55 +04:00
Roman Donchenko
a502ffbd2c
Updated required CMake version in docs to match reality.
2014-01-17 14:50:40 +04:00
Roman Donchenko
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Alexander Shishkov
e90d0b6e4c
changed code in python tutorial, these functions don’t return image
2014-01-11 16:35:41 +04:00
ComFreek
ae795e5797
Corrected package name in tutorial
...
See also #2101
2014-01-09 17:24:20 +01:00
David Schmidt
ef61964768
Update py_face_detection.rst
...
bug in example
2014-01-07 00:11:33 +01:00
Roman Donchenko
9b7e77ccda
Merge commit '83cdd43a' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
2013-12-30 16:36:35 +04:00
Roman Donchenko
3c4b24d531
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
Alexander Smorkalov
4ec1930949
OpenCV version++; OpenCV Manager version++.
2013-12-23 12:35:06 +04:00
Roman Donchenko
6e22be4100
Merge pull request #2003 from vbystricky:intelperc_camera_2.4
2013-12-20 17:06:27 +04:00
Roman Donchenko
ce07840e9f
Merge pull request #1966 from asmorkalov:ocv_neon_support
2013-12-20 17:04:17 +04:00
Alexander Smorkalov
9941c6710d
NEON instruction set control unified for regular and cross-compiler builds.
2013-12-20 16:02:37 +04:00
Vladimir Bystricky
63ae0eeba5
Fix build errors
2013-12-17 18:39:52 +04:00
Vladimir Bystricky
cc08e00876
Fix notes about cmake files. Fix build warning.
2013-12-17 16:13:55 +04:00
Vladimir Bystricky
4088013251
Add set/get depth generator properties by default. Add documentation
2013-12-17 12:00:40 +04:00
Roman Donchenko
9d8d70d6ca
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/features2d/src/freak.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/test/test_api.cpp
2013-12-16 15:02:12 +04:00
Mimmmo Cosenza
00a180185e
remove Daniele
2013-12-11 13:35:20 +01:00
Mimmmo Cosenza
1c639befe6
add tutorial content
2013-12-11 13:30:52 +01:00
Mimmmo Cosenza
b1899e5489
add clojure tutorial
2013-12-11 13:28:27 +01:00
Mimmmo Cosenza
6f292d8036
add clojure logo
2013-12-11 13:28:04 +01:00
Mimmmo Cosenza
2784fd7b27
add Mimmo Cosenza to Authors
2013-12-11 13:25:53 +01:00
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
Roman Donchenko
2b31055914
Fixed the "platfrom" typo everywhere.
2013-12-03 17:33:28 +04:00
Roman Donchenko
f7f194e5dd
Merge pull request #1797 from moodoki:bugfix_3344
2013-12-02 17:53:34 +04:00
tim36272
7539156109
Fixed minor documentation typo
...
In section "How do we get an Affine Transformation" subsection 2 there was a ' where there should have been a ` which caused the math to be rendered incorrectly.
2013-11-27 04:09:40 -08:00
Roman Donchenko
10aec14a4d
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
2013-11-27 13:22:31 +04:00
Roman Donchenko
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
StevenPuttemans
6f892b10ff
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
2013-11-25 10:53:03 +01:00
StevenPuttemans
2427c03625
Wrong example at the visual studio tutorial. Fixed link, fixed sample
...
content and renamed to a more sensible name. Also fixed a wrong link in the
actual display_image tutorial.
2013-11-22 10:41:17 +01:00
Daniel Neel
67a2c4ecd5
Re-phrased some odd wording.
2013-11-21 22:36:31 -05:00
Roman Donchenko
615d6c22d1
Switched OpenCV to a 3-component version number.
...
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
2013-11-15 19:41:53 +04:00
Alexander Shishkov
4c9a6bd4ec
Update widget_pose.rst
...
changed Youtube link to our channel
2013-11-15 04:36:22 +03:00
moodoki
cebf109d39
Replaced code in .rst file with literalinclude as suggested
2013-11-15 00:27:07 +08:00
moodoki
b8de81749c
Slight modification to example code for FLANN matcher with comment on #3344
2013-11-14 00:22:20 +08:00
Roman Donchenko
3314bc94b6
Reworked documentation building to work with extra modules.
...
The main problem with extra modules is that they're located outside
of the OpenCV root, while Sphinx requires that all documents are
within the documentation root. To circumvent this, we create a
"fake root" and copy all documentation (as well as all files that
it depends on) there. It's a bit messy, but what can you do.
As a bonus, this eliminates the need to generate modules/refman.rst
inside the source tree.
2013-11-12 19:38:59 +04:00
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
Roman Donchenko
254aece317
Merge pull request #1753 from abidrahmank:py_tutorials
2013-11-06 15:40:55 +04:00
Alexander Smorkalov
24f369c4ac
Android Manager Version++.
2013-11-06 14:24:18 +04:00
abidrahmank
8bba305487
small correction in Py tutorials
2013-11-06 10:22:08 +05:30
Roman Donchenko
9c83f6c4fb
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
Alexander Smorkalov
f027cf80f7
OpenCV Version++. OpenCV Manager Version++.
2013-11-01 15:22:34 +04:00
Roman Donchenko
78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
Samuel Wejéus
eddaaa9643
Removed incorrect release of obtained colorspace. This fixes bug #3318 (updated commit for 2.4 branch)
2013-10-24 10:36:01 +02:00
Roman Donchenko
8ff267cbac
Fixed incorrectly unprefixed constant names in the OpenNI tutorial.
...
Bug report: http://code.opencv.org/issues/3329
2013-10-22 14:48:25 +04:00
Alexander Alekhin
e845184843
Merge remote-tracking branch 'upstream/2.4' into merge-2.4
...
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
Alexander Alekhin
c0a27ea1a1
cmake: update install rules for doc
2013-10-09 17:49:11 +04:00
Pablo Speciale
169ebae8c0
After commit c7bbd1a
, 'include_directories()' is needed in the CMakeLists.txt (user side). This commit updates the documentation.
2013-10-03 00:43:12 +02:00
Roman Donchenko
30d7e1c33d
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
2013-10-02 13:37:33 +04:00
Roman Donchenko
1ac1b9ae35
Merge pull request #1474 from f-morozov:for_pr
2013-10-02 11:49:54 +04:00
Roman Donchenko
6133aeede8
Merge branch 'master' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
2013-10-01 17:37:05 +04:00
Roman Donchenko
aeedc7adec
Emergency fix: rename a conflicting label in the tutorials.
2013-10-01 16:10:40 +04:00
Roman Donchenko
81eb4bd8be
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
Roman Donchenko
4ec5c04504
Merge pull request #1315 from dbloisi:add_bs_tutorial
2013-10-01 15:29:38 +04:00
Roman Donchenko
f3f7f70588
Merge pull request #1488 from abidrahmank:py_tutorials
2013-09-30 17:39:45 +04:00
Fedor Morozov
c9ace38897
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
Andrey Pavlenko
0a695eb314
hortening the file names (HighDynamicRange -> HDR)
2013-09-26 17:06:06 +04:00
Alexander Smorkalov
c6ab8cb6ee
Merge pull request #1471 from ozantonkal:master
2013-09-25 17:19:39 +04:00
George Andrew Brindeiro
192ca711ef
Added nonfree headers that are required for using SURF features
2013-09-24 12:59:37 -03:00
Alexander Smorkalov
36e7697d1b
Merge pull request #1351 from barisdemiroz:eclipse-java-tutorial
2013-09-24 14:44:33 +04:00
abidrahmank
899781b3d6
GSoC Python Tutorials
...
GSoC Python Tutorials
removed white spaces
removed blank lines at EOF
removed duplicate labels
2013-09-23 13:41:14 +05:30
Alexander Smorkalov
298a1d50d2
Merge pull request #1299 from jet47:gpu-cuda-rename
2013-09-23 10:31:51 +04:00
Fedor Morozov
f99be6bda6
Mergin itseez
2013-09-18 18:55:12 +04:00
Ozan Tonkal
8de46e1f81
removed trailing spaces
2013-09-18 12:50:55 +01:00
Ozan Tonkal
223fb39d94
include viz tutorials in the main tutorials file. ignore viz samples
2013-09-17 20:17:13 +02:00
Ozan Tonkal
3165b526f2
merge with Itseez/opencv
2013-09-15 17:51:27 +02:00
Ozan Tonkal
c31fb8ffff
rename widgets from *Widgets to W*
2013-09-15 16:26:53 +02:00
StevenPuttemans
199aa80915
Added typo in docs of tutorial
2013-09-13 15:01:18 +02:00
Roman Donchenko
160ab8415e
Merge pull request #1330 from lenlen:plantuml
2013-09-13 14:31:01 +04:00
Roman Donchenko
b525c28244
Updated the Java bindings and docs to support the version status.
2013-09-12 16:39:14 +04:00
antonella
5b2d557502
Added plantuml extension
...
Aligned strings in CMakeList
Modified the check on plantuml extension
Some fixes
Moved find_host_program for plantuml script
2013-09-12 10:41:21 +00:00
Vladislav Vinogradov
6bbac2a7d9
Merge branch 'master' into gpu-cuda-rename
2013-09-11 09:41:23 +04:00
Roman Donchenko
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
Alexander Smorkalov
40212e1eb9
Link to Hough Circle Transform sample fixed in tutorial.
2013-09-09 13:53:49 +04:00
Ozan Tonkal
56f9168ac1
support VTK 6.0.0: cmakelist.txt might need to be refactored
2013-09-08 19:07:15 +02:00
Ozan Tonkal
2969ec0274
transformations tutorial rst
2013-09-08 19:03:54 +02:00
Ozan Tonkal
7116e22b52
some of the tutorials
2013-09-08 19:03:54 +02:00
Ozan Tonkal
fdbf20c172
delete common.h, viz_types.hpp, rendering properties are public, setcolor in creating_widgets tutorial
2013-09-08 19:03:54 +02:00
Ozan Tonkal
b60894c1dd
launching viz tutorial
2013-09-05 21:03:40 +02:00
Alexander Shishkov
cf275acbce
small changes in the tutorial
2013-09-04 15:14:49 +04:00
Vladislav Vinogradov
1ad4592bfc
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudaoptflow/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp
2013-09-04 09:58:32 +04:00
Alexander Shishkov
359771fdac
small fixes in the tutorial
2013-09-03 17:07:49 +04:00
Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
Vladislav Vinogradov
cbe437571e
fixed docs
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
80b9fd87dc
removed gpu module from OPENCV2_BASE_MODULES
2013-09-02 14:00:44 +04:00
dbloisi
23f5eacafd
fixing trailing whitespaces
2013-09-01 22:38:21 +02:00
dbloisi
20f932bd46
fixing trailing whitespaces
2013-09-01 22:13:49 +02:00
dbloisi
f0910466f9
fixing trailing whitespaces
2013-09-01 20:59:27 +02:00
dbloisi
a34f7b7714
fixing other white spaces
2013-09-01 19:05:07 +02:00
dbloisi
582d5558cc
trying to solve with space errors
2013-09-01 15:55:06 +02:00