Roman Donchenko
6b8ebf3e94
Fix memory leaks appearing when cvOpenFileStorage throws
...
(cherry picked from commit 16ce114e0c
)
2015-03-10 12:38:45 +03:00
Vadim Pisarevsky
baf191fab2
Merge pull request #3771 from mshabunin:arm-round
2015-03-09 21:49:15 +00:00
Vadim Pisarevsky
64bd77cf4d
Merge pull request #3794 from vpisarev:ubuntu_x86_fixes
2015-03-09 21:34:17 +00:00
Erik Karlsson
5a7118a88b
Merging in master
2015-03-09 22:00:58 +01:00
Maksim Shabunin
451972f3cf
Added ARM implementation in cvRound function
...
- note: uses VFPv3 instructions
- also added overloaded cvRound variants with float and int parameters
- thanks to Marina Kolpakova from Itseez for idea
- thanks to developers from #llvm IRC channel for help with inline asm
2015-03-06 16:14:37 +03:00
Vadim Pisarevsky
5d8a1bf813
explained reason why IPP is disabled on 32-bit Linux. disable IPP's minMaxLoc_32f on 32-bit OSes only
2015-03-06 15:02:22 +03:00
Dmitry-Me
2fb4178f7c
Reduce variable scope
2015-03-06 10:17:37 +03:00
Vadim Pisarevsky
7a52c3d9f1
1) make sure Python 2.7 is detected on Ubuntu (including libs) when it's there.
...
2) disable IPP on 32-bit Linux when OpenCV is built as shared libs. Otherwise we get linker errors
3) disable IPP's minMaxIdx 32-bit floating-point flavor in a hope that it fixes some test failures
2015-03-05 18:58:54 +03:00
Vadim Pisarevsky
aa113c5a85
Merge pull request #3787 from Dmitry-Me:fixNullPointerDereference2
2015-03-05 12:19:02 +00:00
Dmitry-Me
d164d51380
Fix potential null pointer dereference
2015-03-05 10:31:51 +03:00
Vadim Pisarevsky
f9b8ce1d25
Merge pull request #3784 from ilya-lavrenov:nvidia_android
2015-03-05 06:43:03 +00:00
Vadim Pisarevsky
0b99f6bcd6
Merge pull request #3777 from ilya-lavrenov:nvidia_cvtcolor_eps
2015-03-04 13:53:41 +00:00
Ilya Lavrenov
cf4c79ebdd
disabled some kernels for Android && NVidia
2015-03-04 14:46:49 +03:00
Vadim Pisarevsky
ebac739a35
Merge pull request #3781 from Dmitry-Me:dangerousStringManipulation
2015-03-04 10:45:25 +00:00
Dmitry-Me
f8c454733b
Remove dangerous string manipulation, merge declaration with assignment
2015-03-04 10:35:06 +03:00
Dmitry-Me
c587bae997
Uniform computation of variable size
2015-03-03 16:11:07 +03:00
Vadim Pisarevsky
6820292256
Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib
2015-03-03 12:52:03 +00:00
Vadim Pisarevsky
d3b74cdcb2
Merge pull request #3773 from ilya-lavrenov:warning
2015-03-03 12:33:17 +00:00
Ilya Lavrenov
26eebb3ee3
increased EPS for cvtColor for NVIDIA
2015-03-03 15:26:51 +03:00
Dmitry-Me
1b7066fc95
Reduce variable scope, only compute values that are used later
2015-03-03 11:04:22 +03:00
Maxim Kostin
22a30af353
Fixing buildbot job:
...
- explicitly turning OCL off since WinRT does not support it
- fixing macro definitions in core/ocl.cpp
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:45 +03:00
Maxim Kostin
cdd23440c9
Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1
...
- Substituted HAVE_WINRT with WINRT
- Fixed compilation issues in ocl.cpp and parallel.cpp
- Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore
- Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp
- Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c;
- Added ole32.lib for core module (for WindowsStore 8.0 builds)
- Made OpenCV_ARCH aware of ARM
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:43 +03:00
Maksim Shabunin
37c74e38f4
Python support
2015-03-02 18:13:00 +03:00
Maksim Shabunin
457123027e
Modified java wrapping mechanism
2015-03-02 18:12:30 +03:00
Ilya Lavrenov
ffc453ebfd
fixed [-Wsign-compare] warning
2015-03-02 16:41:06 +03:00
Vadim Pisarevsky
8e37a693e5
Merge pull request #3758 from ilya-lavrenov:aarch64
2015-03-02 10:50:31 +00:00
Vadim Pisarevsky
845d3edb67
Merge pull request #3757 from ilya-lavrenov:popcnp
2015-03-02 10:50:08 +00:00
Vladislav Vinogradov
4254e35f6a
merge new setUseOptimizations function with existed setUseOptimized
2015-02-27 14:24:51 +03:00
Vladislav Vinogradov
c10f1851cb
rename setOptimizations -> setUseOptimizations
2015-02-27 12:52:28 +03:00
Vladislav Vinogradov
cda6fed41f
move tegra namespace out of cv to prevent conflicts
2015-02-27 12:52:11 +03:00
Vladislav Vinogradov
d696fac8b8
move cuda tests from core to cudaarithm
2015-02-26 19:49:12 +03:00
Ilya Lavrenov
c5a80193a8
aarch64 support
2015-02-26 19:43:32 +03:00
Vladislav Vinogradov
12180bd7b1
add generic method to disable/enable all optimizations (IPP, OpenCL, Tegra)
2015-02-26 19:36:04 +03:00
Vladislav Vinogradov
44e41baffe
use new functions before all tegra:: calls
2015-02-26 19:34:58 +03:00
Vladislav Vinogradov
f8484e3266
add fucntion to control tegra optimizations in run-time
2015-02-26 19:34:20 +03:00
Ilya Lavrenov
b963d84b41
fixed bug #4215
2015-02-25 21:57:17 +03:00
Ilya Lavrenov
5f7a994ad1
fixed internal compiler error
2015-02-20 15:46:22 +03:00
Vadim Pisarevsky
7b270f4c69
Merge pull request #3679 from mshabunin:remove-algorithm-factory
2015-02-19 18:43:58 +00:00
theodore
cfccdc9b0c
documenting findnonzero() function
2015-02-19 17:57:52 +01:00
theodore
453f384bd7
adding documentation for the findnonzero() function
2015-02-19 17:38:44 +01:00
Dmitry-Me
98a8045aaf
Reduce variable scope
2015-02-19 13:10:02 +01:00
Maksim Shabunin
79e8f0680c
Updated ml module interfaces and documentation
2015-02-17 11:46:14 +03:00
Maksim Shabunin
da383e65e2
Remove deprecated methods from cv::Algorithm
2015-02-16 15:28:54 +03:00
Vladislav Vinogradov
a932d8aba1
use full qualified name for all internal namespaces to prevent ambiguous symbol errors
2015-02-16 11:31:21 +03:00
Erik Karlsson
49e93747b1
Added saturate_cast from int64 and uint64
2015-02-12 22:05:05 +01:00
Dmitry-Me
ea48fcfc9f
Fix possible null pointer dereference
2015-02-09 12:38:02 +03:00
Alexander Alekhin
2054123890
coreTlsData -> getCoreTlsData()
2015-02-04 13:03:27 +03:00
Alexander Alekhin
f282fd0ebf
ocl: print missing error message only if OPENCV_OPENCL_RUNTIME is used
2015-01-29 13:16:31 +03:00
Vadim Pisarevsky
97aa8d3341
Merge pull request #3603 from alalek:ocl_svm
2015-01-29 05:35:46 +00:00
Vadim Pisarevsky
f3311f9e2a
Merge pull request #3638 from jet47:remove-cuda-module
2015-01-28 18:51:32 +00:00
Alexander Alekhin
0a07d780e0
ocl: OpenCL SVM support
2015-01-23 20:37:45 +03:00
Alexander Alekhin
58ad952b1a
UMat: added USAGE_ALLOCATE_SHARED_MEMORY
2015-01-23 18:44:12 +03:00
Ilya Lavrenov
dcb0c68ed3
fix for -m32
2015-01-23 17:26:48 +03:00
Vladislav Vinogradov
2660eee961
restore CUDA module introduction
...
put it into core documentation
2015-01-22 15:02:21 +03:00
Vadim Pisarevsky
f93be25cc8
Merge pull request #3629 from nstiurca:matx-fix
2015-01-22 09:43:33 +00:00
Vadim Pisarevsky
03fc3d1ceb
Merge pull request #3591 from ilya-lavrenov:sse_avx
2015-01-21 10:46:23 +00:00
Nicu Știurcă
8722faa167
fix whitespace
2015-01-20 23:58:05 -05:00
Nicu Știurcă
7a3ca99894
fix _OutputArray::assign() for _OutputArrays of type MATX when data types differ
2015-01-20 23:49:04 -05:00
Ilya Lavrenov
e9a6c5db21
sqsum
2015-01-20 21:10:06 +03:00
Vadim Pisarevsky
21a9a17478
Merge pull request #3568 from ilya-lavrenov:neon_runtime
2015-01-20 12:47:51 +00:00
Vadim Pisarevsky
e501c61c04
Merge pull request #3611 from jet47:fix-gpumat-setto
2015-01-20 12:37:45 +00:00
Nicu Știurcă
e97d18ba81
implement _OutputArray::assign() for _OutputArrays of type MATX
2015-01-19 16:20:10 -05:00
Vadim Pisarevsky
5e92a777ef
Merge pull request #3569 from ilya-lavrenov:sse_mul
2015-01-19 13:42:36 +00:00
Vladislav Vinogradov
f676bfb3d7
fix GpuMat::setTo method in case if mask is empty:
...
it might be called from _OutputArray::setTo
2015-01-15 19:33:27 +03:00
Vadim Pisarevsky
713aa5c5b9
Merge pull request #3557 from ilya-lavrenov:sse_add_weighted
2015-01-15 13:14:06 +00:00
Vadim Pisarevsky
16b56e71d9
Merge pull request #3561 from jet47:cuda-arithm-refactoring
2015-01-15 11:44:35 +00:00
Vadim Pisarevsky
1c9668b371
Merge pull request #3584 from nisargthakkar:UMatDimsZeroAfterRelease
2015-01-15 11:27:11 +00:00
Vadim Pisarevsky
b2a5e66fc5
Merge pull request #3593 from kilobyte:master
2015-01-13 12:25:21 +00:00
Vadim Pisarevsky
2ecca8f59c
Merge pull request #3566 from jet47:cuda-imgproc-refactoring
2015-01-13 11:21:51 +00:00
Adam Borowski
7b0d1c932e
Get rid of sysctl includes on Linux.
...
The 'sysctl' syscall has been strongly deprecated on Linux for ages.
Currently, on old architectures it will spam syslog whenever used, and on
newer ones it's missing from the headers altogether. Opencv has migrated
away on Linux already, but #includes were left lingering. This commit
removes them on non-__APPLE__, unbreaking x32 (and probably others).
2015-01-13 01:52:56 +01:00
Ilya Lavrenov
81f786393a
NEON detection in runtime
2015-01-13 01:35:53 +03:00
Ilya Lavrenov
8c94568cc3
cv::sum
2015-01-12 10:59:31 +03:00
Ilya Lavrenov
6bce6ee34a
checks
2015-01-12 10:59:31 +03:00
Ilya Lavrenov
1d3c860411
SinCos_32f
2015-01-12 10:59:31 +03:00
Ilya Lavrenov
ef29b15c9a
reciprocal
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
44d89638fd
divide
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
f2cd65cf1e
fixes
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
25e99c453f
avx2 in arithm
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
70933ea999
convert from f64
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
612b8ce2cb
fixed compilation issues
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
d87457a025
split/merge
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
fc0869735d
used popcnt
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
31827d8dfe
fixed typo
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
bc394e7516
detection of other CPU features
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
3a426660ea
sse_utils.hpp
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
63fc6ef316
convertTo from 64f
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
8870ef4159
convertTo from 16u, 16s, 32s, 32f
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
116fb275a8
convertTo from 8s
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
19e77e4787
convertTo from 8u
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
b758dbd384
convertTo AVX2
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
3a78a22733
convertScaleAbs for s8, f64
2015-01-12 10:59:29 +03:00
Ilya Lavrenov
5578088983
countNonZero
2015-01-12 10:59:28 +03:00
Ilya Lavrenov
972ff1d0c4
polarToCart
2015-01-12 10:59:28 +03:00
Ilya Lavrenov
0a5c9cf145
magnitude 64f
2015-01-12 10:59:28 +03:00
Ilya Lavrenov
6ab928fb39
phase 64f
2015-01-12 10:59:28 +03:00
Ilya Lavrenov
a2a8ba17fc
compare
2015-01-12 10:59:28 +03:00
Ilya Lavrenov
8d48632ebe
avx2
2015-01-12 10:59:28 +03:00
Nisarg Thakkar
a11c02497f
Fixed Bug similar to Bug#3757. UMat all dims zero after release.
2015-01-08 13:48:48 +05:30
Joe Howse
379de5708f
Fix shadowed variable warning
2015-01-05 10:56:46 -04:00
Ilya Lavrenov
68962adc54
SSE mul
2014-12-31 17:58:54 +03:00
Ilya Lavrenov
60f2f7898a
SSE4.1 addWeighted fo 16u
2014-12-31 17:55:30 +03:00
Vadim Pisarevsky
2f6db4dfac
Merge pull request #3547 from ilya-lavrenov:ocl_setto
2014-12-31 09:30:40 +00:00
Vadim Pisarevsky
1c8493fb0d
Merge pull request #3549 from mshabunin:sphinx-doc-remove
2014-12-31 09:14:22 +00:00
Vadim Pisarevsky
f792fdc3e0
Merge pull request #3559 from ilya-lavrenov:sse_dot_s8
2014-12-31 08:06:06 +00:00
Vladislav Vinogradov
220d937d9a
removed buffered versions of histogram functions
...
used BufferPool mechanism instead
2014-12-30 15:37:45 +03:00
Vladislav Vinogradov
b4e7ee46c6
fix compilation without CUDA
2014-12-30 11:06:33 +03:00
Vladislav Vinogradov
00e7816c1b
add auxiliary functions to work with Input/Output arrays:
...
they allow to perform asynchronous upload/download into temporary buffer
to get valid GpuMat object
2014-12-30 11:06:32 +03:00
Ilya Lavrenov
f57136fd79
SSE2 cv::Mat::dot
2014-12-30 00:34:09 +03:00
Ilya Lavrenov
f6b3bc01e5
addWeighted
2014-12-29 22:01:53 +03:00
Rok Mandeljc
e3b32cce80
modules/core: removed extra semi-colon from mat.inl.hpp and utility.hpp
...
This silences the pedantic warning messages from gcc 4.8.3
2014-12-29 16:23:43 +01:00
Ilya Lavrenov
1af7d397d4
optimization of UMat::setTo
2014-12-29 13:34:21 +03:00
Maksim Shabunin
b4050c775e
Updated sample files documentation inclusions
2014-12-26 19:17:18 +03:00
Maksim Shabunin
d01bedbc61
Removed Sphinx documentation files
2014-12-26 19:12:19 +03:00
Vadim Pisarevsky
0ff67253f7
Merge pull request #3531 from jet47:cuda-core-refactoring
2014-12-26 12:12:42 +00:00
Vladislav Vinogradov
f36546dbd2
improve error reporting in _InputArray methods
2014-12-26 12:03:25 +03:00
Vadim Pisarevsky
1bdd86edeb
Merge pull request #3523 from jet47:fix-cuda-buffer-pool
2014-12-24 11:20:27 +00:00
Vladislav Vinogradov
e7e0da0153
fix GpuMat::swap method:
...
add swap instruction for allocator field
2014-12-23 17:43:28 +03:00
Vladislav Vinogradov
b33f3bb2cc
refactor CV_CUDA_TEST_MAIN, use CV_TEST_MAIN for it
...
use CV_CUDA_TEST_MAIN for opencv_test_core to initialize CUDA
device information
2014-12-23 17:43:14 +03:00
Vladislav Vinogradov
f054d6316a
add cuda::HostMem::getAllocator method
...
it allows to use cudaHostAlloc methods for cv::Mat objects
2014-12-23 17:42:49 +03:00
Vladislav Vinogradov
2f8e1798ca
add more FeatureSet constants
2014-12-23 17:42:49 +03:00
Vladislav Vinogradov
1be1a28920
move CUDA core tests to core module
2014-12-23 17:42:49 +03:00
Vladislav Vinogradov
53862687d5
rename CudaMem -> HostMem to better reflect its purpose
2014-12-23 17:42:49 +03:00
Vladislav Vinogradov
9210d8e542
move allocMatFromBuf function to farneback.cpp:
...
* it is the only place, where it is used
* no need to make this function public
2014-12-23 17:42:49 +03:00
Vladislav Vinogradov
1d82aecf45
minor reorganization for CUDA doxygen groups:
...
move main CUDA group to modules/core/cuda.hpp
2014-12-23 17:42:20 +03:00
Vladislav Vinogradov
b5ab82fdbd
mark old CUDA device layer as deprecated and remove it from doxygen documentation
...
add a note to use new cudev module as a replacement
2014-12-23 17:42:14 +03:00
Vladislav Vinogradov
68e08bbecd
fix null stream initialization for multi-gpu systems
2014-12-23 17:41:24 +03:00
Vladislav Vinogradov
05d40946f3
move StackAllocator to cpp file
...
it is internal class, no need to export it
2014-12-23 17:41:24 +03:00
Vladislav Vinogradov
7ed38b97c3
fix cuda::BufferPool deinitialization
...
The deinitialization of BufferPool internal objects is controled by global
object, but it depends on other global objects, which leads to errors
caused by undefined deinitialization order of global objects.
I merge global objects initialization into single class, which performs
initialization and deinitialization in correct order.
2014-12-23 17:41:24 +03:00
Vadim Pisarevsky
d9f159a554
Merge pull request #3513 from mshabunin:compat-30
2014-12-22 11:58:01 +00:00
Maksim Shabunin
c485aee464
Included c-headers for better 2.4 compatibility
2014-12-19 17:05:26 +03:00
StevenPuttemans
edb608d206
fix documentation bug 2432
2014-12-15 11:53:55 +01:00
Vadim Pisarevsky
25378587e2
Merge pull request #3479 from mshabunin:doxygen-tutorials
2014-12-09 14:06:23 +00:00
Alexander Alekhin
0f7721e915
Merge pull request #3486 from Chuanbo-Weng:repeat-perf
2014-12-08 15:49:21 +00:00
Chuanbo Weng
2d8c89c40b
Remove unnecessary kercn limitation of 4.
...
When accessing global memory by DWORD4, memory bandwidth
can be fully utilized on Intel platform. This patch will
make more image format(e.g. 8UC4) be processed in DWORD4
by work-item. After applying this patch, 3 subcase of
./opencv_perf_core --gtest_filter=OCL_RepeatFixture_Repeat.Repeat/*
can be speedup on HD4000 graphics card with Beignet:
OCL_RepeatFixture_Repeat.Repeat/2, 64% improvement.
OCL_RepeatFixture_Repeat.Repeat/6, 50% improvement.
OCL_RepeatFixture_Repeat.Repeat/8, 56% improvement.
Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
2014-12-04 11:15:13 +08:00
Alexander Karsakov
bcca34bc96
Fixed typo in description of Rect operations
2014-12-03 16:01:03 +03:00
Maksim Shabunin
6d282ddf72
Documentation: removed mention of Mat(IplImage*) constructor
2014-12-02 15:15:10 +03:00
Maksim Shabunin
03e213ccae
Doxygen documentation: BiB references and fixes
2014-12-01 15:50:55 +03:00
Maksim Shabunin
1523fdcc1c
Doxygen documentation: more fixes and cleanups
2014-12-01 15:50:36 +03:00
Maksim Shabunin
6dcafe0c2d
Doxygen documentation: cuda submodules reorganized
2014-12-01 15:47:13 +03:00
Maksim Shabunin
ceb6e8bd94
Doxygen documentation: cuda
2014-12-01 15:47:13 +03:00
Vadim Pisarevsky
aadab03b7b
Merge pull request #3452 from Dmitry-Me:fixIncorrectSizeComputation
2014-12-01 10:43:44 +00:00
Dmitry-Me
4ff8a3ad92
Fix incorrect size computation
2014-11-26 12:24:53 +03:00
Maksim Shabunin
555fdf893a
Documenting imgproc module
...
- disabled doxygen tree
- enabled doxygen enum listing
- added imgproc reference to main page
- enabled BiB support
- chenged doxygen root page format
2014-11-18 14:00:56 +03:00
Maksim Shabunin
6aa7a86ae9
Doxygen documentation for core module
2014-11-12 14:21:58 +03:00
Vadim Pisarevsky
d58cadc1ea
moved cv::partition from private.hpp to operations.hpp, to expose the function to users
2014-11-07 18:14:39 +03:00
Vadim Pisarevsky
9b13b07639
Merge pull request #3400 from vpisarev:fixed_umat_test_crash
2014-11-07 12:50:26 +00:00
Vadim Pisarevsky
7c8789dc12
fixed my_umat(roi).clone() test by disabling poorly aligned ROI's. Real fix of the problem will require a separate branch in UMat::copyTo().
2014-11-07 14:49:48 +03:00
Alexander Alekhin
f50f249f80
Merge pull request #3138 from alalek:icv_update
2014-11-06 15:58:14 +00:00
Alexander Karsakov
462c3c25a9
Removed incorrect using of rootn() and powr() in ocl_pow
2014-11-06 16:23:02 +03:00
Alexander Alekhin
4eb16122c0
ocl: change processing of OpenCL failures
...
disable "unwanted" messages
2014-11-05 19:44:36 +03:00
Vadim Pisarevsky
5efad375e0
Merge pull request #3384 from ilya-lavrenov:neon_new
2014-11-05 11:26:53 +00:00
Vadim Pisarevsky
72419c3778
Merge pull request #3373 from berak:patch-2
2014-11-05 11:14:59 +00:00
Alexander Alekhin
1c9f590f0d
IPPICV: disable NormDiff_L1_16s_C1R for IPP/ICV 8.2/8.2.1
2014-11-05 13:26:23 +03:00
berak
c2cb3b515d
support older gcc versions
2014-11-02 08:16:29 +01:00
Ilya Lavrenov
5ca25ab8f0
cv::pow (integer power)
2014-11-01 13:19:51 +03:00
Ilya Lavrenov
ccdc71286c
cv::polarToCart
2014-11-01 13:19:51 +03:00
Ilya Lavrenov
d5f006eee5
cv::magnitude; cv::corner**
2014-11-01 13:19:51 +03:00
Ilya Lavrenov
fb97273b3c
cv::phase; cv::cartToPolar
2014-11-01 13:19:51 +03:00
Vadim Pisarevsky
dce629d0e2
Merge pull request #3343 from mshabunin:doxygen-docs
2014-10-30 10:45:03 +00:00
Alexander Alekhin
fd59551ff0
Merge pull request #3354 from vbystricky:oclopt_convertScaleAbs
2014-10-29 13:53:56 +00:00
ElenaGvozdeva
d88fdd0378
use LOCAL_SIZE+1
2014-10-28 15:18:31 +03:00
ElenaGvozdeva
65b8a1cb37
Some small fixes
2014-10-27 14:38:22 +03:00
Elena Gvozdeva
c5a2879ce0
use vectors
2014-10-27 14:38:22 +03:00
Elena Gvozdeva
2d89df1804
use local memory
2014-10-27 14:38:21 +03:00
Elena Gvozdeva
d78bc3c321
naive implementation
2014-10-27 14:38:21 +03:00
Alexander Alekhin
dee56598e9
Merge pull request #3369 from vbystricky:fix_scaleAdd
2014-10-27 10:03:29 +00:00
Alexander Alekhin
1f08d8cb6f
Merge pull request #3367 from akarsakov:ocl_image2d
2014-10-24 16:01:21 +00:00
vbystricky
8466911ad0
Move _dst.create() to the begining of scaleAdd function
2014-10-24 18:27:47 +04:00
Alexander Karsakov
237cb93143
Added extra checks to ocl::Image2D
2014-10-24 15:04:42 +03:00
Alexander Alekhin
579a7fff6d
ocl: restore clFinish() in unmap() for AMD devices
...
This reverts commit 7d91b8efcd
.
2014-10-24 14:29:38 +04:00
Alexander Karsakov
3a263c6326
Added tests for Image2D
2014-10-23 14:23:37 +03:00
Maksim Shabunin
ba5f343c38
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
2014-10-22 15:24:15 +04:00
vbystricky
a8aa6381d9
Optimize OpenCL version of conversScaleAbs function
2014-10-21 19:20:20 +04:00
ElenaGvozdeva
070e5ec042
Changed predictOptimalVectorWidth function, now it is possible to choose vector size.
2014-10-21 13:13:15 +03:00
Vadim Pisarevsky
926b64fff7
Merge pull request #3292 from mshabunin:fix-ios-warnings
2014-10-20 06:41:51 +00:00
Vadim Pisarevsky
55f490485b
Merge pull request #3348 from vpisarev:refactor_algorithms2
2014-10-18 18:52:35 +00:00
Vadim Pisarevsky
d2b9dc5530
quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)
2014-10-18 20:44:26 +04:00
Alexander Duda
11ebaf673f
fix warning in template Scalar::mul gcc < 4.8
...
In this particular case t shadows transpose of the base class Matx:
types.hpp:1805:14: warning: declaration of ‘t’ shadows a member of
'this' [-Wshadow]
Changelog gcc 4.8: The option -Wshadow no longer warns if a declaration
shadows a function declaration.
This warning is problematic because it prevents the module
opencv_contrib/modules/ruby to pass the build process
2014-10-18 14:22:27 +02:00
Maksim Shabunin
ef3d02214b
Fixing iOS clang warnings, part 2
2014-10-17 18:14:54 +04:00
Vadim Pisarevsky
01d3848f17
all the tests now pass except for MSER
2014-10-17 14:56:58 +04:00
Pavel Vlasov
45958eaabc
Implementation detector and selector for IPP and OpenCL;
...
IPP can be switched on and off on runtime;
Optional implementation collector was added (switched off by default in CMake). Gathers data of implementation used in functions and report this info through performance TS;
TS modifications for implementations control;
2014-10-15 14:24:41 +04:00
Vadim Pisarevsky
a798386660
Merge pull request #3326 from ilya-lavrenov:neon_canny
2014-10-11 17:58:24 +00:00
Vadim Pisarevsky
a3916113b9
Merge pull request #3254 from ilya-lavrenov:neon_scale_add
2014-10-10 14:26:14 +00:00
Ilya Lavrenov
5f23d99918
the rest modes of cv::Mat::convertTo
2014-10-10 14:10:50 +00:00
Vadim Pisarevsky
f6b1c2a0b6
Merge pull request #3324 from akarsakov:fix_lpsolver_tests
2014-10-10 10:59:09 +00:00
Vadim Pisarevsky
0c1b405964
Merge pull request #3320 from ElenaGvozdeva:gemm_doc
2014-10-09 14:12:51 +00:00
Ilya Lavrenov
4babecf3b0
fixes for cv::addWeighted and cv::Mat::dot
2014-10-09 12:55:52 +00:00
vbystricky
1d280352f4
Add code for print errors of OpenCL kernels runing
2014-10-09 13:59:38 +04:00
Alexander Karsakov
a8169f08fc
Used checking norm of results for LPSolver accuracy tests
2014-10-09 13:32:56 +04:00
ElenaGvozdeva
75601ccf9e
small change in description for Gemm
2014-10-09 11:39:44 +03:00
Ilya Lavrenov
00f16e9178
neon
2014-10-03 08:43:02 +00:00
Ilya Lavrenov
be3efdf274
cv::sum refactoring
2014-09-30 14:36:21 +00:00
Ilya Lavrenov
a3e56114d1
cv::multiply
2014-09-30 14:20:22 +00:00
Ilya Lavrenov
1c491c42cd
fix for cornerHarris
2014-09-29 14:59:46 +00:00
Ilya Lavrenov
bbc161e1cb
fix for cv::Mat::convertTo with scale
2014-09-28 14:51:30 -07:00
Ilya Lavrenov
f50f0ba63e
cv::norm
2014-09-28 07:28:33 -07:00
Ilya Lavrenov
44ea50f1c4
cv::countNonZero
2014-09-28 07:06:53 -07:00
Ilya Lavrenov
34a571d37f
cv::Mat::dot
2014-09-28 05:00:22 -07:00
Ilya Lavrenov
e46332a183
cv::Mat::convertTo with scale and shift
2014-09-28 03:49:56 -07:00
Ilya Lavrenov
74e60e44ad
cv::compare
2014-09-28 02:41:08 -07:00
Ilya Lavrenov
857a2d5bfd
cv::addWeighted
2014-09-28 01:11:07 -07:00
Maksim Shabunin
047abb0050
Merge pull request #3258 from ilya-lavrenov:neon_convert
2014-09-26 09:27:16 +00:00
Ilya Lavrenov
345b1369be
correct neon rounding
2014-09-25 07:54:52 +00:00
Ilya Lavrenov
5d018c090f
Neon optimization of cv::scaleAdd (CV_32F)
2014-09-23 21:16:29 +04:00
Ilya Lavrenov
4b3f2c1972
Neon optimization of Mat::convertTo
2014-09-23 15:06:17 +00:00
Vadim Pisarevsky
7752483486
Merge pull request #3252 from GravityJack:point-division
2014-09-23 08:43:43 +00:00
Vadim Pisarevsky
281ce441a8
Merge pull request #3250 from ilya-lavrenov:neon_convert_scale_abs
2014-09-23 07:15:24 +00:00
Marc Rollins
c8ede7c9ea
Updating documentation to reflect division operations.
2014-09-22 12:07:16 -07:00
Marc Rollins
f32a6fb9a1
Adding element-wise division operators to Point3_ class.
2014-09-22 11:59:11 -07:00
Marc Rollins
fb9bbf99c4
Adding division operators to Point_
class.
...
Performs element-wise division.
2014-09-22 11:54:52 -07:00
Ilya Lavrenov
515be70867
Neon optimization of cv::convertScaleAbs
2014-09-22 15:47:46 +00:00
Ilya Lavrenov
27b933ba5a
Neon optimization of cv::sum
2014-09-22 09:22:03 +00:00
Vadim Pisarevsky
06e55ddf38
Merge pull request #2893 from ilya-lavrenov:tapi_vector_width_intel
2014-09-18 12:05:24 +00:00
Vadim Pisarevsky
4057e27539
Merge pull request #3126 from avdmitry:move_KDTree_to_ml
2014-09-14 18:57:23 +00:00
Andrey Pavlenko
a8db3df8f6
typo: rect -> roi
2014-09-09 12:25:14 +04:00
Alexander Karsakov
c942c6539a
Remove mul24 since id can be larger 2^23
2014-09-08 13:11:58 +04:00
Vadim Pisarevsky
26c284b225
Merge pull request #3167 from akarsakov:ocl_rm_clFinish
2014-09-04 17:00:10 +00:00
Vadim Pisarevsky
64a53de27d
Merge pull request #3185 from ElenaGvozdeva:ocl_norm
2014-09-04 08:53:47 +00:00
Ilya Lavrenov
98e7d4ceec
changed optimal vector width for Intel
2014-09-04 11:59:41 +04:00
Elena Gvozdeva
9fe11db7e2
disabled IPP acceleration for 3-channel norms and for CV_8S only for APPLE
2014-09-04 10:38:45 +04:00
Alexander Karsakov
7d91b8efcd
Removed redundant clFinish() after clEnqueueUnmapMemObject()
...
sss
2014-09-03 14:54:05 +04:00
Alexander Karsakov
f57a4bf87b
Disabled minMaxIdx for 32FC1 since it occasionally fails on AMD devices (e.g. A10-6800K)
2014-09-03 14:36:51 +04:00
Vadim Pisarevsky
0276cc90c2
Merge pull request #3184 from ilya-lavrenov:arm
2014-09-03 05:40:19 +00:00
Alexander Karsakov
ec827bed8e
Changed check to NORM_RELATIVE for OCL.Mat_Scalar_Scale tests
2014-09-02 16:05:50 +04:00
Ilya Lavrenov
5d3a128cd3
NEON impl on cv::convertScaleAba CV_32f
2014-09-01 17:04:36 +00:00
Vadim Pisarevsky
3bafe64666
Merge pull request #3170 from ElenaGvozdeva:ocl_fix
2014-09-01 10:40:02 +00:00
Vadim Pisarevsky
1f85ffa11b
Merge pull request #3166 from akarsakov:ocl_native_sqrt
2014-09-01 10:36:50 +00:00
Philipp Hasper
e310added4
Fixing Matx ostream operator
...
cv::Matx could not be converted to c::Mat automatically
2014-08-31 14:37:43 +02:00
Alexander Alekhin
4d474d40e7
Merge pull request #3171 from akarsakov:amd_fft_fix
2014-08-29 16:28:31 +00:00
Ilya Lavrenov
71ec6144bd
attempt to fix compilation of OpenCL cv::transpose for AMD
2014-08-29 16:59:30 +04:00
Alexander Karsakov
d4e6812be2
Added check AmdFft version to be sure that AmdFft binaries are available
2014-08-29 14:23:18 +04:00
Elena Gvozdeva
31ac73c315
fix for cv::memopTypeToStr
2014-08-29 14:18:52 +04:00
Alexander Alekhin
57fec2f2da
OCL: enable clAmdFftGetVersion
2014-08-29 13:45:04 +04:00
Vadim Pisarevsky
6ccb7e169d
Merge pull request #3163 from StevenPuttemans:fix_nonfree_items
2014-08-29 08:08:52 +00:00
Alexander Karsakov
491bf41356
Disabled native_sqrt for double, since it may be not implemented and gives compilation error.
2014-08-28 17:01:49 +04:00
StevenPuttemans
d27e440b2a
continue fixing nonfree elements
...
fixed dependency of stitching module on xfeatures2d module as optional
fixed the initModule_xfeatures2d function that was called in module stitching since it is in another namespace than the standard cv one.
2014-08-28 13:30:47 +02:00
Vadim Pisarevsky
21f1a0ee49
Merge pull request #3161 from ElenaGvozdeva:ocl_perf_gemm
2014-08-28 10:41:11 +00:00
Alexander Alekhin
b332152bef
Merge pull request #2956 from ilya-lavrenov:tapi_accumulate
2014-08-28 09:08:51 +00:00
Vadim Pisarevsky
4d9d7e6ded
Merge pull request #3160 from akarsakov:ocl_dft_double_support
2014-08-27 10:06:34 +00:00
Alexander Karsakov
a89ff402fc
Refactoring of OCL_FftPlan class
2014-08-27 10:33:25 +04:00
Elena Gvozdeva
46b6a095a2
changed perf test for ocl_gemm
2014-08-26 15:05:36 +04:00
Alexander Karsakov
3ae95150c7
Added double support for OCL version of DFT
2014-08-25 18:08:43 +04:00
Ilya Lavrenov
7017b1250a
used new stratehy in cv::accumulate**
2014-08-25 11:25:54 +04:00
Ilya Lavrenov
2c6b7a52e9
improved cv::ocl::predictOptimalVectorWidth
2014-08-25 11:25:01 +04:00
Ilya Lavrenov
2f46cf5ddb
changed base types for cv::memopTypeToStr
2014-08-25 11:23:46 +04:00
Vadim Pisarevsky
f624f92e7a
Merge pull request #3142 from akarsakov:fix_cvtcolor_luv_rgb_master
2014-08-22 07:24:21 +00:00
Vadim Pisarevsky
0eb1c7edb1
Merge pull request #3127 from GravityJack:size-math-ops
2014-08-22 07:14:13 +00:00
Marc Rollins
17e8d51124
Fixing uninitialized temporary.
2014-08-21 11:41:12 -07:00
Marc Rollins
703921e2fd
Reverting pass-by-value changes to arithmetic operators.
2014-08-21 10:37:36 -07:00
Alexander Karsakov
3d222d313b
Fixed range for 'v' channel for 8U images
2014-08-21 17:22:06 +04:00
Vadim Pisarevsky
de2a8d3706
Merge pull request #3135 from thorikawa:fix-arithmetic-exception-with-ipp
2014-08-21 05:41:18 +00:00
Poly Takahiro Horikawa
cb0ab87646
Fix arithmetic exception when pass an empty mat with IPP option on.
2014-08-19 19:19:53 -07:00
Vadim Pisarevsky
70679b49fc
Merge pull request #3121 from akarsakov:ocl_dft_opt
2014-08-19 08:57:53 +00:00
Marc Rollins
8fc1848918
Simplifying arithmetic and comparison operator implementation.
...
Implementing + and - in terms of += and -=.
Implementing != in terms of ==.
2014-08-18 12:25:48 -07:00
Marc Rollins
d3d9b538c7
Implementing division operators.
2014-08-18 11:48:38 -07:00
Marc Rollins
d7a8166720
Implementing *= operator. Implementing * in terms of it.
2014-08-18 11:42:10 -07:00
Dmitriy Anisimov
37b1a7560c
first version of moving KDTree from core to ml
2014-08-18 22:40:31 +04:00
Alexander Karsakov
fa818d03b8
Changed twiddle buffer creation to use OCL buffer pool (if possible)
2014-08-18 18:22:52 +04:00
Vadim Pisarevsky
0ffc53bafe
Merge pull request #3107 from vpisarev:fixed_win_build
2014-08-18 09:00:54 +00:00
Vadim Pisarevsky
dea40e5e99
Merge pull request #3086 from fpuja:pragma_warning4127_fixing
2014-08-16 16:50:41 +00:00
Vadim Pisarevsky
e9729a9601
multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics
2014-08-16 00:29:10 +04:00
Vadim Pisarevsky
daaa5a1824
removed duplicated Hershey fonts
2014-08-15 12:09:16 +04:00
Vadim Pisarevsky
dfbeaddc72
Merge pull request #3106 from LeszekSwirski:fix-gemm-buf-allocate
2014-08-15 05:44:54 +00:00
jaco
dbb0fcdc7a
#pragma warning4127 fixation modified 2
2014-08-14 19:27:53 +02:00
Roman Donchenko
fb9a143429
Set status to alpha
2014-08-14 19:17:29 +04:00
Leszek Swirski
de806330fd
Fix reallocation of D buffer in gemm
2014-08-14 15:54:54 +01:00
Alexander Alekhin
52ac61d87c
Merge pull request #3088 from vbystricky:ocl_enableNormEtc
2014-08-14 14:34:40 +00:00
vbystricky
942ff5be57
Disable OpenCL version of minMaxIdx with mask on AMD devices
2014-08-14 17:39:41 +04:00
Vadim Pisarevsky
95a4943762
Merge pull request #3103 from vpisarev:core_imgproc_optim_rearrangements
2014-08-14 13:39:01 +00:00
Vadim Pisarevsky
9a5aa4b23c
trying to solve compile problems; temporarily disabled some tests for just added optimization algo's
2014-08-14 14:37:30 +04:00
Vadim Pisarevsky
00b2124876
fixing more compile problems with Java bindings etc
2014-08-14 13:48:52 +04:00
Vadim Pisarevsky
4530c7ad08
trying to fix builds
2014-08-14 13:18:04 +04:00
Vadim Pisarevsky
f7243be79c
Merge pull request #3090 from akarsakov:ocl_reduce_fix
2014-08-14 08:52:18 +00:00
Vadim Pisarevsky
5240a03217
Merge pull request #3100 from vpisarev:disabled_neon_split_merge_on_ios
2014-08-14 08:51:44 +00:00
Vadim Pisarevsky
257463719b
removed optim module; moved its functionality to core and photo modules; moved drawing functions from core to imgproc. Removed FilterEngine etc. from public API
2014-08-14 12:50:07 +04:00
vbystricky
aab6f6c56f
Set sync=true in ocl_minMaxIdx kernel call. For tests
2014-08-14 12:14:56 +04:00
Vadim Pisarevsky
5d8098a2c3
avoid compiler warnings
2014-08-14 10:06:10 +04:00
VBystricky
c5632d412e
Change epsilon for NORM_INF_2args accuracy tests
2014-08-13 23:50:32 +04:00
Vadim Pisarevsky
5f590ebed0
Merge pull request #3094 from Adil-Ibragimov:minor_fixes_in_Mat-data
2014-08-13 18:28:51 +00:00
Vadim Pisarevsky
71ff228ad3
Merge pull request #3089 from Adil-Ibragimov:fix_cuda_constness
2014-08-13 18:09:42 +00:00
Vadim Pisarevsky
a37876ab95
fixed build of iOS framework another time; clang does not like the new NEON-optimized split/merge
2014-08-13 19:59:26 +04:00
jaco
b81dcbdf2a
#pragma warning4127 fixation modified
...
Now use cleaner approach:
#pragma warning( push )
#pragma warning( disable: ThatWarning )
//code with ThatWarning here
#pragma warning( pop )
2014-08-13 17:59:16 +02:00
vbystricky
1fe403f461
Enable OpenCL version of norm and convertScaleAbs or 32F data
...
Fix error in minmaxloc.cl
Change test for convertScaleAbs
Fix minMaxIdx for _src2 align
Change epsilon on the tests
2014-08-13 18:33:01 +04:00
Vadim Pisarevsky
d97f9fc477
now the tests pass with loop_times==30
2014-08-13 16:32:01 +04:00
Adil Ibragimov
8a4a1bb018
Several type of formal refactoring:
...
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
2014-08-13 15:21:35 +04:00
Vadim Pisarevsky
3cd7941098
Merge pull request #3083 from akarsakov:ocl_transpose_check_locmem
2014-08-13 10:50:51 +00:00
Vadim Pisarevsky
01bd4961e3
Merge pull request #3081 from akarsakov:small_fixes
2014-08-13 10:50:33 +00:00
Alexander Karsakov
c3100eeb19
Fixed buffer initialization in reduce kernel. Enabled OCL version of reduce for SUM, MAX, MIN modes.
2014-08-13 12:03:06 +04:00
Adil Ibragimov
dfd0b297ce
datastart must be non-const in CUDA.
2014-08-13 11:11:33 +04:00
Alexander Karsakov
713ddb89bd
Set minimum matrix size for AmdBlas::gemm to 20 since it works incorrect for small sizes
2014-08-12 18:02:29 +04:00
Vadim Pisarevsky
5505aa28ce
Merge pull request #3078 from vpisarev:refactor_features2d_take3
2014-08-12 13:56:17 +00:00
jaco
58b3bc2d7e
#pragma warning4127 fixed for cvstd.inl.hpp
2014-08-12 15:28:39 +02:00
Alexander Karsakov
3deea1c3ce
Added check required local memory size for non-inplace transpose kernel
2014-08-12 16:26:08 +04:00
Alexander Alekhin
da806cc3e7
Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc
2014-08-12 10:21:41 +00:00
vbystricky
6fb282aa39
Remove mul24, for CV8UC3 3840x2160 it generates implementation specific result
2014-08-12 11:25:23 +04:00
Alexander Karsakov
10b3d00fd1
Increased epsilon for passing test with IPPICV
2014-08-12 10:42:42 +04:00
Alexander Karsakov
f3dfdfef8a
Fixed warning with "uninitialized local variable"
2014-08-12 10:35:15 +04:00
Vadim Pisarevsky
27d2d3cbac
fixed doc builder complains and the test failures
2014-08-12 00:03:40 +04:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
Vadim Pisarevsky
6df1198e8b
Merge pull request #3071 from mshabunin:stitch-fix
2014-08-11 16:08:40 +00:00
Alexander Alekhin
8fd61c9aa6
Merge pull request #3075 from akarsakov:ipp_imgproc_fix
2014-08-11 15:02:53 +00:00
Elena Gvozdeva
b73b28ab9c
fix for ocl_lut
2014-08-11 16:21:55 +04:00
vbystricky
dfe5fff2f5
Restore OpenCL branch for minmaxLoc on float data
2014-08-11 15:57:29 +04:00
Alexander Karsakov
835b5e2179
Disabled ippiConvert_32f16s_C1R since it breaks OCL accuracy tests of remap with test_loop_times=30.
2014-08-11 15:50:06 +04:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
Vadim Pisarevsky
9ef373f6a5
Merge pull request #3038 from yury-gorbachev:core_arithm_neon
2014-08-10 20:20:04 +00:00
Vadim Pisarevsky
4de4ff5682
Merge pull request #3067 from vpisarev:minor_fixes2
2014-08-10 10:52:57 +00:00
Vadim Pisarevsky
e2f24f43c9
added some basic functionality needed by the new face module (moved from the old "contrib")
2014-08-10 01:54:16 +04:00
Vadim Pisarevsky
05e7c29de5
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
2014-08-10 00:10:05 +04:00
Yury Gorbachev
9a233999a9
Fixed review comment from Vadim Pisarevsky
2014-08-09 13:37:53 +04:00
Vadim Pisarevsky
09907eeb62
Merge pull request #2639 from kazuki-ma:cv_mat_foreach
2014-08-09 08:25:05 +00:00
Vadim Pisarevsky
99eed2d885
Merge pull request #3057 from Adil-Ibragimov:adding-constness
2014-08-08 17:27:47 +00:00
Vadim Pisarevsky
74457cd3b5
Merge pull request #3055 from akarsakov:copyto_UMat_fix
2014-08-08 14:20:02 +00:00
Vadim Pisarevsky
88672f414b
Merge pull request #3056 from akarsakov:ocl_setIdentity_fix
2014-08-08 14:03:46 +00:00
Alexander Karsakov
6ad4521b78
Fixed typos
2014-08-08 13:11:35 +04:00
Adil Ibragimov
8dab2ffce7
fixing error, wrong template method param.
2014-08-07 17:43:32 +04:00
Adil Ibragimov
6b05ca589d
fixing Mac build
2014-08-07 17:06:22 +04:00
Adil Ibragimov
98d5731ad8
some formal changes (generally adding constness)
2014-08-07 15:49:14 +04:00
Alexander Karsakov
c5ad6de596
Fixed choice of kercn and rowsPerWI for non-Intel device.
2014-08-07 15:37:26 +04:00
Alexander Karsakov
00221e96fd
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
2014-08-07 13:16:02 +04:00
Vadim Pisarevsky
ca183707f2
Merge pull request #3039 from alalek:ocv_world
2014-08-06 14:52:52 +00:00
Vadim Pisarevsky
d611684d9e
Merge pull request #3041 from adrians:optimize_split
2014-08-06 09:22:38 +00:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Alexander Alekhin
d2f1c00719
Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix
2014-08-05 14:52:22 +00:00
vbystricky
774d277c1f
Fix error in OpenCl version of meanstddev for continues src and not continues mask
2014-08-05 17:30:06 +04:00
vbystricky
2637b18b67
Fix epsilon for OpenCL function ConverTo, for convertation from float to integer types
2014-08-05 16:34:23 +04:00
Adrian Stratulat
b2acd1f75a
Vectorize split & merge for NEON
2014-08-05 06:51:36 +00:00
Vadim Pisarevsky
a05ce00a65
Merge pull request #2879 from alalek:ocl_runtime_flags
2014-08-04 16:43:01 +00:00
Vadim Pisarevsky
a58767eff8
Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix
2014-08-04 14:54:12 +00:00
Vadim Pisarevsky
432b7cb235
Merge pull request #3032 from vpisarev:refactor_ml2
2014-08-04 14:51:38 +00:00
Yury Gorbachev
61423a2d47
ARM NEON accelerated implementation of cv::addWeighted, cv::inRange and cv::compare functions.
...
NOT verified on target platform, compilation passes with and without NEON.
2014-08-04 16:44:51 +04:00
vbystricky
2d587ad691
Prevent generating test case with mask filled 0 only
2014-08-04 15:12:36 +04:00
Alexander Alekhin
add9ce46c3
Merge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix
2014-08-04 08:09:38 +00:00
Vadim Pisarevsky
28ca6ac05e
fixed building html docs
2014-08-03 02:34:47 +04:00
VBystricky
2026094691
Increase epsilon for OpenCL version UMatDot and ReduceAvg accurency tests
2014-08-02 13:21:34 +04:00
Alexander Alekhin
11dd36f3aa
Merge pull request #3028 from vbystricky:ocl_MergeAccurTestFix
2014-08-01 17:15:53 +00:00
vbystricky
aad4104297
Fix accurency test for OpenCL matrix operations
2014-08-01 18:30:20 +04:00
vbystricky
184c5917bf
Fix accurency test of OpenCL merge function.
2014-08-01 17:53:24 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
vbystricky
b48e487d53
Enable ocl version of minmaxloc with mask
2014-07-31 19:12:10 +04:00
vbystricky
11a0e3ff78
Fix error in OCL minmaxloc
2014-07-31 19:04:38 +04:00
Elena Gvozdeva
9db8592aa8
fixed ocl_flip for cn==3
2014-07-31 16:57:47 +04:00
Vadim Pisarevsky
b0cd822924
trying to make the tests pass
2014-07-31 14:24:21 +04:00
Vadim Pisarevsky
ef8647fe30
put IPP ReduceSum_32f back
2014-07-30 19:12:11 +04:00
Vadim Pisarevsky
5267ed46c7
1. disabled OpenCL acceleration for cv::multiply() (CV_32F), cv::divide (CV_32F), cv::convertScaleAbs (CV_32F) and cv::reduce (SUM, CV_32F), cv::reduce (MIN & MAX), cv::flip (3-channel case).
...
2. changed the number of test loops from 1 to 30 (except for cv::pow() test, which fails for yet unknown reason)
3. disabled IPP acceleration for 3-channel norms.
4. modified relativeNorm test function to handle very small values
2014-07-30 18:19:47 +04:00
Vadim Pisarevsky
ba3783d205
initial commit; ml has been refactored; it compiles and the tests run well; some other modules, apps and samples do not compile; to be fixed
2014-07-29 23:54:23 +04:00
Vadim Pisarevsky
41df63aacd
Merge pull request #3010 from vpisarev:ocl_disable_some_norms2
2014-07-28 17:24:42 +00:00
Vadim Pisarevsky
962b519708
Merge pull request #2996 from akarsakov:ocl_dft_new_concept
2014-07-28 15:59:59 +00:00
Vadim Pisarevsky
0c749fd7e5
Merge pull request #2998 from ernest-galbrun:cuda_concurrency
2014-07-28 15:59:43 +00:00
Vadim Pisarevsky
af83884dc7
disabled ocl_minmaxloc on 32-bit data completely
2014-07-28 19:35:06 +04:00