Alexander Smorkalov
ccb48ddee0
Android NDK r9 support. x64 NDK support fix for MacOS X.
11 years ago
Ilya Lavrenov
adca219f18
fixed convertC3C4 and convertC4C3 functions in case cols == 1
11 years ago
Pablo Speciale
f47afe5799
Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297)
11 years ago
Pablo Speciale
169ebae8c0
After commit c7bbd1a
, 'include_directories()' is needed in the CMakeLists.txt (user side). This commit updates the documentation.
11 years ago
Andrey Pavlenko
88419f8923
Merge pull request #1507 from pengx17:2.4_fix_test
11 years ago
Andrey Pavlenko
73744904a2
Merge pull request #1542 from alalek:cl_runtime
11 years ago
Alexander Alekhin
12eb340a4e
removed invalid comment
11 years ago
Roman Donchenko
447e03bc28
Merge pull request #1543 from SpecLad:name-enum
11 years ago
Andrey Pavlenko
b396916cdb
Merge pull request #1549 from ilya-lavrenov:ocl_perf_norm
11 years ago
Andrey Pavlenko
b2fe053f4d
Merge pull request #1548 from ilya-lavrenov:ocl_bitwise_not
11 years ago
Roman Donchenko
e389111b5b
Merge pull request #1550 from SpecLad:flann-uninit-master
11 years ago
Alexander Alekhin
5ab49c4cc2
ocl: cl_runtime: added autogenerated code
11 years ago
Alexander Alekhin
212ad97100
ocl: dynamic load of OpenCL libraries
...
Support functions from OpenCL 1.1 / OpenCL 1.2
11 years ago
Ilya Lavrenov
e8b93040d6
enabled ocl::norm perf test
11 years ago
Roman Donchenko
d019344c9d
Merge pull request #1547 from SpecLad:gtest-1.7
11 years ago
Roman Donchenko
58da54cb7a
Cherry-picked mariusmuja/flann@8c8b0e0cb879666797ab2ac51b9ee438bf84a183.
...
Original author: me.
11 years ago
Ilya Lavrenov
a613a1a1da
fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2
11 years ago
Roman Donchenko
4c19e0273a
Cherry-picked mariusmuja/flann@b615f2694723fe402b8bbe50d77e622beff7f171.
...
Original author: Alex Wilson.
11 years ago
Roman Donchenko
78c4ffec99
Revert "Fixed a bug in FLANN resulting in uninitialized accesses."
...
This reverts commit a9975b144a
, to prepare
for cherry-picking upstream's solution.
11 years ago
Roman Donchenko
60bcc52c4f
Merge pull request #1541 from SpecLad:merge-2.4
11 years ago
Roman Donchenko
e65eb4e042
Updated Google Test to 1.7.0.
11 years ago
Roman Donchenko
30d7e1c33d
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
11 years ago
Roman Donchenko
4c7ecf20d8
Merge pull request #1529 from vpisarev:polyfit_accuracy_2
11 years ago
Roman Donchenko
a71a891b93
Merge pull request #1451 from adrians:neon-pull2
11 years ago
Roman Donchenko
1ac1b9ae35
Merge pull request #1474 from f-morozov:for_pr
11 years ago
Andrey Pavlenko
75d89f4331
Merge pull request #1533 from alalek:perf_test_update_relative_error_message
11 years ago
Andrey Pavlenko
154fe4f657
Merge pull request #1519 from ilya-lavrenov:ocl_minMax
11 years ago
Roman Donchenko
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
11 years ago
Roman Donchenko
8c15d27619
Merge pull request #1525 from asmorkalov:ocv_custom_libv4l
11 years ago
Roman Donchenko
bcb6f0386e
Named FastFeatureDetector::Type to allow its use in makePtr.
...
It has actually worked before (likely because it's inside a class),
but C++03 does disallow unnamed types as template arguments,
and there's a report that at least in one version of GCC it's
enforced: <http://code.opencv.org/issues/3278 >.
11 years ago
Ilya Lavrenov
4322c47bb2
removed test_norm.cpp from ocl tests
11 years ago
Roman Donchenko
4d88a6e856
Merge pull request #1530 from alalek:perf_tests_sanity_check_nothing
11 years ago
Roman Donchenko
6133aeede8
Merge branch 'master' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
11 years ago
Roman Donchenko
8717281e0e
Merge pull request #1209 from nghiaho12:master
11 years ago
Alexander Alekhin
a8ac3ec72a
ocl: perf test: disable MOG2 (random hungs), enable upload/download
11 years ago
Alexander Alekhin
66e4aead97
perf tests: added SANITY_CHECK_NOTHING()
11 years ago
Roman Donchenko
aeedc7adec
Emergency fix: rename a conflicting label in the tutorials.
11 years ago
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
11 years ago
Roman Donchenko
4ec5c04504
Merge pull request #1315 from dbloisi:add_bs_tutorial
11 years ago
Nghia Ho
61f5176bad
Removed trailing whitespace
11 years ago
Nghia Ho
d7bf71c24a
Merge remote-tracking branch 'upstream/master'
11 years ago
Ilya Lavrenov
065b40c6c3
fixed and extended ocl::norm
11 years ago
Roman Donchenko
e0f5a2e532
Merge pull request #1512 from Exocoder:pre-gtk3
11 years ago
Tony
0d06b1dced
Change true for TRUE
...
The second parameter of gtk_widget_set_realized is of type gboolean
(gint). This is to ensure compatibility on alternative compilers and
platforms.
11 years ago
Alexander Alekhin
958604a68e
perf test: update error message about relative error
11 years ago
Vadim Pisarevsky
c810d03d5c
some more attempts to fix compile bug on Android
11 years ago
Roman Donchenko
ada858e1c0
Merge pull request #1429 from nzjrs:fix-sketcher
11 years ago
Roman Donchenko
e35bc11504
Merge pull request #1457 from pengx17:2.4_oclsvm
11 years ago
Roman Donchenko
a4b3aa9e1e
Merge pull request #1477 from nzjrs:python-gethardwaresupport
11 years ago
Roman Donchenko
f3f7f70588
Merge pull request #1488 from abidrahmank:py_tutorials
11 years ago