mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 14:29:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,013 Commits 6 Branches 126 Tags 3 GiB
e7e00201f1
Commit Graph

9422 Commits

Author SHA1 Message Date
Roman Donchenko
95a55453df Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/perf/perf_pnp.cpp
	modules/contrib/src/imagelogpolprojection.cpp
	modules/contrib/src/templatebuffer.hpp
	modules/core/perf/opencl/perf_gemm.cpp
	modules/cudafeatures2d/doc/feature_detection_and_description.rst
	modules/cudafeatures2d/perf/perf_features2d.cpp
	modules/cudafeatures2d/src/fast.cpp
	modules/cudafeatures2d/test/test_features2d.cpp
	modules/features2d/doc/feature_detection_and_description.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/imgproc/perf/opencl/perf_blend.cpp
	modules/imgproc/perf/opencl/perf_color.cpp
	modules/imgproc/perf/opencl/perf_moments.cpp
	modules/imgproc/perf/opencl/perf_pyramid.cpp
	modules/objdetect/perf/opencl/perf_hogdetect.cpp
	modules/ocl/perf/perf_arithm.cpp
	modules/ocl/perf/perf_bgfg.cpp
	modules/ocl/perf/perf_blend.cpp
	modules/ocl/perf/perf_brute_force_matcher.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/perf/perf_gftt.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_imgwarp.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_matrix_operation.cpp
	modules/ocl/perf/perf_ml.cpp
	modules/ocl/perf/perf_moments.cpp
	modules/ocl/perf/perf_opticalflow.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/video/src/lkpyramid.cpp
	modules/video/src/precomp.hpp
	samples/gpu/morphology.cpp
 2014-03-11 17:20:01 +04:00
Andrey Pavlenko
702a2a6ff6 Merge pull request #2373 from mlyashko:optflow_dualtvl1 2014-03-11 16:00:22 +04:00
Andrey Pavlenko
5261fbe217 Merge pull request #2387 from alalek:ocl_remap_3cn 2014-03-11 15:59:12 +04:00
Andrey Pavlenko
90c5dde887 Merge pull request #2455 from ilya-lavrenov:tapi_fix 2014-03-11 15:58:32 +04:00
Ilya Lavrenov
9b31e6cd44 changes according to reviewer's suggestions 2014-03-11 15:40:31 +04:00
Andrey Pavlenko
0084dee05b Merge pull request #2448 from akarsakov:ocl_cxt_termination 2014-03-11 12:57:29 +04:00
Ilya Lavrenov
3eff05e3eb added performance tests for cv::ocl::calcHist 2014-03-11 12:34:27 +04:00
Alexander Alekhin
e7475bff68 TAPI: remap 3-channel 2014-03-10 20:35:10 +04:00
Alexander Alekhin
e4608229f0 ocl: copyMakeBorder 3-channel 2014-03-10 17:22:49 +04:00
Ziyang LI
786e3b9eee Moved x = 0 into the parenthesis 
Easier to understand
 2014-03-10 17:33:13 +08:00
Ian Taylor
45969bb3ae fix variable name typo in calcBlurriness 2014-03-10 03:02:06 -04:00
Ilya Lavrenov
208831eb5d optimized cv::calcHist 2014-03-08 12:24:31 +04:00
Vadim Pisarevsky
efdfca7a11 do not use the large "score" buffer; now without non-max suppression OpenCL FAST is pretty efficient 2014-03-07 18:55:45 +04:00
Roman Donchenko
70e22b682d Merge pull request #2397 from vbystricky:intelperc 2014-03-07 18:19:00 +04:00
Vadim Pisarevsky
06c138bd64 make the correctness test pass 2014-03-07 18:18:10 +04:00
vbystricky
193e97a34a Move declaration of IVideoCapture class into precomp.hpp, make some methods of IVideoCapture pure virtual 2014-03-07 16:25:15 +04:00
kurodash
0eaeff0641 fix: use "cvAlloc" wrapper function for malloc. 2014-03-07 19:02:37 +09:00
Andrey Pavlenko
2879ff2098 Merge pull request #2437 from ilya-lavrenov:tapi_morph 2014-03-07 14:00:09 +04:00
Andrey Pavlenko
5dbe73f94d Merge pull request #2438 from ilya-lavrenov:tapi_flip 2014-03-07 13:54:34 +04:00
Andrey Pavlenko
182d74d33f Merge pull request #2441 from akarsakov:ocl_platform_vendor 2014-03-07 13:54:13 +04:00
Andrey Pavlenko
451be9ed53 Merge pull request #2444 from ilya-lavrenov:tapi_gftt 2014-03-07 13:53:43 +04:00
Andrey Pavlenko
3cb49eac49 Merge pull request #2451 from ilya-lavrenov:tapi_fast_covar_data 2014-03-07 13:52:47 +04:00
Andrey Pavlenko
8f3492851e Merge pull request #2453 from ilya-lavrenov:tapi_sobel 2014-03-07 13:51:37 +04:00
Alexander Karsakov
8660588fe9 Pass vendor macro to opencl kernel 2014-03-07 12:57:29 +04:00
mlyashko
eb2e8a11fa changed kernel.set to support unsuccssful set 2014-03-07 11:15:54 +04:00
Ilya Lavrenov
0e2cc5ef63 fix bitwise ops and mask support 2014-03-06 23:39:05 +04:00
Andrey Pavlenko
d1d451c952 Merge pull request #2431 from ilya-lavrenov:tapi_perf 2014-03-06 22:17:44 +04:00
Andrey Pavlenko
229aa62300 Merge pull request #2445 from ilya-lavrenov:ocl_perf 2014-03-06 22:03:01 +04:00
Andrey Pavlenko
2f0fe5b87b Merge pull request #2450 from ilya-lavrenov:tapi_test 2014-03-06 21:55:50 +04:00
Vadim Pisarevsky
8e1918e86e added OpenCL-accelerated(?) FAST; for now the tests fail :( 2014-03-06 18:04:04 +04:00
Ilya Lavrenov
dc76e6b4a1 added new dtypes to cv::Sobel 2014-03-06 17:57:13 +04:00
Ilya Lavrenov
4a7289b22f improved cv::preCornerDetect 2014-03-06 17:40:02 +04:00
Ilya Lavrenov
d9c5fbc9ba disable SURF 2014-03-06 16:49:22 +04:00
Alexander Karsakov
806e9241a6 Clarifying comments 2014-03-06 16:44:46 +04:00
Ilya Lavrenov
1291bd1c4a ported fast calculation of covar data 2014-03-06 15:40:27 +04:00
Ilya Lavrenov
f404315368 test for clEnqueueReadBufferRect 2014-03-06 12:11:46 +04:00
mlyashko
66ed6a8a50 macro for normal return from thriveless kernel.set 2014-03-06 11:43:01 +04:00
Alexander Smorkalov
b3e18d23a3 Implicit CUDA and OpenCL control for module definition added. 
Feature allows to exclude CUDA or OpenCL optimizations at all even CUDA is used
on build. Exclusion of CUDA or OpenCL cut unwanted dependencies.
 2014-03-06 10:31:33 +04:00
Ilya Lavrenov
f7a474180b tuned some tests 2014-03-06 09:24:02 +04:00
Ilya Lavrenov
86a3ed4162 improved performance of GFTT 2014-03-06 09:19:40 +04:00
Anatoly Baksheev
fde0185a77 iteractor work 2014-03-06 03:26:21 +04:00
Vadim Pisarevsky
22f42a639f fixed doc builder warnings; make sure the tests give reasonable results when OpenCL is not available 2014-03-05 18:48:19 +04:00
Alexander Karsakov
4aa891e773 Remove clReleaseDevice call (workaround for pure virtual call on Windows) 2014-03-05 17:57:06 +04:00
Vadim Pisarevsky
60ce2b2e9f modified SURF's performance test to test OpenCL version as well 2014-03-05 17:10:51 +04:00
Vadim Pisarevsky
da70b04262 made SURF_OCL default constructor parameters the same as SURF 2014-03-05 17:04:49 +04:00
Vadim Pisarevsky
3c1917771b modified OpenCL SURF API and the tests in 2.4.x to prove that it gives different from CPU results 2014-03-05 16:31:41 +04:00
Alexander Karsakov
c1dad2178c Added Device:: isAMD,isIntel,isNvidia methods. 2014-03-05 14:43:11 +04:00
vbystricky
d4a1df85be Change text of copyright 2014-03-05 13:06:36 +04:00
vbystricky
f9e942f9ef Change text of license and copyright 2014-03-05 11:03:57 +04:00
Dave Hughes
b184d7f27b Fix for #3554 
v4l2_scan_controls_enumerate_menu is unused and causes ioctl error on
RaspberryPi and possibly other Video4Linux variants. See
http://www.raspberrypi.org/forum/viewtopic.php?f=43&t=65026 for more
detail.
 2014-03-05 02:44:40 +00:00
Cody Rigney
a80ebfe28d Master Version: Added NEON Optimizations for LK Optical Flow. 2014-03-04 14:47:12 -05:00
Andrey Pavlenko
0a3aca230c Merge pull request #2436 from ilya-lavrenov:tapi_dft_fix 2014-03-04 19:21:15 +04:00
Andrey Pavlenko
ba4513503e Merge pull request #2429 from ilya-lavrenov:master_compatible_tests 2014-03-04 19:18:13 +04:00
Andrey Pavlenko
c9d8025fab Merge pull request #2391 from ilya-lavrenov:tapi_match_template 2014-03-04 18:50:14 +04:00
Andrey Pavlenko
c00f0faf24 Merge pull request #2408 from ilya-lavrenov:tapi_core_opt 2014-03-04 18:37:26 +04:00
Roman Donchenko
5527f2872d Merge pull request #2409 from juanmanpr:master 2014-03-04 15:32:13 +04:00
Roman Donchenko
b5248dbf3f Merge pull request #2407 from codyrigney92:LKOptFlow_NEON 2014-03-04 15:30:26 +04:00
Roman Donchenko
fa3f29f2b5 Merge pull request #2439 from ilya-lavrenov:typo 2014-03-04 13:51:31 +04:00
Ilya Lavrenov
099ea91823 typos 2014-03-04 12:47:40 +04:00
Roman Donchenko
0692a674d1 Merge pull request #2381 from ElenaGvozdeva:ipp_resize 2014-03-04 11:49:02 +04:00
Roman Donchenko
a600267b9f Merge pull request #2432 from ilya-lavrenov:summary_py 2014-03-04 11:46:29 +04:00
mlyashko
5c867463d2 changed localsize to NULL (reviewers comment) 2014-03-04 11:36:47 +04:00
Hilton Bristow
72d5609a36 Merged upstream master 2014-03-04 11:14:03 +10:00
GregoryMorse
90920c2376 Update cap_msmf.cpp 
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.

Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.

My discussion and proposal to finish this change:
 Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.

ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.

The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.

It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.

Update cap_msmf.cpp

Fixed bugs and completed the change.  I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction).  Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it).  Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled).  After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft.  This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration.  Better to document that it is not supported.

Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.

The remaining changes are not difficult and will be complete soon along with debug tracing messages.

Update cap_msmf.cpp

Create cap_msmf.h

Update cap_msmf.cpp

Update cap_msmf.h

Update cap_msmf.cpp

Update cap_msmf.h

Update and rename cap_msmf.h to cap_msmf.hpp

Update cap_msmf.cpp

Update CMakeLists.txt

Update cap_msmf.hpp

Update cap_msmf.cpp

Update cap_msmf.cpp

Update cap_msmf.cpp

Update cap_msmf.hpp

Update cap_msmf.hpp

Update cap_msmf.cpp

Successful test - samples are grabbed

Update cap_msmf.cpp

Update cap_msmf.hpp

Update cap_msmf.cpp

Update cap_msmf.hpp

Update cap_msmf.hpp

Update cap_msmf.cpp

Update cap_msmf.hpp

Update cap_msmf.cpp

Update cap_msmf.hpp

Update cap_msmf.cpp

Update cap_msmf.hpp

Create ppltasks_winrt.h

Update cap_msmf.hpp

Update cap_msmf.hpp

Update cap_msmf.cpp

Update ppltasks_winrt.h

Library updated and cleaned up with comments, marshaling, exceptions and linker settings

Update ppltasks_winrt.h

Fixed trailing whitespace
 2014-03-04 01:52:17 +08:00
Ilya Lavrenov
050cca0422 improved performance of cv::flip (flip cols) 2014-03-03 19:04:32 +04:00
Ilya Lavrenov
4376de7698 fixed morphology operations 2014-03-03 15:29:48 +04:00
Ilya Lavrenov
be5b5a0471 fixed cv::dft 2014-03-03 14:32:38 +04:00
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
 2014-03-03 13:45:22 +04:00
Ilya Lavrenov
29deff8707 ability to merge logs with intersections only 2014-03-03 13:27:07 +04:00
Roman Donchenko
af8aa8a2fa Merge pull request #2433 from ilya-lavrenov:typos 2014-03-03 12:20:35 +04:00
Anatoly Baksheev
fb7e74c511 iteractor work 2014-03-02 23:15:53 +04:00
Ilya Lavrenov
eedf86402d typos 2014-03-02 21:04:17 +04:00
Ilya Lavrenov
68957b2757 added some new performance tests 2014-03-02 10:29:50 +04:00
Ilya Lavrenov
767b28f2e3 tests 2014-03-01 18:47:44 +04:00
Cody Rigney
fbc69e444b Added NEON optimizations for LK optical flow (Intrinsics). 2014-02-28 16:48:04 -05:00
Ilya Lavrenov
c1c3139368 master-like performance tests 2014-02-28 22:40:24 +04:00
Elena Gvozdeva
68edda3350 fixed 2014-02-28 11:56:23 +04:00
Alexander Alekhin
b9d68ef061 core/ocl: OpenCL build log improvements 2014-02-27 13:16:07 +04:00
Andrey Pavlenko
57b6850d74 Merge pull request #2415 from vpisarev:fix_stereobm_sse 2014-02-27 09:37:04 +04:00
Alexander Karsakov
e6f6707558 OCL: Fix for Haar classifier (thanks to Konstantin Rodyushkin). 2014-02-26 18:11:11 +04:00
Roman Donchenko
bd5d8404c9 Merge pull request #2393 from ilya-lavrenov:coverity 2014-02-26 12:16:36 +04:00
mlyashko
ba5ebaa758 changed file name to case-sensitve to support linux 2014-02-26 10:55:18 +04:00
juanmanpr
7a68e3d207 CV_Assert for photo module corrected 2014-02-25 19:58:08 +01:00
Roman Donchenko
693129902d Merge pull request #2399 from SpecLad:merge-2.4 2014-02-25 19:42:54 +04:00
Vadim Pisarevsky
a3aced20c1 fixed difference between SSE2 and C branches of StereoBM; they should now produce absolutely the same results 2014-02-25 18:13:51 +04:00
Roman Donchenko
c9a4a82667 Merge pull request #2358 from rohitgirdhar:rotatedRect 2014-02-25 17:43:48 +04:00
Ilya Lavrenov
ce0557ebb8 fixed defects from Xcode 2014-02-25 17:33:12 +04:00
Elena Gvozdeva
45cc8a5300 fixed 2014-02-25 16:43:52 +04:00
Roman Donchenko
1db1a83410 Merge pull request #2410 from asmorkalov:android_tiff_lowmem_fix 2014-02-25 15:04:24 +04:00
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
 2014-02-25 15:02:24 +04:00
Ilya Lavrenov
fe38aab84a core tapi optimization 2014-02-25 14:14:42 +04:00
Elena Gvozdeva
48e7bc6b30 fixed 2014-02-25 12:59:33 +04:00
Roman Donchenko
7dc549f166 Merge pull request #2411 from asmorkalov:android_mat_leak_fix 2014-02-25 12:37:01 +04:00
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.
 2014-02-25 11:54:03 +04:00
vbystricky
ff8b8ef24c Remove implementation of CvCapture interface for Intel PerC camera. Add IVideoCapture interface and implementation of this one for Intel PerC camera 2014-02-25 10:59:35 +04:00
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.
 2014-02-25 10:36:20 +04:00
Andrey Pavlenko
d695d4a0bf Merge pull request #2406 from ilya-lavrenov:abf 2014-02-25 09:12:32 +04:00
juanmanpr
540a60fca7 Replaced calls to cout from photo module, by CV_Assert 2014-02-25 00:29:07 +01:00
Ilya Lavrenov
653b99c9bd new scheme of sqrSum 2014-02-25 00:38:44 +04:00
Ilya Lavrenov
e1a598c5b3 disabled ABF tests 2014-02-24 23:26:01 +04:00
mlyashko
e75a257f92 changed epsilon for test passing 2014-02-24 17:47:56 +04:00
Andrey Pavlenko
73dfc4cb8c Merge pull request #2402 from ilya-lavrenov:amd_libs 2014-02-24 16:56:40 +04:00
Andrey Pavlenko
3845b96f6c Merge pull request #2388 from alalek:coverity_bug_fix 2014-02-24 16:54:44 +04:00
Andrey Pavlenko
52a339cba5 Merge pull request #2401 from akarsakov:fix_elem_size 2014-02-24 16:22:28 +04:00
Ilya Lavrenov
16bfdbd22a dump AMD Blas/Fft 2014-02-24 15:12:42 +04:00
Alexander Karsakov
6d83048ec3 Fixed incorrect calculation of element size in OCL.(Mul/Div).Mat_Scalar_Scale. 2014-02-24 15:10:00 +04:00
Nghia Ho
ced8e7a813 Typo 2014-02-24 20:06:20 +11:00
Ilya Lavrenov
32eb38ec98 fixed defects from coverity.com 2014-02-23 20:21:08 +04:00
Ilya Lavrenov
0406898b9a int2 -> ulong; to work properly with 3 channels 2014-02-23 15:12:38 +04:00
Ilya Lavrenov
0ef16125ae improved cv::matchTemplate OpenCL part 2014-02-22 14:30:19 +04:00
Rohit Girdhar
fd4461d543 addressed issues 2014-02-22 09:54:16 +05:30
Roman Donchenko
0a90d6dde6 Merge pull request #2266 from vpisarev:ipp_norm_fix 2014-02-21 19:11:57 +04:00
Vadim Pisarevsky
51dafc780b fixed hint type declaration 2014-02-21 18:07:01 +04:00
Roman Donchenko
51421098dd Merge pull request #2201 from mattip:2.4 2014-02-21 17:57:36 +04:00
Matti Picus
dc50dc7254 fix merge 2014-02-21 13:54:58 +02:00
Alexander Alekhin
9b3c76a3db TAPI: coverity bug fix 2014-02-21 14:04:01 +04:00
Matti Picus
f5330a44e8 merge with origin 2014-02-21 11:59:49 +02:00
Ilya Lavrenov
c7857e8c13 small fixes 2014-02-21 12:19:08 +04:00
Rohit Girdhar
347a3dc520 added randomized test 2014-02-21 12:47:01 +05:30
Matti Picus
31c8f2ec57 fix code, it turns out only TIFFReadRGBATile needs buffer pointer mangling 2014-02-20 22:12:22 +02:00
Matti Picus
46d128e073 add test (needs updated opencv_extra repo) 2014-02-20 22:10:22 +02:00
Andrey Pavlenko
9c5bd85247 Merge pull request #2375 from akarsakov:fix_getGradient 2014-02-20 21:41:43 +04:00
Andrey Pavlenko
b96923d5fa Merge pull request #2377 from alalek:tapi_warpers_perf_test 2014-02-20 21:40:28 +04:00
Ilya Lavrenov
aa5311ea9f backport of master-based perf tests for matchTemplate to 2.4 2014-02-20 18:58:32 +04:00
Ilya Lavrenov
804b70b72f ported 2.4 perf tests for matchTemplate 2014-02-20 18:11:56 +04:00
Elena Gvozdeva
7b552c0493 fixed 2014-02-20 17:34:51 +04:00
Rohit Girdhar
ea7b1bb3d2 added test, doc 2014-02-20 17:51:48 +05:30
Elena Gvozdeva
cd68cd43a2 Fixed 2014-02-20 16:13:05 +04:00
mlyashko
10f2a038c2 Optical flow dualt tvl1 ocl-based implementation and tests 2014-02-20 14:23:10 +04:00
Elena Gvozdeva
e013d31715 Added IPP function for resize() 2014-02-20 14:01:22 +04:00
Alexander Karsakov
7e4dea968c Fixed typo with indexes in getGradient(x/y) functions. 2014-02-20 13:58:31 +04:00
Roman Donchenko
ad66233774 Merge pull request #2376 from GrinIara:master 2014-02-20 13:43:22 +04:00
Alexander Alekhin
79eba54a4f some fixes in perf tests 2014-02-20 13:29:11 +04:00
Alexander Alekhin
ddd3c062b5 TAPI: fix perf test for warpers 2014-02-20 13:09:06 +04:00
Vladislav Vinogradov
7fd21d217a fix bug #3562: 
add missing __syncthreads to edgesHysteresisLocalKernel
 2014-02-20 10:24:52 +04:00
GrinIara
fa0599448d Fixed compilation error due to missing std::. 2014-02-19 17:06:33 +01:00
Rohit Girdhar
b939b4ae3b removed inline, changed interface 2014-02-19 20:58:40 +05:30
Ilya Lavrenov
8bf616e4c7 added color image support via L*a*b* 2014-02-19 18:35:37 +04:00
Ilya Lavrenov
634e8d37cc fixed for 2 channels 2014-02-19 18:18:22 +04:00
Alexander Alekhin
bf4f15fb5f TAPI: fix OpenCL warpers and test 2014-02-19 15:30:43 +04:00
Ilya Lavrenov
7faf1f6277 some improvements 2014-02-19 15:01:34 +04:00
Roman Donchenko
ccbceb56c4 Merge pull request #2144 from nickdademo:pvapi_framestarttriggermode 2014-02-19 14:48:57 +04:00
Roman Donchenko
ce42593fe6 Merge pull request #2368 from asmorkalov:ocv_gcc48_warning_fix 2014-02-19 12:03:06 +04:00
Alexander Smorkalov
4c1ed13846 Warning fixes for GCC 4.8. 2014-02-18 23:53:35 +04:00
Ilya Lavrenov
72c327fef8 hope it finally works 2014-02-18 19:23:38 +04:00
Roman Donchenko
af9368d35f Merge pull request #2370 from ilya-lavrenov:cuda_nlm_typo 2014-02-18 17:00:54 +04:00
Roman Donchenko
c35dab9046 Merge pull request #2359 from SpecLad:moments-no-vectorize 2014-02-18 17:00:32 +04:00
Roman Donchenko
3782c324c4 Merge pull request #2098 from pxli168:patch-1 2014-02-18 15:49:19 +04:00
Roman Donchenko
6f19ef8631 Merge pull request #2361 from alekcac:ios_camera_changes 2014-02-18 15:44:56 +04:00
Ilya Lavrenov
38cbe9873a small fixes 2014-02-18 14:56:13 +04:00
Ilya Lavrenov
9db28f332a more fixes 2014-02-18 14:32:03 +04:00
Ilya Lavrenov
891dbeabba implemented OpenCL version of cv::fastNlMeansDenoising 2014-02-18 14:32:03 +04:00
Ilya Lavrenov
d27068f79a some more refactoring 2014-02-18 14:32:03 +04:00
Ilya Lavrenov
e16d89e8d6 some refactoring 2014-02-18 14:32:03 +04:00
Ilya Lavrenov
da9bdf9c15 fixes typo and unused variables 2014-02-18 14:16:54 +04:00
Alexander Shishkov
77df5948e7 removed trailing spaces 2014-02-18 13:56:26 +04:00
Roman Donchenko
e35d98e566 Worked around an apparent GCC bug in moments. 2014-02-18 13:51:27 +04:00
Roman Donchenko
b7659c62f3 Merge pull request #2366 from yashdv:mat_copyto_doc_bug 2014-02-18 13:47:46 +04:00
yash
394c74b349 edited the doc for mat::copyto and clarified the part regarding reallocation by .create 2014-02-18 15:04:27 +05:30
Andrey Pavlenko
e6420c523d Merge pull request #2235 from alalek:ocl_svm_perf_test 2014-02-18 13:33:16 +04:00
Andrey Pavlenko
b3cfe6b446 Merge pull request #2341 from alalek:ocl_fix_error_processing 2014-02-18 13:27:38 +04:00
Andrey Pavlenko
ff9a0815b9 Merge pull request #2352 from ilya-lavrenov:flann 2014-02-18 13:24:41 +04:00
Roman Donchenko
2409812803 Merge pull request #2347 from Chechli:master 2014-02-18 12:57:26 +04:00
Roman Donchenko
139a262072 Merge pull request #2367 from jet47:fix-3544 2014-02-18 12:15:49 +04:00
Roman Donchenko
bcf4307345 Merge pull request #2356 from SpecLad:merge-2.4 2014-02-18 12:14:57 +04:00
Roman Donchenko
95d7ecb33f Merge pull request #2364 from ilya-lavrenov:unused_field 2014-02-18 11:57:36 +04:00
Chechli
768da4d95a Update hough_circles.cpp 2014-02-18 08:50:33 +01:00
Vladislav Vinogradov
afd99c9c81 fix bug #3544: 
add "opencv2/core/utility.hpp" header to precomp.hpp
 2014-02-18 10:45:47 +04:00
yash
38ef8894b7 Made a sentence in the doc for Mat::copyTo more clearer 2014-02-18 10:51:05 +05:30
pxli168
44ecb727c5 Change again. 
Opps.
 2014-02-18 10:13:30 +08:00
Ilya Lavrenov
6ad7b64912 some more changes 2014-02-17 21:57:33 +04:00
Ilya Lavrenov
01527c44fd removed unused field 2014-02-17 21:50:00 +04:00
Andrey Pavlenko
9885a671ee Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup 2014-02-17 17:53:05 +04:00
Andrey Pavlenko
47d9b933f6 Merge pull request #2345 from ilya-lavrenov:tapi_3cn_perf 2014-02-17 17:38:26 +04:00
Alexander Shishkov
cc529d971b removed tabs 2014-02-17 17:37:02 +04:00
Andrey Pavlenko
aeeb9f9e25 Merge pull request #2334 from alalek:umat_usage_flags_2 2014-02-17 17:34:19 +04:00
Rohit Girdhar
a879e1fcd6 fixed warnings 2014-02-17 19:00:36 +05:30
Evgeniy
8236181c62 Added more colorizing options to XLS generating script 2014-02-17 17:01:23 +04:00
Andrey Pavlenko
01b225acb0 Merge pull request #2340 from ilya-lavrenov:tapi_lab 2014-02-17 16:45:40 +04:00
Rohit Girdhar
613a17355d rotRect using points 2014-02-17 17:39:13 +05:30
Roman Donchenko
029ffb7c2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp
 2014-02-17 15:24:05 +04:00
Roman Donchenko
a6d64e254f Merge pull request #2354 from gleb-sternharz:Branch_2.4.8 2014-02-17 15:00:47 +04:00
Roman Donchenko
e8d26b02ac Merge pull request #2339 from jet47:gpu-warnings 2014-02-17 13:35:15 +04:00
Marijan Vukcevich
9a98cd6e65 Update cap_ios_abstract_camera.mm 
AVCaptureVideoPreviewLayer setOrientation is depricated. This fixes the warning and provides backward compatibility.
 2014-02-17 13:23:25 +04:00
Chechli
9211d1ac2d Update hough_circles.cpp 2014-02-17 09:50:32 +01:00
Chechli
640a45d359 Update precomp.hpp 2014-02-17 09:48:51 +01:00
Roman Donchenko
a0bb74a086 Merge pull request #2337 from pmoulon:master 2014-02-17 12:24:48 +04:00
Roman Donchenko
cfcf07acfa Merge pull request #2328 from rohitgirdhar:bugfix_blobdetector_kpt_radius 2014-02-17 12:23:59 +04:00
Roman Donchenko
8cbb284b7b Merge pull request #2348 from ilya-lavrenov:typo 2014-02-17 12:02:59 +04:00
gleb.sternharz
f85aa929f1 fix dev by 0 in KL-Divergence 2014-02-17 04:08:30 +01:00
pxli168
70d462b352 Simplify the code 
Simplify the code as @SpecLad suggested.
 2014-02-17 10:21:18 +08:00
Ilya Lavrenov
f74ef644bc changed the signature of add method according to the base class 2014-02-17 02:39:38 +04:00
yash
1a89a03c7c Fixed CV_ASSERT condition in the code for bag of words 2014-02-16 22:33:30 +05:30
Chechli
10465c546a Update hough_circles.cpp 2014-02-16 13:26:00 +01:00
Ilya Lavrenov
c8e22c04c8 extended performance test 2014-02-16 13:42:25 +04:00
Vladislav Vinogradov
150e522bee fix bug #3552: 
replace std::swap with own code
 2014-02-16 12:17:17 +04:00
Ilya Lavrenov
510680a5df typo 2014-02-16 01:42:02 +04:00
Ilya Lavrenov
7629bb78a4 extended performance tests to test 3 channels 2014-02-16 01:31:33 +04:00
Anatoly Baksheev
03bd82796d source compatibility with master 2014-02-15 23:40:09 +04:00
Chechli
72e4f72a75 Update hough_circles.cpp 2014-02-15 17:31:14 +01:00
Ilya Lavrenov
9b627a5e9f disabled 'reshape', 'copyTo' test 2014-02-15 20:17:42 +04:00
Anatoly Baksheev
56754e907d fixed crash for windows if console widow is closed or CTRL_C/CTRL_BRAK keys in console are pressed. 2014-02-15 20:08:04 +04:00
Anatoly Baksheev
1a5dfe421d Added WidgetMerger, Polyline - colors support for each point independently, simple widgets now compute color array instead of setting global color 2014-02-15 17:02:17 +04:00
Ilya Lavrenov
7ce2c3574a restored lost in PR #1735 umat tests 2014-02-15 16:09:55 +04:00
Ilya Lavrenov
4f36bc29d9 cleaned-up UMat tests 2014-02-15 15:51:52 +04:00
Alexander Alekhin
915fb632fd core/ocl: change error processing for missed function 2014-02-14 19:50:58 +04:00
Ilya Lavrenov
8150c1b7e4 added [s|l]rgb <-> lab conversion 2014-02-14 18:45:56 +04:00
Vladislav Vinogradov
8b8c368148 fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo) 2014-02-14 17:56:03 +04:00
Alexander Alekhin
d1606b4aa3 ocl: added SVM perf test 2014-02-14 16:36:46 +04:00
Roman Donchenko
e0d991cf46 Merge pull request #2335 from jet47:gpu-alphacomp-test 2014-02-14 16:20:45 +04:00
Andrey Pavlenko
0fc248fb70 Merge pull request #2326 from vpisarev:ocl_ch3 2014-02-14 15:49:36 +04:00
Alexander Alekhin
95e38e457f core/umat: usage flags (with proposals from PR #2195) 2014-02-14 15:40:16 +04:00
Roman Donchenko
fa272c43c2 Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host 2014-02-14 15:37:09 +04:00
Pierre Moulon
8829e9f6c8 Fix a typo error 2014-02-14 12:22:53 +01:00
Roman Donchenko
a1de9e9ad5 Merge pull request #2329 from ilya-lavrenov:macosx_ogl 2014-02-14 14:38:37 +04:00
Vladislav Vinogradov
1ce5165cb7 temporary disable performance test for alphaComp function 2014-02-14 14:27:43 +04:00
Andrey Pavlenko
534bec3a90 Merge pull request #2315 from ilya-lavrenov:nlmeans_perf 2014-02-14 13:24:12 +04:00
Andrey Pavlenko
d68c688f22 Merge pull request #1735 from KonstantinMatskevich:umat_tests 2014-02-14 12:37:47 +04:00
Roman Donchenko
3def7778dc Merge pull request #2062 from cook:bug3440 2014-02-14 12:09:03 +04:00
Yantao Xie
6b00c4e337 Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab. 2014-02-13 23:53:58 +08:00
Roman Donchenko
ecbe843061 Merge pull request #2333 from asmorkalov:java_dead_code_fix 2014-02-13 19:21:56 +04:00
Alexander Smorkalov
dbe7634286 Dead code removed as this cannot be null in Java. 2014-02-13 18:17:47 +04:00
Vadim Pisarevsky
630bdbf42f fixed OpenCL kernel flag in resize (thanks to Ilya L) 2014-02-13 17:37:42 +04:00
Vladislav Vinogradov
eb247d826f temporary disable perf test for StereoBeliefPropagation 2014-02-13 17:25:59 +04:00
Vladislav Vinogradov
9e69e2a07a increase epsilon for AlphaComp sanity test for integer input 2014-02-13 17:16:43 +04:00
Konstantin Matskevich
5f76072c62 update 2014-02-13 13:29:53 +04:00
Andrey Pavlenko
0ee5c34f40 Merge pull request #2324 from vpisarev:fix_facedetect 2014-02-13 11:46:24 +04:00
Konstantin Matskevich
a0a3b8b56d Some tests for UMat 2014-02-13 09:59:05 +04:00
Ilya Lavrenov
879c0196d4 enabled OpenGL on MacOSX 2014-02-13 00:17:15 +04:00
Rohit Girdhar
a4b5641836 bugfix: blobdetector was putting incorrect diameter value in keypoints 2014-02-12 22:29:04 +05:30
Vadim Pisarevsky
91587059ad tab => spaces 2014-02-12 20:28:55 +04:00
Vadim Pisarevsky
290fbc0121 3-channel support in OpenCL kernels for setTo, resize, warpAffine and warpPerspective 2014-02-12 19:29:18 +04:00
Vadim Pisarevsky
a18bc9651d fixed bug reported by Irina K. Also tried to fix LBP detector regression in quality (probably it did not help but still ...) 2014-02-12 17:42:09 +04:00
Stuart Cunningham
5d43d3ca88 Fix Windows build of grfmt_tiff.cpp by using libtiff's integer types. 2014-02-12 23:41:38 +11:00
Roman Donchenko
863e9c699a Merge pull request #2322 from berak:b_cc_read 2014-02-12 16:32:29 +04:00
Stuart Cunningham
8bbce0a2a2 Fix reading of 16-bit TIFF images on big endian host. 
Use correct integer types for arguments to TIFFGetField to avoid corruption
of values and failed loads of TIFF file when using cv::imread().

Added test where both big and little endian TIFF files are read using imread().

Fixed build of 3rdparty libtiff on big endian hosts.

Reduced memory required during decode_tile16384x16384 test by not converting
large grayscale test image to color image during read.
 2014-02-12 21:21:06 +11:00
Vadim Pisarevsky
f7620dc7d1 added 3-channel support to arithmetic operations 2014-02-12 12:18:55 +04:00
Zhigang Gong
9aef26e2ad Workaround a LLVM/Clang 3.3 bug. 
The LLVM/Clang 3.3 has a bug when compile a cl kernel with
assignment of a scalar to a vector data type. This patch
could work around this bug.

Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
 2014-02-12 13:14:43 +08:00
Anatoly Baksheev
261546f6f6 casting Vec3b operator for viz::Color 2014-02-11 23:27:19 +04:00
Ilya Lavrenov
4f2cdc9bac added performance tests for NLMeans 2014-02-11 18:21:53 +04:00
Roman Donchenko
72aabb8a84 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVGenAndroidMK.cmake
	cmake/templates/OpenCV.mk.in
	doc/tutorials/viz/creating_widgets/creating_widgets.rst
	doc/tutorials/viz/launching_viz/launching_viz.rst
	doc/tutorials/viz/table_of_content_viz/images/image_effects.png
	doc/tutorials/viz/transformations/transformations.rst
	doc/tutorials/viz/widget_pose/widget_pose.rst
	modules/core/include/opencv2/core/affine.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/cuda/canny.cu
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_color.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_gpumat.cpp
	modules/gpu/test/test_hough.cpp
	modules/nonfree/CMakeLists.txt
	modules/nonfree/include/opencv2/nonfree/gpu.hpp
	modules/nonfree/perf/perf_gpu.cpp
	modules/nonfree/src/cuda/surf.cu
	modules/nonfree/src/precomp.hpp
	modules/nonfree/src/surf_gpu.cpp
	modules/nonfree/test/test_gpu.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/stitching/CMakeLists.txt
	modules/stitching/include/opencv2/stitching/detail/matchers.hpp
	modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
	modules/stitching/include/opencv2/stitching/detail/warpers.hpp
	modules/stitching/include/opencv2/stitching/warpers.hpp
	modules/stitching/src/blenders.cpp
	modules/stitching/src/matchers.cpp
	modules/stitching/src/precomp.hpp
	modules/stitching/src/seam_finders.cpp
	modules/stitching/src/stitcher.cpp
	modules/stitching/src/warpers.cpp
	modules/viz/doc/widget.rst
	modules/viz/include/opencv2/viz/types.hpp
	modules/viz/include/opencv2/viz/viz3d.hpp
	modules/viz/include/opencv2/viz/widget_accessor.hpp
	modules/viz/src/precomp.hpp
	modules/viz/src/shapes.cpp
	modules/viz/src/vizcore.cpp
	modules/viz/src/vtk/vtkCloudMatSink.h
	modules/viz/src/vtk/vtkCloudMatSource.h
	modules/viz/test/test_precomp.hpp
	modules/viz/test/tests_simple.cpp
	samples/android/tutorial-4-cuda/CMakeLists.txt
	samples/android/tutorial-4-cuda/jni/Android.mk
	samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java
	samples/cpp/stitching_detailed.cpp
	samples/cpp/tutorial_code/viz/creating_widgets.cpp
	samples/cpp/tutorial_code/viz/launching_viz.cpp
	samples/cpp/tutorial_code/viz/transformations.cpp
	samples/cpp/tutorial_code/viz/widget_pose.cpp
 2014-02-11 12:05:01 +04:00
Anatoly Baksheev
f1c062c30a cloud collection finalize 2014-02-10 15:45:46 +04:00
Anatoly Baksheev
5dc17f5d58 Fixed all OpenGL issues for Macos (via objective-C++ layer) 2014-02-10 15:45:46 +04:00
Anatoly Baksheev
069dd8a068 default meshlab background 2014-02-10 15:45:45 +04:00
Anatoly Baksheev
f8ccc115ef proper render call order (fixes some issues with VTK6.1) 2014-02-10 15:45:45 +04:00
Anatoly Baksheev
17fea0dd0a fixed size_t/int conversion warnings 2014-02-10 15:45:45 +04:00
Anatoly Baksheev
998aefd1d1 cloud collection merges data only on rendering 2014-02-10 15:45:44 +04:00
Anatoly Baksheev
eb8728d727 Updated cloud io functionality - removed dependency from VTK legacy 2014-02-10 15:45:44 +04:00
Roman Donchenko
63dbe66b41 Merge pull request #2308 from jet47:gpu-tests-timeout 2014-02-10 15:10:31 +04:00
Roman Donchenko
3cc27c769c Merge pull request #2309 from Nerei:fixed_cl_exe_hang_with_eigen 2014-02-10 14:59:05 +04:00
Anatoly Baksheev
becbfa6281 Fixed Cl.exe hang for VS2008 x64 with Eigen::exp() function 2014-02-10 13:41:27 +04:00
Vladislav Vinogradov
8b44a42a40 decrease input size for several gpu tests to fix "timed out" error: 
* BruteForceNonLocalMeans
* OpticalFlowBM
 2014-02-10 11:50:14 +04:00
berak
3959329ef4 proper initialization for ccimpl in bool CascadeClassifier::read(const FileNode 2014-02-08 14:42:09 +01:00
Roman Donchenko
1d68a89947 Merge pull request #2303 from jet47:gpu-canny-fix 2014-02-07 19:03:14 +04:00
Andrey Pavlenko
86b6c48712 Merge pull request #2295 from alalek:opencl_align_rw_buffers 2014-02-07 17:45:15 +04:00
Roman Donchenko
48f95d92ae Merge pull request #2294 from jet47:fix-gpu-issues 2014-02-07 16:54:49 +04:00
Roman Donchenko
8b16b8b657 Merge pull request #2296 from apavlenko:fix_coverity_scan 2014-02-07 16:54:30 +04:00
Vladislav Vinogradov
5dbdadb769 fixed several bugs in CUDA Canny implementation: 
* out of border access in edgesHysteresisLocalKernel
* incorrect usage of atomicAdd
 2014-02-07 16:04:29 +04:00
Vladislav Vinogradov
bfc27271e2 Revert "disable gpu Canny and HoughCircles perf tests:" 
This reverts commit dbce90692a.
 2014-02-07 14:55:06 +04:00
Alexander Alekhin
ce992c8269 ocl: update gftt 2014-02-07 14:51:59 +04:00
Alexander Alekhin
e371901dd9 ocl: workaround for failures with misaligned host buffers 2014-02-07 14:51:58 +04:00
Vladislav Vinogradov
3e1f74f2ca fix nonfree module compilation without CUDA 2014-02-07 13:40:37 +04:00
Andrey Pavlenko
4b31b9cb8c Merge pull request #2251 from ilya-lavrenov:tapi_sqrboxfilter 2014-02-07 11:33:49 +04:00
Andrey Pavlenko
710d51bb41 Merge pull request #2287 from ilya-lavrenov:mat_step 2014-02-06 21:38:22 +04:00
Andrey Pavlenko
9ff5a24f92 Merge pull request #2289 from ilya-lavrenov:umat_expr 2014-02-06 21:37:57 +04:00
Andrey Pavlenko
38f46eb3b4 fixing issues from coverity scan 1167937, 1167938, 1167939, 1127248 (http://scan.coverity.com/projects/169?tab=Overview) 2014-02-06 21:33:44 +04:00
Ilya Lavrenov
412468e0ae added cv::sqrBoxFilter to T-API 2014-02-06 19:19:18 +04:00
Vladislav Vinogradov
5d099df578 Revert "disable CUDA generalized Hough Transform" 
This reverts commit 33d42b740c.
 2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
3e4bb371c8 fix epsilons for several gpu tests 2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
b6ba1f226c Revert "disable gpu CvtColor.*2HSV tests:" 
This reverts commit 952027a853.
 2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
da44a2fac1 Revert "disable gpu Subtract_Array test:" 
This reverts commit e91bf95d58.
 2014-02-06 18:02:14 +04:00
Roman Donchenko
7daf26d398 Merge pull request #2269 from Nerei:qt5_vtk_guards 2014-02-06 16:47:15 +04:00
Ilya Lavrenov
af0040eab0 condition for Mat step 2014-02-06 15:44:27 +04:00
Alexander Smorkalov
6ae4a9b09b Multiple improvements in OpenCV examples build. 
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
 2014-02-06 15:32:57 +04:00
Andrey Pavlenko
b6675ee2a8 Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray 2014-02-06 12:55:04 +04:00
Ilya Lavrenov
e190d3fd36 added perf test 2014-02-05 20:24:30 +04:00
Ilya Lavrenov
563dc5aa38 implemented umat expressions 2014-02-05 19:23:42 +04:00
Roman Donchenko
721d0145e0 Merge pull request #2002 from abak:stereo_calibrate 2014-02-05 17:47:27 +04:00
Konstantin Matskevich
bdfa9fa14a fixes2 2014-02-05 13:51:14 +04:00
Konstantin Matskevich
435615ba2e update test CascadeClassifier 2014-02-05 12:23:36 +04:00
Konstantin Matskevich
84fa60abb8 update test for cascade 2014-02-05 12:06:48 +04:00
Konstantin Matskevich
1aa83d324b fixed docs2 2014-02-05 11:32:35 +04:00
Andrey Pavlenko
e6f3c9b0bf Merge pull request #2281 from vpisarev:ocl_surf 2014-02-05 11:07:19 +04:00
Konstantin Matskevich
eb4c2cd59f removed CV_IN/OUT 2014-02-05 10:55:26 +04:00
Konstantin Matskevich
a0ccb46a7f fixed docs 2014-02-05 10:49:56 +04:00
Konstantin Matskevich
b0f617bc01 fixes 2014-02-05 09:59:04 +04:00
Andrey Pavlenko
055f41c92a Merge pull request #2250 from ilya-lavrenov:tapi_renaming 2014-02-05 09:27:06 +04:00
Ilya Lavrenov
2e8579fe9b cleaned up super_resolution sample from old OCL 2014-02-05 00:28:10 +04:00
Vadim Pisarevsky
3e0c72a8f7 fixed warnings/errors from GCC 2014-02-04 21:50:04 +04:00
Andrey Pavlenko
564f5fcca3 Merge pull request #2280 from ilya-lavrenov:attempt_pvc 2014-02-04 21:22:49 +04:00
Vadim Pisarevsky
092d058d06 fixed warnings from OCL and DOC builders 2014-02-04 21:19:31 +04:00
Andrey Pavlenko
b7ffed7b46 Merge pull request #2279 from alalek:fix_memory_leak_getumat 2014-02-04 20:45:27 +04:00
Vadim Pisarevsky
38f5c7140c undone change in ocl.hpp (explicit Image2D constructor) 2014-02-04 20:41:11 +04:00
Vadim Pisarevsky
c18d1ee2a9 SURF kind of works (let's see if the tests pass) 2014-02-04 20:00:51 +04:00
Ilya Lavrenov
c7fe162829 renamed **2 -> ** 2014-02-04 19:55:11 +04:00
Ilya Lavrenov
d957e8e40d attempt to fix pure virtual call in Mat::deallocate 2014-02-04 19:50:37 +04:00
Alexander Alekhin
83a2b566a3 fix memory leak for Mat::getUMat() operation 2014-02-04 17:25:09 +04:00
Konstantin Matskevich
f44334285b features2d 2014-02-04 16:55:07 +04:00
Alexander Alekhin
485635310c core/ocl: OpenCLBufferPool 2014-02-04 16:48:35 +04:00
Andrey Pavlenko
22146e4b18 Merge pull request #2234 from KonstantinMatskevich:ocl_tapi_hog 2014-02-04 16:35:12 +04:00