mariadeanton
|
191336de97
|
Added biicode docs to introduction tutorials
biicode docs added with fixes
fixed biicode docs
added biicode docs
added biicode docs
fixed #include typos
fixed whitespaces and tabs in indent
fixed whitespaces
small fixes
fixed trailing whitespace
trial fix #includes
fixed #includes
fixed link and branch name
|
2015-02-25 16:43:23 +01:00 |
|
Maksim Shabunin
|
b4050c775e
|
Updated sample files documentation inclusions
|
2014-12-26 19:17:18 +03:00 |
|
Maksim Shabunin
|
ad6a80f68c
|
Moved tutorial table-of-contents files to corresponding root level
|
2014-12-26 19:17:14 +03:00 |
|
Maksim Shabunin
|
d01bedbc61
|
Removed Sphinx documentation files
|
2014-12-26 19:12:19 +03:00 |
|
Maksim Shabunin
|
06c2a70c49
|
Fixed some mistakes
|
2014-12-22 17:21:37 +03:00 |
|
Maksim Shabunin
|
637b615e08
|
Tutorial: documenting OpenCV
|
2014-12-22 15:51:37 +03:00 |
|
Maksim Shabunin
|
36a04ef8de
|
Doxygen tutorials: cpp done
|
2014-12-01 16:05:38 +03:00 |
|
Maksim Shabunin
|
c5536534d8
|
Doxygen tutorials: warnings cleared
|
2014-12-01 16:05:38 +03:00 |
|
Maksim Shabunin
|
8375182e34
|
Doxygen tutorials: basic structure
|
2014-12-01 16:05:37 +03:00 |
|
Maksim Shabunin
|
220f671655
|
Doxygen tutorials: some fixes in RST-docs
|
2014-12-01 16:05:37 +03:00 |
|
Dmitriy Anisimov
|
28944336d4
|
updated linux installation documentation
|
2014-11-14 12:32:42 +03:00 |
|
Vadim Pisarevsky
|
c91b0e7ac4
|
Merge pull request #3217 from avdmitry:samples_cpp_data
|
2014-11-05 14:57:46 +00:00 |
|
micha137
|
67b2380d19
|
Update table_of_content_introduction.rst
|
2014-10-13 16:31:37 +02: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
|
46718cae28
|
Merge pull request #3209 from PhilLab:patch-5
|
2014-09-14 18:47:21 +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 |
|
Vadim Pisarevsky
|
00b2124876
|
fixing more compile problems with Java bindings etc
|
2014-08-14 13:48:52 +04:00 |
|
Roman Donchenko
|
983e75e5de
|
Merge remote-tracking branch 'origin/master' into merge-2.4
|
2014-08-01 15:01:41 +04:00 |
|
vbystricky
|
d58f736935
|
Split highgui module to videoio and highgui
|
2014-07-14 23:16:47 +04: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 |
|
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 |
|
StevenPuttemans
|
1d557e6702
|
adding bugfix 3549
|
2014-05-13 15:34:30 +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 |
|
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 |
|
Alexander Smorkalov
|
e23f7303a6
|
OpenCV version++. OpenCV Manager version++.
|
2014-03-31 15:00:25 -07: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 |
|
Daniil Osokin
|
ac19420907
|
Removed obsolete list from docs
|
2014-03-24 14:50:20 +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
|
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 |
|
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 |
|
yash
|
017a282c7a
|
Minor error in the documentation Load and Save Image
|
2014-02-18 10:34:58 +05:30 |
|
Alexander Shishkov
|
a8eab26bae
|
fixed incorrect code in introduction tutorial
|
2014-02-17 18:10:08 +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 |
|
yash
|
e2f5001b11
|
fixed doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
|
2014-02-14 23:04:03 +05:30 |
|
Rohit Girdhar
|
01b624e359
|
-j8 in linux_installation tutorial
|
2014-02-13 13:52:00 +05:30 |
|
Elliot Godzich
|
2806679781
|
Updated DisplayImage.cpp program to compile
CV_WINDOW_AUTOSIZE -> WINDOW_AUTOSIZE
|
2014-02-11 21:46:14 -08:00 |
|
Roman Donchenko
|
dad536f490
|
Merge pull request #1851 from dneelyep:patch-1
|
2014-02-11 16:46:35 +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 |
|
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 |
|
ComFreek
|
ae795e5797
|
Corrected package name in tutorial
See also #2101
|
2014-01-09 17:24:20 +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
|
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 |
|
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
|
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 |
|
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
|
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
|
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 |
|
Alexander Smorkalov
|
24f369c4ac
|
Android Manager Version++.
|
2013-11-06 14:24:18 +04:00 |
|
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 |
|
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
|
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
|
7afc2677e6
|
Removed a duplicate line.
|
2013-08-28 13:13:15 +04:00 |
|
Baris Evrim Demiroz
|
9a560a5a8d
|
Added a new tutorial "Using OpenCV Java with Eclipse". Removed information related to Eclipse from "Desktop Java" tutorial.
|
2013-08-27 22:42:03 +03:00 |
|
Roman Donchenko
|
9b92545ce6
|
War on Whitespace, master edition: trailing spaces.
|
2013-08-27 13:57:24 +04:00 |
|
Roman Donchenko
|
2c4bbb313c
|
Merge commit '43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
|
2013-08-27 13:26:44 +04:00 |
|
Roman Donchenko
|
3c137f7a04
|
Converted tabs to spaces.
|
2013-08-21 18:59:26 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Roman Donchenko
|
f55740da70
|
Deleted all trailing whitespace.
|
2013-08-21 18:59:24 +04:00 |
|
Roman Donchenko
|
2f780ed994
|
Fix whitespace errors.
|
2013-08-06 18:07:00 +04:00 |
|
Roman Donchenko
|
dcaf923517
|
Merge remote-tracking branch 'origin/2.4'
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
|
2013-08-06 13:56:49 +04:00 |
|
Roman Donchenko
|
48e31fd202
|
Merge pull request #1168 from StevenPuttemans:feature_2753
|
2013-07-23 11:54:40 +04:00 |
|
Roman Donchenko
|
3939d78336
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp
|
2013-07-22 18:38:57 +04:00 |
|
StevenPuttemans
|
7968789544
|
Made change to install in windows guide, showing only difference between VS2010 and VS2012
|
2013-07-22 15:16:22 +02:00 |
|
StevenPuttemans
|
a58860d35a
|
Removed Note, added other fix (libs to lib)
|
2013-07-17 15:02:55 +02:00 |
|
StevenPuttemans
|
d42b283abf
|
Changed tutorial for installing openCV under VS2010 like bug 3157 suggested
|
2013-07-17 13:38:45 +02:00 |
|
Roman Donchenko
|
c05bfe9d6d
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp
|
2013-07-08 18:47:38 +04:00 |
|
Alexander Smorkalov
|
e905c81ccc
|
OpenCV Manager version++.
|
2013-07-05 12:07:04 +04:00 |
|
Roman Donchenko
|
4cf9990d4e
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
|
2013-07-03 19:53:21 +04:00 |
|