mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-26 10:48:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
17,133 Commits 6 Branches 127 Tags 3 GiB
16a3773a34
Commit Graph

12583 Commits

Author SHA1 Message Date
Maksim Shabunin
d2add41b6b Merge pull request #5321 from alalek:copy_if_different 2015-09-10 09:41:49 +00:00
Maksim Shabunin
0a6e93dd3a Merge pull request #5258 from sturkmen72:patch-6 2015-09-10 09:22:07 +00:00
Alexander Alekhin
ad70ab404c ocl: workaround for getUMat() 2015-09-09 18:56:14 +03:00
Andrey Pavlenko
cea2dafa0f man/unmap, preventing getMat/getUMat from temp object, fix thread-unsafe code in UMat::getMat() 2015-09-09 18:05:29 +03:00
Alexander Alekhin
536634b1fe Merge pull request #5293 from alalek:tapi_custom_ptr_perf 2015-09-09 14:59:17 +00:00
Alexander Alekhin
cdfdf29eca Merge pull request #5292 from alalek:tapi_custom_ptr 2015-09-09 14:58:28 +00:00
Vadim Pisarevsky
32c386786e Merge pull request #5294 from LorenaGdL:master 2015-09-09 13:41:39 +00:00
Vadim Pisarevsky
666de1b087 Merge pull request #5312 from sturkmen72:patch-2 2015-09-09 10:30:22 +00:00
Alexander Alekhin
b15a9d675e cmake: use copy_if_different 2015-09-08 22:42:05 +03:00
Alexey Ershov
5937e58a11 fixed argument in call to {Input|Output}Array.getMat() 2015-09-08 19:29:19 +03:00
Alexey Ershov
949410b347 separated UMat & Mat usage in interop/copy paths 2015-09-07 21:11:05 +03:00
Maksim Shabunin
5618f4a0ac Fixed: Concurrency static scheduler release failed 2015-09-07 18:59:07 +03:00
Suleyman TURKMEN
c63f443bba Update drawing.cpp 
https://github.com/Itseez/opencv/issues/4791
 2015-09-07 11:30:14 +03:00
Suleyman TURKMEN
e15dabf1db documentation patch 2015-09-05 10:41:01 +03:00
Alexey Ershov
68a0347ff9 fallback path & sample timing implemented 
fixed trailing whitespaces
renamed files *vaapi* to *va_intel*
changed names vaapi* to va_intel*
 2015-09-04 02:42:49 +03:00
Alexander Alekhin
4ecc023219 UMat: add perf test for custom ptr 2015-09-03 10:48:07 +03:00
Alexander Alekhin
8694ba0978 update custom_ptr test 2015-09-03 10:46:38 +03:00
Lorena García
4e7bd86fad TrainData doc update 
Update docs according to PR #5127
 2015-09-03 05:52:04 +02:00
Maksim Shabunin
8c65f8a0d1 fixup! Some changes to support mingw-w64 2015-09-01 13:49:23 +03:00
Maksim Shabunin
771af4f32d Some changes to support mingw-w64 
- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253)
 2015-09-01 00:59:08 +03:00
Elad Joseph
7c16ad3f49 Update documentation in calib3d.hpp 
Fixed small mistake in documentation.
The prism coefficients in y'' equation were mistakenly written as s1,s2 instead of s3,s4
 2015-08-30 12:42:30 +03:00
Vadim Pisarevsky
a78da45fec Merge pull request #5242 from apavlenko:fix_releasing_temp_umat 2015-08-27 14:29:52 +00:00
Vadim Pisarevsky
bd43c62a75 Merge pull request #5232 from sturkmen72:patch-6 2015-08-27 07:07:53 +00:00
berak
a11ff876d4 enable VideoWriter class for java 
fixing fourcc
 2015-08-27 08:04:58 +02:00
Suleyman TURKMEN
f660461bb3 documentation patch 2015-08-26 17:40:38 +03:00
Andrey Pavlenko
b78eb49178 removing a garbage comment 2015-08-26 14:15:18 +03:00
Andrey Pavlenko
4aefb9f2fc making the test deepper 2015-08-26 13:38:26 +03:00
Alexander Alekhin
bbff288447 fix build with python3 only 2015-08-26 13:08:06 +03:00
Vadim Pisarevsky
b33853c5be Merge pull request #4199 from AVshokurov:master 2015-08-25 18:09:50 +00:00
Vadim Pisarevsky
587b0cc7b4 Merge pull request #4200 from Astero92:#3800 2015-08-25 18:08:54 +00:00
Vadim Pisarevsky
96fa0ef752 Merge pull request #5115 from ManuelFreudenreich:hog_variable 2015-08-25 14:45:53 +00:00
Andrey Pavlenko
3656a1aa66 fixing 'map_unmap_counting' 2015-08-25 17:25:03 +03:00
Vadim Pisarevsky
edcd2c0408 Merge pull request #4176 from alalek:issue_4461 2015-08-25 07:46:28 +00:00
Vadim Pisarevsky
e2b677ddcf Merge pull request #5109 from olumby:fix-cvvideocamera-defaultfps 2015-08-25 07:44:29 +00:00
Vadim Pisarevsky
b6869df556 Merge pull request #5127 from LorenaGdL:data.cpp-(ml-module) 2015-08-25 07:42:41 +00:00
Vadim Pisarevsky
622301c78a Merge pull request #5142 from StevenPuttemans:fix_4230 2015-08-25 07:39:02 +00:00
Andrey Pavlenko
f6b758699b Revert merging of pull request #5176 from vladimir-dudnik:master (reverted from commit 5ee00ec5c6) 2015-08-24 19:22:22 +03:00
Vadim Pisarevsky
bd8bac27d5 Merge pull request #4212 from ludv1x:master 2015-08-24 14:20:54 +00:00
Vadim Pisarevsky
ff8aa6662e Merge pull request #5201 from alalek:move_semantics 2015-08-24 11:05:43 +00:00
Alexander Alekhin
c385ac575d Merge pull request #5238 from LorenaGdL:master 2015-08-24 00:47:01 +00:00
Lorena García
9d01818e8a Small update of Colormap documentation 
Small change in documentation: http://docs.opencv.org/master/d3/d50/group__imgproc__colormap.html#gga9a805d8262bcbe273f16be9ea2055a65a5d4a709cda1130bfa3cc4b4c5ae8f82a&gsc.tab=0

In the enum images, the "parula" colormap has wrongly assigned subtitle 'hot'
 2015-08-23 19:09:15 +02:00
Philippe FOUBERT
b668d3f693 Modification of the related tests in core/tests/ocl 2015-08-22 13:39:34 +02:00
Philippe FOUBERT
0629add3f7 Fix issue #5234 (UMat::convertTo when noScale) 2015-08-22 13:16:59 +02:00
Vitaliy Lyudvichenko
85cc11e3b2 Changed behaviour of Mat/UMat::reshape() to accept n-dim shapes 2015-08-21 19:26:29 +03:00
Alexander Alekhin
b8956d0111 tls: fix access to array (out of bounds) 2015-08-21 16:43:15 +03:00
Alexander Alekhin
44f8670719 Merge pull request #5171 from avershov:opencl-vaapi-interop 2015-08-21 12:47:14 +00:00
Alexey Ershov
a8656ea20f implemented core support & sample 
fixed whitespaces
fixed issues
fixed issue
fixed module statement issues
fixed access mode
added initialization check
fixed warning
 2015-08-21 02:44:03 +03:00
Alexander Alekhin
c1778f1199 Merge pull request #5161 from alalek:fix_string 2015-08-20 12:49:54 +00:00
Maksim Shabunin
4a067dca58 Merge pull request #5154 from brunomorishita:patch-1 2015-08-19 15:22:35 +00:00
Alexander Alekhin
887d8d091b Merge pull request #5177 from lupustr3:pvlasov/tls_fixes 2015-08-19 14:18:19 +00:00
Pavel Vlasov
a33d98c13a TLS memory leaks were fixed; 
TLS was redesigned in more straightforward way;
OPENCV_ABI_COMPATIBILITY define was added;
 2015-08-19 13:31:44 +03:00
thebucc
421e1b237c Fix for bug #5007: moved definition of Size_MatDepth_t and Size_MatDepth from ts_perf.hpp to perf_channels.cpp. This way they are closer to where they are needed and live in a different namespace (possibly the reason why the fix works). 2015-08-17 16:09:00 +01:00
Vladimir Dudnik
58934f1e16 add condition to skip unmapping for internally allocated host memory. this should fix map_unmap_counting UMat test. 2015-08-17 14:36:34 +03:00
Alexander Alekhin
9b0f5e61d1 Merge pull request #5185 from mshabunin:fix-rgbe-header-parse 2015-08-17 10:19:15 +00:00
Alexander Alekhin
e65de8d1da fixes for MSVS compiler optimizer 2015-08-16 02:03:04 +03:00
Alexander Alekhin
ac37b77452 c++ move semantics for cv::UMat 2015-08-16 02:02:26 +03:00
Alexander Alekhin
306aa0e699 c++ move semantics for cv::Mat_ 2015-08-16 02:02:25 +03:00
Alexander Alekhin
1afc9eb730 c++ move semantics for cv::Mat 2015-08-16 02:02:24 +03:00
Alexander Alekhin
5a0af53683 c++ move semantics for cv::Ptr<> 2015-08-15 16:45:19 +03:00
Alexander Alekhin
56cdd6f14f Merge pull request #5116 from lenlen:viz_improvement 2015-08-15 08:28:22 +00:00
Antonella Cascitelli
079ceea616 Added new functionalities to viz module 
- load OBJ file
- set offscreen rendering
- set roll angle of the camera
- get Mat screenshot of the current scene
- remove all lights from the scene
- add a custom light in the scene
- modify the size of the WImage3D widget
- added ambient property for the widget

Changed Vec3d in cv::viz::Color

Renamed method getMatScreenshotin getScreenshot

Modified showWidget

Fixed on viz::Color and reverted fix on vtkProp3D

Removed cameraRoll method

Merged load mesh method (for ply and obj file)

Fixed doc

Fixed cv::viz::WImage3D::setSize for vtk5.8

Fixed enum for cv::viz::Mesh::load
 2015-08-15 01:03:59 +02:00
Alexander Alekhin
e866680d96 Merge pull request #5156 from brunomorishita:fix_build 2015-08-14 13:56:45 +00:00
Alexander Duda
fbcf5f0918 cvCreateCameraCapture: fix using preffered interface 
The provided interface id must be removed from the index. Otherwise, the
underlying implementations are using a wrong camera id.

Example:
VideoCapture(800) fails because PvAPI tries to open a camera
on position 800
 2015-08-14 13:40:24 +02:00
Bruno Goncalves
cf4025c224 fix documentation code formulas 2015-08-13 23:13:47 -03:00
Alexander Alekhin
68f8d1cef0 Merge pull request #5164 from vladimir-dudnik:test-umat-copyTo-issue 2015-08-13 14:59:07 +00:00
Maksim Shabunin
9e4c62967b Fixed RGBE images header parsing (fixes #4885) 2015-08-13 17:24:54 +03:00
boatx
d674965bf9 Fixing typo in variable name. 2015-08-12 20:50:05 +00:00
ManuelFreudenreich
89889ae8ea changed hog to work with variable parameters and changed the hog sample to test it with more options 
added comments and tests
 2015-08-12 09:16:20 +02:00
Vladimir Dudnik
6bb8afde96 fixed typo in OpenCLAllocator.upload method (wrong step used) 2015-08-11 16:01:05 +03:00
Vladimir Dudnik
131d7c394e enabled test UMat copyTo. Now it will detect FAIL on Intel platform for ROI (issue with clEnqueueCopyBufferRect) 2015-08-11 14:19:14 +03:00
Vladimir Dudnik
ef0d1c1c3f fixed download/upload for non contiguous umat 2015-08-11 01:33:46 +03:00
Alexander Alekhin
cda9ed449f fix some functions for valid processing of empty string content (cstr_==0, len_==0) 2015-08-10 18:08:58 +03:00
Alexander Alekhin
09b9b0fb9e Merge pull request #5135 from alalek:issue_4468 2015-08-10 14:46:31 +00:00
Alexander Alekhin
3316e58314 more test loops (and disable tests - tests pass but require a lot of time) 2015-08-10 14:44:28 +03:00
Alexander Alekhin
aed9f5d5e8 Merge pull request #5132 from hewj03:master 2015-08-09 11:27:43 +00:00
Bruno Goncalves
894c2468df fix build error when both OpenNI and OpenNI2 are supported (issue 4918) 2015-08-09 00:48:49 -03:00
Anatoly Baksheev
0dab097a26 minor comment fix 2015-08-07 12:55:10 +03:00
StevenPuttemans
dd8589c352 change as suggested by original programmer and user of ecc software 2015-08-06 14:59:15 +02:00
Alexander Alekhin
8293ed7f9b add tests from issue 4468 (#5062) 2015-08-06 13:50:13 +03:00
Wenju He
67ca143a0b fix adaptiveThreshold mean 2015-08-06 10:23:31 +08:00
Vadim Pisarevsky
4a2aad5bba Merge pull request #4149 from LaurentBerger:ThreshGaussianFloat 2015-08-05 17:25:01 +00:00
Alexander Alekhin
21467d817b tapi: add test from issue 4380 (#5010) 2015-08-05 16:08:48 +03:00
LaurentBerger
a64d096369 remove test 2015-08-04 22:58:22 +02:00
Lorena García
c545857ea6 Indent fix 2015-08-04 16:50:55 +02:00
Lorena García
4cd78bc7ad Whitespace error 2015-08-04 16:45:39 +02:00
Lorena García
fe62243805 Whitespace error 2015-08-04 16:37:41 +02:00
Lorena García
2cb47b4191 Update data.cpp 
Update to allow loading data from a .csv file that only contains training samples values and not the associated responses. To allow this behavior, function must be called with parameters ResponsesStartIdx <= -2 and ResponsesEndIdx = 0
 2015-08-04 15:58:24 +02:00
Vadim Pisarevsky
3f65a86977 Merge pull request #4233 from alalek:fix_4006 2015-08-03 05:46:29 +00:00
Vadim Pisarevsky
c10230f81c Merge pull request #5087 from alexst07:cuda_contrib 2015-08-03 05:42:33 +00:00
Oliver Lumby
2de3a24f46 fix CvVideoCamera defaultfps 2015-08-01 13:55:28 +02:00
Alexander Alekhin
fe0a17e78f fix build with Win7 SDK 2015-07-30 23:23:01 +03:00
Alexander Alekhin
1704aea6a0 tapi: enable some disabled tests 2015-07-30 19:21:24 +03:00
Maksim Shabunin
429d280501 Merge pull request #5081 from sbokov:Adding_HAL_v_extract 2015-07-30 16:12:38 +00:00
Alexander Alekhin
2b2bc83b61 Merge pull request #4238 from vladimir-dudnik:d3d11-nv12-interop 2015-07-30 10:36:25 +00:00
Alex Torres
383b7e9dd1 Fixes namespace error on cudaoptflow 2015-07-29 14:22:45 -03:00
Vladimir Dudnik
6bd01a96d9 finished with NV12 support for D3D11-interop. Now, if texture is in NV12 format then it will be converted to/from BGR UMat. 2015-07-29 19:52:05 +03:00
Vladimir Dudnik
d4774ead43 d3d11-nv12 interop 
fixed issues with ocl nv12 cvt kernel

finisged ocl nv12-to-rgba kernel, update dx-interop samples. (ocl rgba-to-nv12 kernel will be added later)

an attempt to fix build issue

fix for non opencl build issue

fix typo

fix compilation warnings

fix compile issue for Mac (OpenCL)

add convertion from rgba to nv12 (still need to debug kernel)

remove empty line at the EOF

fixed compilation warning
 2015-07-29 19:52:03 +03:00
Alex Torres
2838ccc78e Fixes compilation errors when BUILD_CUDA_STUBS is ON 2015-07-29 08:59:38 -03:00
Alexander Alekhin
4eef486afe tapi: datarace fixup for cvtColor 2015-07-28 11:49:46 +03:00
Alexander Alekhin
9bcccb028b fixes 2015-07-28 11:49:46 +03:00
Alexander Alekhin
cd5c70691a ocl: add map tests 2015-07-28 11:49:46 +03:00
Alexander Alekhin
b36f565d13 fix OpenCV code (bug 4006: #4862) 2015-07-28 11:49:41 +03:00
Vladimir Dudnik
ed7907e46c add test for bug 4006: #4862 2015-07-28 11:49:02 +03:00
sbokov
1ef8cf5a23 Replacing SSE with v_extract 2015-07-27 19:49:25 +03:00
Alexander Alekhin
47e7a7a7ce Merge pull request #4213 from mshabunin:hal-vextq 2015-07-27 15:08:29 +00:00
Alexander Alekhin
c94945f892 Merge pull request #4210 from wangyan42164:ocl_umat_convert 2015-07-27 15:05:57 +00:00
Maksim Shabunin
6b8e13d017 Merge pull request #4232 from berak:patch-2 2015-07-27 08:15:11 +00:00
berak
d9148ea604 Update ml.hpp 
misplaced CV_WRAP statement lead to not exposing EM::getCovs() to python/java/matlab wrappers

add a CV_OUT to return the covs properly
 2015-07-25 08:22:39 +02:00
Maksim Shabunin
ecd3661119 Merge pull request #4179 from sbokov:improvingStereoSGBM 2015-07-24 21:12:56 +00:00
Maksim Shabunin
6a6ccf6032 v_extract universal intrinsic 2015-07-24 14:05:28 +03:00
sbokov
f40b580bb8 Fixing StereoSGBM ROI 
Now StereoSGBM behaves similarly to StereoBM in terms of ROI handling.
 2015-07-23 23:17:16 +03:00
sbokov
aea4157340 Adding new HAL-accelerated MODE_SGBM_3WAY 
New mode is approximately 2-3 times faster than MODE_SGBM
with minimal degradation in quality and uses universal
HAL intrinsics. A performance test was added. The accuracy
test was updated to support the new mode.
 2015-07-23 23:08:26 +03:00
Alexander Alekhin
11c3fa527a Merge pull request #4222 from mshabunin:fix-android-warnings 2015-07-23 12:38:14 +00:00
Yan Wang
132416ebe9 It is unnecessary to use fma() if no scaling. 
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
 2015-07-23 10:18:11 +08:00
Maksim Shabunin
46e457d340 Fixed loop check 2015-07-22 17:54:42 +03:00
Maksim Shabunin
14d7b38613 Fixing GCC 4.9 warnings 2015-07-22 16:12:31 +03:00
Vadim Pisarevsky
6d3bc7c82d Merge pull request #4183 from paroj:8point 2015-07-22 11:01:23 +00:00
Yan Wang
a00eb1e9f5 Move coefficient (32.0f) to the end of every iteration. 
It could reduce 7 multiplications every iteration.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
 2015-07-22 11:25:18 +08:00
Alexander Alekhin
c1c0f23fd1 Merge pull request #4004 from paroj:camera-api 2015-07-21 15:57:48 +00:00
Alexander Alekhin
c0ee03fab2 Merge pull request #4192 from avershov:opencl-opengl-buffer 2015-07-21 14:10:00 +00:00
Vadim Pisarevsky
c976c1192d Merge pull request #4181 from themightyoarfish:findEssMatDocTypoFix 2015-07-21 12:06:45 +00:00
Vadim Pisarevsky
61c0ff007a Merge pull request #4197 from themightyoarfish:projectPointsDocBugfix 2015-07-21 11:56:46 +00:00
Vadim Pisarevsky
03824682ad Merge pull request #4189 from vladimir-dudnik:update_dx_samples 2015-07-21 11:55:21 +00:00
Vadim Pisarevsky
a7805301cb Merge pull request #4201 from sturkmen72:new_function_imread_reduced 2015-07-21 11:49:51 +00:00
Vadim Pisarevsky
e26b941e66 Merge pull request #4207 from alalek:fix_calib3d_test 2015-07-21 11:48:14 +00:00
Alexey Ershov
89392b2a6d added convertToGLBuffer() & convertFromGLBuffer() functions; added OpenGL interop sample comment 
rewrite & change convertFromGLBuffer() & convertToGLBuffer() into acquireGLBuffer() & releaseGLBuffer(), respectively

opengl sample: added buffer support

tested and fixed buffer support on Windows

change glFlush() call to glFinish()

added UMat::release() call; fixed functions' names

adopted & implemented API suggestion(s) from Alexander

fixed unreachable code warning

added more info to the mapGLBuffer/unmapGLBuffer description
 2015-07-21 13:42:17 +03:00
Alexander Alekhin
b6d88f21af Merge pull request #4195 from wangyan42164:ocl_pyrlk 2015-07-21 09:25:11 +00:00
Alexander Alekhin
dac071ed78 Merge pull request #4202 from PhilLab:patch-5 2015-07-20 15:13:43 +00:00
Alexander Alekhin
bbe75fe1d2 calib3d: normalize Rodrigues vector in perf test 2015-07-20 17:05:25 +03:00
Suleyman TURKMEN
7522527827 Update window_w32.cpp 2015-07-20 16:35:00 +03:00
Philipp Hasper
2b7637df36 Fixed buffer overflow in string handling 
pos should never exceed strlen, else the overflow check 'if (!len)' will wrongfully pass
 2015-07-20 09:00:24 +02:00
Yan Wang
2c1650ad33 Optimize pyrlk. 
1. Remove uncessary index calculation.
2. Use mad/mad24 as possible.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
 2015-07-20 13:46:01 +08:00
Suleyman TURKMEN
7b7d54df68 new function imread_reduced() 
by this new function we can set libjpeg "scale_denom" parameter and load jpeg images scaled 1/2 - 1/4 - 1/8
other image formats resized after loading
 2015-07-19 03:53:43 +03:00
Anton V. Shokurov
4691d98e19 Adds support for property CV_CAP_PROP_FOCUS in functions cvSetCaptureProperty and cvGetCaptureProperty. 
In compliance with the Windows (DirectDraw) version autofocus is disabled when either of the abovementioned functions is called.
 2015-07-18 15:24:16 +03:00
Dominik Kleiser
f363670934 Bug #3800 - Resize viewport when CV_WINDOW_KEEPRATIO was set (Qt) 2015-07-17 20:02:01 +02:00
themightyoarfish
b8f93e08e9 Fixed documentation bug for projectPoints: Distortion coefficients cannot actually be NULL 2015-07-17 17:34:33 +02:00
Maksim Shabunin
0726c4d4ea Merge pull request #4190 from sbokov:fixingStereoBMissue 2015-07-15 14:43:09 +00:00
Josh Klontz
beed99dbc1 fixed conditional compilation of RGB2Gray<ushort> template specialization 2015-07-14 20:56:43 -04:00
sbokov
e0cea92f6e Fixing possible invalid memory access in validateDisparity 2015-07-14 18:23:24 +03:00
Maksim Shabunin
00b72df6c5 Merge pull request #4147 from alalek:fix_world_cyclic_deps 2015-07-14 14:54:38 +00:00
Alexander Alekhin
4c1cbffd2a Merge pull request #4184 from alalek:fix_cmake_status 2015-07-14 10:32:06 +00:00
Vladimir Dudnik
dee05f982b compute fps changed (now only interop counts). fixed d3d10 and d3d11 print info method (there were issues with texture mapping) 2015-07-13 23:40:45 +03:00
Pavel Rojtberg
0688bb61ed simplify 8point algorithm using Matx classes 2015-07-13 16:58:35 +02:00
ultrafro
ed574171bb Fixed polarity of ImageRegistration mode in setDepthGeneratorProperty function of CvCapture_OpenNI2 class 2015-07-12 18:28:23 -04:00
Alexander Alekhin
aa871ca506 fix wrong usage of status(), remove useless message in videoio 2015-07-10 19:18:07 +03:00
themightyoarfish
fcc842f08b Fixed typo in doc for findEssentialMat 2015-07-10 12:45:45 +02:00
Alexander Alekhin
88e66697a7 t-api: try to fix allocator fallback code paths 
issue: http://code.opencv.org/issues/4461
 2015-07-09 13:26:59 +03:00
Alexander Alekhin
06617392e0 workaround issue with MatExpr 2015-07-08 16:22:59 +03:00
Alexander Alekhin
a6f46d7bb1 issue 4457 2015-07-08 16:22:58 +03:00
Pavel Rojtberg
b1842a4b89 use simplified API selection logic in cvCreateCameraCapture as well 2015-07-08 13:46:57 +02:00
Pavel Rojtberg
2909e07cb2 deny any other interfaces if someone is specified as preference 
it provides more expectable results to end-users.
based on feedback by Alexander Alekhin
 2015-07-08 13:46:56 +02:00
Pavel Rojtberg
41d8c4d879 allow specifying apiPreference in VideoCapture when opening a file. Add 
a separate function instead of an overload not to change the ABI.

rename VideoCapture paramter 'device' to 'index' in CPP to reflect that
it allows specifying the API.
update comments to explain how to specify the API.
 2015-07-08 13:46:56 +02:00
Vadim Pisarevsky
cd8143be0a Merge pull request #4171 from jet47:install-cudev-test 2015-07-08 10:10:17 +00:00
Vadim Pisarevsky
4997f5dfe9 Merge pull request #4174 from yangj1e:fix_svm_trainauto 2015-07-08 10:04:40 +00:00
Vadim Pisarevsky
743160b6ac Merge pull request #4158 from alalek:fix-bigdata-copyto 2015-07-08 10:00:46 +00:00
Vadim Pisarevsky
92777281a7 Merge pull request #4173 from kalistratovag:mjpeg_encoder_coverity_warnings 2015-07-08 09:19:01 +00:00
Alexander Alekhin
40fcc9d149 Merge pull request #4159 from alalek:vector_processing 2015-07-06 13:22:57 +00:00
Alexander Alekhin
c0d61964d6 ocl: fix unaligned memory access 
http://code.opencv.org/issues/4462
 2015-07-06 13:58:17 +03:00
kalistratovag
e2fe0ca835 Removing deadcode blocks, redudant variable & initializing all vars in constructor 
Adding &31 to bit shift in order to silince coverity BAD_SHIFT defect

add default_stripes_count const
 2015-07-06 12:36:21 +03:00
Jie Yang
2ba0d31785 Fix SVM::trainAuto (Bug #4464) 
Fix SVM::trainAuto (Bug #4464)
 2015-07-06 01:20:26 +09:30
Vladislav Vinogradov
2f0de3aa2c add opencv_test_cudev to installation package 2015-07-03 13:33:36 +03:00
Alexander Alekhin
ca692b9804 Merge pull request #4168 from Dikay900:export_threadcontrol 2015-07-02 11:31:16 +00:00
Alexander Alekhin
f4cb8c0dfb Merge pull request #4127 from avershov:opengl-opencl-sample 2015-07-02 11:24:10 +00:00
Alexander Alekhin
885114ed2c fix copyTo memory corruption, but the main problem is still here 2015-07-02 13:47:59 +03:00
Dikay900
3ebb5d0e3b export thread control to python aswell 2015-07-01 22:55:12 +02:00
Vadim Pisarevsky
172c00faa6 Merge pull request #4167 from berak:patch-2 2015-07-01 17:29:24 +00:00
Alexander Alekhin
30a5a9ed34 test vector processing 2015-07-01 20:10:22 +03:00
Vadim Pisarevsky
c81b064727 Merge pull request #4164 from kalistratovag:parallel_mjpeg 2015-07-01 14:15:52 +00:00
berak
b29e473c21 fix plausability check, #issue 4429 2015-07-01 15:32:37 +02:00
Vadim Pisarevsky
e379ea6ed6 Merge pull request #4117 from jaimefrio:relaxed_strides 2015-07-01 10:53:45 +00:00
Vadim Pisarevsky
80eec9d531 Merge pull request #4064 from MSOpenTech:test-contrib 2015-07-01 10:47:44 +00:00
Vadim Pisarevsky
0ed0f2953a Merge pull request #4166 from sbokov:fixingStereoBMissue 2015-07-01 10:27:21 +00:00
Vadim Pisarevsky
426b3f6198 Merge pull request #4139 from swook:spatial_gradient 2015-07-01 10:22:36 +00:00
Vadim Pisarevsky
d5afd070ce Merge pull request #4094 from kashefy:Mat_push_back_MatExpr_bug_4340 2015-07-01 09:09:51 +00:00
Seon-Wook Park
20bf88bad1 spatialGradient: Make kern args const& 2015-07-01 09:34:27 +09:00
Alexey Ershov
9dfa9a81e9 eliminated unused function __OpenCLinitializeGL(), simplified query device logic 2015-06-30 21:27:15 +03:00
Seon-Wook Park
90c398ea67 spatialGradient: Add CV_SSE2 check 2015-07-01 00:42:08 +09:00
sbokov
ff1687d378 Fixing uninitialized memory access problem 2015-06-30 18:16:56 +03:00
Evgeny Agafonchikov
6a6d58d389 Adding test support for WINRT 2015-06-30 15:35:20 +03:00
kalistratovag
65e0387aa5 Implementing parallel mjpeg encoder. 
Fixed errors in parallel_for based on pthreads

Fixing compiler errore & removing whitespaces

Fixing prallel_for_pthreads error and warnings on win
 2015-06-30 13:57:37 +03:00
LaurentBerger
12362f76b1 Test for adaptive thresh will give FAIL_BAD_ACCURACY for old 
implementation of adaptivethreshold
 2015-06-30 10:51:50 +02:00
Youssef Kashef
790ef21a60 add unit test around Mat::push_back() 
add template specialization Mat::push_back() for MatExpr paramters

extend push_back MatExpr to mat in unit test

cast to object instead of reference

test with multi-row MatExpr input
 2015-06-30 10:29:40 +02:00
Seon-Wook Park
ed38ca5179 spatialGradient: Remove 4 loads in inner loop 2015-06-30 16:08:15 +09:00
Vadim Pisarevsky
8869150649 Merge pull request #4153 from stefan-cornelius:master 2015-06-30 06:12:03 +00:00
Seon-Wook Park
5dddb47863 spatialGradient: Remove pointers caching 2015-06-30 10:51:10 +09:00
Alexander Alekhin
50b453e5c2 Merge pull request #4150 from alalek:opencv_org_issue_4428 2015-06-29 17:08:54 +00:00
Seon-Wook Park
cf0fdfa2bb spatialGradient: Change ordering of vector loads 2015-06-29 23:50:05 +09:00
Seon-Wook Park
658f96b447 spatialGradient: L/R border handling outside. Kernelize. 2015-06-29 23:12:33 +09:00
Vadim Pisarevsky
d0c43f16e0 Merge pull request #4155 from MSOpenTech:highgui_contrib 2015-06-29 12:44:16 +00:00
Seon-Wook Park
15ea401087 spatialGradient: Move vector decl into loop 2015-06-27 10:01:47 +02:00
Seon-Wook Park
db0cc56c52 spatialGradient: Re-introduce 2-rows at a time 2015-06-27 09:53:42 +02:00
Seon-Wook Park
f958f29c55 spatialGradient: Suppress uninitialised j warnings 2015-06-27 01:03:43 +02:00
Maxim Kostin
face069874 Added support for highgui module on WinRT 8.1+ 
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
 2015-06-26 23:41:25 +03:00
Seon-Wook Park
62cad09c64 spatialGradient: Process 1 row at a time in SSE 2015-06-26 17:35:17 +02:00
Seon-Wook Park
8a21726ae5 spatialGradient: Remove an unnecessary branch in nosse code 2015-06-26 17:26:21 +02:00
Seon-Wook Park
febd0f14c6 spatialGradient: Don't dynamically alloc C array, use vector 2015-06-26 17:15:44 +02:00
Seon-Wook Park
f92e2ed57a spatialGradient: Make nosse version faster 2015-06-26 17:13:23 +02:00
Seon-Wook Park
7b01e32fe8 spatialGradient: HAL-accelerated 
TODO: Make nosse ver faster than Sobel
      Make sse ver faster than Sobel for BORDER_REPLICATE
 2015-06-26 16:41:00 +02:00
Seon-Wook Park
6803d1ed28 Support non continuous, BORDER_REPLICATE 
TODO: HAL-accelerated code
 2015-06-26 14:49:31 +02:00
Alexey Ershov
3f68787051 OpenGL OpenCL sample 
057cd52 first versions: cv::ogl::convertFromGLTexture2D & cv::ogl::convertToGLTexture2D
5656e94 added autogenerated stuff for cl_gl.h
765f1fd resolved CL functions in opengl.cpp
9f9fee3 implemented function cv::ogl::ocl::initializeContextFromGLTexture2D()
a792adb cv::ogl::ocl::initializeContextFromGLTexture2D() - added linux support (glx.h)
51c2869 added missing error message in function cv::ogl::ocl::initializeContextFromGLTexture2D()
513b887 fixed extension call in function cv::ogl::ocl::initializeContextFromGLTexture2D()
475a3e9 added CL-GL interop Windows sample (gpu/opengl_interop.cpp)
07af28f added building of CL-GL interop sample - Windows only
befe3a2 fixed whitespace errors & doxygen warnings (precommit_docs)
551251a changed function name to cv::ogl::ocl::initializeContextFromGL(), removed unused argument
4d5f009 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR
9fc3055 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH
6d31cee Revert "changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH"
cc6a025 added texture format check in cv::ogl::convertFromGLTexture2D()
063a2c1 CL-GL sample: added Linux implementation (Xlib/GLX)
c392ae9 fixed trailing whitespace
85a80d0 fixed include files
ae23628 excluded samples/opengl from build case 2
9870ea5 added android EGL support
530b64c added doxygen documentation comments to CL-GL interop functions
 2015-06-26 14:15:12 +03:00
Alexander Alekhin
04b2edcc8c ocl: autogenerated files for cl_gl.h 2015-06-26 14:08:27 +03:00
Alexander Alekhin
ee68d26f99 ocl: update generator scripts 2015-06-26 14:08:20 +03:00
Alexander Alekhin
24e2a008c3 copyTo: fix for big data (4Gb+) 2015-06-25 21:08:37 +03:00
Alexander Alekhin
eb4bd6b4fb Merge pull request #4156 from mshabunin:fix-neon-intrin 2015-06-25 17:52:14 +00:00
Alexander Alekhin
bb556b8f55 Merge pull request #4124 from ruslo:android.fix 2015-06-25 17:16:04 +00:00
Maksim Shabunin
7b784fa2ea Fixed transpose intrinsic prefix for NEON 2015-06-25 18:19:23 +03:00
LaurentBerger
ca0114228c In adaptiveThreshold ADAPTIVE_THRES_GAUSSIAN_C gaussianBlur is computed using float 
number
 2015-06-25 07:51:06 +02:00
Stefan Cornelius
851f20e40c Fix processing of SunRaster images with negative maplength 2015-06-25 00:17:49 +02:00
Alexander Alekhin
8298644b85 Merge pull request #4151 from lupustr3:pvlasov/ipp_alignment 2015-06-24 16:45:13 +00:00
Vadim Pisarevsky
56e637d5f4 Merge pull request #4135 from lupustr3:ipp_code_refactoring 2015-06-24 16:18:55 +00:00
Maksim Shabunin
6eb8d0aa51 Fixed build with CUDA 2015-06-24 16:05:08 +03:00
Pavel Vlasov
e02195b3dc Accidentally removed tegra checks were returned; 2015-06-24 14:55:45 +03:00
Pavel Vlasov
e57609836c Warning fix; 2015-06-24 14:43:42 +03:00
Pavel Vlasov
101607a7d0 Imgproc_Hist_MinMaxVal.accuracy fix; 
Some code style corrections;
 2015-06-24 13:50:17 +03:00
Pavel Vlasov
8439b5942b Proper IPP alignment; 2015-06-24 09:21:35 +03:00
Alexander Alekhin
53fc5440d7 implement singleton lazy initialization 2015-06-23 14:38:45 +03:00
LaurentBerger
56b2b450ce A new constant in adaptivethreshold is created to calculate 
gaussianBlur with CV_32F. hence rouding error are avoided
 2015-06-22 22:21:30 +02:00
Alexander Alekhin
c8167c0b99 fix cyclic deps error (world,shared) 2015-06-22 20:14:30 +03:00
Vadim Pisarevsky
945aa06f58 Merge pull request #4111 from mshabunin:fix-flann-access 2015-06-22 11:53:32 +00:00
Vadim Pisarevsky
81e1c043cc Merge pull request #4142 from sturkmen72:patch-2 2015-06-22 11:51:39 +00:00
Vadim Pisarevsky
bd90425f71 Merge pull request #4136 from alalek:fix_matallocator_destruction 2015-06-22 11:49:36 +00:00
Alexander Alekhin
a1cdbd4d84 Merge pull request #4140 from mshabunin:fix-java-package 2015-06-20 14:20:54 +00:00
Suleyman TURKMEN
d64c8aad99 Update mat.hpp 
spelling corrections
 2015-06-20 11:18:47 +03:00
Dikay900
902e381264 fix one dict parameter in ffmpeg implementation (introduced while porting) 2015-06-20 10:17:34 +02:00
Seon-Wook Park
2ff614dfab spatialGradient: Per row in outer loop 2015-06-19 19:25:07 +02:00
Maksim Shabunin
83b2621de4 Android: renamed default library name for static and dynamic fallback load; fixed libz import for 64-bit platforms 2015-06-19 18:53:45 +03:00
Vladimir Dudnik
217dd63e02 OpenCV-OpenCL interop (PR #4072): 
Commits:
added new function, cv::ocl::attachContext(String& platformName, void* platformID, void* context, void* deviceID) which allow to attach externally created OpenCL context to OpenCV.
add definitions of clRetainDevice, clRetainContext funcs
removed definitions for clRetainContext, clRetainDevice
fixed build issue under Linux
fixed uninitialized vars, replace dbgassert in error handling
remove function which is not ready yet
add new function, cv::ocl::convertFromBuffer(int rows, int cols, int type, void* cl_mem_obj, UMat& dst, UMatUsageFlags usageFlags = cv::USAGE_DEFAULT) which attaches user allocated OpenCL clBuffer to UMat
uncommented clGetMemObjectInfo definition (otherwise prevent opencv build)
fixed build issue on linux and android
add step parameter to cv::ocl::convertFromBuffer func
suppress compile-time warning
added sample opencl-opencv interoperability (showcase for cv::ocl::convertFromBuffer func)
CMakeLists.txt modified to not create sample build script if OpenCL SDK not found in system
fixed build issue (apple opencl include dir and spaces in CMake file)
added call to clRetainContext for attachContext func and call to clRetainMemObject for convertFromBuffer func
uncommented clRetainMemObject definition
added comments and cleanup
add local path to cmake modules search dirs (instead of replacing)
remove REQUIRED for find_package call (sample build together with opencv). need to try standalone sample build
opencl-interop sample moved to standalone build
set minimum version requirement for sample's cmake to 3.1
put cmake_minimum_required under condition, so do not check if samples not builded
remove code dups for setSize, updateContinuityFlag, and finalizeHdr
commented out cmake_minimum_required(VERSION 3.1)
add safety check for cmake version
add convertFromImage func and update opencl-interop sample
uncommented clGetImageInfo defs
uncommented clEnqueueCopyImageToBuffer defs
fixed clEnqueueCopyImageToBuffer defs
add doxygen comments
remove doxygen @fn tag
try to restart buildbot
add doxygen comments to directx interop funcs
remove internal header, use fwd declarations in affected compile units instead
 2015-06-19 13:33:22 +03:00
Seon-Wook Park
e633c991b0 spatialGradient: Doc, fix dangling newline error 2015-06-19 04:57:01 +02:00
Seon-Wook Park
815cd8970d spatialGradient: Remove unnecessary index calculation 2015-06-19 04:46:17 +02:00
Seon-Wook Park
b5c4355c13 spatialGradient: Add basic perf test 2015-06-19 04:29:28 +02:00
Seon-Wook Park
f9c4c96663 spatialGradient: Reduce temporary vectors 2015-06-19 04:29:07 +02:00
Seon-Wook Park
a2dbd2f10e spatialGradient: Less vector loads 2015-06-19 04:07:18 +02:00
Seon-Wook Park
88bc88125a spatialGradient: Vectorise inner area 2015-06-19 03:36:49 +02:00
Seon-Wook Park
770e742e04 spatialGradient: Add non-SSE version 2015-06-19 02:56:51 +02:00
Seon-Wook Park
11fb1f74cc spatialGradient: Add asserts 2015-06-19 01:23:01 +02:00
Alexander Alekhin
6ab9df5208 Merge pull request #4132 from mshabunin:fix-java-package 2015-06-18 16:13:23 +00:00
Seon-Wook Park
9f1c641199 spatialGradient: Add test class and Sobel proxy method 2015-06-18 17:42:32 +02:00
Maksim Shabunin
00fb8a3abf Merge pull request #4103 from mtamburrano:master 2015-06-18 11:41:13 +00:00
Alexander Alekhin
032b6322fc fix MatAllocator creation/destruction issues 2015-06-18 14:02:01 +03:00
Dmitry Budnikov
a5a21019b2 ipp_countNonZero build fix; 
Removed IPP port for tiny arithm.cpp functions

Additional warnings fix on various platforms.

Build without OPENCL and GCC warnings fixed

Fixed warnings, trailing spaces and removed unused secure_cpy.

IPP code refactored.

IPP code path  implemented as separate static functions to simplify future work with IPP code and make it more readable.
 2015-06-18 12:47:07 +03:00
manuele
a55a8c9aa5 Enable NEON optimization for cvRound on newer devices 2015-06-18 11:19:46 +02:00
Maksim Shabunin
c79ad45fce Added interface libraries for android opencv_java 2015-06-17 18:10:28 +03:00
Maksim Shabunin
7bfd070864 Merge pull request #4095 from alalek:hal_unresolved_symbols 2015-06-17 14:35:40 +00:00
Vadim Pisarevsky
bf8434770f Merge pull request #4115 from themightyoarfish:MatToUIImage_transparency 2015-06-17 11:59:33 +00:00
Vadim Pisarevsky
e055128d0d Merge pull request #4099 from sash-kan:fix.2822 2015-06-17 11:58:40 +00:00
Vadim Pisarevsky
66216ea2be Merge pull request #4093 from mshabunin:python-bases 2015-06-17 11:55:07 +00:00
Vadim Pisarevsky
d882797fbd Merge pull request #4100 from alalek:fix_ffmpeg 2015-06-17 11:29:33 +00:00
Vadim Pisarevsky
0824ed595b Merge pull request #4090 from MSOpenTech:highgui_winrt 2015-06-17 11:22:41 +00:00
Vadim Pisarevsky
fd225469bc Merge pull request #4122 from alalek:fix_issue_3891 2015-06-17 11:13:27 +00:00
Ruslan Baratov
0fcc5face3 Fix `cmake -E touch classes.jar' step 
`-E touch` command doesn't create intermediate directories. We have to do it
manually using `file(MAKE_DIRECTORY ...)` command.
 2015-06-17 12:11:11 +02:00