Hilton Bristow
|
068b1bc3d0
|
More generic todict
|
11 years ago |
Hilton Bristow
|
72d5609a36
|
Merged upstream master
|
11 years ago |
Roman Donchenko
|
7ecbf45751
|
Merge pull request #2435 from SpecLad:merge-2.4
|
11 years ago |
Roman Donchenko
|
db85c35e69
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
|
11 years ago |
Roman Donchenko
|
af8aa8a2fa
|
Merge pull request #2433 from ilya-lavrenov:typos
|
11 years ago |
Ilya Lavrenov
|
eedf86402d
|
typos
|
11 years ago |
Andrey Pavlenko
|
409bd162ff
|
Merge pull request #2421 from akarsakov:fix_ocl_haar_intel
|
11 years ago |
Andrey Pavlenko
|
37580687e6
|
Merge pull request #2427 from alalek:ocl_build_log
|
11 years ago |
Alexander Alekhin
|
b9d68ef061
|
core/ocl: OpenCL build log improvements
|
11 years ago |
Andrey Pavlenko
|
57b6850d74
|
Merge pull request #2415 from vpisarev:fix_stereobm_sse
|
11 years ago |
Alexander Karsakov
|
e6f6707558
|
OCL: Fix for Haar classifier (thanks to Konstantin Rodyushkin).
|
11 years ago |
Roman Donchenko
|
7dc22b4ea6
|
Merge pull request #2419 from linquize:tgit.icon
|
11 years ago |
Linquize
|
a228633d31
|
Add tgit.icon project config
|
11 years ago |
Roman Donchenko
|
bd5d8404c9
|
Merge pull request #2393 from ilya-lavrenov:coverity
|
11 years ago |
Roman Donchenko
|
693129902d
|
Merge pull request #2399 from SpecLad:merge-2.4
|
11 years ago |
Vadim Pisarevsky
|
a3aced20c1
|
fixed difference between SSE2 and C branches of StereoBM; they should now produce absolutely the same results
|
11 years ago |
Roman Donchenko
|
c9a4a82667
|
Merge pull request #2358 from rohitgirdhar:rotatedRect
|
11 years ago |
Ilya Lavrenov
|
ce0557ebb8
|
fixed defects from Xcode
|
11 years ago |
Roman Donchenko
|
1db1a83410
|
Merge pull request #2410 from asmorkalov:android_tiff_lowmem_fix
|
11 years ago |
Roman Donchenko
|
48432502b6
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
|
11 years ago |
Roman Donchenko
|
3693facd9e
|
Merge pull request #2412 from arunjvs:master
|
11 years ago |
Arun JVS
|
31fb7c4fec
|
Fixed Bug #3568: Build fails with WITH_OPENGL=ON
|
11 years ago |
Roman Donchenko
|
7dc549f166
|
Merge pull request #2411 from asmorkalov:android_mat_leak_fix
|
11 years ago |
Alexander Smorkalov
|
c78142acb0
|
Bug #3391 org.opencv.android.NativeCameraView crashes after latest OpenCV Manager update fixed.
The crash was cased by massive Mat objects leak in NativeCameraView class.
|
11 years ago |
Alexander Smorkalov
|
dbb7aa7856
|
Highgui_Tiff.decode_tile16384x16384 disabled for Android.
Last changes in test leads to SIGKILL on Android.
SIGKILL is called by out of memory killer.
|
11 years ago |
Andrey Pavlenko
|
d695d4a0bf
|
Merge pull request #2406 from ilya-lavrenov:abf
|
11 years ago |
Ilya Lavrenov
|
e1a598c5b3
|
disabled ABF tests
|
11 years ago |
Andrey Pavlenko
|
73dfc4cb8c
|
Merge pull request #2402 from ilya-lavrenov:amd_libs
|
11 years ago |
Andrey Pavlenko
|
3845b96f6c
|
Merge pull request #2388 from alalek:coverity_bug_fix
|
11 years ago |
Andrey Pavlenko
|
52a339cba5
|
Merge pull request #2401 from akarsakov:fix_elem_size
|
11 years ago |
Andrey Pavlenko
|
0f43345f9e
|
Merge pull request #2394 from ilya-lavrenov:tapi_memop_fix
|
11 years ago |
Ilya Lavrenov
|
16bfdbd22a
|
dump AMD Blas/Fft
|
11 years ago |
Alexander Karsakov
|
6d83048ec3
|
Fixed incorrect calculation of element size in OCL.(Mul/Div).Mat_Scalar_Scale.
|
11 years ago |
Roman Donchenko
|
681a8c6e18
|
Merge pull request #2398 from nghiaho12:integral_doc
|
11 years ago |
Nghia Ho
|
ced8e7a813
|
Typo
|
11 years ago |
Roman Donchenko
|
2b0c3eb170
|
Merge pull request #2389 from SpecLad:ios-big-endian
|
11 years ago |
Roman Donchenko
|
1cf75c0cab
|
Hardcode iOS's endianness, since the TestBigEndian module doesn't work there
|
11 years ago |
Ilya Lavrenov
|
32eb38ec98
|
fixed defects from coverity.com
|
11 years ago |
Ilya Lavrenov
|
0406898b9a
|
int2 -> ulong; to work properly with 3 channels
|
11 years ago |
Rohit Girdhar
|
fd4461d543
|
addressed issues
|
11 years ago |
Roman Donchenko
|
0a90d6dde6
|
Merge pull request #2266 from vpisarev:ipp_norm_fix
|
11 years ago |
Vadim Pisarevsky
|
51dafc780b
|
fixed hint type declaration
|
11 years ago |
Roman Donchenko
|
51421098dd
|
Merge pull request #2201 from mattip:2.4
|
11 years ago |
Matti Picus
|
dc50dc7254
|
fix merge
|
11 years ago |
Andrey Pavlenko
|
3e5890694e
|
Merge pull request #2384 from ilya-lavrenov:perf_match
|
11 years ago |
Alexander Alekhin
|
9b3c76a3db
|
TAPI: coverity bug fix
|
11 years ago |
Matti Picus
|
f5330a44e8
|
merge with origin
|
11 years ago |
Rohit Girdhar
|
347a3dc520
|
added randomized test
|
11 years ago |
Matti Picus
|
31c8f2ec57
|
fix code, it turns out only TIFFReadRGBATile needs buffer pointer mangling
|
11 years ago |
Matti Picus
|
46d128e073
|
add test (needs updated opencv_extra repo)
|
11 years ago |