Andrey Pavlenko
96a228fd7e
Merge pull request #1866 from ilya-lavrenov:ocl_fix2
2013-11-26 23:27:49 +04:00
Andrey Pavlenko
736097a462
Merge pull request #1868 from KonstantinMatskevich:umat_bugfix
2013-11-26 23:24:51 +04:00
Roman Donchenko
aaf97c4548
Merge pull request #1863 from nevion:master
2013-11-26 13:53:48 +04:00
Roman Donchenko
e7339ac11a
Merge pull request #1818 from GregoryMorse:patch-2
2013-11-26 13:00:56 +04:00
Roman Donchenko
e20f7014cf
Merge pull request #1835 from SpecLad:windows-xadd
2013-11-26 11:43:34 +04:00
Roman Donchenko
05e22ee8c9
Merge pull request #1859 from SpecLad:string-plus-equals
2013-11-26 11:40:37 +04:00
GregoryMorse
e4793e3d5e
Update system.cpp
...
Fixed to use native C++ instead of C++/CX although it does require significantly more code, it goes along with the spirit of keeping the project in native C++
Update system.cpp
Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
Update system.cpp
Fixed compiler warning over comma operator clause
Update system.cpp
NULL initialization
Update system.cpp
Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
Update system.cpp
Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference.
Update system.cpp
Fixed conditional compilation around include and library
Update system.cpp
Fixed trailing space
Update system.cpp
Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
Update system.cpp
Fixed compiler warning over comma operator clause
Update system.cpp
NULL initialization
Update system.cpp
Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
Update system.cpp
Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference.
Update system.cpp
Fixed conditional compilation around include and library
Update system.cpp
Fixed trailing space
2013-11-26 00:22:14 +08:00
Konstantin Matskevich
145855767c
bugfix in deallocate
2013-11-25 17:16:22 +04:00
Ilya Lavrenov
9d23a0cb81
fixed ocl_arithm_op; fix for 3-channel images is needed
2013-11-25 14:21:12 +04:00
Roman Donchenko
684ff70308
Merge pull request #1864 from berak:mouse_and_match
2013-11-25 12:15:52 +04:00
Roman Donchenko
52e810ed33
Merge pull request #1850 from ilya-lavrenov:pthread_mutex
2013-11-25 12:04:17 +04:00
berak
10639d63f5
mouse_and_match.py missing import cv2
2013-11-24 15:58:13 +01:00
Jason Newton
88b2fe9dbb
correct upper bound for maximum number of labels for 8-way connectivity
2013-11-24 01:20:07 -08:00
Andrey Pavlenko
3ab47300ce
Merge pull request #1862 from alalek:ocl_disable_tests
2013-11-23 18:54:52 +04:00
Alexander Alekhin
fd4a7e7d1f
ocl: disable tests
2013-11-23 18:13:32 +04:00
Andrey Pavlenko
b157cc17e9
Merge pull request #1857 from alalek:ocl_ta_tests_infra
2013-11-23 16:44:58 +04:00
Andrey Pavlenko
b82c55de12
Merge pull request #1861 from ilya-lavrenov:ocl_args_fix
2013-11-23 16:44:38 +04:00
Ilya Lavrenov
1af95ea12c
fixed error in setting kernel arguments
2013-11-22 18:56:03 +04:00
Alexander Alekhin
881e837520
ocl/core: added prototype for tests
2013-11-22 18:37:44 +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
Roman Donchenko
fc49d33c8d
Gave cv::String appropriate += operators.
...
Note that since String is a reference to an immutable string,
this doesn't actually change the string; it just replaces *this
with a reference to the concatenated string.
2013-11-22 17:58:40 +04:00
Ilya Lavrenov
c8abb6124f
recursive mutex for linux
2013-11-22 17:30:32 +04:00
Andrey Pavlenko
c1f59c4c76
Merge pull request #1852 from ilya-lavrenov:ocl_retina
2013-11-22 13:57:22 +04:00
Ilya Lavrenov
8834d5e57b
changed eps in Retina_OCL test
2013-11-22 12:35:46 +04:00
Andrey Pavlenko
c33cb94d66
Merge pull request #1847 from ilya-lavrenov:ocl_imgproc_fix
2013-11-21 21:29:26 +04:00
Andrey Pavlenko
ca8c129c57
Merge pull request #1848 from ilya-lavrenov:warn
2013-11-21 21:29:09 +04:00
Ilya Lavrenov
650f92f9cc
eliminated warning C4267
2013-11-21 18:27:07 +04:00
Ilya Lavrenov
561a7f5782
fixed kernel compilation in imgproc module
2013-11-21 18:23:57 +04:00
Andrey Pavlenko
9bf2516eb1
Merge pull request #1841 from ilya-lavrenov:ocl_kernel_compilation
2013-11-21 17:32:37 +04:00
Ilya Lavrenov
65b7e2018c
fixed kernel compilation
2013-11-21 14:22:24 +04:00
Andrey Pavlenko
8d1a8df1a9
Merge pull request #1824 from vpisarev:ocl_experiments5
2013-11-20 19:14:40 +04:00
Roman Donchenko
3703c7040a
Merge pull request #1828 from SpecLad:merge-2.4
2013-11-20 16:08:53 +04:00
Roman Donchenko
4cfbee70bd
Simplified the Windows implementation of CV_XADD.
...
_InterlockedExchangeAdd is a Visual Studio intrinsic that's available
for all architectures and in all VS versions that we care about. It's also
faster than the underscore-less function, since it's an intrinsic.
We also don't need to declare it ourselves.
It is, however, a Visual Studio-specific intrinsic, so I changed the
preprocessing condition accordingly.
Fixes <http://code.opencv.org/issues/3365 >.
2013-11-20 13:47:35 +04:00
Roman Donchenko
95006af170
Merge pull request #1816 from SpecLad:no-more-epoch
2013-11-20 11:52:54 +04:00
Roman Donchenko
63b3db53d7
Merge pull request #1830 from SpecLad:config-includes
2013-11-20 11:52:30 +04:00
Vadim Pisarevsky
ae8b2cbd68
fixed bug with cl_long size on Win32 (thanks to Aaron Kunze)
2013-11-19 20:51:31 -05:00
Vadim Pisarevsky
677c7f27cb
fixed failure in Tonemap test
2013-11-19 19:20:24 -05:00
Roman Donchenko
ef27ac3782
In the example in OpenCVConfig.cmake.in, explicitly add the include paths.
...
After #1801 , the include directories are no longer added automatically,
so we should show the user how to do that.
2013-11-19 19:00:56 +04:00
Roman Donchenko
7f935717cb
In OpenCVConfig.cmake.in, lowercased the commands in the example.
...
This is the preferred style nowadays, and more consistent with the
rest of the code.
2013-11-19 18:58:33 +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
Vadim Pisarevsky
d0b3c7a518
added some diagnostic into Tonemap test
2013-11-18 23:14:44 -05:00
Vadim Pisarevsky
8c44995ea6
another attempt to fix compile errors
2013-11-18 22:15:04 -05:00
Vadim Pisarevsky
241002384c
fixed some more compile errors
2013-11-18 14:26:19 -05:00
Vadim Pisarevsky
e2bbe7597b
fixed few compile errors and doc build errors
2013-11-18 13:48:04 -05:00
Vadim Pisarevsky
8762ee3f6f
removed unnecessary opencl kernels
2013-11-18 12:02:10 -05:00
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
2013-11-18 11:48:00 -05:00
Roman Donchenko
bb4bf7a1f9
Merge pull request #1811 from Nerei:fixed_some_build_errors
2013-11-18 18:09:44 +04:00
Roman Donchenko
7703b63cae
Merge pull request #1722 from StevenPuttemans:feature_1631_second
2013-11-18 15:48:27 +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
