Roman Donchenko
3509018bd6
Merge pull request #1916 from alalek:ocl_moments_fix_perf
11 years ago
Andrey Pavlenko
1966e7cea9
fixing compilation on Linux
11 years ago
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
11 years ago
Roman Donchenko
2b31055914
Fixed the "platfrom" typo everywhere.
11 years ago
Andrey Pavlenko
b5dbe9e04b
Added patch from master for fixing VS2013 in 3rd party lib OpenEXR
11 years ago
Alexander Alekhin
c962a9d61c
ocl:perf: fix moments test for plain impl
11 years ago
Vladislav Vinogradov
adb2040980
added additional check in cv::gpu::demosaicing that source is not empty
11 years ago
Vladislav Vinogradov
14ee306b9e
fix gpu test for Demosaicing:
...
check that input images was loaded correctly
11 years ago
Konstantin Matskevich
eaf620ddde
small fix
11 years ago
Konstantin Matskevich
14dccdf23d
T-API cv::log, cv::exp, cv::magnitude, cv::phase
11 years ago
Roman Donchenko
35ea600c54
Merge pull request #1891 from alalek:cv_error_noreturn
11 years ago
Roman Donchenko
df136339ff
Merge pull request #1907 from severin-lemaignan:emscripten-2.4
11 years ago
Andrey Pavlenko
bd9d3dd561
fixing build of 2.4 branch with VC12 (aka 2013)
...
(master branch was fixed before, no need to merge this to master!)
- disable openexr (numerous undefined std::min & std::max)
- workaround for two compilator bugs
11 years ago
Roman Donchenko
d2b46d421f
Merge pull request #1910 from alalek:ts_perf_warmuptype
11 years ago
Alexander Alekhin
cb4267cb38
ts/perf: int -> enum WarmUpType
11 years ago
Séverin Lemaignan
9ce9fc3361
Ensure compilation to Javascript with Emscripten
11 years ago
Roman Donchenko
17f53bc301
Merge pull request #1904 from severin-lemaignan:emscripten
11 years ago
Roman Donchenko
6e9a7706ce
Merge pull request #1890 from alalek:ts_fix_seh_exceptions_handling
11 years ago
Andrey Pavlenko
3ff1620086
Merge pull request #1899 from berak:b_3171_24
11 years ago
Andrey Pavlenko
8db6d9f9b2
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
11 years ago
Andrey Pavlenko
0a624ee67d
Merge pull request #1901 from vpisarev:ocl_svm3
11 years ago
Alexander Alekhin
206b56ed39
ts: catch & append general exceptions into log
11 years ago
Vadim Pisarevsky
cd97d789b6
dummy commit to rerun pre-commit tests
11 years ago
Andrey Pavlenko
368bac7af6
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test
11 years ago
Andrey Pavlenko
19ceab13f2
Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix
11 years ago
Roman Donchenko
aed69cc458
Merge pull request #1882 from philippefoubert:branch_ocl_instrumentation
11 years ago
Roman Donchenko
790f53f12a
Merge pull request #1887 from jet47:android-cuda-6.0
11 years ago
Vadim Pisarevsky
161c3b71e6
hopefully, now opencv_test_imgproc should pass
11 years ago
Roman Donchenko
f7f194e5dd
Merge pull request #1797 from moodoki:bugfix_3344
11 years ago
Alexander Smorkalov
eab7603096
Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.
11 years ago
Roman Donchenko
838961a289
Merge pull request #1897 from berak:b_3393_24
11 years ago
Séverin Lemaignan
efe564e3b3
Ensure compilation to Javascript with Emscripten
11 years ago
Roman Donchenko
fb568755a1
Merge pull request #1898 from berak:b_3349_24
11 years ago
Vadim Pisarevsky
5fea17ff0d
still trying to fix failure in opencv_test_imgproc
11 years ago
Roman Donchenko
b27d7d2a61
Merge pull request #1886 from ilya-lavrenov:tapi_lut
11 years ago
Roman Donchenko
0bbd768d9d
Merge pull request #1884 from asmorkalov:winrt_img_proc_sample
11 years ago
Roman Donchenko
f20af817d4
Merge pull request #1894 from asmorkalov:ocv_debug_build
11 years ago
Vadim Pisarevsky
7626a8e8de
try to eliminate failure in opencv_imgproc_test
11 years ago
Vadim Pisarevsky
82b852c13c
yet another attempt to make Core_UMat.getUMat test work
11 years ago
Vadim Pisarevsky
9be727b1ea
another attempt to fix Core_UMat.getUMat test
11 years ago
Vadim Pisarevsky
f263fe145a
trying to guess and fix strange failure in core test
11 years ago
Vadim Pisarevsky
d7f4a223cf
fixed several compile errors/warnings; reacted on the PR comments
11 years ago
Philippe FOUBERT
ec6f2e1c4d
Using cv::String instead of std::string.
11 years ago
Vadim Pisarevsky
6da5d21331
fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance
11 years ago
berak
34a390fbc2
CV_WRAP for BackgroundSubtractorMOG2
11 years ago
berak
059bf1d9e5
corrected initialization of output_folder in facereco examples
11 years ago
berak
773616ee04
swapped x,y in elbp_
11 years ago
Alexander Alekhin
c1cfb4d422
core: added cv::error with CV_NORETURN attr
11 years ago
Andrey Pavlenko
429ab8ebee
Merge pull request #1845 from StevenPuttemans:bugfix_3306
11 years ago
Andrey Pavlenko
daefe6983f
Merge pull request #1878 from ilya-lavrenov:ocl_resize_area_master
11 years ago