Pavel Rojtberg
46ada3886f
fix wrong parsing of values containing '='
...
fixes #5074
2015-09-24 17:27:07 +02:00
Pavel Rojtberg
1dd7f546af
CommandLineParser: add special <none> value to disallow empty strings
...
some mandatory string keys like paths must not be empty. Add the special
default value `<none>` so the CommandLineParser can enforce this and
generate an according error message for us.
2015-09-23 15:43:46 +02:00
Pavel Rojtberg
a388806555
enable additional CommandLineParser tests
2015-09-22 18:37:51 +02:00
Pavel Rojtberg
2ced3ba276
CommandLineParser: throw on programmer error
...
requesting a previously undeclared key is most likely an programming
error. e.g. a typo "--unused vs --unsued".
So throw in those cases.
Add an according failure testcase.
2015-09-22 18:35:49 +02:00
Alexander Alekhin
d430e802f2
cmdparser: allow empty strings
2015-09-22 16:34:37 +03:00
Vadim Pisarevsky
9f697510ca
Merge pull request #5320 from berak:lda_fix
2015-09-22 10:38:46 +00:00
Alexander Alekhin
4bb4c92f68
Merge pull request #5376 from lupustr3:pvlasov/compare_16s_fix
2015-09-22 10:19:52 +00:00
Pavel Vlasov
33e659786f
Fix for cmp16s condition during IPP compare type convert;
2015-09-21 18:11:20 +03:00
Alexander Alekhin
d945aff132
Merge pull request #5371 from Dikay900:ports_to_master
2015-09-21 13:52:45 +00:00
Alexander Alekhin
a9b91bb400
Merge pull request #5372 from alalek:cmd_tests
2015-09-21 13:52:26 +00:00
Gleb Gladilov
2bc4486966
Added test of minMaxLoc on filling with maximums of int
2015-09-21 13:44:30 +02:00
Gleb Gladilov
344d9fd83f
Fixed minMaxLoc and test functions
2015-09-21 13:44:29 +02:00
Elena Shipunova
5de01fde53
do not proceed with removing zero-length slice
2015-09-21 13:44:26 +02:00
Alexander Alekhin
05b1636780
Merge pull request #5329 from paroj:cliparser
2015-09-21 09:46:54 +00:00
berak
2f7c926670
remove usage of obsolete _dataAsRows flag
2015-09-21 07:59:09 +02:00
Alexander Alekhin
d3071db0d7
add some CommandLineParser tests
2015-09-20 13:14:41 +03:00
Pavel Rojtberg
96cc618410
has() should only test for the presence of the argument
...
and not consider its value. treat arguments with a set default value as
present.
2015-09-18 18:42:14 +02:00
Pavel Rojtberg
08dd126f08
do not parse empty default values and improve error messages
2015-09-18 18:42:14 +02:00
Alexander Alekhin
0051208684
Merge pull request #5349 from lupustr3:pvlasov/tls_update
2015-09-18 14:39:08 +00:00
Alexander Alekhin
d2b10d8aa1
Merge pull request #5355 from renatoGarcia:master
2015-09-18 13:38:29 +00:00
Alexander Alekhin
af0942c78f
Merge pull request #5335 from Dikay900:ports_to_master
2015-09-18 11:06:08 +00:00
Pavel Vlasov
aa485ccd75
TLS keys leak fix;
...
Disables TLS copy constructor and operator, as they can lead to errors and reservation of too much keys in TLS storage;
gather method was added to TLS to gather data from all threads;
2015-09-17 15:49:20 +03:00
Renato Florentino Garcia
1a18fa1c94
Correct a typo.
2015-09-16 21:16:23 -03:00
Vadim Pisarevsky
9533982729
Merge pull request #5272 from avershov:opencl-vaapi-fallback
2015-09-14 11:54:20 +00:00
Alexander Alekhin
bf42b9603b
fix "unreachable code" warning
2015-09-14 13:11:12 +03:00
Alexander Alekhin
1a8d7f9587
ocl: temporary restore OpenCL tls data (ocl.cpp without fix)
2015-09-13 20:28:24 +03:00
Alexander Alekhin
7213e5f68a
ocl: correct disabling of OpenCL code
2015-09-13 20:28:23 +03:00
Ilya Lavrenov
df21a24f81
initialize padding of CvString with zeros
2015-09-13 12:38:10 +02:00
Ilya Lavrenov
0303e8067e
fixed memory leak in core ds tests
2015-09-11 18:46:52 +02:00
Alexey Ershov
933ad0e710
changed call to getDefault: false to true in fallback initialization
2015-09-10 14:36:40 +03: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
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
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
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
Vadim Pisarevsky
a78da45fec
Merge pull request #5242 from apavlenko:fix_releasing_temp_umat
2015-08-27 14:29:52 +00: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
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
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
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
Philipp Hasper
14c0bfce2f
kmeans and one-dimensional vectors
...
Clustering one-dimensional data was only possible when storing it column-based. But a std::vector is interpreted as matrix with height=1
Additionally, made conditionals more readable
2015-08-21 14:20:00 +02: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
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
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
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
Anatoly Baksheev
0dab097a26
minor comment fix
2015-08-07 12:55:10 +03:00
Alexander Alekhin
8293ed7f9b
add tests from issue 4468 ( #5062 )
2015-08-06 13:50:13 +03:00
Alexander Alekhin
21467d817b
tapi: add test from issue 4380 ( #5010 )
2015-08-05 16:08:48 +03:00
Vadim Pisarevsky
3f65a86977
Merge pull request #4233 from alalek:fix_4006
2015-08-03 05:46:29 +00: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
Alexander Alekhin
2b2bc83b61
Merge pull request #4238 from vladimir-dudnik:d3d11-nv12-interop
2015-07-30 10:36:25 +00: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
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
Alexander Alekhin
c94945f892
Merge pull request #4210 from wangyan42164:ocl_umat_convert
2015-07-27 15:05:57 +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
Alexander Alekhin
c0ee03fab2
Merge pull request #4192 from avershov:opencl-opengl-buffer
2015-07-21 14:10:00 +00:00
Vadim Pisarevsky
03824682ad
Merge pull request #4189 from vladimir-dudnik:update_dx_samples
2015-07-21 11:55:21 +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
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
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
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
Vadim Pisarevsky
743160b6ac
Merge pull request #4158 from alalek:fix-bigdata-copyto
2015-07-08 10:00:46 +00:00