IanVS
41fc41829c
Updated documentation to new "COLOR_" format for color conversion enums.
2013-06-05 21:59:01 -04:00
Vadim Pisarevsky
6e119049ce
Merge pull request #945 from malcolmreynolds:master
2013-06-04 13:32:34 +04:00
Malcolm Reynolds
a9c9210bf9
update safe_call.hpp to fix OpenCL import on case sensitive mac FS
...
On a Mac with a case sensitive filesystem <OpenCL/OpenCL.h> does not exist but <OpenCL/opencl.h> does. I presume (!), but have no way to test, that on a Mac with case insensitive FS this change will make no difference.
2013-06-03 18:07:05 +02:00
Malcolm Reynolds
229ff632b6
update util.hpp to fix OpenCL import on case sensitive mac FS
...
On a Mac with a case sensitive filesystem <OpenCL/OpenCL.h> does not exist but <OpenCL/opencl.h> does. I presume (!), but have no way to test, that on a Mac with case insensitive FS this change will make no difference.
2013-06-03 18:06:25 +02:00
Roman Donchenko
d81d3fc830
Merge pull request #921 from SpecLad:merge-2.4
2013-05-29 16:24:49 +04:00
Roman Donchenko
5ac3b8d5d8
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Pull requests:
#904 from ograycode:2.4
#905 from bitwangyaoyao:2.4_TVL1
#902 from apavlenko:fix_run_py
#882 from pengx17:2.4_rewrite_query_info
Conflicts:
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/hog.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/tvl1flow.cpp
2013-05-27 16:58:04 +04:00
Roman Donchenko
56121d01ea
Merge pull request #911 from jrdi:patch-1
2013-05-23 15:17:55 +04:00
Roman Donchenko
cfa985db43
Merge pull request #917 from SpecLad:cuda-4-build
2013-05-23 15:15:00 +04:00
Roman Donchenko
dad58d8940
Fix a build error which manifests when building with CUDA < 5.
2013-05-23 14:00:13 +04:00
Roman Donchenko
4da0cdb959
Merge pull request #914 from SpecLad:master
2013-05-23 13:54:57 +04:00
Roman Donchenko
324cafdda6
Merge pull request #904 from ograycode:2.4
2013-05-22 18:46:40 +04:00
Roman Donchenko
5e0e1fac87
Merge commit 'b51a1a7d' (PR #895 from 2.4)
...
Conflicts:
modules/ocl/CMakeLists.txt
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
2013-05-22 18:28:28 +04:00
Jordi Villar
ee29b0454c
fix parenthesis
2013-05-22 13:57:43 +03:00
Andrey Pavlenko
61567adc5d
Merge pull request #797 from vhdirk:installheaders
2013-05-22 13:54:20 +04:00
Roman Donchenko
7efb24917f
Merge pull request #887 from LeszekSwirski:fix-glinkedptrmutex
2013-05-22 12:57:04 +04:00
Roman Donchenko
519ee72f6f
Merge pull request #905 from bitwangyaoyao:2.4_TVL1
2013-05-22 12:08:16 +04:00
Roman Donchenko
b5c013682b
Merge pull request #907 from SpecLad:master
2013-05-22 12:03:28 +04:00
Roman Donchenko
029fce10c9
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
Andrey Pavlenko
d4255b7f75
Merge pull request #902 from apavlenko:fix_run_py
2013-05-21 14:07:32 +04:00
Vadim Pisarevsky
cbbc82a789
Merge pull request #882 from pengx17:2.4_rewrite_query_info
2013-05-20 14:01:03 +04:00
Vadim Pisarevsky
b51a1a7d15
Merge pull request #895 from bitwangyaoyao:2.4_perf
2013-05-20 14:00:47 +04:00
Roman Donchenko
389be67605
Merge pull request #853 from icylord:2.4
2013-05-20 12:11:47 +04:00
yao
d8b192c84d
Fix the mismatch on NV GPUs
2013-05-20 14:46:17 +08:00
ograycode
97e9368e75
Simple set of the camera index to allow the user to change it after the object has been initialized.
2013-05-19 22:04:56 -04:00
Andrey Pavlenko
4af104aaae
'aapt' tool moved in SDK r22, adding support to run.py
2013-05-19 14:57:21 +04:00
Vadim Pisarevsky
aee6a617a6
Merge pull request #897 from bitwangyaoyao:2.4_TVL1
2013-05-19 00:23:24 +04:00
Vadim Pisarevsky
416eaf2ae1
Merge pull request #896 from jet47:removed-vibe-master
2013-05-17 14:44:49 +04:00
yao
04399a27d0
fix a warning
2013-05-17 15:44:22 +08:00
yao
4162ebfad3
add OpticalFlowDual_TVL1_OCL function
2013-05-17 15:34:22 +08:00
Vladislav Vinogradov
49a4f27d42
removed VIBE implementation
2013-05-17 11:27:00 +04:00
yao
03c55db4fb
fix the waring in gemm test
2013-05-17 13:19:09 +08:00
yao
5f20fce6fd
add accuracy tests while running perf
2013-05-17 13:18:46 +08:00
Andrey Pavlenko
528db00095
Merge pull request #892 from jet47:removed-vibe
2013-05-16 18:44:07 +04:00
Vladislav Vinogradov
ec52096e30
removed VIBE implementation
2013-05-16 13:47:24 +04:00
Leszek Swirski
0e8c2b0395
Fix visibility of g_linked_ptr_mutex on Windows
...
Reverts some changes in b8ed00bd64
2013-05-15 14:42:28 +01:00
Vadim Pisarevsky
7d9041460a
Merge pull request #885 from pengx17:2.4_bfmatcher_ocl
2013-05-15 14:21:50 +04:00
Vadim Pisarevsky
4d866ea32e
Merge pull request #884 from pengx17:2.4_pyrup_fix
2013-05-15 14:18:54 +04:00
peng xiao
d053f2165d
Add BFMatcher_OCL class alias for BruteForceMatcher_OCL.
...
This adds a similar interface with pure-cpp and gpu versions.
2013-05-15 10:47:17 +08:00
peng xiao
3f93c3cc4e
Clean up spaces in ocl.hpp
2013-05-15 10:43:47 +08:00
peng xiao
1ecc765903
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix
2013-05-15 08:55:43 +08:00
peng xiao
df3997b108
Fix ocl::pyrUp
...
Use predefined OpenCL function to convert integers to floating points.
This is more accurate than before as it enables:
1. saturate cast
2. customized rounding
2013-05-15 08:51:21 +08:00
Vadim Pisarevsky
2a646f7626
Merge pull request #862 from piponazo:v4lFPS
2013-05-14 16:00:28 +04:00
Vadim Pisarevsky
25e6902a43
Merge pull request #818 from bitwangyaoyao:2.4_optBlur
2013-05-14 15:56:56 +04:00
Vadim Pisarevsky
54afb85d0c
Merge pull request #823 from pickle27:starter_image_sequence
2013-05-14 15:56:35 +04:00
Vadim Pisarevsky
bd1d7cd208
Merge pull request #839 from pengx17:2.4_ocl_csbp
2013-05-14 15:56:07 +04:00
Vadim Pisarevsky
87765c0f16
Merge pull request #883 from bitwangyaoyao:2.4_fixMoments
2013-05-14 15:55:38 +04:00
yao
1d1d28baf2
fix black screen when input Mat is large
2013-05-14 18:02:53 +08:00
peng xiao
ac21cabda2
Copy ocl::queryDeviceInfo interface from master to 2.4.
...
Affected functions surf.ocl, pyrlk.ocl and hog.ocl are updated with the change.
2013-05-14 17:50:38 +08:00
Andrey Pavlenko
87fcd2342f
Merge pull request #878 from apavlenko:better_glue_search
2013-05-14 11:57:25 +04:00
Vadim Pisarevsky
35d8fa444b
Merge pull request #849 from dominikrose:dom_2.4
2013-05-13 23:38:26 +04:00
