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
|
12 years ago |
|
Roman Donchenko
|
ada858e1c0
|
Merge pull request #1429 from nzjrs:fix-sketcher
|
12 years ago |
|
Roman Donchenko
|
e35bc11504
|
Merge pull request #1457 from pengx17:2.4_oclsvm
|
12 years ago |
|
Roman Donchenko
|
a4b3aa9e1e
|
Merge pull request #1477 from nzjrs:python-gethardwaresupport
|
12 years ago |
|
Roman Donchenko
|
f3f7f70588
|
Merge pull request #1488 from abidrahmank:py_tutorials
|
12 years ago |
|
Roman Donchenko
|
54c902dccd
|
Merge pull request #1509 from perping:2.4_docs
|
12 years ago |
|
Roman Donchenko
|
8aa63af5de
|
Merge pull request #1518 from jet47:bug-3291-tbb-install
|
12 years ago |
|
Roman Donchenko
|
4ce0a8a822
|
Merge pull request #1520 from lluisgomez:scene_text_erGrouping_classifier
|
12 years ago |
|
Roman Donchenko
|
42b396c97e
|
Merge pull request #1522 from nghiaho12:latentsvm
|
12 years ago |
peng xiao
|
315c054379
|
Fix new blank line at EOF.
|
12 years ago |
|
peng xiao
|
422396ef6a
|
fix build error
|
12 years ago |
|
peng xiao
|
f69ccfa43d
|
Add opencl svm.
|
12 years ago |
Nghia Ho
|
b9e542e35e
|
Missing closedir with opendir
|
12 years ago |
lluis
|
047b568f6d
|
erGrouping now uses a classifier for group validation instead of a set of heuristical ifos.
Updated documentation and sample to use the new function API
|
12 years ago |
Vladislav Vinogradov
|
d1f3a62832
|
fix for bug #3291:
add INSTALL command for TBB target
|
12 years ago |
Alexander Smorkalov
|
178f0272fe
|
Merge pull request #1515 from asmorkalov:ocv_pr_1464_revert
|
12 years ago |
|
Alexander Smorkalov
|
8cb0921252
|
pr #1464 reverted as breaking the build for Linux without libv4l library.
|
12 years ago |
perping
|
1bc20ae6f8
|
fix warning about addWeighted and remove magnitudeSqr().
|
12 years ago |
|
Alexander Smorkalov
|
9d626f3005
|
Merge pull request #1511 from apavlenko:shorten_hdr
|
12 years ago |
Andrey Pavlenko
|
0a695eb314
|
hortening the file names (HighDynamicRange -> HDR)
|
12 years ago |
|
Alexander Smorkalov
|
4b203f7b1a
|
Merge pull request #1470 from IceRage:min_enclosing_triangle
|
12 years ago |
|
Andrey Pavlenko
|
3e91350a31
|
Merge pull request #1503 from ilya-lavrenov:ocl_arithm
|
12 years ago |
|
Alexander Smorkalov
|
26a1a93295
|
Merge pull request #1464 from StevenPuttemans:bugfix_3186_second
|
12 years ago |
|
perping
|
074f9e33cb
|
fix three warning about mog, mog2 and KNearestNeighbour.
|
12 years ago |
|
Alexander Smorkalov
|
0d49206a98
|
Merge pull request #1485 from vpisarev:ipp_fixes
|
12 years ago |
|
perping
|
f65286d3c6
|
Update the OpenCL documents.
|
12 years ago |
|
Alexander Smorkalov
|
241aa6e5a8
|
Merge pull request #1497 from jet47:fix-bug-3277
|
12 years ago |
|
Alexander Smorkalov
|
7f819008d9
|
Merge pull request #1500 from alalek:fix_add_definitions
|
12 years ago |
|
Alexander Smorkalov
|
9f19126472
|
Merge pull request #1502 from melody-rain:2.4_Stereo_Match_Const_Space_BP
|
12 years ago |
Ilya Lavrenov
|
f5af3ab851
|
changes in OpenCL matrix operations docs
|
12 years ago |
|
Alexander Smorkalov
|
0b41df46ad
|
Merge pull request #1499 from georgebrindeiro:patch-2
|
12 years ago |
|
Alexander Smorkalov
|
c6ab8cb6ee
|
Merge pull request #1471 from ozantonkal:master
|
12 years ago |
|
Ilya Lavrenov
|
c8821bd909
|
replaced manually new/delete by AutoBuffer
|
12 years ago |
|
Ilya Lavrenov
|
0faac595a8
|
fixed minMaxLoc kernel (removed compilation errors)
|
12 years ago |
|
Ilya Lavrenov
|
544c02407e
|
reverted and generalized original ocl::transpose
|
12 years ago |
Jin Ma
|
c7c0a41e17
|
Resolved the bug that the work group size is not valid.
|
12 years ago |
Alexander Alekhin
|
b4a534a235
|
cmake: PCH: use DEFINE_SYMBOL target property
|
12 years ago |
|
Alexander Alekhin
|
48774a39b4
|
cmake: fixed incorrect usage of add_definitions() on Linux
|
12 years ago |
|
Alexander Smorkalov
|
e1f55c3fcc
|
Merge pull request #1496 from shawke:patch-1
|
12 years ago |
|
Alexander Smorkalov
|
887ff0de7b
|
Merge pull request #1498 from alalek:revert_1487
|
12 years ago |
George Andrew Brindeiro
|
192ca711ef
|
Added nonfree headers that are required for using SURF features
|
12 years ago |
|
Alexander Smorkalov
|
6057414a93
|
Merge pull request #1199 from devernay:2.4-qtkit
|
12 years ago |
|
Alexander Alekhin
|
ce557fb7be
|
Revert "cmake: fixed incorrect usage of add_definitions() on Linux"
This reverts commit 286244efed.
|
12 years ago |
|
Vladislav Vinogradov
|
e675684c81
|
fix bug #3277 (findCirclesGrid failures):
findHomagraphy can return empty Mat in master branch
|
12 years ago |
|
Alexander Smorkalov
|
36e7697d1b
|
Merge pull request #1351 from barisdemiroz:eclipse-java-tutorial
|
12 years ago |
|
Ilya Lavrenov
|
c87d2d414d
|
removed arithm_absdiff.cl
|
12 years ago |
|
Ilya Lavrenov
|
8aa3eb817d
|
refactored arithm.cpp. Extended param list for all the tests
|
12 years ago |
|
Ilya Lavrenov
|
b4ad128218
|
refactoed and extended ocl::transpose
|
12 years ago |
|
Ilya Lavrenov
|
799afab23b
|
refactored and extended ocl::exp and ocl::log
|
12 years ago |
|
Ilya Lavrenov
|
0730963576
|
refactored and extended ocl::compare
|
12 years ago |
