mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,443 Commits 6 Branches 126 Tags 3 GiB
88b1847d09
Commit Graph

10443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Hale
88b1847d09 add include limits, for compilers that dont add it implicitly 2013-10-06 01:21:43 -04:00
Eric Martin Christiansen
c8a3a85e26 adds include to fix build 2013-10-05 15:52:19 -07:00
Roman Donchenko
744f4b1609 Merge pull request #1565 from SpecLad:cmake-new-ptr 2013-10-04 18:14:34 +04:00
Roman Donchenko
cca2e5d8b1 Merge pull request #1536 from asmorkalov:android_ndk_r9_master 2013-10-04 16:36:44 +04:00
Roman Donchenko
f04cade607 Merge pull request #1559 from SpecLad:Wnull-conversion 2013-10-04 16:08:54 +04:00
Roman Donchenko
b03c19a8ac Merge pull request #1554 from pablospe:fix_viz_module_compilation 2013-10-04 14:02:17 +04:00
Roman Donchenko
32630dbf61 Adapt cap_openni.cpp to the new Ptr. 2013-10-04 13:51:58 +04:00
Roman Donchenko
ac36ae0498 Merge pull request #1553 from pablospe:doc_include_directories_cmake 2013-10-04 12:59:09 +04:00
Roman Donchenko
1817a07a5e Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp. 2013-10-03 12:11:50 +04:00
Roman Donchenko
a1e239d2bf Merge pull request #1527 from vpisarev:shape_module 2013-10-03 11:54:41 +04:00
Alexander Smorkalov
ccb48ddee0 Android NDK r9 support. x64 NDK support fix for MacOS X. 2013-10-03 11:23:50 +04:00
Pablo Speciale
f47afe5799 Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297) 2013-10-03 02:10:27 +02: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
447e03bc28 Merge pull request #1543 from SpecLad:name-enum 2013-10-02 19:22:35 +04:00
Roman Donchenko
e389111b5b Merge pull request #1550 from SpecLad:flann-uninit-master 2013-10-02 18:52:38 +04:00
Roman Donchenko
58da54cb7a Cherry-picked mariusmuja/flann@8c8b0e0cb8. 
Original author: me.
 2013-10-02 16:09:45 +04:00
Roman Donchenko
4c19e0273a Cherry-picked mariusmuja/flann@b615f26947. 
Original author: Alex Wilson.
 2013-10-02 16:06:56 +04:00
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.
 2013-10-02 16:02:11 +04:00
Roman Donchenko
60bcc52c4f Merge pull request #1541 from SpecLad:merge-2.4 2013-10-02 14:47:30 +04:00
Roman Donchenko
30d7e1c33d Merge remote-tracking branch 'origin/master' into merge-2.4 
Conflicts:
	doc/tutorials/bioinspired/retina_model/retina_model.rst~
 2013-10-02 13:37:33 +04:00
Roman Donchenko
4c7ecf20d8 Merge pull request #1529 from vpisarev:polyfit_accuracy_2 2013-10-02 12:52:33 +04:00
Roman Donchenko
a71a891b93 Merge pull request #1451 from adrians:neon-pull2 2013-10-02 12:51:30 +04:00
Roman Donchenko
1ac1b9ae35 Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00
Roman Donchenko
184ae873d4 Merge pull request #1526 from vpisarev:linedetector_python 2013-10-01 19:49:17 +04:00
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>.
 2013-10-01 18:22:03 +04:00
Roman Donchenko
6133aeede8 Merge branch 'master' into merge-2.4 
Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
 2013-10-01 17:37:05 +04:00
Roman Donchenko
8717281e0e Merge pull request #1209 from nghiaho12:master 2013-10-01 17:07:39 +04:00
Roman Donchenko
aeedc7adec Emergency fix: rename a conflicting label in the tutorials. 2013-10-01 16:10:40 +04: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
4ec5c04504 Merge pull request #1315 from dbloisi:add_bs_tutorial 2013-10-01 15:29:38 +04:00
Nghia Ho
61f5176bad Removed trailing whitespace 2013-10-01 21:03:54 +10:00
Nghia Ho
d7bf71c24a Merge remote-tracking branch 'upstream/master' 2013-10-01 19:56:47 +10:00
Roman Donchenko
e0f5a2e532 Merge pull request #1512 from Exocoder:pre-gtk3 2013-10-01 12:09:17 +04:00
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.
 2013-09-30 21:04:43 +01:00
Vadim Pisarevsky
c810d03d5c some more attempts to fix compile bug on Android 2013-09-30 19:28:11 +04:00
Roman Donchenko
ada858e1c0 Merge pull request #1429 from nzjrs:fix-sketcher 2013-09-30 18:06:56 +04:00
Roman Donchenko
e35bc11504 Merge pull request #1457 from pengx17:2.4_oclsvm 2013-09-30 17:50:29 +04:00
Roman Donchenko
a4b3aa9e1e Merge pull request #1477 from nzjrs:python-gethardwaresupport 2013-09-30 17:44:45 +04:00
Roman Donchenko
f3f7f70588 Merge pull request #1488 from abidrahmank:py_tutorials 2013-09-30 17:39:45 +04:00
Roman Donchenko
54c902dccd Merge pull request #1509 from perping:2.4_docs 2013-09-30 17:37:19 +04:00
Nghia Ho
c41a5b9c2c Merge remote-tracking branch 'upstream/master' 2013-09-30 22:59:29 +10:00
Roman Donchenko
8aa63af5de Merge pull request #1518 from jet47:bug-3291-tbb-install 2013-09-30 16:21:51 +04:00
Roman Donchenko
4ce0a8a822 Merge pull request #1520 from lluisgomez:scene_text_erGrouping_classifier 2013-09-30 16:08:21 +04:00
Vadim Pisarevsky
c3748a5f95 fixed the trailing whitespaces 2013-09-30 16:06:48 +04:00
Roman Donchenko
42b396c97e Merge pull request #1522 from nghiaho12:latentsvm 2013-09-30 16:04:59 +04:00
Vadim Pisarevsky
ca0956a7e2 this is rewrite of the github patch #674 by chouclee; the goal is to improve polyfit accuracy 2013-09-30 16:00:39 +04:00
Vadim Pisarevsky
bc1f9d6268 fixed description of createLineSegmentDetector 2013-09-30 15:07:32 +04:00
Vadim Pisarevsky
cd84742556 attempts to fix build errors on Android 2013-09-30 14:53:48 +04:00
Juan Manuel Perez
f6fc39ce8f Putting definitions of SCD and SCDMatcher separated from sc_dis.cpp file 2013-09-30 14:39:17 +04:00
Juan Manuel Perez
4672a70c1f Replaced dynamic_cas with Ptr::dynamicCast<>, and & with && 2013-09-30 14:39:17 +04:00