Andrey Pavlenko
61567adc5d
Merge pull request #797 from vhdirk:installheaders
12 years ago
Roman Donchenko
7efb24917f
Merge pull request #887 from LeszekSwirski:fix-glinkedptrmutex
12 years ago
Roman Donchenko
b5c013682b
Merge pull request #907 from SpecLad:master
12 years ago
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
12 years ago
Roman Donchenko
389be67605
Merge pull request #853 from icylord:2.4
12 years ago
Vadim Pisarevsky
aee6a617a6
Merge pull request #897 from bitwangyaoyao:2.4_TVL1
12 years ago
Vadim Pisarevsky
416eaf2ae1
Merge pull request #896 from jet47:removed-vibe-master
12 years ago
yao
4162ebfad3
add OpticalFlowDual_TVL1_OCL function
12 years ago
Vladislav Vinogradov
49a4f27d42
removed VIBE implementation
12 years ago
Andrey Pavlenko
528db00095
Merge pull request #892 from jet47:removed-vibe
12 years ago
Vladislav Vinogradov
ec52096e30
removed VIBE implementation
12 years ago
Leszek Swirski
0e8c2b0395
Fix visibility of g_linked_ptr_mutex on Windows
...
Reverts some changes in b8ed00bd64
12 years ago
Vadim Pisarevsky
7d9041460a
Merge pull request #885 from pengx17:2.4_bfmatcher_ocl
12 years ago
Vadim Pisarevsky
4d866ea32e
Merge pull request #884 from pengx17:2.4_pyrup_fix
12 years ago
peng xiao
d053f2165d
Add BFMatcher_OCL class alias for BruteForceMatcher_OCL.
...
This adds a similar interface with pure-cpp and gpu versions.
12 years ago
peng xiao
3f93c3cc4e
Clean up spaces in ocl.hpp
12 years ago
peng xiao
1ecc765903
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix
12 years ago
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
12 years ago
Vadim Pisarevsky
2a646f7626
Merge pull request #862 from piponazo:v4lFPS
12 years ago
Vadim Pisarevsky
25e6902a43
Merge pull request #818 from bitwangyaoyao:2.4_optBlur
12 years ago
Vadim Pisarevsky
54afb85d0c
Merge pull request #823 from pickle27:starter_image_sequence
12 years ago
Vadim Pisarevsky
bd1d7cd208
Merge pull request #839 from pengx17:2.4_ocl_csbp
12 years ago
Vadim Pisarevsky
87765c0f16
Merge pull request #883 from bitwangyaoyao:2.4_fixMoments
12 years ago
yao
1d1d28baf2
fix black screen when input Mat is large
12 years ago
Andrey Pavlenko
87fcd2342f
Merge pull request #878 from apavlenko:better_glue_search
12 years ago
Vadim Pisarevsky
35d8fa444b
Merge pull request #849 from dominikrose:dom_2.4
12 years ago
Vadim Pisarevsky
d79c05fec9
Merge pull request #872 from pengx17:2.4_create2dimage_fix
12 years ago
Vadim Pisarevsky
6eb5a95a59
Merge pull request #871 from bitwangyaoyao:2.4_acry
12 years ago
Vadim Pisarevsky
14c50d2fce
Merge pull request #874 from pengx17:master_queryDeviceInfo_rewrite
12 years ago
Vadim Pisarevsky
fd83f2f5ca
Merge pull request #819 from bitwangyaoyao:2.4_haarBuf
12 years ago
Vadim Pisarevsky
c549ec8371
Merge pull request #850 from SpecLad:convhull-orientation
12 years ago
Vadim Pisarevsky
6e44e0a476
Merge pull request #881 from apavlenko:hidden_visibility
12 years ago
Andrey Pavlenko
885566295a
Merge pull request #840 from pablospe:master
12 years ago
Andrey Pavlenko
d94ecf40e6
Merge pull request #880 from apavlenko:qt-5.0
12 years ago
Andrey Pavlenko
0fec2eb6e5
Merge pull request #879 from apavlenko:gcc-4.8
12 years ago
Vadim Pisarevsky
e4d4b07f00
Merge pull request #873 from prclibo:2.4
12 years ago
Andrey Kamaev
b8ed00bd64
Compile OpenCV with GCC visibility set to hidden
12 years ago
Andrey Kamaev
f856f78ac0
Update CMake scripts to recognize Qt 5.0
12 years ago
Andrey Kamaev
2665c39a0d
Fix build warnings from gcc 4.8
12 years ago
Andrey Kamaev
60059a7aa0
Improve handling of native_app_glue dependency in Android samples
12 years ago
yao
e23884a238
fix the warnings in fft tests
12 years ago
Vadim Pisarevsky
9cce8ca4b6
Merge pull request #864 from pengx17:2.4_stereobm
12 years ago
Vadim Pisarevsky
1348e7cd4d
Merge pull request #877 from apavlenko:version_info_in_test_log
12 years ago
Andrey Pavlenko
d5881bc00a
adding version info to test log
12 years ago
Vadim Pisarevsky
8130d92602
Merge pull request #841 from Pastafarianist:patch-1
12 years ago
Vadim Pisarevsky
103ee12f00
Merge pull request #845 from githubuser0xFFFF:master
12 years ago
Vadim Pisarevsky
4b49b84976
Merge pull request #848 from pengx17:master_ocl_platform_name
12 years ago
Vadim Pisarevsky
f1e8f69d2c
Merge pull request #861 from albenoit:master
12 years ago
Vadim Pisarevsky
7f083a049d
Merge pull request #867 from Pastafarianist:patch-2
12 years ago
yao
ada8f92cc7
fix warnings, unify test names
12 years ago