lluis
ca6b30a568
using explicit keyword in the ERStat constructor for safe contruction
11 years ago
lluis
9fbff009e9
fixed compilation errors and warnings on builds 3298 and 4384
11 years ago
lluis
6adba09463
fixed some warnings on build 4285
11 years ago
lluis
1d8e80aa3b
add opencv_ml headers to precomp
11 years ago
lluis
5abe3b59f5
Class-specific Extremal Region Filter algorithm as proposed in :
...
Neumann L., Matas J.: Real-Time Scene Text Localization and Recognition, CVPR 2012.
High-level C++ interface and implementation of algorithm is in the objdetect module.
C++ example, a test image, and the default classifiers in xml files.
11 years ago
Roman Donchenko
d81d3fc830
Merge pull request #921 from SpecLad:merge-2.4
12 years ago
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
12 years ago
Roman Donchenko
56121d01ea
Merge pull request #911 from jrdi:patch-1
12 years ago
Roman Donchenko
cfa985db43
Merge pull request #917 from SpecLad:cuda-4-build
12 years ago
Roman Donchenko
dad58d8940
Fix a build error which manifests when building with CUDA < 5.
12 years ago
Roman Donchenko
4da0cdb959
Merge pull request #914 from SpecLad:master
12 years ago
Roman Donchenko
324cafdda6
Merge pull request #904 from ograycode:2.4
12 years ago
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
12 years ago
Jordi Villar
ee29b0454c
fix parenthesis
12 years ago
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
519ee72f6f
Merge pull request #905 from bitwangyaoyao:2.4_TVL1
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
Andrey Pavlenko
d4255b7f75
Merge pull request #902 from apavlenko:fix_run_py
12 years ago
Vadim Pisarevsky
cbbc82a789
Merge pull request #882 from pengx17:2.4_rewrite_query_info
12 years ago
Vadim Pisarevsky
b51a1a7d15
Merge pull request #895 from bitwangyaoyao:2.4_perf
12 years ago
Roman Donchenko
389be67605
Merge pull request #853 from icylord:2.4
12 years ago
yao
d8b192c84d
Fix the mismatch on NV GPUs
12 years ago
ograycode
97e9368e75
Simple set of the camera index to allow the user to change it after the object has been initialized.
12 years ago
Andrey Pavlenko
4af104aaae
'aapt' tool moved in SDK r22, adding support to run.py
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
04399a27d0
fix a warning
12 years ago
yao
4162ebfad3
add OpticalFlowDual_TVL1_OCL function
12 years ago
Vladislav Vinogradov
49a4f27d42
removed VIBE implementation
12 years ago
yao
03c55db4fb
fix the waring in gemm test
12 years ago
yao
5f20fce6fd
add accuracy tests while running perf
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
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.
12 years ago
Andrey Pavlenko
87fcd2342f
Merge pull request #878 from apavlenko:better_glue_search
12 years ago