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 |
|
Kirill Kornyakov
|
aef347e7b3
|
Removed references to opencv.itseez.com
|
2013-06-28 12:48:12 +04:00 |
|
Kirill Kornyakov
|
0339dd51f1
|
Removed all references to trunk
|
2013-06-28 12:38:44 +04:00 |
|
Kirill Kornyakov
|
f065c46fbe
|
Completely get rid of opencv_group
|
2013-06-28 12:15:14 +04:00 |
|
Kirill Kornyakov
|
a78ebc1175
|
Updated a couple of more links
|
2013-06-28 12:12:53 +04:00 |
|
Kirill Kornyakov
|
2980a88570
|
Mentioned 2.4 and master branches
|
2013-06-28 11:51:40 +04:00 |
|
Kirill Kornyakov
|
e447d87496
|
Added link to contribution process, updated formatting
|
2013-06-28 11:44:10 +04:00 |
|
Alexander Shishkov
|
a8db327574
|
changed contacts in tutorual
|
2013-06-28 11:44:09 +04:00 |
|
Alexander Smorkalov
|
e241c14b94
|
OpenCV Library and Manager version incremented.
OpenCV Version 2.4.6;
OpenCV Manager Version 2.8;
Doc fixes.
|
2013-06-27 12:05:25 +04:00 |
|
Alexander Shishkov
|
68741bf8a0
|
moved iOS part to platforms folder
|
2013-06-19 00:20:21 +04:00 |
|
Andrey Kamaev
|
8f32902ce6
|
Minimize usages of legacy C API inside the library
|
2013-04-16 12:00:02 +04:00 |
|
Andrey Kamaev
|
67073daf19
|
Merge branch '2.4'
|
2013-04-05 21:11:59 +04:00 |
|
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
|
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 |
|
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
|
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 |
|
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
|
0570aa6494
|
Avoid problem of old sphinx reporting an error on lines starting from :
See http://sourceforge.net/tracker/?func=detail&aid=3484857&group_id=38414&atid=422030
|
2013-02-19 10:34:43 +04:00 |
|
Andrey Kamaev
|
262fc929aa
|
Merge branch '2.4'
|
2013-02-18 15:35:42 +04:00 |
|
Andrey Kamaev
|
7e5eee5bf1
|
Merge pull request #301 from emchristiansen:javasample2.4
|
2013-02-15 18:38:25 +04:00 |
|
Andrey Pavlenko
|
edb15dee3d
|
review feed-back considered
|
2013-02-15 16:33:13 +04:00 |
|
Andrey Pavlenko
|
a8c2fc6908
|
changing layout, adding ant and eclipse sections, more pictures
|
2013-02-14 17:54:37 +04:00 |
|
Andrey Kamaev
|
b44b920997
|
Merge branch '2.4'
|
2013-02-12 16:30:18 +04:00 |
|
Alexander Smorkalov
|
c7e7b77093
|
Tutorial for Android synchronized with actual application framework.
|
2013-02-08 16:53:06 +04:00 |
|
Andrey Kamaev
|
61079547f0
|
Merge branch '2.4'
|
2013-02-01 14:59:40 +04:00 |
|
Andrey Kamaev
|
acb2cb5bf0
|
Merge pull request #389 from Daniil-Osokin:bugfix_doc_opencv_with_cmake
|
2013-01-31 15:04:56 +04:00 |
|
Daniil Osokin
|
b5ed86c6a1
|
Fixed sample files in "Using OpenCV with gcc and CMake" tutorial (bug #2663, #2588)
|
2013-01-31 13:26:29 +04:00 |
|
Andrey Kamaev
|
7572b4d400
|
Merge branch '2.4'
|
2013-01-30 15:12:50 +04:00 |
|
Daniil Osokin
|
568591670c
|
Fixed color code in cvtColor in "Load, Modify, and Save an Image" tutorial (bug #2739)
|
2013-01-30 08:16:47 +04:00 |
|
Andrey Kamaev
|
0734d9b877
|
Merge branch '2.4'
|
2013-01-29 14:16:07 +04:00 |
|
Daniil Osokin
|
f9bff103dd
|
Removed obsolete steps from Windows installation tutorial (bug #2550)
|
2013-01-28 17:46:03 +04:00 |
|
Eric Christiansen
|
c2c2403a79
|
Added a desktop Java tutorial
|
2013-01-21 14:57:25 -08:00 |
|
Andrey Kamaev
|
084b1c7969
|
Merge branch 2.4
|
2013-01-11 15:45:23 +04:00 |
|
Vsevolod Glumov
|
c0411caef4
|
Fixed a bunch of minor issues in 'dev_with_OCV_on_Android.rst'.
|
2012-12-28 16:37:05 +04:00 |
|
Andrey Kamaev
|
132b5d6435
|
Merge release 2.4.3.2
|
2012-12-25 19:07:08 +04:00 |
|
Andrey Pavlenko
|
1e5b533d01
|
updating tutorial #2
|
2012-12-24 20:05:27 +04:00 |
|
Andrey Pavlenko
|
99299b3605
|
updating tutorial #1
|
2012-12-24 19:25:42 +04:00 |
|
Andrey Kamaev
|
962884cdec
|
Merge branch 2.4
|
2012-12-21 17:58:48 +04:00 |
|
Vsevolod Glumov
|
e9e46d3086
|
Updated Android introductory tutorials, based on frequent Q&A questions/issues.
|
2012-12-21 16:10:20 +04:00 |
|
Alexander Smorkalov
|
3c09b075fc
|
OpenCV Manager selection chapter added to documentation.
|
2012-12-18 18:34:51 +04:00 |
|
Andrey Kamaev
|
e10ee89ec4
|
Merge branch 2.4
|
2012-11-30 19:54:24 +04:00 |
|
Vsevolod Glumov
|
0711e65972
|
Added a note to the android_dev_intro.rst.
|
2012-11-27 15:10:57 +04:00 |
|
Andrey Kamaev
|
0938358002
|
Merge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix
|
2012-11-13 19:47:16 +04:00 |
|
Alexander Smorkalov
|
6fb959710d
|
Code review comments applied.
|
2012-11-12 18:01:56 +04:00 |
|
mikle
|
7ef378b230
|
Android tutorial updated. HelloWorld sample ported on new framework.
|
2012-11-08 14:51:42 +04:00 |
|
Andrey Kamaev
|
4d059e9e5b
|
Merge release 2.4.3
|
2012-11-02 17:58:02 +04:00 |
|
Andrey Pavlenko
|
65c6b81cbc
|
Android Tutorial update (TADP link, Android SDK platforms, CDT)
|
2012-11-02 16:11:08 +04:00 |
|
Kirill Kornyakov
|
2b7d65d078
|
Updated OpenCV4Android SDK tutorial
|
2012-11-01 22:28:46 +04:00 |
|
Kirill Kornyakov
|
61ed591728
|
Updated Introduction into Android Development tutorial
|
2012-11-01 22:28:46 +04:00 |
|
Vadim Pisarevsky
|
849a8c8d20
|
fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)
|
2012-10-31 15:15:51 +04:00 |
|
Andrey Kamaev
|
91f47d2779
|
Merge branch '2.4'
Conflicts:
modules/core/include/opencv2/core/version.hpp
|
2012-10-23 20:39:02 +04:00 |
|
Andrey Kamaev
|
6f08d03322
|
Advance version number to 2.4.3-rc
|
2012-10-23 17:59:59 +04:00 |
|
Andrey Kamaev
|
0e7ca71dcc
|
Normalize whitespace in documentation and text files
|
2012-10-17 21:42:09 +04:00 |
|
OpenCV Buildbot
|
81f826db2b
|
Normalize line endings and whitespace
|
2012-10-17 15:57:49 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Kirill Kornyakov
|
aedf56404e
|
made imread description slightly better #2406
|
2012-10-15 15:23:38 +04:00 |
|
Vsevolod Glumov
|
a2088d0c52
|
Replaced SVN instructions with Git ones for 'Installation in Windows' section (Issue #2249); Also, fixed both bugs from issue #2374 in the same section.
|
2012-10-11 18:37:00 +04:00 |
|
Vsevolod Glumov
|
a3080636ba
|
Replaced SVN instructions with Git instructions in iOS and Linux installation tutorials. Issue #2249
+ Minor formatting fixes.
|
2012-10-11 16:44:53 +04:00 |
|
Alexander Smorkalov
|
306ed9801a
|
Issue #2284 BaseLoaderCallback requires use of Activity fixed.
|
2012-10-10 11:44:01 +04:00 |
|
Alexander Smorkalov
|
9a76573172
|
Auto expand of OpenCV version for Android Library prject and some documentation pages added.
|
2012-10-09 18:30:58 +04:00 |
|
Alexander Smorkalov
|
9ab19691d4
|
OpenCV Manager documentation updated.
Diagram rendering script updated.
|
2012-10-09 10:34:40 +04:00 |
|
Vadim Pisarevsky
|
3d4ca2d709
|
added ios tutorials by Charu Hans and Eduard Feicho
|
2012-08-30 15:49:53 +04:00 |
|
Andrey Kamaev
|
bf4c1df0d0
|
Fix formatting in Android tutorials
|
2012-08-17 19:23:45 +04:00 |
|
Andrey Kamaev
|
9d6ccecfdd
|
Fixed layout in third Android tutorial
|
2012-08-17 18:15:15 +04:00 |
|
Vsevolod Glumov
|
8899835886
|
Reviewed 'android_dev_intro'
|
2012-08-15 15:10:58 +04:00 |
|
Andrey Pavlenko
|
3b07e977a9
|
improving android tutorial v2
|
2012-08-15 12:21:58 +04:00 |
|
Andrey Pavlenko
|
6e07a1346c
|
improving android tutorial v2
|
2012-08-15 11:47:48 +04:00 |
|
Vsevolod Glumov
|
a4392e4906
|
Merge remote-tracking branch 'origin/master'
|
2012-08-15 11:39:54 +04:00 |
|
Vsevolod Glumov
|
5825c60491
|
Reviewed 'android_dev_intro' and 'O4A_SDK'
|
2012-08-15 11:39:02 +04:00 |
|
Andrey Pavlenko
|
c004df234f
|
improving android tutorial v2, removing v1
|
2012-08-15 10:56:50 +04:00 |
|
Andrey Kamaev
|
d861063159
|
Fixed tutorial link to NVIDIA Tegra platform
|
2012-08-14 17:26:00 +04:00 |
|
Andrey Pavlenko
|
37740fa30e
|
improving android tutorial v2
|
2012-08-14 17:18:24 +04:00 |
|
Vsevolod Glumov
|
2a1e8e3efd
|
Merge remote-tracking branch 'origin/master'
|
2012-08-13 16:29:08 +04:00 |
|
Vsevolod Glumov
|
27212fdafe
|
some minor fixes to the 'android_dev_intro'
|
2012-08-13 16:29:00 +04:00 |
|
Oleg Sklyarov
|
85351389f4
|
ubuntu screenshot png
|
2012-08-13 16:03:01 +04:00 |
|
Oleg Sklyarov
|
3b70fc6d32
|
Android device recognition in Ubuntu Linux manual
|
2012-08-13 16:00:58 +04:00 |
|
Vsevolod Glumov
|
87737c20c1
|
added a short preface to the 'android_dev_intro' doc.
|
2012-08-13 13:13:07 +04:00 |
|
Andrey Pavlenko
|
a682ee40ad
|
android tutorial, part 1 - adding 'device connection via usb' section, sections reordering
|
2012-08-09 22:57:06 +04:00 |
|
Oleg Sklyarov
|
3f68e5bb0e
|
android tutorial minor layout fix (also my first test commit)
|
2012-08-09 18:21:56 +04:00 |
|
Andrey Kamaev
|
73f720d470
|
Fixed links in formatting in Android intro tutorial
|
2012-08-08 16:28:12 +04:00 |
|
Andrey Kamaev
|
8aa2d6cddc
|
Fix several documentation build warnings
|
2012-08-07 18:00:09 +04:00 |
|
Andrey Pavlenko
|
c1571e21ff
|
android tutorial v2, initial draft commit
|
2012-08-07 17:27:48 +04:00 |
|
Andrey Kamaev
|
5100ca7508
|
svn repository web references are replaced with links to git
|
2012-08-07 14:30:36 +04:00 |
|
Andrey Pavlenko
|
484e83a9b6
|
minor update (pictures resize removed, emulator screen-shot downscaled)
|
2012-07-31 12:31:23 +04:00 |
|
Andrey Pavlenko
|
e1c7bcab3a
|
minor updates to android tutorials
|
2012-07-24 19:04:38 +04:00 |
|