Roman Donchenko [Wed, 9 Oct 2013 08:33:49 +0000 (12:33 +0400)]
Merge pull request #1581 from SpecLad:merge-2.4
Alexander Alekhin [Tue, 8 Oct 2013 15:13:10 +0000 (19:13 +0400)]
ocl: fix CL_RUNTIME_EXPORT for master branch
Roman Donchenko [Tue, 8 Oct 2013 13:21:42 +0000 (17:21 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectOpenCL.cmake
cmake/OpenCVModule.cmake
modules/imgproc/src/floodfill.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_programcache.hpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/mssegmentation.cpp
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/stereo_csbp.cpp
modules/ocl/src/stereobm.cpp
modules/ocl/test/main.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/stereo_match.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
Roman Donchenko [Tue, 8 Oct 2013 09:50:49 +0000 (13:50 +0400)]
Merge pull request #1567 from ilya-lavrenov:warn_fix
Ilya Lavrenov [Fri, 4 Oct 2013 13:03:15 +0000 (17:03 +0400)]
fixed warnings
Roman Donchenko [Mon, 7 Oct 2013 13:47:36 +0000 (17:47 +0400)]
Merge pull request #1569 from ilya-lavrenov:ocl_hough_circles
Roman Donchenko [Mon, 7 Oct 2013 12:59:23 +0000 (16:59 +0400)]
Merge pull request #1572 from emchristiansen:includeLimits
Roman Donchenko [Mon, 7 Oct 2013 11:53:20 +0000 (15:53 +0400)]
Merge pull request #1568 from ilya-lavrenov:ocl_pyrlk
Roman Donchenko [Mon, 7 Oct 2013 11:48:39 +0000 (15:48 +0400)]
Merge pull request #1566 from SpecLad:Wshadow-openni
emchristiansen [Sun, 6 Oct 2013 19:26:45 +0000 (12:26 -0700)]
Merge pull request #1 from ImAlsoGreg/master
add include limits, for compilers that dont add it implicitly
Greg Hale [Sun, 6 Oct 2013 05:21:43 +0000 (01:21 -0400)]
add include limits, for compilers that dont add it implicitly
Eric Martin Christiansen [Sat, 5 Oct 2013 22:52:19 +0000 (15:52 -0700)]
adds include to fix build
Ilya Lavrenov [Fri, 4 Oct 2013 15:44:04 +0000 (19:44 +0400)]
added plain branch to HoughCircle perf test
Roman Donchenko [Fri, 4 Oct 2013 14:29:03 +0000 (18:29 +0400)]
Merge pull request #1564 from alalek:cl_runtime_fix_32bit
Roman Donchenko [Fri, 4 Oct 2013 14:25:44 +0000 (18:25 +0400)]
Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update
Ilya Lavrenov [Fri, 4 Oct 2013 14:09:45 +0000 (18:09 +0400)]
fixed mog2
Roman Donchenko [Fri, 4 Oct 2013 14:15:05 +0000 (18:15 +0400)]
Merge pull request #1560 from jet47:cmake-config-cuda-5.5-fix
Roman Donchenko [Fri, 4 Oct 2013 14:14:34 +0000 (18:14 +0400)]
Merge pull request #1565 from SpecLad:cmake-new-ptr
Roman Donchenko [Fri, 4 Oct 2013 14:12:42 +0000 (18:12 +0400)]
Merge pull request #1562 from ilya-lavrenov:ocl_integral
Ilya Lavrenov [Fri, 4 Oct 2013 13:56:02 +0000 (17:56 +0400)]
fixed pyrlk optical flow
Roman Donchenko [Fri, 4 Oct 2013 12:43:51 +0000 (16:43 +0400)]
Merge pull request #1532 from alalek:stereo_csbp
Roman Donchenko [Fri, 4 Oct 2013 12:36:43 +0000 (16:36 +0400)]
Merge pull request #1536 from asmorkalov:android_ndk_r9_master
Roman Donchenko [Fri, 4 Oct 2013 12:32:08 +0000 (16:32 +0400)]
Merge pull request #1558 from SpecLad:Wparentheses-equality
Roman Donchenko [Fri, 4 Oct 2013 12:08:53 +0000 (16:08 +0400)]
Merge pull request #1559 from SpecLad:Wnull-conversion
Vladislav Vinogradov [Fri, 4 Oct 2013 11:14:21 +0000 (15:14 +0400)]
fixed OpenCVConfig.cmake.in file for CUDA 5.5 toolkit
Roman Donchenko [Fri, 4 Oct 2013 10:23:06 +0000 (14:23 +0400)]
Fix a -Wshadow warning in cap_openni.cpp.
Roman Donchenko [Fri, 4 Oct 2013 10:14:20 +0000 (14:14 +0400)]
Merge pull request #1535 from asmorkalov:android_ndk_r9
Roman Donchenko [Fri, 4 Oct 2013 10:02:16 +0000 (14:02 +0400)]
Merge pull request #1554 from pablospe:fix_viz_module_compilation
Roman Donchenko [Fri, 4 Oct 2013 09:59:19 +0000 (13:59 +0400)]
Merge pull request #1563 from ilya-lavrenov:ocl_arithm
Roman Donchenko [Fri, 4 Oct 2013 09:51:58 +0000 (13:51 +0400)]
Adapt cap_openni.cpp to the new Ptr.
Roman Donchenko [Fri, 4 Oct 2013 08:59:08 +0000 (12:59 +0400)]
Merge pull request #1553 from pablospe:doc_include_directories_cmake
Alexander Alekhin [Mon, 30 Sep 2013 16:33:56 +0000 (20:33 +0400)]
ocl: stereo_csbp: divUp -> roundUp
Alexander Alekhin [Thu, 3 Oct 2013 18:57:39 +0000 (22:57 +0400)]
autogenerated code
Alexander Alekhin [Thu, 3 Oct 2013 18:57:05 +0000 (22:57 +0400)]
ocl: runtime, fix 32-bit builds
Ilya Lavrenov [Thu, 3 Oct 2013 15:17:54 +0000 (19:17 +0400)]
fixed ocl::integral and enabled perf test for it
Ilya Lavrenov [Thu, 3 Oct 2013 16:04:04 +0000 (20:04 +0400)]
refactored arithm binary operations in order to make them more scalable
Andrey Pavlenko [Fri, 4 Oct 2013 07:50:03 +0000 (11:50 +0400)]
Merge pull request #1561 from alalek:ocl_refactoring
Alexander Alekhin [Thu, 3 Oct 2013 16:00:41 +0000 (20:00 +0400)]
ocl: update module documentation
Alexander Alekhin [Thu, 3 Oct 2013 15:35:01 +0000 (19:35 +0400)]
ocl: update ocl samples
Alexander Alekhin [Thu, 3 Oct 2013 13:05:00 +0000 (17:05 +0400)]
ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp
Alexander Alekhin [Mon, 30 Sep 2013 17:32:46 +0000 (21:32 +0400)]
ocl: merge with upstream/2.4
Alexander Alekhin [Mon, 30 Sep 2013 15:07:37 +0000 (19:07 +0400)]
ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable
Alexander Alekhin [Wed, 25 Sep 2013 15:07:14 +0000 (19:07 +0400)]
ocl: file-based ProgramCache refactoring
Alexander Alekhin [Fri, 27 Sep 2013 12:41:25 +0000 (16:41 +0400)]
ocl: move program names into opencl_kernels.hpp
Alexander Alekhin [Fri, 20 Sep 2013 15:19:52 +0000 (19:19 +0400)]
ocl: split initialization.cpp into 3 files: context, operations, programcache
Ilya Lavrenov [Thu, 3 Oct 2013 07:36:49 +0000 (11:36 +0400)]
removed ocl::minMax_buf, updated doc (operation on matrices)
Roman Donchenko [Thu, 3 Oct 2013 12:52:10 +0000 (16:52 +0400)]
Merge pull request #1555 from ilya-lavrenov:ocl_convertC3C4
Roman Donchenko [Thu, 3 Oct 2013 08:11:50 +0000 (12:11 +0400)]
Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp.
Roman Donchenko [Thu, 3 Oct 2013 08:04:57 +0000 (12:04 +0400)]
Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp.
Roman Donchenko [Thu, 3 Oct 2013 07:54:40 +0000 (11:54 +0400)]
Merge pull request #1527 from vpisarev:shape_module
Alexander Smorkalov [Tue, 1 Oct 2013 08:47:03 +0000 (12:47 +0400)]
Android NDK r9 support. x64 NDK support fix for MacOS X.
Alexander Smorkalov [Tue, 1 Oct 2013 08:58:39 +0000 (12:58 +0400)]
Android NDK r9 support. x64 NDK support fix for MacOS X.
Ilya Lavrenov [Wed, 2 Oct 2013 19:21:28 +0000 (23:21 +0400)]
fixed convertC3C4 and convertC4C3 functions in case cols == 1
Pablo Speciale [Thu, 3 Oct 2013 00:10:27 +0000 (02:10 +0200)]
Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297)
Pablo Speciale [Wed, 2 Oct 2013 22:43:12 +0000 (00:43 +0200)]
After commit c7bbd1a, 'include_directories()' is needed in the CMakeLists.txt (user side). This commit updates the documentation.
Andrey Pavlenko [Wed, 2 Oct 2013 15:52:12 +0000 (19:52 +0400)]
Merge pull request #1507 from pengx17:2.4_fix_test
Andrey Pavlenko [Wed, 2 Oct 2013 15:50:34 +0000 (19:50 +0400)]
Merge pull request #1542 from alalek:cl_runtime
Alexander Alekhin [Wed, 2 Oct 2013 15:35:21 +0000 (19:35 +0400)]
removed invalid comment
Roman Donchenko [Wed, 2 Oct 2013 15:22:35 +0000 (19:22 +0400)]
Merge pull request #1543 from SpecLad:name-enum
Andrey Pavlenko [Wed, 2 Oct 2013 15:14:15 +0000 (19:14 +0400)]
Merge pull request #1549 from ilya-lavrenov:ocl_perf_norm
Andrey Pavlenko [Wed, 2 Oct 2013 15:13:59 +0000 (19:13 +0400)]
Merge pull request #1548 from ilya-lavrenov:ocl_bitwise_not
Roman Donchenko [Wed, 2 Oct 2013 14:52:37 +0000 (18:52 +0400)]
Merge pull request #1550 from SpecLad:flann-uninit-master
Alexander Alekhin [Sat, 14 Sep 2013 23:06:47 +0000 (03:06 +0400)]
ocl: cl_runtime: added autogenerated code
Alexander Alekhin [Sat, 14 Sep 2013 22:45:02 +0000 (02:45 +0400)]
ocl: dynamic load of OpenCL libraries
Support functions from OpenCL 1.1 / OpenCL 1.2
Ilya Lavrenov [Wed, 2 Oct 2013 12:39:05 +0000 (16:39 +0400)]
enabled ocl::norm perf test
Roman Donchenko [Wed, 2 Oct 2013 12:46:18 +0000 (16:46 +0400)]
Merge pull request #1547 from SpecLad:gtest-1.7
Roman Donchenko [Wed, 2 Oct 2013 12:09:45 +0000 (16:09 +0400)]
Cherry-picked mariusmuja/flann@
8c8b0e0cb879666797ab2ac51b9ee438bf84a183.
Original author: me.
Ilya Lavrenov [Wed, 2 Oct 2013 12:06:15 +0000 (16:06 +0400)]
fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2
Roman Donchenko [Wed, 2 Oct 2013 12:06:56 +0000 (16:06 +0400)]
Cherry-picked mariusmuja/flann@
b615f2694723fe402b8bbe50d77e622beff7f171.
Original author: Alex Wilson.
Roman Donchenko [Wed, 2 Oct 2013 12:02:11 +0000 (16:02 +0400)]
Revert "Fixed a bug in FLANN resulting in uninitialized accesses."
This reverts commit
a9975b144a22e76228125eb0a25f78ec13db6815, to prepare
for cherry-picking upstream's solution.
Roman Donchenko [Wed, 2 Oct 2013 10:47:29 +0000 (14:47 +0400)]
Merge pull request #1541 from SpecLad:merge-2.4
Roman Donchenko [Wed, 2 Oct 2013 10:41:00 +0000 (14:41 +0400)]
Updated Google Test to 1.7.0.
Roman Donchenko [Wed, 2 Oct 2013 09:37:33 +0000 (13:37 +0400)]
Merge remote-tracking branch 'origin/master' into merge-2.4
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
Roman Donchenko [Wed, 2 Oct 2013 08:52:32 +0000 (12:52 +0400)]
Merge pull request #1529 from vpisarev:polyfit_accuracy_2
Roman Donchenko [Wed, 2 Oct 2013 08:51:27 +0000 (12:51 +0400)]
Merge pull request #1451 from adrians:neon-pull2
Roman Donchenko [Wed, 2 Oct 2013 07:49:51 +0000 (11:49 +0400)]
Merge pull request #1474 from f-morozov:for_pr
Andrey Pavlenko [Tue, 1 Oct 2013 16:17:52 +0000 (20:17 +0400)]
Merge pull request #1533 from alalek:perf_test_update_relative_error_message
Andrey Pavlenko [Tue, 1 Oct 2013 16:16:47 +0000 (20:16 +0400)]
Merge pull request #1519 from ilya-lavrenov:ocl_minMax
Roman Donchenko [Tue, 1 Oct 2013 15:49:16 +0000 (19:49 +0400)]
Merge pull request #1526 from vpisarev:linedetector_python
Roman Donchenko [Tue, 1 Oct 2013 15:40:12 +0000 (19:40 +0400)]
Merge pull request #1525 from asmorkalov:ocv_custom_libv4l
Roman Donchenko [Tue, 1 Oct 2013 13:31:26 +0000 (17:31 +0400)]
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>.
Ilya Lavrenov [Tue, 1 Oct 2013 13:53:14 +0000 (17:53 +0400)]
removed test_norm.cpp from ocl tests
Roman Donchenko [Tue, 1 Oct 2013 13:39:18 +0000 (17:39 +0400)]
Merge pull request #1530 from alalek:perf_tests_sanity_check_nothing
Roman Donchenko [Tue, 1 Oct 2013 13:37:05 +0000 (17:37 +0400)]
Merge branch 'master' into merge-2.4
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
Roman Donchenko [Tue, 1 Oct 2013 13:07:39 +0000 (17:07 +0400)]
Merge pull request #1209 from nghiaho12:master
Alexander Alekhin [Mon, 30 Sep 2013 12:08:08 +0000 (16:08 +0400)]
ocl: perf test: disable MOG2 (random hungs), enable upload/download
Alexander Alekhin [Mon, 30 Sep 2013 12:07:50 +0000 (16:07 +0400)]
perf tests: added SANITY_CHECK_NOTHING()
Roman Donchenko [Tue, 1 Oct 2013 12:10:40 +0000 (16:10 +0400)]
Emergency fix: rename a conflicting label in the tutorials.
Roman Donchenko [Tue, 1 Oct 2013 11:57:33 +0000 (15:57 +0400)]
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
Roman Donchenko [Tue, 1 Oct 2013 11:29:33 +0000 (15:29 +0400)]
Merge pull request #1315 from dbloisi:add_bs_tutorial
Nghia Ho [Tue, 1 Oct 2013 11:03:54 +0000 (21:03 +1000)]
Removed trailing whitespace
Nghia Ho [Tue, 1 Oct 2013 09:56:47 +0000 (19:56 +1000)]
Merge remote-tracking branch 'upstream/master'
Ilya Lavrenov [Mon, 30 Sep 2013 14:58:32 +0000 (18:58 +0400)]
fixed and extended ocl::norm
Roman Donchenko [Tue, 1 Oct 2013 08:09:11 +0000 (12:09 +0400)]
Merge pull request #1512 from Exocoder:pre-gtk3
Tony [Mon, 30 Sep 2013 20:04:43 +0000 (21:04 +0100)]
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.
Alexander Alekhin [Sun, 29 Sep 2013 02:35:12 +0000 (06:35 +0400)]
perf test: update error message about relative error
Vadim Pisarevsky [Mon, 30 Sep 2013 15:28:11 +0000 (19:28 +0400)]
some more attempts to fix compile bug on Android
Roman Donchenko [Mon, 30 Sep 2013 14:06:53 +0000 (18:06 +0400)]
Merge pull request #1429 from nzjrs:fix-sketcher
Roman Donchenko [Mon, 30 Sep 2013 13:50:29 +0000 (17:50 +0400)]
Merge pull request #1457 from pengx17:2.4_oclsvm
Roman Donchenko [Mon, 30 Sep 2013 13:44:42 +0000 (17:44 +0400)]
Merge pull request #1477 from nzjrs:python-gethardwaresupport