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
2013-12-03 17:35:21 +04:00
Andrey Pavlenko
8db6d9f9b2
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
2013-12-03 11:20:48 +04:00
Andrey Pavlenko
368bac7af6
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test
2013-12-02 20:38:49 +04:00
Roman Donchenko
aed69cc458
Merge pull request #1882 from philippefoubert:branch_ocl_instrumentation
2013-12-02 18:55:47 +04:00
Alexander Smorkalov
eab7603096
Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.
2013-12-02 17:51:29 +04:00
Philippe FOUBERT
ec6f2e1c4d
Using cv::String instead of std::string.
2013-12-01 16:41:17 +01:00
Philippe FOUBERT
c056e7fc61
Correction to be able to compile using the directive PRINT_KERNEL_RUN_TIME
2013-11-28 00:26:37 +01:00
Roman Donchenko
2fed668390
Fixed build errors.
2013-11-27 12:59:19 +04:00
Roman Donchenko
920fd48228
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
modules/ocl/src/arithm.cpp
2013-11-26 15:32:44 +04:00
Roman Donchenko
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
Andrey Pavlenko
d45ce086c1
Merge pull request #1856 from alalek:ocl_fix_mt
2013-11-26 09:58:22 +04:00
Roman Donchenko
4c5593b633
Merge pull request #1837 from asmorkalov:android_opencl
2013-11-25 12:19:20 +04:00
Roman Donchenko
dd817857b4
Replaced most of the instances of "s = s +" with "s +=".
...
This resynchronizes master code with 2.4. I say "most", because I might
have missed some due to different spacing; I'll deal with those
instances later if I find them.
2013-11-22 17:59:56 +04:00
Alexander Smorkalov
514e97223c
Some hacks to build and run OpenCL on Qualcomm S800.
...
Some of functions were enabled on Qualcomm S800 by changing grid size;
OpenCL kernel grid size unification for different platfroms;
Test pass rate improvements by inclreasing threshold;
Some tests were disabled for Android;
run.py was adopted for devices with brackets in in name.
2013-11-22 16:13:38 +04:00
Alexander Alekhin
d650efc069
ocl: multi-threading: opencl buffer memory guard
2013-11-22 14:39:51 +04:00
Alexander Alekhin
96a4a7b339
ocl: multi-threading: fix bug in intialization
2013-11-22 14:39:33 +04:00
Ilya Lavrenov
60b59eeb73
workaround for AMD bug: UNREACHABLE EXECUTED
2013-11-20 15:40:56 +04:00
Roman Donchenko
e69d2c1bb1
Merge pull request #1819 from ilya-lavrenov:ocl_resize_AREA
2013-11-19 16:25:47 +04:00
Roman Donchenko
aacf188e83
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/color.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_color.cpp
samples/cpp/3calibration.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
samples/cpp/Qt_sample/main.cpp
samples/cpp/camshiftdemo.cpp
samples/cpp/descriptor_extractor_matcher.cpp
samples/cpp/distrans.cpp
samples/cpp/generic_descriptor_match.cpp
samples/cpp/grabcut.cpp
samples/cpp/morphology2.cpp
samples/cpp/segment_objects.cpp
samples/cpp/stereo_calib.cpp
samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
samples/cpp/video_dmtx.cpp
2013-11-19 16:21:09 +04:00
Ilya Lavrenov
198cd1a40d
added area fast mode to ocl::resize
2013-11-19 13:43:50 +04:00
Ilya Lavrenov
c0456df611
workaround for ocl::absSum (eliminated error: unreachable executed)
2013-11-18 20:38:39 +04:00
Ilya Lavrenov
f70d63e4c9
added INTER_AREA interpolation to ocl::resize
2013-11-18 18:28:49 +04:00
Roman Donchenko
4fd1960425
Merge pull request #1807 from KonstantinMatskevich:intel_bug
2013-11-18 15:16:37 +04:00
Roman Donchenko
3f927abb4d
Merge pull request #1809 from ilya-lavrenov:ocl_resize_nn
2013-11-18 14:55:24 +04:00
Konstantin Matskevich
327d9f274b
fixed Split for device version equals 78712
2013-11-18 13:20:57 +04:00
Konstantin Matskevich
0e1717c14c
fixing bugs for Intel platform CPU device
2013-11-18 13:20:54 +04:00
Roman Donchenko
f5ded41016
Merge pull request #1808 from alalek:ocl_fix_cvtcolor_xyz
2013-11-18 12:20:58 +04:00
Alexander Alekhin
0a698bf145
ocl: fix cvtColor XYZ: variables on stack
2013-11-16 13:45:39 +04:00
Ilya Lavrenov
cc237b7aba
generalized ocl::resize for all data types (INTER_NEAREST mode)
2013-11-15 22:52:29 +04:00
Roman Donchenko
4e2ec7b97d
Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor
2013-11-15 15:55:29 +04:00
Roman Donchenko
be88b20154
Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor
2013-11-14 14:46:43 +04:00
Roman Donchenko
19b3064706
Merge pull request #1790 from ilya-lavrenov:ocl_ref
2013-11-14 14:45:50 +04:00
Ilya Lavrenov
fe76b2116a
added RGBA <-> mRGBA
2013-11-14 12:02:59 +04:00
Ilya Lavrenov
1b7c5b201d
added HLS -> RGB[A][FULL] conversion
2013-11-13 19:35:24 +04:00
Ilya Lavrenov
98915e06bc
added HSV -> RGB[A][FULL] conversion
2013-11-13 19:10:06 +04:00
Ilya Lavrenov
3bdd9626f3
added RGB[A] -> HLS[FULL] conversion
2013-11-13 17:41:40 +04:00
Ilya Lavrenov
af7c614438
added RGB[A] -> HSV[FULL] conversion
2013-11-13 17:09:05 +04:00
Roman Donchenko
54ea5bbac7
Merge pull request #1779 from perping:integral_2.4
2013-11-13 15:53:42 +04:00
Ilya Lavrenov
6770c04073
refactored some functions from ocl arithm
2013-11-13 13:56:49 +04:00
Roman Donchenko
376993be4c
Merge pull request #1785 from ilya-lavrenov:ocl_kern_warn
2013-11-13 12:20:09 +04:00
perping
185059959b
fix haar
2013-11-13 10:19:09 +08:00
perping
1e2fb6de30
fix match_template and haar
2013-11-13 10:09:39 +08:00
Ilya Lavrenov
0bf7350615
fixed compilation of ocl::minMaxLoc for Intel device
2013-11-12 19:14:40 +04:00
Ilya Lavrenov
96121a66c5
kernel warnings on AMD
2013-11-12 15:06:46 +04:00
Roman Donchenko
a81efdbb25
Merge pull request #1775 from ilya-lavrenov:ocl_cvtColor
2013-11-12 14:26:50 +04:00
perping
d6e0ef2710
fix linux warning.
2013-11-12 18:13:44 +08:00
perping
dee584ee15
fix haar
2013-11-12 17:54:03 +08:00
Roman Donchenko
ef4eadd5d3
Merge pull request #1766 from ilya-lavrenov:ocl_remap_linear
2013-11-12 12:40:14 +04:00
Roman Donchenko
46e423d217
Merge pull request #1773 from ilya-lavrenov:ocl_buildWarpPerspectiveMaps
2013-11-12 12:26:37 +04:00
perping
8af626d295
fix some bug about haar and match_template.
2013-11-12 13:56:47 +08:00
