Roman Donchenko
cca2e5d8b1
Merge pull request #1536 from asmorkalov:android_ndk_r9_master
11 years ago
Roman Donchenko
f04cade607
Merge pull request #1559 from SpecLad:Wnull-conversion
11 years ago
Roman Donchenko
b03c19a8ac
Merge pull request #1554 from pablospe:fix_viz_module_compilation
11 years ago
Roman Donchenko
ac36ae0498
Merge pull request #1553 from pablospe:doc_include_directories_cmake
11 years ago
Roman Donchenko
1817a07a5e
Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp.
11 years ago
Roman Donchenko
a1e239d2bf
Merge pull request #1527 from vpisarev:shape_module
11 years ago
Alexander Smorkalov
ccb48ddee0
Android NDK r9 support. x64 NDK support fix for MacOS X.
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
Roman Donchenko
447e03bc28
Merge pull request #1543 from SpecLad:name-enum
11 years ago
Roman Donchenko
e389111b5b
Merge pull request #1550 from SpecLad:flann-uninit-master
11 years ago
Roman Donchenko
58da54cb7a
Cherry-picked mariusmuja/flann@8c8b0e0cb879666797ab2ac51b9ee438bf84a183.
...
Original author: me.
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
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
Roman Donchenko
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
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
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
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
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
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
Roman Donchenko
54c902dccd
Merge pull request #1509 from perping:2.4_docs
11 years ago
Nghia Ho
c41a5b9c2c
Merge remote-tracking branch 'upstream/master'
11 years ago
Roman Donchenko
8aa63af5de
Merge pull request #1518 from jet47:bug-3291-tbb-install
11 years ago
Roman Donchenko
4ce0a8a822
Merge pull request #1520 from lluisgomez:scene_text_erGrouping_classifier
11 years ago
Vadim Pisarevsky
c3748a5f95
fixed the trailing whitespaces
11 years ago
Roman Donchenko
42b396c97e
Merge pull request #1522 from nghiaho12:latentsvm
11 years ago
Vadim Pisarevsky
ca0956a7e2
this is rewrite of the github patch #674 by chouclee; the goal is to improve polyfit accuracy
11 years ago
Vadim Pisarevsky
bc1f9d6268
fixed description of createLineSegmentDetector
11 years ago
Vadim Pisarevsky
cd84742556
attempts to fix build errors on Android
11 years ago
Juan Manuel Perez
f6fc39ce8f
Putting definitions of SCD and SCDMatcher separated from sc_dis.cpp file
11 years ago
Juan Manuel Perez
4672a70c1f
Replaced dynamic_cas with Ptr::dynamicCast<>, and & with &&
11 years ago
Juan Manuel Perez
1bf4298251
Macro removal
11 years ago
Juan Manuel Perez
aa73dafbbb
2 Compile error fix for Win
11 years ago
Juan Manuel Perez
752d88f5d2
Compile error fix for Win
11 years ago
Juan Manuel Perez
5a1e9876fc
Corrected compilation errors Win
11 years ago