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 |
|
Alexander Smorkalov
|
9f04222a75
|
OpenCV Manager version++.
|
2013-12-06 18:53:03 +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 |
|
Alexander Smorkalov
|
bd314bf955
|
VFPv4 detection implemented. Some Tegra5 related updates.
|
2013-11-22 14:30:23 +04:00 |
|
Alexander Smorkalov
|
fd759223fa
|
Package selection for Tegra 4i fixed. Initial Tegra5 support added.
|
2013-11-22 11:46:18 +04:00 |
|
Alexander Smorkalov
|
e08b075db0
|
Android NDK r9b support added.
|
2013-11-19 11:46:29 +04: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 Smorkalov
|
24f369c4ac
|
Android Manager Version++.
|
2013-11-06 14:24:18 +04:00 |
|
Alexander Smorkalov
|
f027cf80f7
|
OpenCV Version++. OpenCV Manager Version++.
|
2013-11-01 15:22:34 +04:00 |
|
Roman Donchenko
|
e1c8f5d723
|
Removed a stray comma in the Android toolchain file.
It was actually acting as an additional argument, breaking the error message.
|
2013-10-25 13:50:22 +04:00 |
|
Alexander Smorkalov
|
1aaeb52a4c
|
Android NDK r9 support. x64 NDK support fix for MacOS X.
|
2013-10-03 11:36:12 +04:00 |
|
Alexander Smorkalov
|
aa00b5a0ab
|
New Tegra detector with Android 4.3 support added. Manager version++.
|
2013-08-28 15:22:14 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Alexander Smorkalov
|
e905c81ccc
|
OpenCV Manager version++.
|
2013-07-05 12:07:04 +04:00 |
|
Alexander Smorkalov
|
8b6f1d9bd9
|
OpenCV Version++; Manager Version++
|
2013-06-28 18:25:53 +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 Smorkalov
|
80f6ede233
|
Fix build problems on MIPS and Linaro NDK.
Merged android.toolchain.cmake from project
https://github.com/taka-no-me/android-cmake
commit: fd1f7055f8b7338644d58d9a2015a784dfa3a5ca
|
2013-06-13 16:51:45 +04:00 |
|
Alexander Smorkalov
|
f85cf5bdd9
|
Build fixes. Build scrips reorganized.
|
2013-05-28 12:27:56 +04:00 |
|
Alexander Smorkalov
|
20fef00a77
|
android -> plarforms/android
|
2013-05-27 11:10:38 +04:00 |
|