Roman Donchenko
7ea1bf3cf0
Fixed several problems found by PVS-Studio.
...
This fixes all problems from the article "Checking OpenCV with PVS-Studio"
<http://www.viva64.com/en/b/0191/ > that are not already fixed and are
not in 3rdparty or the legacy module.
The problems fixed are two instances of useless code and one instance
of unspecified behavior (right-shifting a negative number).
2014-05-20 13:54:00 +04:00
Roman Donchenko
3d7a457c97
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
2014-05-19 18:39:20 +04:00
Vadim Pisarevsky
c6113c6cb3
Merge pull request #2630 from isarandi:concat_corr
2014-05-19 17:36:20 +04:00
Vadim Pisarevsky
934cb6c452
Merge pull request #2680 from adrians:remove_cv_err
2014-05-19 17:35:03 +04:00
Vadim Pisarevsky
118b27f5b4
Merge pull request #2744 from jet47:kmeans-fix
2014-05-19 17:33:10 +04:00
Roman Donchenko
cba5235f08
Merge pull request #2698 from GregoryMorse:patch-2
2014-05-19 14:52:58 +04:00
Roman Donchenko
06b335b2d7
Merge pull request #2733 from StevenPuttemans:bug_2162
2014-05-19 13:04:54 +04:00
Kazuki Matsuda
fa292c3d8d
Implimentation "cv::Mat::forEach"
...
I propose forEach method for cv::Mat and cv::Mat_.
This is solution for the overhead of MatIterator_<_Tp>.
I runs a test that micro opecode runs all over the pixel of cv::Mat_<cv::Point3_<uint8_t>>.
And this implementation 40% faster than the simple pointer, 80% faster than iterator.
With OpenMP, 70% faster than simple pointer, 95% faster than iterator (Core i7 920).
Above all, code is more readable.
My test code is here.
https://gist.github.com/kazuki-ma/8285876
Thanks.
2014-05-18 11:01:45 +09:00
Ilya Lavrenov
1e46a99d9f
added performance test for cv::norm with NORM_RELATIVE
2014-05-16 14:15:31 +04:00
Ilya Lavrenov
eb1dd1900b
fixed conditions
2014-05-16 12:18:35 +04:00
Elena Gvozdeva
c7dc884855
T-API: optimized ocl_flip
2014-05-16 11:01:10 +04:00
Vladislav Vinogradov
746185652a
add additional tests for different input cases
2014-05-15 12:08:38 +04:00
Vladislav Vinogradov
f16503743f
use more accurate reshape
2014-05-15 12:08:01 +04:00
Alexander Mordvintsev
2756ae2051
exposed OpenCL-control functions to python
2014-05-14 17:42:21 +04:00
Roman Donchenko
f13e05cdcb
Merge pull request #2740 from ilya-lavrenov:tapi_norm_fix
2014-05-14 12:40:19 +04:00
Alexander Alekhin
46d672dcc3
Merge pull request #2663 from ilya-lavrenov:ipp_slow
2014-05-14 12:30:05 +04:00
Vladislav Vinogradov
55a714c83b
fix cv::kmeans function
...
reshape input matrix, since the function works with data
as with [N x dims] matrix
2014-05-13 18:00:17 +04:00
Ilya Lavrenov
d16e0b377f
disabled IPP functions that slower than OpenCV
2014-05-13 15:06:38 +04:00
Roman Donchenko
4a24ecd176
Merge pull request #2731 from StevenPuttemans:bug_2626
2014-05-13 14:21:36 +04:00
Ilya Lavrenov
f64dfeb222
fix for cv::norm (norm_inf)
2014-05-13 14:21:07 +04:00
StevenPuttemans
006956c324
Fixing as suggested in bug 2626, made naming same for both C, C++ and python API
2014-05-13 11:02:01 +02:00
Roman Donchenko
ff2d76ec0d
Merge pull request #2699 from GregoryMorse:patch-1
2014-05-13 11:58:25 +04:00
StevenPuttemans
a0a8fb4fd9
fixed bug 2626
2014-05-12 16:43:07 +02:00
Roman Donchenko
313a0ad255
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/internal.hpp
modules/core/src/arithm.cpp
modules/imgproc/src/imgwarp.cpp
modules/objdetect/src/hog.cpp
2014-05-12 17:38:07 +04:00
Ilya Lavrenov
1e5694e082
heuristic for Intel
2014-05-12 16:08:39 +04:00
Alexander Alekhin
1f638a3e5b
icv: enable functions
2014-05-12 15:38:38 +04:00
Alexander Alekhin
c74fed1fcf
Merge pull request #2706 from ilya-lavrenov:ipp_2.4_warnings
2014-05-08 17:04:18 +04:00
Ilya Lavrenov
19a2495067
fixed IPP related warnings
2014-05-08 13:31:27 +04:00
Vladislav Vinogradov
77275031ab
finally fix cv::subtract
2014-05-08 13:11:42 +04:00
Vladislav Vinogradov
629461c836
fix output matrix allocation in cv::subtract
2014-05-07 19:52:35 +04:00
Alexander Alekhin
07d5f56707
Merge pull request #2679 from alalek:ippicv_update
2014-05-07 18:24:41 +04:00
Alexander Alekhin
849228ac6a
Merge pull request #2684 from ElenaGvozdeva:ippiDFT
2014-05-07 17:57:17 +04:00
Alexander Alekhin
d54aa307fd
Merge pull request #2676 from ilya-lavrenov:ipp_gaussianblur
2014-05-07 16:49:59 +04:00
Alexander Alekhin
0e1bf58195
Merge pull request #2634 from ElenaGvozdeva:ippiDCT
2014-05-07 14:49:13 +04:00
Vladislav Vinogradov
4c66614e07
fix cv::subtract function:
...
call dst.create(...) before using it
2014-05-07 13:15:19 +04:00
GregoryMorse
38db7a78df
WinRT core compatibility fixes
...
Update system.cpp
Update system.cpp
Update system.cpp
Update matching.cpp
Update matching.cpp
2014-05-07 06:17:37 +08:00
GregoryMorse
b1443bc1bc
WinRT core compatibility fixes
...
Update system.cpp
Update system.cpp
Update ocl.cpp
Update matching.cpp
Update ocl.cpp
Update matching.cpp
2014-05-07 06:15:54 +08:00
Elena Gvozdeva
12279e2631
fixed
2014-05-06 14:49:03 +04:00
Alexander Alekhin
01f31dc007
Merge pull request #2687 from ilya-lavrenov:tapi_norm_inf_234cn
2014-05-06 13:27:03 +04:00
Elena Gvozdeva
e362c3fb38
fixed
2014-05-06 13:09:45 +04:00
Alexander Alekhin
03b1d133df
Merge pull request #2660 from arkunze:pullreq/140423-filter2D
2014-05-06 12:59:03 +04:00
Ilya Lavrenov
c80faff42f
added cn>1 support to cv::norm (NORM_INF)
2014-04-30 14:59:37 +04:00
Alexander Alekhin
b62e59aac0
icv: enable functions
2014-04-29 15:36:43 +04:00
Alexander Alekhin
5658ba0002
icv: update package
2014-04-29 15:35:27 +04:00
Elena Gvozdeva
043b917c7d
IPP: cv::dft fixed
2014-04-29 12:23:23 +04:00
Adrian Stratulat
cbf3c1fbf1
remove unused macros
2014-04-28 19:40:11 +00:00
Elena Gvozdeva
507ea95265
fixed
2014-04-28 16:46:11 +04:00
Elena Gvozdeva
16629bff4c
Added parallel version for DCT_ROWS
2014-04-28 16:05:19 +04:00
Elena Gvozdeva
6880dbfd95
IPP: cv::dct
2014-04-28 16:05:19 +04:00
Alexander Alekhin
649935596e
Merge pull request #2653 from alalek:ipp_lut
2014-04-28 15:15:11 +04:00
Alexander Alekhin
0e5b0677c9
Merge pull request #2654 from ElenaGvozdeva:ipp_DFT
2014-04-28 15:14:40 +04:00
Ilya Lavrenov
55bbca2d09
added more types to cv::GaussianBlur
2014-04-28 13:50:28 +04:00
Istvan Sarandi
4bf1df7da3
Suppress warning in constructor.
2014-04-26 00:42:26 +02:00
Alexander Alekhin
7ee1d5f69b
ipp: added LUT optimization
2014-04-25 12:09:06 +04:00
Elena Gvozdeva
10d1b3a534
Added parallel version for DFT_ROWS
2014-04-25 11:39:19 +04:00
Alexander Alekhin
32b25de583
Merge pull request #2656 from ilya-lavrenov:ipp_copymakeborder
2014-04-24 20:30:34 +04:00
Ilya Lavrenov
46e8d9d02d
cv::copyMakeBorder
2014-04-24 14:27:51 +04:00
Istvan Sarandi
c20cab9ec1
Added test for concatenation with empty matrices.
2014-04-24 03:09:07 +02:00
Aaron Kunze
1f8b41f390
Optimizes filter2D for Intel GPUs
2014-04-23 10:20:09 -07:00
Alexander Alekhin
dcc4d3640b
Merge pull request #2651 from ilya-lavrenov:ipp_minmaxidx_3cn
2014-04-23 20:06:55 +04:00
Elena Gvozdeva
2d71c094b3
IPP: CV::dft
2014-04-23 15:52:05 +04:00
Andrey Pavlenko
d93161812b
Merge pull request #2620 from ilya-lavrenov:ipp_integration
2014-04-23 15:12:45 +04:00
Alexander Alekhin
ba0ab8edb0
Merge pull request #2647 from vbystricky:ipp_norm
2014-04-23 11:50:13 +04:00
Ilya Lavrenov
493679dc56
cv::minMaxIdx for cn > 1
2014-04-22 23:47:04 +04:00
vbystricky
dfe6adebb9
Fix error in arguments of ipp function
2014-04-22 15:07:03 +04:00
Ilya Lavrenov
51e2a8ec96
fixes
2014-04-22 14:51:39 +04:00
vbystricky
e68a55cca2
Fix error in ipp function call
2014-04-22 14:35:27 +04:00
vbystricky
9cdb330452
Change test conditions
2014-04-22 13:27:20 +04:00
vbystricky
f5c729396d
Fix call of ippiConvert.
2014-04-22 10:50:35 +04:00
Ilya Lavrenov
fe644ede19
cv::multiply
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
9cc80a68db
fixed warnings
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
8603c58f37
Mat::setTo(with mask)
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
0b678c2451
Mat::setTo(Scalar::all(0))
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
3bd8211a72
Mat::copyTo
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
f7ec4a5c47
Mat::copyTo with mask
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
8d24a83c9c
cv::flip inplace
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
5ca3d855a2
cv::transpose inplace
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
d453a598f8
cv::min/cv::max CV_64F
2014-04-21 13:14:55 +04:00
Andrey Pavlenko
82c67abbfa
Merge pull request #2622 from ilya-lavrenov:ipp_sort
2014-04-18 14:47:06 +04:00
Ilya Lavrenov
9a109440df
cv::reduce sum/avg
2014-04-18 14:44:12 +04:00
Ilya Lavrenov
aa5767421a
cv::reduce (min/max to single column)
2014-04-18 14:39:33 +04:00
Ilya Lavrenov
1f6b719776
added ippisFlip to cv::sort
2014-04-18 14:37:46 +04:00
Ilya Lavrenov
26e8c6216f
cv:;sortIdx
2014-04-18 14:31:27 +04:00
Ilya Lavrenov
d5513f522b
cv::sort
2014-04-18 14:31:27 +04:00
Ilya Lavrenov
05a47d9014
cmd option
2014-04-17 18:06:14 +04:00
Ilya Lavrenov
6f9ca3d77c
fixed some errors
2014-04-17 11:08:02 +04:00
Ilya Lavrenov
ce0941160e
added status check
2014-04-17 11:08:02 +04:00
Ilya Lavrenov
2cd7a913ed
verbose errors
2014-04-17 11:07:01 +04:00
Ilya Lavrenov
f3c56f8310
first attemp
2014-04-17 11:07:01 +04:00
Istvan Sarandi
e18224110c
Removed emptiness check from cv::hconcat and cv::vconcat. Sometimes you want to concatenate with an empty matrix.
2014-04-17 02:41:52 +02:00
KayKwon
e13e3be16e
Merge branch 'master' into matlab_formatter
2014-04-16 11:13:02 +09:00
KayKwon
84257b57d0
Fix for (Bug #2789 )
...
Add MatlabFormatter for matlab style output.
See http://code.opencv.org/issues/2789
2014-04-16 10:56:27 +09:00
Andrey Pavlenko
80ef1f6753
Merge pull request #2621 from arkunze:pullreq/140319-resize-b
2014-04-15 19:56:56 +04:00
Andrey Pavlenko
dab8e920b0
Merge pull request #2565 from apavlenko:tapi_stitching
2014-04-15 19:56:11 +04:00
Roman Donchenko
534f9623f2
Merge pull request #2616 from SpecLad:merge-2.4
2014-04-15 12:06:13 +04:00
Aaron Kunze
ebbac3c66d
Optimizes OpenCL resize and optical flow to use image extension.
2014-04-14 16:09:17 -07:00
Andrey Pavlenko
5ff59af09d
Merge pull request #2610 from ilya-lavrenov:ipp_cvtcolor
2014-04-14 18:52:07 +04:00
Roman Donchenko
799d2dabd6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/test/test_arithm.cpp
modules/cuda/src/cascadeclassifier.cpp
modules/imgproc/doc/geometric_transformations.rst
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/moments.cpp
2014-04-14 16:08:02 +04:00
Ilya Lavrenov
884b706b3a
fixed warning
2014-04-14 14:40:40 +04:00
Ilya Lavrenov
ad7f2311c0
cv::Laplacian
2014-04-14 14:34:28 +04:00
Ilya Lavrenov
2a051a124f
cvtColor
2014-04-14 14:29:36 +04:00
Roman Donchenko
4c2db3d6e7
Merge pull request #2579 from maksqwe:test_operations_fix
2014-04-11 14:14:33 +04:00
Ilya Lavrenov
19d470749b
added macro for denoting region for suppression of "Wdeprecated-declarations"
2014-04-11 13:45:20 +04:00
Andrey Pavlenko
925178749a
removing SuppressWarning and CV_OPENCL_RUN
2014-04-11 13:09:19 +04:00
Alexander Alekhin
3578f0afe9
ocl: workaround for synchronization issue in ::map()
2014-04-11 13:09:18 +04:00
Alexander Alekhin
e6cc1be7e8
stitching: allow to use dynamic DescriptorMatcher
2014-04-11 13:01:13 +04:00
Alexander Alekhin
06738468af
TAPI: stiching: add custom OpenCL kernels for MultiBandBlender
2014-04-11 13:01:12 +04:00
Alexander Alekhin
1d9808e5d5
TAPI: stitching, replaced Mat->UMat/_Array
2014-04-11 13:01:06 +04:00
Andrey Pavlenko
7ae547a208
Merge pull request #2597 from ilya-lavrenov:ipp_countnonzero
2014-04-11 12:43:24 +04:00
Vadim Pisarevsky
b5755b1228
Merge pull request #2588 from vpisarev:fix_samples_n_unused
2014-04-10 13:30:20 +04:00
Ilya Lavrenov
b2379b51b5
cv::countNonZero
2014-04-10 13:21:52 +04:00
Maks Naumov
29d1bce85f
remove unused variable in TEST_P()
2014-04-09 23:06:06 +03:00
Andrey Pavlenko
7b366df822
Merge pull request #2589 from alalek:icv_update
2014-04-09 18:23:35 +04:00
Andrey Pavlenko
cd02a7002b
Merge pull request #2596 from ilya-lavrenov:tapi_setto
2014-04-09 18:23:15 +04:00
Alexander Alekhin
ab691a4a24
ipp: some functions are not available in the ICV package #2
2014-04-09 18:20:49 +04:00
Alexander Alekhin
1461ab41bc
ipp: added support for updated ICV package
2014-04-09 18:20:49 +04:00
Andrey Pavlenko
ced81b9121
Merge pull request #2594 from arkunze:pullreq/140319-dll-shutdown-fix-b
2014-04-09 14:25:12 +04:00
Andrey Pavlenko
e6d6a3a85b
Merge pull request #2586 from ilya-lavrenov:ipp_disable
2014-04-09 14:16:25 +04:00
Ilya Lavrenov
bcd7151867
added UMat::setTo accuracy test
2014-04-09 14:15:22 +04:00
Aaron Kunze
629ddf0bf8
Resolves bug #3450 (Improperly cleaning up resources in DllMain)
2014-04-08 16:21:33 -07:00
Ilya Lavrenov
444ab0ef0d
fixed (IppiSize&)sz
2014-04-09 00:19:56 +04:00
Ilya Lavrenov
c735594178
cv::scaleAdd
2014-04-09 00:12:48 +04:00
Ilya Lavrenov
fd3a6f0db7
cv::blur
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
a624ec167d
cv::Mat::convertTo
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
b72b256fda
cv::pow (added ippiSqr_32f_C1R for power=2)
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
77723db034
cv::flip
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
ed1ca00bf6
cv::magnitude
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
bf860dbb31
cv::pow
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
49d1691a3e
cv::sqrt
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
5ddff235bb
cv::polarToCart
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
46cb4e0cbc
cv::transpose
2014-04-09 00:11:26 +04:00
Ilya Lavrenov
e090aa07db
disabled some IPP funcs
2014-04-08 22:30:18 +04:00
Vadim Pisarevsky
1b339eb0d4
fixed slow down in getRectSubPix (original patch by Markus JR Mueller); removed some unused variables and functions
2014-04-08 17:54:08 +04:00
Ilya Lavrenov
aa5326c231
cv::norm -> cvtest::norm in tests
...
Conflicts:
modules/core/src/stat.cpp
2014-04-08 14:49:20 +04:00
Andrey Pavlenko
a6ef45aa13
Merge pull request #2582 from vbystricky:ipp_fix
2014-04-08 14:30:48 +04:00
vbystricky
9828cd6086
Remove defined(HAVE_IPP)
2014-04-08 13:05:23 +04:00
vbystricky
f23134ce01
Add IPP_VERSION_X100 define
2014-04-08 12:43:57 +04:00
Andrey Pavlenko
9ec823d800
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
2014-04-08 11:05:30 +04:00
Elena Gvozdeva
f9c5289483
fixed
2014-04-07 18:53:07 +04:00
Roman Donchenko
6f055d7a76
Merge pull request #2580 from SpecLad:merge-2.4
2014-04-07 18:29:51 +04:00
vbystricky
7badc85b60
Fix for pullrequest comment
2014-04-07 17:06:02 +04:00
vbystricky
2d54581971
Fix ifdef for IPP version greater 8.1
2014-04-07 16:45:35 +04:00
Roman Donchenko
4f2b126b7b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/core/src/out.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/generalized_hough.cpp
modules/nonfree/perf/perf_main.cpp
2014-04-07 14:59:34 +04:00
vbystricky
dbdc476b79
Check results of ipp function
2014-04-07 14:31:34 +04:00
vbystricky
38913bf5f6
Change all 'ippStsNoErr==' to '0<=', and all 'ippStsNoErr!=' to '0>'
2014-04-07 14:31:34 +04:00
vbystricky
67484e027b
Fix function names (log, exp)
2014-04-07 14:31:33 +04:00
vbystricky
1b3651d8ee
Undo changes ipp to ippicv prefix of function names
2014-04-07 14:30:03 +04:00
vbystricky
eb8c531791
Add preprocessor check for IPP version greater 8.1 on some code
2014-04-07 14:26:51 +04:00
vbystricky
188c506237
Uncomment ippiNormDiff_Inf_16s_C3R, ippiNormDiff_Inf_16s_C4R
2014-04-07 14:26:51 +04:00
vbystricky
ec6f977783
Uncomment ippicviNorm_Inf_16s_C3R, ippicviNorm_Inf_16s_C4R functions
2014-04-07 14:26:50 +04:00
vbystricky
ad23ef2a42
Remove unused #include "ippverdion.h"
2014-04-07 14:26:49 +04:00
vbystricky
9d138b2bbe
Enable ipp MeanStdDev calculation for 32F_C1 images. Decrease accuracy sanity check of the perfomance test
2014-04-07 14:26:49 +04:00
vbystricky
9b6feee1a5
Change sanity check for perfomance test of dft
2014-04-07 14:26:47 +04:00
vbystricky
01a66a2938
Prepare codes for ippicv library
2014-04-07 14:24:05 +04:00
Andrey Pavlenko
c2f859569c
Merge pull request #2563 from alalek:ipp_builds
2014-04-07 13:03:11 +04:00
Maks Naumov
8271bd5f14
fix condition in CV_OperationsTest::operations1()
2014-04-07 11:24:27 +03:00
Andrey Pavlenko
5a3200d513
Merge pull request #2567 from apavlenko:fix_compare_scalar
2014-04-03 22:08:18 +04:00
Andrey Pavlenko
9a3895d842
Merge pull request #2556 from DeanF:master
2014-04-03 17:07:06 +04:00
Andrey Pavlenko
271f60ba7a
fixing OCL run condition (build program failure for comparison 64F Mat with Scalar)
2014-04-03 16:21:04 +04:00
Alexander Alekhin
bfc546d23c
enable IPP ICV support
2014-04-03 15:05:38 +04:00
Elena Gvozdeva
037ac27ec8
Added SharedMatrix
2014-04-03 14:53:27 +04:00
Roman Donchenko
c165f07319
Merge pull request #2550 from SpecLad:merge-2.4
2014-04-02 12:00:01 +04:00
DeanF
48df67a9c5
Fixed trailing whitespace
2014-04-01 22:04:58 +03:00
DeanF
bdc91c66c9
Fixed problem with compilation without HAVE_OPENCL
...
When compiling without OpenCL, some classes from its namespace are still used in code.
2014-04-01 21:20:13 +03:00
Elena Gvozdeva
fa2d79a15b
Added IPP Async converters, doc and sample
2014-04-01 16:47:29 +04:00
Alexander Smorkalov
e23f7303a6
OpenCV version++. OpenCV Manager version++.
2014-03-31 15:00:25 -07:00
Ilya Lavrenov
322b15a459
compare with scalar (cn > 1)
2014-03-31 17:50:16 +04:00
Roman Donchenko
f77c68e0fa
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
Roman Donchenko
d6b54ff9d1
Merge pull request #2476 from minkless:3.0-bugfix-core-filestorage
2014-03-28 12:17:16 +04:00
Koji Miyazato
1ab8060b62
corrected some style errors found by review.
2014-03-28 10:45:33 +09:00
JinoBetti
91511c1521
Update out.cpp
...
Fixed a bug with the cv::format(cv::Mat, ...) method for matrices with only one row
see http://answers.opencv.org/question/21201/cvformat-does-not-format-the-way-it-should/?answer=23945#post-id-23945 for details
2014-03-27 16:28:40 +01:00
Alexander Alekhin
3488fdcb43
disable failed tests
2014-03-26 19:29:59 +04:00
Alexander Alekhin
569e1346f2
UMat: issue in OpenCLAllocator::unmap()
2014-03-26 19:29:41 +04:00
Andrey Pavlenko
04c857a4e8
Merge pull request #2505 from alalek:umat_unmap_synchronization_test
2014-03-26 19:08:15 +04:00
Ilya Lavrenov
f7d6d3cff5
improved cv::filter2D
2014-03-26 14:19:59 +04:00
Roman Donchenko
a7f9677378
Merge pull request #2404 from yashdv:old_basic_structures_doc_fix
2014-03-26 12:18:39 +04:00
Alexander Alekhin
6bd7a444bc
UMat map-unmap synchronization test
2014-03-25 16:19:52 +04:00
Roman Donchenko
85cf2d9671
Merge pull request #2524 from SpecLad:merge-2.4
2014-03-25 12:13:04 +04:00
Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Andrey Pavlenko
9c5745383f
Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser
2014-03-24 18:46:01 +04:00
Konstantin Matskevich
c2355d3a12
case-insensitivity
2014-03-24 15:20:00 +04:00
Andrey Pavlenko
d8c018289a
Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
2014-03-24 10:37:15 +04:00
Koji Miyazato
0a5d6e10b9
Added test code for I/O of user-defined types.
2014-03-22 00:32:44 +09:00
Konstantin Matskevich
79fc3a6203
added gpu type selection in OPENCV_OPENCL_DEVICE parser
2014-03-21 17:01:37 +04:00
Andrey Pavlenko
7193762d2d
Merge pull request #2495 from ilya-lavrenov:tapi_flip
2014-03-21 16:08:46 +04:00
Ilya Lavrenov
2875ce60ea
added 3-channels support to optimized version
2014-03-21 16:02:47 +04:00
Andrey Pavlenko
2299e2ed1b
Merge pull request #2494 from ilya-lavrenov:tapi_merge
2014-03-20 13:39:39 +04:00
Andrey Pavlenko
87ae0f9990
Merge pull request #2492 from KonstantinMatskevich:ocl_fix_wrongdevice
2014-03-20 13:39:17 +04:00
Ilya Lavrenov
eb8b4c58c7
fixed bug in cv::ocl::predictOptimalVectorWidth
2014-03-20 00:28:21 +04:00
Ilya Lavrenov
291458a859
generalized OpenCL version of cv::sepFilter2D; removed some restrictions and added 3-channels support
2014-03-19 18:56:16 +04:00
Ilya Lavrenov
b73490f86c
eliminated restriction src[i].channels() == 1 in cv::merge
2014-03-19 13:56:31 +04:00
Konstantin Matskevich
f9f730c426
update error message
2014-03-19 12:14:48 +04:00
Ilya Lavrenov
04884ebf45
added 3-channels support to cv::setIdentity
2014-03-19 01:53:53 +04:00
Ilya Lavrenov
8d97d0d631
added 3-channels support to cv::flip
2014-03-18 19:31:37 +04:00
Koji Miyazato
a43ef9a6cd
WriteStructContext treats state of fs
2014-03-18 23:29:30 +09:00
Konstantin Matskevich
eebf92ba58
fix for incorrect opencl device selection
2014-03-18 15:47:35 +04:00
Roman Donchenko
d76226e21b
Merge pull request #2456 from kurodash:pr_use_cvAlloc
2014-03-18 14:39:40 +04:00
Roman Donchenko
ae2b0b0098
Merge pull request #2486 from SpecLad:merge-2.4
2014-03-18 13:55:57 +04:00
Ilya Lavrenov
82e6edfba2
optimized sep filter
2014-03-18 00:16:38 +04:00
yash
51cb6998ea
made the example consistent with the fuction definition and improved doc
...
made the example consistent with the fuction definition and improved doc
2014-03-17 18:44:02 +05:30
Roman Donchenko
40a740ff88
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/imgproc/src/opencl/precornerdetect.cl
modules/nonfree/perf/perf_main.cpp
modules/nonfree/perf/perf_surf.ocl.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/opencl/arithm_bitwise.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_minMax.cl
modules/ocl/src/opencl/arithm_nonzero.cl
modules/ocl/src/opencl/arithm_sum.cl
modules/ocl/test/test_arithm.cpp
modules/viz/src/precomp.hpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkXYZReader.cpp
modules/viz/src/vtk/vtkXYZReader.h
modules/viz/test/test_precomp.hpp
2014-03-17 14:14:07 +04:00
Andrey Pavlenko
dc28451b8a
Merge pull request #2479 from alalek:ocl_compare_scalar
2014-03-17 14:04:22 +04:00
Andrey Pavlenko
2a1d5c6d43
Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels
2014-03-17 13:10:34 +04:00
Alexander Alekhin
af062b7c42
ocl: compare: remove useless perf tests
2014-03-17 12:33:12 +04:00
Roman Donchenko
136e5eb804
Merge pull request #2484 from berak:mat_doc_24
2014-03-17 11:57:10 +04:00
berak
80708008a4
missing () on Mat::type()
2014-03-16 14:04:05 +01:00
Alexander Alekhin
7ce2ca2e0c
ocl: workaround for Pow accuracy test failure
2014-03-14 19:51:19 +04:00
Alexander Alekhin
9cafd50160
ocl: fixes
2014-03-14 19:51:19 +04:00
Alexander Alekhin
755ca4b7cf
ocl: compare with scalar
2014-03-14 19:51:19 +04:00
Ilya Lavrenov
6be7869ae8
fix for unsupported doubles
2014-03-14 16:54:52 +04:00
kuroda sho
f9484bae8a
fix: use "cvAlloc" wrapper function for malloc.
2014-03-14 17:09:08 +09:00
Andrey Pavlenko
0ce8f1d5dd
Merge pull request #2477 from alalek:ocl_cleanup_workarounds
2014-03-13 18:55:28 +04:00
Andrey Pavlenko
c5bf1c108c
Merge pull request #2470 from ilya-lavrenov:tapi_reduction
2014-03-13 18:42:01 +04:00
Andrey Pavlenko
a6c40abfb2
Merge pull request #2466 from ilya-lavrenov:tapi_transpose_3cn
2014-03-13 16:56:01 +04:00
Andrey Pavlenko
0764a23eb2
Merge pull request #2459 from ilya-lavrenov:tapi_experiments
2014-03-13 16:49:57 +04:00
Alexander Alekhin
48196ad10b
ocl: cleanup workarounds
2014-03-13 15:46:38 +04:00
Koji Miyazato
b96762a48f
Fix for bug #3599 : cv::FileStorage does not work for std::vector of user-defined struct.
2014-03-13 19:41:13 +09:00
Ilya Lavrenov
9932cf41a4
3-channel reduction operations
2014-03-12 15:07:39 +04:00
Ilya Lavrenov
f138b613b7
cv::compare
2014-03-12 13:16:33 +04:00
Ilya Lavrenov
89b7c0dd93
3 channel support to cv::transpose
2014-03-12 00:17:11 +04:00
Ilya Lavrenov
2755ae5df9
experiments
2014-03-11 23:03:55 +04:00
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
90c5dde887
Merge pull request #2455 from ilya-lavrenov:tapi_fix
2014-03-11 15:58:32 +04:00
Alexander Alekhin
e4608229f0
ocl: copyMakeBorder 3-channel
2014-03-10 17:22:49 +04:00
kurodash
0eaeff0641
fix: use "cvAlloc" wrapper function for malloc.
2014-03-07 19:02:37 +09: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
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
2f0fe5b87b
Merge pull request #2450 from ilya-lavrenov:tapi_test
2014-03-06 21:55:50 +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 Karsakov
c1dad2178c
Added Device:: isAMD,isIntel,isNvidia methods.
2014-03-05 14:43:11 +04:00
Andrey Pavlenko
0a3aca230c
Merge pull request #2436 from ilya-lavrenov:tapi_dft_fix
2014-03-04 19:21:15 +04:00
Andrey Pavlenko
c00f0faf24
Merge pull request #2408 from ilya-lavrenov:tapi_core_opt
2014-03-04 18:37:26 +04:00
Ilya Lavrenov
099ea91823
typos
2014-03-04 12:47:40 +04:00
Ilya Lavrenov
050cca0422
improved performance of cv::flip (flip cols)
2014-03-03 19:04:32 +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
Roman Donchenko
af8aa8a2fa
Merge pull request #2433 from ilya-lavrenov:typos
2014-03-03 12:20:35 +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
Alexander Alekhin
b9d68ef061
core/ocl: OpenCL build log improvements
2014-02-27 13:16:07 +04:00
Roman Donchenko
bd5d8404c9
Merge pull request #2393 from ilya-lavrenov:coverity
2014-02-26 12:16:36 +04:00
Roman Donchenko
693129902d
Merge pull request #2399 from SpecLad:merge-2.4
2014-02-25 19:42:54 +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
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
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
Alexander Karsakov
6d83048ec3
Fixed incorrect calculation of element size in OCL.(Mul/Div).Mat_Scalar_Scale.
2014-02-24 15:10:00 +04: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
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
Alexander Alekhin
9b3c76a3db
TAPI: coverity bug fix
2014-02-21 14:04:01 +04:00
Rohit Girdhar
347a3dc520
added randomized test
2014-02-21 12:47:01 +05:30
Rohit Girdhar
ea7b1bb3d2
added test, doc
2014-02-20 17:51:48 +05:30
Alexander Alekhin
79eba54a4f
some fixes in perf tests
2014-02-20 13:29:11 +04:00
Rohit Girdhar
b939b4ae3b
removed inline, changed interface
2014-02-19 20:58:40 +05:30
Roman Donchenko
3782c324c4
Merge pull request #2098 from pxli168:patch-1
2014-02-18 15:49:19 +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
b3cfe6b446
Merge pull request #2341 from alalek:ocl_fix_error_processing
2014-02-18 13:27:38 +04:00
Roman Donchenko
bcf4307345
Merge pull request #2356 from SpecLad:merge-2.4
2014-02-18 12:14:57 +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
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
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
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
e8d26b02ac
Merge pull request #2339 from jet47:gpu-warnings
2014-02-17 13:35:15 +04:00
pxli168
70d462b352
Simplify the code
...
Simplify the code as @SpecLad suggested.
2014-02-17 10:21:18 +08: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
Ilya Lavrenov
9b627a5e9f
disabled 'reshape', 'copyTo' test
2014-02-15 20:17:42 +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
Vladislav Vinogradov
8b8c368148
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
2014-02-14 17:56:03 +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
Konstantin Matskevich
5f76072c62
update
2014-02-13 13:29:53 +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
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
f7620dc7d1
added 3-channel support to arithmetic operations
2014-02-12 12:18:55 +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
Andrey Pavlenko
86b6c48712
Merge pull request #2295 from alalek:opencl_align_rw_buffers
2014-02-07 17:45:15 +04:00
Roman Donchenko
8b16b8b657
Merge pull request #2296 from apavlenko:fix_coverity_scan
2014-02-07 16:54:30 +04:00
Alexander Alekhin
e371901dd9
ocl: workaround for failures with misaligned host buffers
2014-02-07 14:51:58 +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
af0040eab0
condition for Mat step
2014-02-06 15:44:27 +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
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
Andrey Pavlenko
564f5fcca3
Merge pull request #2280 from ilya-lavrenov:attempt_pvc
2014-02-04 21:22:49 +04:00
Andrey Pavlenko
b7ffed7b46
Merge pull request #2279 from alalek:fix_memory_leak_getumat
2014-02-04 20:45:27 +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
Alexander Alekhin
485635310c
core/ocl: OpenCLBufferPool
2014-02-04 16:48:35 +04:00
Andrey Pavlenko
bd6620fa87
Merge pull request #2252 from ilya-lavrenov:ocl_ref
2014-02-04 16:34:28 +04:00
Andrey Pavlenko
49db511882
Merge pull request #2268 from ilya-lavrenov:tapi_pow
2014-02-04 16:32:43 +04:00
Konstantin Matskevich
c684da3549
drawing
2014-02-04 11:09:29 +04:00
Ilya Lavrenov
da5b316b4e
minor ocl.cpp refactoring
...
fix for cv::LUT and cv::transpose
2014-02-04 01:52:48 +04:00
Andrey Pavlenko
92c8b94ba9
Merge pull request #2265 from vpisarev:ocl_facedetect_amd3
2014-02-04 00:39:09 +04:00
Ilya Lavrenov
98b72ff389
optimized cv::pow for integer power
2014-02-03 22:36:57 +04:00
Andrey Pavlenko
810dc262ad
Merge pull request #2196 from KonstantinMatskevich:ocl_bugcautching
2014-02-03 17:32:20 +04:00
Vadim Pisarevsky
b8c6adc569
Merge pull request #2178 from Nerei:viz_backport
2014-02-03 16:16:51 +04:00
Roman Donchenko
652a0bd5ce
Merge pull request #2262 from SpecLad:merge-2.4
2014-02-03 15:33:41 +04:00
Vadim Pisarevsky
11926dafb2
eliminate crash in ipp-accelerated norm and mean functions (thanks to Matt Curfman and Aaron Kunze for the patch)
2014-02-03 15:31:32 +04:00
Vadim Pisarevsky
30593ee55e
3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier.
2014-02-03 15:12:27 +04:00
Andrey Pavlenko
0fef7f8b96
Merge pull request #2217 from ilya-lavrenov:tapi_superres
2014-02-03 14:38:59 +04:00
Konstantin Matskevich
ffeb223150
test for failure
2014-02-03 14:34:02 +04:00
Ilya Lavrenov
cc47edb850
more strict checks and reseting state
2014-02-03 14:32:25 +04:00
Konstantin Matskevich
aa23a842a1
test for failure
2014-02-03 14:32:25 +04:00
Andrey Pavlenko
13875b5fbc
Merge pull request #2257 from ilya-lavrenov:tapi_opencl_game2
2014-02-03 14:26:05 +04:00
Andrey Pavlenko
cb1e4b2ede
Merge pull request #2256 from ilya-lavrenov:tapi_matchTempl
2014-02-03 14:10:21 +04:00
Roman Donchenko
2bbda9d225
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
Roman Donchenko
82330a51bd
Merge pull request #2253 from ilya-lavrenov:cuda
2014-02-03 12:12:12 +04:00
Roman Donchenko
c967069922
Merge pull request #2254 from ilya-lavrenov:opengl
2014-02-03 12:11:28 +04:00
Ilya Lavrenov
e844c08203
some fixes and improvements in cv::matchTemplate
2014-02-02 19:20:37 +04:00
Ilya Lavrenov
19f799ba1e
fix2 for OpenCL on/off
2014-02-02 15:35:13 +04:00
Ilya Lavrenov
02692f9ac0
fix MACRO
2014-02-01 22:43:41 +04:00
Andrey Pavlenko
75dde49b64
Merge pull request #2230 from ilya-lavrenov:tapi_openc_on-off_game
2014-02-01 22:32:39 +04:00
Ilya Lavrenov
ec3eb14138
unused function in case of unavailable OpenGL
2014-02-01 18:14:10 +04:00
Ilya Lavrenov
a6104bd025
fixed unused function in case of unavailable CUDA
2014-02-01 18:11:45 +04:00
Ilya Lavrenov
6ad4823f0c
ported superres to T-API
2014-02-01 17:20:18 +04:00
Andrey Pavlenko
25d2ab8a68
Merge pull request #2218 from alalek:fix_defects_code_coverity
2014-01-31 19:23:02 +04:00
Andrey Pavlenko
2c35438771
Merge pull request #2228 from ilya-lavrenov:tapi_experiments
2014-01-31 19:14:19 +04:00
Andrey Pavlenko
0b57d3717f
Merge pull request #2244 from ilya-lavrenov:tapi_device_cache
2014-01-31 19:04:30 +04:00
Ilya Lavrenov
d15bf6261a
redundant clFinish in upload since clEnqueueWriteBuffer above is already blocked
2014-01-31 14:39:03 +04:00
Ilya Lavrenov
50cf152977
cached commonly used device properties
2014-01-31 14:00:05 +04:00
Andrey Pavlenko
77bbd65fa6
Merge pull request #2220 from ilya-lavrenov:tapi_accumulate
2014-01-30 17:33:06 +04:00
Ilya Lavrenov
1ab1594d00
workaround
2014-01-30 17:26:56 +04:00
Ilya Lavrenov
372cdac07c
moved kernelToStr to ocl.hpp
2014-01-30 15:23:11 +04:00
Ilya Lavrenov
86353eb541
fix for PR 2196
2014-01-30 01:47:25 +04:00
Ilya Lavrenov
e7e63fac6c
eliminated possible memory leak
2014-01-30 01:21:04 +04:00
Ilya Lavrenov
6d64907f18
async
2014-01-30 00:19:18 +04:00
Ilya Lavrenov
384a28622d
added cv::calcHist to T-API (only for CV_8UC1 with 256 bins)
2014-01-29 20:19:15 +04:00
Alexander Alekhin
f91f55927e
fix memory management problem
2014-01-29 19:59:01 +04:00
Ilya Lavrenov
7c96d98a24
implemented OpenCL version of cv::accumulate****
2014-01-29 11:42:46 +04:00
Alexander Alekhin
5474935a81
fixes for defects from code coverity
2014-01-28 20:24:10 +04:00
Andrey Pavlenko
fff5a6c058
Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid
2014-01-28 16:31:30 +04:00
Roman Donchenko
84c29745f2
Merge pull request #2211 from SpecLad:merge-2.4
2014-01-28 12:44:29 +04:00
Andrey Pavlenko
6deda99f07
Merge pull request #2207 from ilya-lavrenov:tapi_macro
2014-01-27 18:56:06 +04:00
Ilya Lavrenov
78c2b3ca2a
refactored imgproc
2014-01-27 18:47:16 +04:00
Ilya Lavrenov
48a084c236
OpenCL version of cv::buildPyramid
2014-01-27 18:42:44 +04:00
Andrey Pavlenko
d9b24457fa
Merge pull request #2208 from alalek:ocl_dynload_warn
2014-01-27 18:24:14 +04:00
Roman Donchenko
bbc35d609d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
Alexander Alekhin
1ff9a8ef52
core/ocl: added warning about incompatible configuration
2014-01-27 13:52:52 +04:00
Ilya Lavrenov
321782b9b7
added macro with ability of returning values
2014-01-27 12:32:26 +04:00
Ilya Lavrenov
f767077a41
fixed condition
2014-01-27 12:00:53 +04:00
Ilya Lavrenov
2dd294cc84
fixed cv::split; enabled test
2014-01-27 12:00:53 +04:00
Ilya Lavrenov
fa5492343a
added STD_VECTOR_UMAT support to _OutputArray::create
2014-01-27 11:59:59 +04:00
Andrey Pavlenko
a64d3c1744
Merge pull request #2155 from vbystricky:ocl_calcOpticalFlowPyrLK
2014-01-25 17:08:07 +04:00
Andrey Pavlenko
3f61007563
Merge pull request #2191 from ilya-lavrenov:tapi_macro
2014-01-25 16:32:54 +04:00
Ilya Lavrenov
7f785e0a11
refactored core using new macro
2014-01-24 23:59:00 +04:00
vbystricky
33fc46cdec
Validate parameters for using OpenCL version, before upload UMat
2014-01-24 17:37:50 +04:00
vbystricky
4152135e63
Fix error with some opencl functions on the build WITH_OPENCL=OFF
2014-01-24 17:37:50 +04:00
vbystricky
c57e427fba
Move OpticalFlowPyrLK from ocl module to video module
2014-01-24 17:37:50 +04:00
Ilya Lavrenov
cc514ac7a9
added new macros useful for tracking whether OpenCL impl run or not
2014-01-24 17:16:40 +04:00
Andrey Pavlenko
5424c55565
Merge pull request #2142 from KonstantinMatskevich:ocl_tapi_bfmatcher
2014-01-24 16:50:03 +04:00
Andrey Pavlenko
b0caa588ec
Merge pull request #2190 from KonstantinMatskevich:ocl_dumpinfo
2014-01-24 16:44:19 +04:00
Konstantin Matskevich
ae827a638c
fixes
2014-01-24 14:01:31 +04:00
Andrey Pavlenko
ee88cc2c52
Merge pull request #2110 from hmax:master
2014-01-23 14:37:34 +04:00
Konstantin Matskevich
f90e41d54e
dumpinfo
2014-01-22 17:04:44 +04:00
Konstantin Matskevich
ca5689e0db
BFMatcher
...
match
radiusMatch
2014-01-22 15:31:26 +04:00
Vladislav Vinogradov
dda999545c
fix GpuMat::copyTo method with mask:
...
fill destination matrix with zeros if it was reallocated
2014-01-22 10:40:14 +04:00
Andrey Pavlenko
5d818c010e
Merge pull request #2156 from ilya-lavrenov:tapi_reduce
2014-01-22 10:12:08 +04:00
Andrey Pavlenko
99942e8043
Merge pull request #2166 from ilya-lavrenov:tapi_gftt
2014-01-21 22:29:41 +04:00
Ilya Lavrenov
bfa382cf9d
fixed copying UMat -> std::vector
2014-01-21 14:37:22 +04:00
Ilya Lavrenov
ae4be413c3
added perf tests for cv::reduce
2014-01-21 14:18:38 +04:00
Andrey Pavlenko
801d2d0a32
Merge pull request #2167 from ilya-lavrenov:tapi_kern_warn
2014-01-20 23:33:55 +04:00
Anatoly Baksheev
02ebc4368c
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
2014-01-20 22:51:33 +04:00
Roman Donchenko
a509819b21
Merge pull request #2163 from ilya-lavrenov:tapi_channels
2014-01-20 18:48:52 +04:00
Roman Donchenko
9710b25c7d
Merge pull request #2173 from Nerei:viz
2014-01-20 18:05:11 +04:00
Roman Donchenko
9dc93ce328
Merge pull request #2176 from SpecLad:merge-2.4
2014-01-20 18:04:56 +04:00
Anatoly Baksheev
ac035b9b8e
review comments
2014-01-20 15:22:58 +04:00
Andrey Pavlenko
69ba0c53ad
Merge pull request #2165 from ilya-lavrenov:tapi_upload
2014-01-20 15:18:56 +04:00
Roman Donchenko
e45fd939c2
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
2014-01-20 15:10:19 +04:00
Roman Donchenko
087371c021
Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2
2014-01-20 14:15:05 +04:00
Ilya Lavrenov
5d18cf9989
added cv::[extract|insert]Channel to T-API
2014-01-20 13:52:07 +04:00
Roman Donchenko
8386ce2b2f
Merge pull request #2160 from SpecLad:norm-assert
2014-01-20 12:20:21 +04:00
Anatoly Baksheev
0d702b83f4
updated code to use mapper->SetInput instead of SetInputConnection. All widgets except plane, images ans texts
2014-01-19 18:38:51 +04:00
Anatoly Baksheev
7b28f730f4
traits for Affine3
2014-01-19 18:38:47 +04:00
Anatoly Baksheev
a76a34d28e
added Affine3: 3x4 input Mat support
2014-01-19 18:38:46 +04:00
Anatoly Baksheev
3e071491c9
added Affine3 ctor from array
2014-01-19 18:38:46 +04:00
Anatoly Baksheev
b1c0bf1fee
Affine::rotate(rvec) method
2014-01-19 18:38:45 +04:00
Anatoly Baksheev
7e952e2f10
removed incorrect and unnecessarily methods from Affine3f
2014-01-19 18:38:43 +04:00
Ilya Lavrenov
5af2e6f1c9
removed useless CRC calculation
2014-01-19 11:57:50 +04:00
Drew Jetter
6bf599b1bc
Fixed bug #3489 : The code assumed that two global variables would be constructed in a particular order, but global variable initialization order is compiler-dependent.
2014-01-18 23:04:16 -07:00
Ilya Lavrenov
6b8bee6e0b
fixed kernel compilation warnings
2014-01-18 22:37:47 +04:00
Ilya Lavrenov
37789f015a
deleted excess semicolons, commas
2014-01-18 01:31:33 +04:00
Roman Donchenko
0de799b3b0
Removed some duplicate assertions.
2014-01-17 18:25:28 +04:00
Roman Donchenko
79fcc06a4b
Merge pull request #2146 from SpecLad:merge-2.4
2014-01-17 16:28:30 +04:00
Roman Donchenko
e9805e444f
Fixed an overly-narrow assertion in cv::norm.
...
size() requires that the matrix is two-dimensional, and norm()
works on higher dimensions.
2014-01-17 14:49:42 +04:00
Roman Donchenko
5f8d8c0069
Added a test for matrix-to-vector copy and convert.
2014-01-17 14:18:31 +04:00
Roman Donchenko
4e4a7d0353
Removed an unnecessary workaround for matrix-to-vector copyTo.
2014-01-17 14:16:22 +04:00
Roman Donchenko
ee97a5e757
Re-fix bug #3319 with less side effects.
2014-01-17 14:13:21 +04:00
Roman Donchenko
f02204847a
Revert "fixed bug #3319 "
...
See 092f9164f9c081dc3
2014-01-17 13:43:00 +04:00
Roman Donchenko
092f916db9
Revert 4f9c081
...
That commit introduces problems, as it breaks certain use cases of
OpenCV functions; for example, convertTo of an Nx1 matrix to an
std::vector.
Since vectors can't store separate width and height values, OpenCV
considers them to always be 1xN. So even though the vector is created with
.create(N, 1), the Mat passed to getContinousSize has dimensions 1xN,
and the size comparison fails, even though the operation itself is safe.
This is a use case we probably don't want to break, at the very least
for backwards compatibility. So I'm reverting the commit. This will also
unfix bug #3319 ; I'll submit a less intrusive solution as a PR to 2.4, which
will also revert 4f9c081
2014-01-17 12:51:52 +04:00
Ilya Lavrenov
93a818684c
ported cv::Canny to T-API
2014-01-17 11:13:28 +04:00
Ilya Lavrenov
63a5e39e2c
added cv::reduce to T-API
2014-01-17 00:41:18 +04:00
Roman Donchenko
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Andrey Pavlenko
fdb1019b9e
Merge pull request #2147 from ilya-lavrenov:tapi_sqrt
2014-01-14 11:34:03 +04:00
Ilya Lavrenov
09bff78d63
deleted extra arg in case of power=0.5
2014-01-13 19:59:10 +04:00
Roman Donchenko
af9cd79e16
Merge pull request #2121 from ilya-lavrenov:tapi_perf
2014-01-13 16:30:33 +04:00
Max Khardin
d8e5f1611b
Rewrite definition/declaration of variables to be more compact
2014-01-13 15:55:49 +04:00
Andrey Pavlenko
6071671bda
Merge pull request #2135 from alalek:ocl_runtime_cleanup_2
2014-01-11 17:15:22 +04:00
Ilya Lavrenov
da2790249e
added NORM_L2SQR type to cv::norm
2014-01-10 18:45:52 +04:00
Ilya Lavrenov
2e5e278271
added cv::PSNR performance test
2014-01-10 18:45:40 +04:00
Ilya Lavrenov
a01e81c8f7
added some performance tests
2014-01-10 18:45:40 +04:00
Ilya Lavrenov
1592234f1a
added mask support to cv::norm, cv::meanStdDev
2014-01-10 18:45:40 +04:00
Roman Donchenko
5a9900481a
Merge pull request #2105 from ilya-lavrenov:norm
2014-01-10 18:12:08 +04:00
Alexander Alekhin
f7b0940d44
core/ocl: runtime, remove unused declarations
2014-01-10 11:42:02 +04:00
Ilya Lavrenov
dd302158e0
fixed case with zero mask
2014-01-09 19:26:09 +04:00
Andrey Pavlenko
a75cfe13e7
Merge pull request #2128 from alalek:ocl_cleanup_runtime
2014-01-09 17:08:48 +04:00
Roman Donchenko
d509165d96
Merge pull request #2118 from ilya-lavrenov:semicolons
2014-01-09 16:21:49 +04:00
Ilya Lavrenov
9899cf7519
fixed cv::mixChannels perf test
2014-01-09 14:26:44 +04:00
Ilya Lavrenov
6ee0b6eb56
added mask support to cv::norm, cv::meanStdDev
2014-01-09 13:49:42 +04:00
Alexander Alekhin
70a0327004
core/ocl: cleanup unused files
2014-01-09 13:47:04 +04:00
Roman Donchenko
7acea48788
Merge pull request #2106 from robbertkl:patch-2
2014-01-09 13:25:59 +04:00
Roman Donchenko
6d84671e8b
Merge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix
2014-01-09 12:41:57 +04:00
Roman Donchenko
4e35ebb52f
Merge pull request #2102 from Nerei:compilatin_for_windows
2014-01-09 12:35:30 +04:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Ilya Lavrenov
0119e8553c
fixed cv::mixChannels OpenCL version
2014-01-06 14:41:57 +04:00
Kazuki Matsuda
2ae20c74a2
Fix typo of SparseMat_<_Tp>::SparseMat_(const SparseMat& m)
...
Fix compilation erros when compiling this constructor.
First argument type of "convertTo" should be instance, not a pointer of instance.
First pull request was created for master branch.
But it should be marged for 2.4.
https://github.com/Itseez/opencv/pull/2113
2014-01-06 02:24:14 +09:00
Max Khardin
699eda46b6
Remove three sneaky tabs
2014-01-04 20:09:30 +08:00
Ilya Lavrenov
3a4d4080f4
fixed overflow for cv::norm NORM_L2
2014-01-04 15:20:50 +04:00
Max Khardin
34b05794d6
Fix source code indents
2014-01-04 19:01:32 +08:00
Max Khardin
214e9d4b12
Add performance tests for elementwise multiplication
2014-01-04 18:56:32 +08:00
Robbert Klarenbeek
e21c6e19db
Fix algorithm setter argument validation for uchar
2014-01-02 21:17:55 +01:00
Anatoly Baksheev
c2dd7fd762
compilation for windows
2014-01-01 15:39:21 +04:00
Roman Donchenko
5327482b46
Merge pull request #2084 from ilya-lavrenov:cont
2013-12-31 16:51:30 +04:00
Vadim Pisarevsky
1c3bfae212
Merge pull request #1957 from Nerei:format_declaration_by_default
2013-12-31 15:55:00 +04:00
Ilya Lavrenov
4f9c081dc3
fixed bug #3319
2013-12-31 13:56:59 +04:00
Roman Donchenko
cd576c7364
Merge pull request #2096 from kamjagin:master
2013-12-31 11:53:25 +04:00
pxli168
203a9acdbc
Add support to bool type
...
Add the bool support to the get function
2013-12-31 12:53:31 +08:00
Andrey Pavlenko
2d5723ccca
Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix
2013-12-31 00:35:39 +04:00
Andrey Pavlenko
967703c3ac
Merge pull request #2093 from SpecLad:merge-2.4
2013-12-31 00:26:22 +04:00
Andrey Pavlenko
8a456c5a6b
Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe
2013-12-31 00:17:33 +04:00
Miroslav Kobetski
3f07655231
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
2013-12-30 17:00:17 +01:00
Andrey Pavlenko
8151571dd6
Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs
2013-12-30 19:54:27 +04:00
Ilya Lavrenov
3e1bec5248
added OpenCL version of cv::patchNaNs
2013-12-30 19:53:03 +04:00
Ilya Lavrenov
a2e683d133
fixed umat access
2013-12-30 19:37:20 +04:00
Roman Donchenko
6811d2ab24
Merge pull request #2086 from ilya-lavrenov:mul_fix
2013-12-30 17:57:43 +04:00
Roman Donchenko
1312eca220
Merge commit '0566ab4d3d' into merge-2.4
...
Conflicts:
modules/core/src/system.cpp
2013-12-30 16:51:46 +04:00
Roman Donchenko
7f795e964f
Merge commit 'ee36717d' into merge-2.4
2013-12-30 16:49:39 +04:00
Ilya Lavrenov
09d25e11c6
fixed bug #3341
2013-12-30 16:47:54 +04:00
Konstantin Matskevich
55634c1f52
fix
2013-12-30 13:06:32 +04:00
Alexander Alekhin
44970ddf56
eliminate MINGW pragma warning
2013-12-30 12:31:00 +04:00
Ilya Lavrenov
c4c913ff13
converted CPU-based example to T-API (Mat 2 UMat, etc)
2013-12-30 03:19:17 +04:00
Ilya Lavrenov
6b64257c81
added OpenCL version of cv::scaleAdd
2013-12-29 18:46:25 +04:00
Ilya Lavrenov
abcf8d9e61
implemented OpenCL version of cv::convertScaleAbs
2013-12-29 18:01:19 +04:00
Andrey Pavlenko
4a6c2ce378
Merge pull request #2081 from ilya-lavrenov:tapi_perf
2013-12-28 22:06:12 +04:00
Andrey Pavlenko
dbaf125fcd
Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels
2013-12-28 22:05:49 +04:00
Ilya Lavrenov
bb7e96311e
disabled cv::split perf test
2013-12-27 21:57:20 +04:00
Roman Donchenko
2d2312d742
Merge pull request #2077 from ilya-lavrenov:tapi_context
2013-12-27 20:23:57 +04:00
Ilya Lavrenov
31e6251793
added new perf tests to core
2013-12-27 20:02:12 +04:00
Alexander Smorkalov
df63060e4d
Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules.
2013-12-27 18:04:10 +04:00
Ilya Lavrenov
f221f57c7c
this commit prevents segfaults in case of opencl disabled
2013-12-27 14:02:03 +04:00
Ilya Lavrenov
73c96cbd50
some fixes of cv::mixChannels
2013-12-27 13:59:55 +04:00
Ilya Lavrenov
2eab07f0a4
disabled cv::dft opencl impl for CPU devices
2013-12-27 13:39:29 +04:00
Ilya Lavrenov
a7d2830d3f
added cv::mixChannels to T-API
2013-12-27 13:14:37 +04:00
Roman Donchenko
c45492371a
Merge pull request #2036 from GregoryMorse:patch-1
2013-12-27 12:44:02 +04:00
Roman Donchenko
ee36717db4
Merge pull request #2037 from GregoryMorse:patch-2
2013-12-27 12:11:52 +04:00
Andrey Pavlenko
4644a864a5
Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject
2013-12-26 20:37:34 +04:00
Andrey Pavlenko
fd6a74496b
Merge pull request #2066 from ilya-lavrenov:tapi_ocl
2013-12-26 19:38:01 +04:00
Andrey Pavlenko
c8a52daafd
Merge pull request #2054 from alalek:ocl_tapi_dev_selection
2013-12-26 17:27:06 +04:00
Ilya Lavrenov
fc1f9ab236
removed unnecessary data copying
2013-12-26 17:13:26 +04:00
GregoryMorse
4880858119
Update CMakeLists.txt
...
WinRT native C++ support allowing building of static libraries
Update CMakeLists.txt
Update OpenCVCRTLinkage.cmake
Update OpenCVCRTLinkage.cmake
2013-12-26 19:45:21 +08:00
Ilya Lavrenov
d64bea00b2
ported cv::calcBackProject to T-API
2013-12-26 14:58:50 +04:00
Alexander Smorkalov
1e038e2837
CUDA warning fix/supporession for Android.
2013-12-26 10:17:38 +04:00
Alexander Smorkalov
4aa9f83100
Dynamic CUDA support library name fixed. Additional error messages added.
2013-12-26 10:16:29 +04:00
Alexander Alekhin
217b2282b8
fixes
2013-12-26 03:06:58 +04:00
Andrey Pavlenko
65b020f0d3
Merge pull request #2046 from ilya-lavrenov:tapi_inrange
2013-12-26 00:14:23 +04:00
Andrey Pavlenko
6e8386f705
Merge pull request #1984 from ilya-lavrenov:tapi_perf
2013-12-26 00:13:28 +04:00
Andrey Pavlenko
512ddcc804
Merge pull request #2043 from ilya-lavrenov:tapi_hack
2013-12-25 19:00:26 +04:00
Ilya Lavrenov
4c23059209
added cv::inRange to T-API
2013-12-25 18:22:41 +04:00
Ilya Lavrenov
d7c22343aa
added perf tests for T-API core functions
2013-12-25 18:19:40 +04:00
Roman Donchenko
faddd5b97f
Merge pull request #2045 from SpecLad:merge-2.4
2013-12-25 16:18:00 +04:00
Alexander Alekhin
e49065b1dc
core/ocl: temporary move device selection from ocl module
2013-12-25 16:17:40 +04:00
Ilya Lavrenov
a70467d7a2
removed unnecessary assert
2013-12-23 21:51:25 +04:00
Andrey Pavlenko
0966e5ffa1
Merge pull request #2033 from ilya-lavrenov:tapi_normalize
2013-12-23 19:19:00 +04:00
Ilya Lavrenov
e3d23918fa
added cv::normalize to T-API; implemented missed UMat::copyTo with mask
2013-12-23 19:17:35 +04:00
Roman Donchenko
3c4b24d531
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
Roman Donchenko
83cdd43a4c
Merge pull request #2039 from asmorkalov:ocv_version_inc3
2013-12-23 15:53:11 +04:00
Roman Donchenko
f22d9a232d
Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda
2013-12-23 12:45:49 +04:00
Alexander Smorkalov
4ec1930949
OpenCV version++; OpenCV Manager version++.
2013-12-23 12:35:06 +04:00
Alexander Smorkalov
bc72f4d2a2
Code review fixes.
2013-12-23 11:34:46 +04:00
GregoryMorse
08d8faf9da
Update system.cpp
...
Add native C++ support
2013-12-23 00:21:51 +08:00
Ilya Lavrenov
febb200eee
fixed cv::multuply, cv::divide
2013-12-22 15:49:36 +04:00
Andrey Pavlenko
a49211a77e
Merge pull request #2032 from ilya-lavrenov:tapi_mulSpectrums
2013-12-20 21:38:14 +04:00
Ilya Lavrenov
c33a7cd7bf
added cv::mulSpectrums to T-API
2013-12-20 18:41:20 +04:00
Roman Donchenko
b0ec7dafd8
Merge pull request #1950 from GregoryMorse:patch-2
2013-12-20 17:54:02 +04:00
Roman Donchenko
b4bd5bab6d
Merge pull request #2021 from vpisarev:ocl_facedetect7
2013-12-20 12:30:49 +04:00
Alexander Smorkalov
529bd41751
Build fixes for case where HAVE_CUDA==OFF.
2013-12-20 11:37:15 +04:00
Andrey Pavlenko
cdffa05c27
Merge pull request #2019 from ilya-lavrenov:tapi_repeat
2013-12-19 19:28:58 +04:00
Alexander Smorkalov
069f3d8d9a
Build fixes for GPU module.
2013-12-19 19:12:18 +04:00
Alexander Smorkalov
2509fa8080
Warious fixes for case where HAVE_CUDA==OFF.
2013-12-19 18:02:59 +04:00
Alexander Smorkalov
5a5c82bb1d
Additional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refactoring.
2013-12-19 17:41:04 +04:00
Andrey Pavlenko
dde1d6b636
Merge pull request #2018 from ilya-lavrenov:tapi_dft
2013-12-19 16:47:19 +04:00
Alexander Smorkalov
037ffcdf99
Dynamic CUDA support library reimplemented as OpenCV module.
2013-12-19 16:42:11 +04:00
Vadim Pisarevsky
f41f633d2d
fixed various warnings from the “doc” and other builders
2013-12-19 16:31:30 +04:00
Vadim Pisarevsky
a1784b7320
converted old haar cascades to the new format; added the conversion function; added OpenCL optimization into CascadeClassfier; optimized the data structures and CPU code for the stump case.
2013-12-19 14:48:42 +04:00
Ilya Lavrenov
b3af0e3154
added cv::repeat to T-API
2013-12-19 14:28:09 +04:00
Ilya Lavrenov
c8cbfe5382
added cv::dft T-API test
2013-12-19 13:42:16 +04:00
Alexander Smorkalov
64c94cb22c
CUDA related func tables refactored to remove unneeded dependencies.
2013-12-19 11:18:04 +04:00
Alexander Smorkalov
6da7c50fb5
Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.
2013-12-19 10:27:38 +04:00
Alexander Smorkalov
442082eb0f
Fixes for Android support.
2013-12-19 09:38:46 +04:00
Andrey Pavlenko
59cab94fc7
Merge pull request #1997 from alalek:tapi_fix_memleaks
2013-12-18 13:53:17 +04:00
Andrey Pavlenko
388d0ef182
Merge pull request #2004 from ilya-lavrenov:tapi_umat_copyto
2013-12-18 13:46:14 +04:00
Alexander Smorkalov
be530bd085
DeviceInfo class method that were implemented in header moved to cpp file.
2013-12-18 12:02:15 +04:00
Ilya Lavrenov
3a6d248bee
typo
2013-12-17 17:41:28 +04:00
Andrey Pavlenko
bd91b39593
Merge pull request #1917 from alalek:ocl_d3d
2013-12-17 16:44:27 +04:00
Andrey Pavlenko
586a5cb6db
Merge pull request #1969 from KonstantinMatskevich:ocl_tapi_minmaxloc
2013-12-17 16:42:44 +04:00
Andrey Pavlenko
d3fa2bfe8c
Merge pull request #1998 from ilya-lavrenov:tapi_gemm
2013-12-17 16:41:59 +04:00
Ilya Lavrenov
ac030c16f1
fixed UMat::copyTo(UMat)
2013-12-17 15:23:39 +04:00
Vadim Pisarevsky
9d3e7e027a
almost finished opencl-ization of cascade classifier
2013-12-17 14:29:30 +04:00
Roman Donchenko
52a785e95a
Merge pull request #1996 from SpecLad:merge-2.4
2013-12-17 13:21:48 +04:00
Konstantin Matskevich
5cf4166801
some fixes
2013-12-17 12:43:21 +04:00
Konstantin Matskevich
904dac7670
minMaxLoc
2013-12-17 12:43:21 +04:00
Alexander Smorkalov
88a883e68e
Build fix.
2013-12-17 10:24:00 +04:00
Ilya Lavrenov
2f34bb9aa0
added cv::gemm to T-API
2013-12-16 19:12:27 +04:00
Roman Donchenko
f2befa01f4
Fixed build for the TLS-related stuff.
2013-12-16 18:45:41 +04:00
Alexander Alekhin
9cb31e86ae
umat: fix memory leaks
2013-12-16 16:46:36 +04:00
Roman Donchenko
9d8d70d6ca
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/features2d/src/freak.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/test/test_api.cpp
2013-12-16 15:02:12 +04:00
Alexander Smorkalov
8660e048bc
Dynamic CUDA support library loading implemented for Linux.
...
Logical mistake in macro fixed;
DeviceInfo deligate reimplemented;
Build and warning fixes.
2013-12-16 14:46:44 +04:00
Alexander Smorkalov
d4087f19a2
All CUDA related stuff were moved to separate dynamic library.
2013-12-16 14:46:44 +04:00
Peter Andreas Entschev
f44de302a0
cv::completeSymm fixed to work with any OpenCV data type and multiple channels.
2013-12-15 20:56:55 -02:00
Ilya Lavrenov
558c4a2b1d
implemented UMat::convertTo
2013-12-15 14:15:30 +04:00
Andrey Pavlenko
c9ed05c3bd
Merge pull request #1981 from ilya-lavrenov:tapi_sqrt
2013-12-13 19:34:28 +04:00
Alexander Alekhin
11b9d5bf4d
core: added DirectX interop implementation (OpenCL) with samples
2013-12-13 19:02:41 +04:00
Ilya Lavrenov
e30875bcef
fixed UMat sync problems
2013-12-13 18:38:12 +04:00
Ilya Lavrenov
1d6715e58a
added cv::sqrt to T-API (using built-in sqrt OpenCL function)
2013-12-12 18:12:30 +04:00
Andrey Pavlenko
b0a9220de8
Merge pull request #1889 from alalek:ocl_core_dynamic_runtime
2013-12-12 17:27:34 +04:00
Ilya Lavrenov
b20714a8a8
fixed kernel compilation of cv::min, cv::max for CV_64F
2013-12-12 02:42:24 +04:00
Andrey Pavlenko
f3e2bfea79
Merge pull request #1970 from ilya-lavrenov:tapi_checks
2013-12-11 21:37:10 +04:00
Alexander Alekhin
a118577a57
core: added TLS support
2013-12-11 18:50:11 +04:00
Alexander Alekhin
3bbf51fbfb
ocl: disabled test for Split (there are problems with OutputArray and getMatRef)
2013-12-11 16:46:08 +04:00
Alexander Alekhin
d0114b24e0
core/ocl: replace dynamic runtime
2013-12-11 15:56:54 +04:00
Alexander Alekhin
9f388a2be7
core/ocl: autogenerated files for dynamic runtime
2013-12-11 15:56:54 +04:00
Alexander Alekhin
5ecf759742
core/ocl: update dynamic runtime
2013-12-11 15:56:54 +04:00
Alexander Alekhin
381d7851b7
core/ocl: move opencl dynamic runtime from ocl module
2013-12-11 15:56:54 +04:00
Alexander Alekhin
bdbd3eb2bf
ocl: process termination hung workaround
2013-12-11 00:31:34 +04:00
Ilya Lavrenov
5566d31468
more strict checks outside ROI
2013-12-10 19:30:14 +04:00
Roman Donchenko
9d87f9c974
Merge pull request #1956 from ilya-lavrenov:tapi_split_merge
2013-12-09 16:56:06 +04:00
Roman Donchenko
24465bbd05
Merge pull request #1855 from Nerei:master
2013-12-09 14:13:40 +04:00
Roman Donchenko
8db53c1760
Merge pull request #1883 from philippefoubert:branch_matx_inv
2013-12-09 14:07:10 +04:00
Anatoly Baksheev
262f70f3ab
cv::format declaration in default headers
2013-12-08 19:00:53 +04:00
Ilya Lavrenov
c16c9a2e8e
added cv::split to T-API
2013-12-08 16:30:17 +04:00
Ilya Lavrenov
b6c33bf86b
added cv::norm to T-API
2013-12-08 15:27:48 +04:00
Ilya Lavrenov
cd3f7fbf05
added cv::merge to T-API
2013-12-08 13:49:28 +04:00
Anatoly Baksheev
546c084fe6
fixed shadow error and added ocv_disable_module
2013-12-07 18:58:27 +04:00
Anatoly Baksheev
ace71cef3f
Added Affine3<T>::rvec()
2013-12-07 18:50:45 +04:00
Anatoly Baksheev
9f1f5aed53
compilation
2013-12-07 18:50:44 +04:00
Anatoly Baksheev
a9c7aa92d9
removed CV_EXPORTS from cv::Afiine
2013-12-07 18:50:44 +04:00
GregoryMorse
68d8f6410f
Update system.cpp
...
Cleaned up to use the preferred namespace code. This can be further simplified by using the HString/HStringReference classes from wrl\wrappers\corewrappers.h
2013-12-07 15:40:30 +08:00
Andrey Pavlenko
a0c296fcdb
Merge pull request #1936 from ElenaGvozdeva:ocl_flip
2013-12-06 16:40:30 +04:00
Andrey Pavlenko
f2cf9dd8bf
updating version to 2.4.7.2
2013-12-06 16:21:22 +04:00
Andrey Pavlenko
c34fc180a7
Merge pull request #1762 from jet47:cuda-6.0-npp-fix
2013-12-06 15:56:15 +04:00
Elena Gvozdeva
f5a01f15a5
Fixed test for ocl_flip
2013-12-06 15:53:00 +04:00
Ilya Lavrenov
3eaa8f149b
added cv::intergal to T-API
2013-12-06 13:18:25 +04:00
Elena Gvozdeva
b930028727
Added cv::flip using Transparent API
2013-12-05 17:54:05 +04:00
Andrey Pavlenko
458ac2592b
Merge pull request #1908 from ilya-lavrenov:tapi_imgproc
2013-12-04 21:41:44 +04:00
Roman Donchenko
0736ede7e5
Merge pull request #1914 from SpecLad:merge-2.4
2013-12-04 16:30:57 +04:00
Ilya Lavrenov
e2b99a32b2
added cv::threshold to T-API
2013-12-04 13:45:44 +04:00
Ilya Lavrenov
474fc887a6
added cv::copyMakeBorder to T-API
2013-12-04 13:41:35 +04:00
Andrey Pavlenko
f9190cc662
Merge pull request #1909 from alalek:ocl_tapi_perf
2013-12-04 11:35:11 +04:00
Andrey Pavlenko
e585f145f6
Merge pull request #1903 from ilya-lavrenov:tapi_warp
2013-12-04 11:34:52 +04:00
Ilya Lavrenov
49474903cb
refactoring
2013-12-04 00:51:55 +04:00
Ilya Lavrenov
49e729f89d
ability to use cv::PSNR with transparent cv::norm
2013-12-04 00:51:55 +04:00
Ilya Lavrenov
88bceb5060
added cv::meanStdDev to T-API
2013-12-04 00:51:55 +04:00
Ilya Lavrenov
b8edc2cc4d
added cv::sum to T-API
2013-12-04 00:51:43 +04:00
Ilya Lavrenov
28575c1969
added cv::countNonZero to T-API
2013-12-04 00:51:32 +04:00
Ilya Lavrenov
fed7e61879
added cv::repeat to T-API (fix for copyTo -> UMat is needed)
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
e17107e864
added cv::compare to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
a180cebb2d
added cv::polarToCart to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
ba850f0b64
added cv::cartToPolar to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
435028ccee
added cv::transpose to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
6ab297718d
added setIdentity to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
3e586f42a0
added cv::pow to T-API
2013-12-04 00:50:02 +04:00
Ilya Lavrenov
997ec60839
added OCL-TAPI arithm tests
2013-12-04 00:50:02 +04:00
Ilya Lavrenov
803672feea
added cv::remap to T-API
2013-12-04 00:43:43 +04:00
Ilya Lavrenov
dcce9d7088
added cv::warpAffine to T-API
2013-12-04 00:43:43 +04:00
Ilya Lavrenov
55af7857b9
added cv::warpPerspective to T-API
2013-12-04 00:43:42 +04:00
Alexander Alekhin
7d9150460a
core/ocl: added perf test infra + "Add" perf test
2013-12-03 18:43:50 +04:00
Roman Donchenko
90c230678e
Merge pull request #1912 from KonstantinMatskevich:ocl_tapi_math
2013-12-03 18:02:44 +04:00
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
Konstantin Matskevich
eaf620ddde
small fix
2013-12-03 14:57:13 +04:00
Konstantin Matskevich
14dccdf23d
T-API cv::log, cv::exp, cv::magnitude, cv::phase
2013-12-03 14:07:00 +04:00
Roman Donchenko
35ea600c54
Merge pull request #1891 from alalek:cv_error_noreturn
2013-12-03 13:57:35 +04:00
Roman Donchenko
df136339ff
Merge pull request #1907 from severin-lemaignan:emscripten-2.4
2013-12-03 13:38:10 +04:00
Séverin Lemaignan
9ce9fc3361
Ensure compilation to Javascript with Emscripten
2013-12-03 09:18:59 +01:00
Roman Donchenko
17f53bc301
Merge pull request #1904 from severin-lemaignan:emscripten
2013-12-03 12:14:09 +04:00
Andrey Pavlenko
0a624ee67d
Merge pull request #1901 from vpisarev:ocl_svm3
2013-12-03 11:20:26 +04:00
Vadim Pisarevsky
cd97d789b6
dummy commit to rerun pre-commit tests
2013-12-02 22:15:07 +04:00
Andrey Pavlenko
19ceab13f2
Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix
2013-12-02 20:07:47 +04:00
Vadim Pisarevsky
161c3b71e6
hopefully, now opencv_test_imgproc should pass
2013-12-02 18:27:08 +04:00
Séverin Lemaignan
efe564e3b3
Ensure compilation to Javascript with Emscripten
2013-12-02 14:06:24 +01:00
Vadim Pisarevsky
5fea17ff0d
still trying to fix failure in opencv_test_imgproc
2013-12-02 13:46:54 +04:00
Roman Donchenko
b27d7d2a61
Merge pull request #1886 from ilya-lavrenov:tapi_lut
2013-12-02 12:28:18 +04:00
Vadim Pisarevsky
82b852c13c
yet another attempt to make Core_UMat.getUMat test work
2013-12-02 00:12:20 +04:00
Vadim Pisarevsky
9be727b1ea
another attempt to fix Core_UMat.getUMat test
2013-12-01 23:14:45 +04:00
Vadim Pisarevsky
f263fe145a
trying to guess and fix strange failure in core test
2013-12-01 22:14:15 +04:00
Vadim Pisarevsky
d7f4a223cf
fixed several compile errors/warnings; reacted on the PR comments
2013-12-01 20:58:30 +04:00
Vadim Pisarevsky
6da5d21331
fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance
2013-12-01 03:12:19 +04:00
Alexander Alekhin
c1cfb4d422
core: added cv::error with CV_NORETURN attr
2013-11-30 03:43:31 +04:00
Ilya Lavrenov
09795e3265
added cv::resize INTER_AREA to T-API
2013-11-29 17:57:37 +04:00
Andrey Pavlenko
d83094b412
Merge pull request #1880 from ilya-lavrenov:tapi_cvtColor
2013-11-29 12:59:09 +04:00
Roman Donchenko
9ca80961fd
Merge pull request #1874 from SpecLad:merge-2.4
2013-11-28 16:43:00 +04:00
Ilya Lavrenov
4eba74ee19
added cv::LUT to T-API
2013-11-28 12:31:04 +04:00
Vladislav Vinogradov
95ebdf4069
fixed compilation with CUDA 6.0:
...
GpuMat::setTo function, removed NPP call for CV_8S
2013-11-28 09:54:34 +04:00
Philippe FOUBERT
22ad487328
Comment correction
2013-11-28 00:45:58 +01:00
Philippe FOUBERT
735f704b3e
Add on optional parameter to the matx invert function to know if this operation is successfull without having to analyse the matrix (it may fail in case of bad preconditioning or inappropriate decomposition method)
2013-11-28 00:42:19 +01:00
Ilya Lavrenov
41d046a2db
restored ocl_cvtcolor.cl
2013-11-27 23:46:30 +04:00
Ilya Lavrenov
0b900b54e5
RGB[A] <-> HSV
2013-11-27 23:30:29 +04:00
Andrey Pavlenko
96a228fd7e
Merge pull request #1866 from ilya-lavrenov:ocl_fix2
2013-11-26 23:27:49 +04:00
Andrey Pavlenko
736097a462
Merge pull request #1868 from KonstantinMatskevich:umat_bugfix
2013-11-26 23:24:51 +04:00
Roman Donchenko
920fd48228
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
modules/ocl/src/arithm.cpp
2013-11-26 15:32:44 +04:00
Roman Donchenko
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
Roman Donchenko
e7339ac11a
Merge pull request #1818 from GregoryMorse:patch-2
2013-11-26 13:00:56 +04:00
Roman Donchenko
e20f7014cf
Merge pull request #1835 from SpecLad:windows-xadd
2013-11-26 11:43:34 +04:00
Roman Donchenko
05e22ee8c9
Merge pull request #1859 from SpecLad:string-plus-equals
2013-11-26 11:40:37 +04:00
GregoryMorse
e4793e3d5e
Update system.cpp
...
Fixed to use native C++ instead of C++/CX although it does require significantly more code, it goes along with the spirit of keeping the project in native C++
Update system.cpp
Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
Update system.cpp
Fixed compiler warning over comma operator clause
Update system.cpp
NULL initialization
Update system.cpp
Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
Update system.cpp
Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference.
Update system.cpp
Fixed conditional compilation around include and library
Update system.cpp
Fixed trailing space
Update system.cpp
Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
Update system.cpp
Fixed compiler warning over comma operator clause
Update system.cpp
NULL initialization
Update system.cpp
Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
Update system.cpp
Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference.
Update system.cpp
Fixed conditional compilation around include and library
Update system.cpp
Fixed trailing space
2013-11-26 00:22:14 +08:00
Konstantin Matskevich
145855767c
bugfix in deallocate
2013-11-25 17:16:22 +04:00
Ilya Lavrenov
9d23a0cb81
fixed ocl_arithm_op; fix for 3-channel images is needed
2013-11-25 14:21:12 +04:00
StevenPuttemans
6f892b10ff
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
2013-11-25 10:53:03 +01:00
Roman Donchenko
52e810ed33
Merge pull request #1850 from ilya-lavrenov:pthread_mutex
2013-11-25 12:04:17 +04:00
Alexander Alekhin
fd4a7e7d1f
ocl: disable tests
2013-11-23 18:13:32 +04:00
Andrey Pavlenko
b157cc17e9
Merge pull request #1857 from alalek:ocl_ta_tests_infra
2013-11-23 16:44:58 +04:00
Ilya Lavrenov
1af95ea12c
fixed error in setting kernel arguments
2013-11-22 18:56:03 +04:00
Alexander Alekhin
881e837520
ocl/core: added prototype for tests
2013-11-22 18:37:44 +04:00
Roman Donchenko
fc49d33c8d
Gave cv::String appropriate += operators.
...
Note that since String is a reference to an immutable string,
this doesn't actually change the string; it just replaces *this
with a reference to the concatenated string.
2013-11-22 17:58:40 +04:00
Ilya Lavrenov
c8abb6124f
recursive mutex for linux
2013-11-22 17:30:32 +04:00
Ilya Lavrenov
650f92f9cc
eliminated warning C4267
2013-11-21 18:27:07 +04:00
Ilya Lavrenov
65b7e2018c
fixed kernel compilation
2013-11-21 14:22:24 +04:00
Andrey Pavlenko
8d1a8df1a9
Merge pull request #1824 from vpisarev:ocl_experiments5
2013-11-20 19:14:40 +04:00
Roman Donchenko
4cfbee70bd
Simplified the Windows implementation of CV_XADD.
...
_InterlockedExchangeAdd is a Visual Studio intrinsic that's available
for all architectures and in all VS versions that we care about. It's also
faster than the underscore-less function, since it's an intrinsic.
We also don't need to declare it ourselves.
It is, however, a Visual Studio-specific intrinsic, so I changed the
preprocessing condition accordingly.
Fixes <http://code.opencv.org/issues/3365 >.
2013-11-20 13:47:35 +04:00
Vadim Pisarevsky
ae8b2cbd68
fixed bug with cl_long size on Win32 (thanks to Aaron Kunze)
2013-11-19 20:51:31 -05:00
Vadim Pisarevsky
677c7f27cb
fixed failure in Tonemap test
2013-11-19 19:20:24 -05:00
Roman Donchenko
56f791679b
Merge pull request #1825 from jet47:fix-opengl-mem-leak
2013-11-19 12:31:53 +04:00
Vladislav Vinogradov
66221a32b9
fixed memory leak in ogl::Texture2D
2013-11-19 10:12:22 +04:00
Vadim Pisarevsky
e2bbe7597b
fixed few compile errors and doc build errors
2013-11-18 13:48:04 -05:00
Vadim Pisarevsky
8762ee3f6f
removed unnecessary opencl kernels
2013-11-18 12:02:10 -05:00
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
2013-11-18 11:48:00 -05:00
Anatoly Baksheev
8f6f9c3e58
compilation for VS2008
2013-11-16 20:14:01 +04:00
Roman Donchenko
615d6c22d1
Switched OpenCV to a 3-component version number.
...
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
2013-11-15 19:41:53 +04:00
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
Roman Donchenko
2c38be079e
Enabled CV_Assert and such to print the function name with Visual C++.
...
Also, I made a separate macro for the current function name, which
helps simplify a lot of code that uses it.
2013-11-07 17:22:02 +04:00
Ilya Lavrenov
2df53d97c5
added ocl::repeat
2013-11-05 12:23:20 +04:00
Alexander Smorkalov
f027cf80f7
OpenCV Version++. OpenCV Manager Version++.
2013-11-01 15:22:34 +04:00
Vadim Pisarevsky
485d36d3c0
changed InputArray's enumeration constant for UMat, since it may potentially conflict with existing OpenCL module. refactored Kernel's setArg API (now UMat is passed to a kernel as a structure, as Alexander A suggested). removed Kernel's cleanup callback from the external API; now each kernel keeps track of used matrices and they are dereferenced after it's complete.
2013-10-25 16:46:03 +04:00
Vadim Pisarevsky
6416c33020
fixed some bugs in OpenCL branch of UMat implementation; maybe now the tests will finally pass?! (please ;( )
2013-10-25 11:19:40 +04:00
Vadim Pisarevsky
5920bd4f2e
fixed whitespace errors
2013-10-24 23:18:05 +04:00
Vadim Pisarevsky
caa33b2242
added first very simple test for UMat<=>Mat conversion
2013-10-24 22:33:41 +04:00
Vadim Pisarevsky
b1aa4a4913
yet another attempt to fix test failures
2013-10-24 18:00:15 +04:00
Vadim Pisarevsky
a9065b7d0c
trying to fix failures in tests
2013-10-24 17:23:48 +04:00
Vadim Pisarevsky
303df78cca
removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now
2013-10-24 16:08:15 +04:00
Vadim Pisarevsky
5a34272150
fixed build on Windows
2013-10-23 00:17:18 +04:00
Vadim Pisarevsky
de521fc9fa
fixed some more compile bugs (including Python bindings)
2013-10-22 23:34:16 +04:00
Vadim Pisarevsky
d3076c5014
hopefully, fixed compile errors on Win & Linux; fixed getMatVector() so core & imgproc tests now pass; fixed doc builder errors
2013-10-22 17:41:28 +04:00
Vadim Pisarevsky
d8c8339bec
the first draft of transparent API and new UMat class. more files
2013-10-22 14:05:15 +04:00
Vadim Pisarevsky
278fb617d2
the first draft of transparent API and new UMat class.
2013-10-22 14:04:49 +04:00
Roman Donchenko
29f37fc130
Merge pull request #1575 from jet47:gpu-buffer-pool
2013-10-21 16:35:14 +04:00
Roman Donchenko
21233656bd
Merge pull request #1540 from jet47:gpuarithm-cudev
2013-10-21 16:34:45 +04:00
Roman Donchenko
578e984739
OpenCV 2.4.6.2 (Tegra detection and native camera update)
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iF4EABEIAAYFAlIxuvoACgkQdDiF7KIeJGrdaQEA0cMV6JhnsWSnZbRCd3RzyXD7
8mf7qrSjIV9ty1UL9AMA/0d4iUIm/iEiBIEP0DbsshX+trN5kXsH5woriScbZMGS
=WeoS
-----END PGP SIGNATURE-----
Merge tag '2.4.6.2' into 2.4
OpenCV 2.4.6.2 (Tegra detection and native camera update)
2013-10-17 17:19:04 +04:00
Alexander Alekhin
e845184843
Merge remote-tracking branch 'upstream/2.4' into merge-2.4
...
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
Han Qiang
88f68a3fe0
Fixed typo in document.
...
Signed-off-by: Han Qiang <a0byte@gmail.com>
2013-10-14 23:23:59 +08:00
Roman Donchenko
3f8db9d708
Merge pull request #1450 from adrians:neon-pull3
2013-10-14 15:08:37 +04:00
Ilya Lavrenov
1be77dd2f3
enabled accuracy tests for the functions that use inside AMD Blas/Fft
2013-10-11 00:37:52 +04:00
Adrian Stratulat
3561bc1bbc
rename vBinOp64f to vBinOp64, minor fixups
2013-10-10 21:28:05 +03:00
Andrey Pavlenko
3b1c53fa8d
Merge pull request #1551 from alalek:cmake_install_win
2013-10-10 18:20:35 +04:00
Adrian Stratulat
cb445d697c
Refactor vectorized arithmetical operations
2013-10-10 15:52:48 +03:00
Ilya Lavrenov
9d1636daa6
catching OpenCL double not supported exceptions
2013-10-10 12:45:55 +04:00
Alexander Alekhin
555c505b70
update cmake 'install' target for Windows platform
...
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
2013-10-09 17:49:10 +04:00
Ilya Lavrenov
d57a7008f1
fixed cmd parser when arg is like -+
2013-10-09 17:42:36 +04:00
Vladislav Vinogradov
342e007dc6
now Allocator accepts GpuMat* instead of 3 pointers
2013-10-08 17:21:25 +04:00
Vladislav Vinogradov
3b412b51ac
moved BufferPool management functions to public
2013-10-08 17:21:22 +04:00
Vladislav Vinogradov
5ea8085220
added BufferPool class
2013-10-08 17:20:29 +04:00
Vladislav Vinogradov
988ab79acb
added BufferAllocator
2013-10-08 17:20:20 +04:00
Roman Donchenko
895308a811
Merge pull request #1538 from StevenPuttemans:bugfix_3283
2013-10-08 13:00:39 +04:00
Vladislav Vinogradov
e5188c7e94
added GpuMat::Allocator interface
2013-10-07 09:42:43 +04:00
Ilya Lavrenov
036e99d03a
fixed ipp-related warnings
2013-10-05 14:54:00 +04:00
StevenPuttemans
2f474db27f
Fix of bug #3283 and bug #3301
...
Added extra information for fitEllipse, minAreaRect and addapted ellipse &
ellipse2Poly parameter description.
2013-10-04 11:19:45 +02:00
Roman Donchenko
81eb4bd8be
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
Vladislav Vinogradov
32d578f5f0
fixed gridTransform overloads problems
2013-10-01 12:18:35 +04:00
Roman Donchenko
a4b3aa9e1e
Merge pull request #1477 from nzjrs:python-gethardwaresupport
2013-09-30 17:44:45 +04:00
Alexander Smorkalov
0d49206a98
Merge pull request #1485 from vpisarev:ipp_fixes
2013-09-26 11:09:59 +04:00
shawke
720241de87
Make similar default typedefs for Point_, Size_ and Rect_
...
Currently, there are different default typedefs for Point_, Size_, and Rect_. This pull request at least makes sure that default typedefs exist for int, float and double variants of each of these types.
2013-09-24 11:48:04 +02:00
Alexander Smorkalov
298a1d50d2
Merge pull request #1299 from jet47:gpu-cuda-rename
2013-09-23 10:31:51 +04:00
John Stowers
14d225134d
Redefine CPU_xx constants in cv::namespace
...
This makes them visible from the python bindings
2013-09-20 20:04:33 +02:00
Vadim Pisarevsky
8e7eb79f6e
fixed compile errors and warnings when building master branch with IPP enabled
2013-09-20 16:02:15 +04:00
Alexander Alekhin
f1b5cbc8fe
ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp
2013-09-18 01:14:41 +04:00
Alexander Alekhin
0ee47502d9
remove CV_EXPORT from templates
2013-09-15 13:48:54 +04:00
Roman Donchenko
d669559ec3
Bumped version to 3.0.
2013-09-12 16:40:14 +04:00
Roman Donchenko
887825e831
Added an additional version component - the development status.
...
This will allow us to distinguish between regular releases, prereleases
and development versions.
2013-09-12 16:20:09 +04:00
Roman Donchenko
dee2a65978
Merge pull request #1440 from SpecLad:wcast-align
2013-09-12 13:56:23 +04:00
Roman Donchenko
fec697b390
Silenced a few -Wcast-align warnings in the headers.
...
We don't use -Wcast-align ourselves, but the headers trigger warnings
for those users who do, which is not nice.
2013-09-12 12:33:56 +04:00
Vadim Pisarevsky
61f2107829
added IPP optimization of separable 32f filters; fixed IPP version check in DFT; fixed conditions in IPP optimization of norm functions.
2013-09-09 16:13:39 +04:00
Vladislav Vinogradov
1036ce807c
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudaimgproc/src/gftt.cpp
modules/objdetect/include/opencv2/objdetect/erfilter.hpp
modules/objdetect/src/erfilter.cpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-09 12:57:35 +04:00
Vladislav Vinogradov
a0771630b0
restored original behaviour or release functions for (Buffer and Texture)
2013-09-09 10:57:45 +04:00
Vladislav Vinogradov
b7eff94137
fixed compilation issues with new Ptr
2013-09-06 15:52:07 +04:00
Vladislav Vinogradov
0c7663eb3b
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
Roman Donchenko
86b841563b
Added tests for Ptr.
2013-09-05 19:03:00 +04:00
Roman Donchenko
a97ffe6513
Rewrote the documentation for Ptr to fit the new implementation.
2013-09-05 19:03:00 +04:00
Roman Donchenko
a50d75d362
Made Filestorage able to not own its CvFileStorage instance.
...
This allows to get rid of the last remaining Ptr<T>::addref calls.
2013-09-05 19:03:00 +04:00
Roman Donchenko
3e189a2b41
Replaced calls to Ptr<T>::ptr to ::dynamicCast.
2013-09-05 19:03:00 +04:00
Roman Donchenko
24dee16b12
Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.
...
Also changed the static functions to inline, to stop GCC complaining
about unused functions.
2013-09-05 19:03:00 +04:00
Roman Donchenko
8200a95ced
Boring changes - core.
...
This and several following commits contain the "boring" changes required
to support the new Ptr. These are changes like:
* new T -> makePtr<T> or .reset(new T) or Ptr<T>(new T)
(depending on the situation)
* p.empty() -> !p
* delete_obj -> DefaultDeleter::operator()
and similar changes that are numerous, but primitive.
2013-09-05 18:26:43 +04:00
Roman Donchenko
461c98fa86
Replaced Ptr with my new implementation.
2013-09-05 14:54:20 +04:00
Roman Donchenko
fd3b2326b4
Merge pull request #1373 from abidrahmank:pykeypoints
2013-09-04 11:53:33 +04:00
Vladislav Vinogradov
1ad4592bfc
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudaoptflow/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp
2013-09-04 09:58:32 +04:00
Roman Donchenko
009919872f
Merge pull request #1389 from SpecLad:merge-2.4
2013-09-03 19:42:06 +04:00
Abid K
0902f183ca
alignment of parameters as per speclad
2013-09-03 21:12:03 +05:30
Roman Donchenko
79457f8f49
Merge pull request #1224 from mbarnach:pca_io
2013-09-03 18:43:54 +04:00
Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
Roman Donchenko
99043f6fc2
Merge pull request #1385 from asmorkalov:winrt_glob_fix
2013-09-02 16:05:15 +04:00
Alexander Smorkalov
6d3102141c
Globbing accuracy test fail on Windows RT fixed.
2013-09-02 04:31:58 -07:00
Roman Donchenko
188d3f02ee
Merge pull request #1302 from kdrobnyh:compare
2013-09-02 15:11:20 +04:00
Vladislav Vinogradov
ba4bf04c6c
fixed incorrect GPUs -> CUDAs replacement
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
cbe437571e
fixed docs
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
fd88654b45
replaced GPU -> CUDA
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
cfe4a71dc6
renamed gpu* source to cuda* in core module
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
8282f6ebc1
renamed gpu::cudev namespace -> cuda::device
...
cudev is used for new device layer
2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
e895b7455e
renamed gpu namespace -> cuda
2013-09-02 14:00:41 +04:00
Roman Donchenko
46d74d7c6b
Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect
2013-08-30 17:55:07 +04:00
abidrahmank
7fd8a19fe8
warning corrections
2013-08-30 15:58:10 +05:30
abidrahmank
14af369640
Python bindings for KeyPoint methods
...
Usage:
import numpy as np
import cv2
img = cv2.imread('messi5.jpg',0)
sift = cv2.SIFT()
kp = sift.detect(img)
pts = cv2.KeyPoint_convert(kp)
kps = cv2.KeyPoint_convert(pts.reshape(-1,1,2))
overlap = cv2.KeyPoint_overlap(kp[0],kp[1])
2013-08-30 11:11:06 +05:30
kdrobnyh
f4aa7ff919
Add IPP support in meanStdDev, minMaxIdx, norm functions
2013-08-29 21:09:19 +04:00
Alexander Smorkalov
114e04ee12
OpenCV version++. Current OpenCv version 2.4.6.2
2013-08-29 19:00:13 +04:00
kdrobnyh
7a7aa148d4
Add IPP support in compare function
2013-08-29 17:55:57 +04:00
Roman Donchenko
fc37df05ec
Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix
2013-08-29 16:35:38 +04:00
Alexander Smorkalov
5af2cc6223
AutoBuffer with initial zero size fixed.
2013-08-29 15:03:53 +04:00
Vadim Pisarevsky
771feb61c2
fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches)
2013-08-28 17:00:26 +04:00
Roman Donchenko
2d6f35d6ed
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
4d06c4c7b6
Merge commit '43aec5ad^' into merge-2.4
...
Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp
2013-08-27 13:23:26 +04:00
Roman Donchenko
3182e68b8a
Merge pull request #1334 from MarkBelmont:bugfix_1
2013-08-23 16:49:51 +04:00
Roman Donchenko
cae4480834
Merge pull request #1332 from pengx17:2.4_fix_parallel
2013-08-23 14:47:49 +04:00
MarkBelmont
cf34b3d65b
Changed the brief description of function Mat::colRange from "Create a matrix header for the specified row span." to "Create a matrix header for the specified column span."
2013-08-23 16:39:39 +08:00
peng xiao
2519a21935
Fix a potential bug of ParallelLoopBodyWrapper::operator(Range)
...
On a 32-bit compiler the calculation may result in data (size_t) overflow when running some paralleled algorithms (which can safely run on a 64-bit compiler).
This bug is found when running OpenCV's Retina tutorial on 32bit VS2010.
2013-08-23 15:35:55 +08:00
Roman Donchenko
6fed0e85c2
Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.
...
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
2013-08-22 18:17:19 +04:00
Roman Donchenko
43aec5ad4a
Merge pull request #1318 from SpecLad:wow
2013-08-22 11:49:45 +04:00
Roman Donchenko
9c60a2c24c
Merge pull request #1316 from asmorkalov:winrt_c4447_fix
2013-08-21 19:24:25 +04:00
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Alexander Smorkalov
b15addec70
C4447 warning about main function format suppressed.
2013-08-21 07:24:46 -07:00
Alexander Smorkalov
d62c98527a
Invalid usage of cv::Ptr for arrays fixed.
2013-08-21 07:20:35 -07:00
Roman Donchenko
beada19ad0
Merge pull request #1297 from SpecLad:merge-2.4
2013-08-20 14:10:22 +04:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Vladislav Vinogradov
7bda6992e5
fixed gpu BGR <-> YUV color conversion
2013-08-19 13:17:55 +04:00
Roman Donchenko
7919bcef70
Merge pull request #1277 from NCBee:2.4
2013-08-16 19:59:12 +04:00
Roman Donchenko
2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
2013-08-16 14:14:12 +04:00
Roman Donchenko
47b3e7855f
Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix
2013-08-16 14:05:39 +04:00
Roman Donchenko
a3bbb3dd3d
Merge pull request #1279 from asmorkalov:ocv_opt_tabs
2013-08-16 13:58:14 +04:00
Alexander Smorkalov
a3dd13450c
All optimized function tables wrapped to getters to change its
...
initialization time.
2013-08-16 12:10:07 +04:00
Alexander Smorkalov
9af2c1661a
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
...
for libpng added.
2013-08-15 06:42:00 -07:00
Dmitry Retinskiy
ab8c0fde52
applied comments after review
2013-08-15 16:18:01 +04:00
Roman Donchenko
556028eff5
Merge pull request #1253 from kamjagin:fixingCompilationOnOSX
2013-08-15 11:54:55 +04:00
Bahram Dahi
83e21568ee
Minor bug fix, missing const in method signature
2013-08-14 15:54:13 -07:00
Bahram Dahi
6cf9070b9a
Added ability to read several opencv types (Size, Point, etc.) to FileStorage. Solves issue #3196
2013-08-14 15:08:34 -07:00
kamjagin
ed29d91d42
adding std to cstdint typedef of uint32_t
2013-08-14 17:16:52 +02:00
Miroslav Kobetski
b595d73d6d
defined uint for non-windows platforms too. replaced isnan for cvIsNaN.
2013-08-14 17:16:52 +02:00
Dmitry Retinskiy
f013baf739
bug #1922 : restored most of the class definitions in basic_structures.rst
2013-08-14 17:37:59 +04:00
Roman Donchenko
8e245f8a3a
Merge pull request #1186 from SpecLad:dont-export-templates
2013-08-14 17:25:01 +04:00
Roman Donchenko
18358521f2
Merge pull request #1162 from jet47:cudev-integration
2013-08-14 12:00:34 +04:00
Roman Donchenko
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
Roman Donchenko
dc06d47f1c
Merge pull request #1241 from SpecLad:redundant-precomps
2013-08-12 17:19:53 +04:00
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
Roman Donchenko
79b6f68f54
Merge pull request #1233 from vpisarev:24_ipp_78
2013-08-08 12:00:52 +04:00
Vadim Pisarevsky
d5539975d7
polished the patch
2013-08-07 22:34:29 +04:00
Andrey Pavlenko
1c55096c01
Merge pull request #1232 from StevenPuttemans:fix_wrong_documentation
2013-08-07 21:05:43 +04:00
StevenPuttemans
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
2013-08-07 14:49:33 +02:00
Andrey Pavlenko
a7da129984
Merge pull request #1187 from kdrobnyh:mean_and_sum
2013-08-06 20:54:52 +04:00
Vadim Pisarevsky
10fde1ca5c
disabled 64f IPP DFT; added IPP Gaussian filter; added IPP GetRectSubPix; added IPP BilateralFilter (temporarily disabled)
2013-08-06 18:31:06 +04:00
Roman Donchenko
8bed7bb5f9
Fixed documentation errors.
2013-08-06 18:07:08 +04:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
Mathieu Barnachon
ff85575b28
Adding read/write functions to PCA class. Update PCA test.
2013-08-05 12:06:55 +12:00
Alexander Smorkalov
2243118fc0
NEON instruction set enabled for WIN32 on ARM by default.
2013-08-04 08:47:42 -07:00
Andrey Pavlenko
ee8687ba19
Merge pull request #1214 from StevenPuttemans:feature_3169_others
2013-08-02 17:59:06 +04:00
StevenPuttemans
f28496c628
Added sample links in documentation for python2, ocl and gpu
2013-08-02 14:05:08 +02:00
Alexander Smorkalov
63786c389f
Warning and review notes fixes.
...
WITH_WINRT -> ENABLE_WINRT_MODE;
Some temporary char* replaced with Ptr<char>;
Build fix for regular WIN32;
Windows Platform SDK and MSVC search added to cmake;
Warinig fixes.
2013-08-02 04:10:56 -07:00
Alexander Smorkalov
e03ffde346
WinRT API Certification fixes for core and contrib.
2013-07-31 05:43:53 -07:00
Alexander Smorkalov
62b85a41da
TLS calls on WinRT replaced on variables with C++11 "thread" attribute.
2013-07-31 05:43:52 -07:00
Alexander Smorkalov
6257df1c4b
API restricted on WinRT partially removed from core.
...
Additional CMAKE flag WITH_WINRT added.
2013-07-31 05:43:51 -07:00
Andrey Pavlenko
4c35449b7d
Merge pull request #1139 from StevenPuttemans:bugfix_3101
2013-07-31 15:14:03 +04:00
Andrey Pavlenko
d138f77143
Merge pull request #1019 from jet47:opengl-documentation
2013-07-31 15:10:27 +04:00
Andrey Pavlenko
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +04:00
StevenPuttemans
0c5244103f
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
...
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
2013-07-31 11:20:05 +02:00
Andrey Pavlenko
f7ce70f70a
Merge pull request #1110 from SpecLad:config-cleanup
2013-07-30 17:39:35 +04:00
Andrey Pavlenko
26a3cabbf8
Merge pull request #1193 from SpecLad:exports-for-contrarians
2013-07-30 16:50:29 +04:00
kdrobnyh
6af10a2937
Some changes in sum and mean functions
2013-07-30 00:54:27 +04:00
Michael Hanselmann
cdc2ee9789
Documentation fix for cv::compare (issue 3149)
...
Since commit d8417af086
2013-07-28 16:19:19 +02:00
Roman Donchenko
ee182eb086
Fixed the setting of CVAPI_EXPORTS for modules that are always static/shared.
...
Also, removed needless check of BUILD_SHARED_LIBS in core; in that case,
only the current module's library type matters.
2013-07-26 14:35:40 +04:00
kdrobnyh
4dfd40bec0
Add IPP mean and sum functions
2013-07-25 21:27:35 +04:00
Roman Donchenko
4ac2db271d
Removed CV_EXPORTS from all template classes (that I could find).
...
It doesn't make sense to export template classes, since there's no way
the user can learn that it can import them. In fact, it is somewhat
deleterious, because every module will export every instantiation
that it uses, but doesn't inline.
2013-07-25 19:40:08 +04:00
Roman Donchenko
3939d78336
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
Vladislav Vinogradov
6dfd8f184c
rewrote matrix operations with cudev module
2013-07-22 13:07:07 +04:00
Vladislav Vinogradov
2311b0b43b
added cudev::GpuMat_<T> support to Input/Output arrays
2013-07-22 10:33:40 +04:00
Andrey Pavlenko
bd4d24f0fa
Merge pull request #1122 from SpecLad:merge-2.4
2013-07-21 18:46:27 +04:00
StevenPuttemans
dd0481ef2d
Added brackets around line 888-892 for correct code!
2013-07-18 15:34:38 +02:00
StevenPuttemans
f9b594bf08
Changed first approach to a more general MS-specific approach.
...
Suggested by @SpecLad
2013-07-18 14:24:19 +02:00
Roman Donchenko
73b5cc358e
Merge pull request #1132 from apavlenko:master_ver_290
2013-07-17 17:51:56 +04:00
StevenPuttemans
c3dee28394
Fixed bug #3101 , problem on ellipse2poly function
2013-07-17 15:21:23 +02:00
StevenPuttemans
1fc89bb2e0
Added the solution mentioned in patch #3125
2013-07-17 13:20:25 +02:00
Andrey Pavlenko
e04517af36
moving version to 2.9.0,
...
also adding NVidia copyright
2013-07-17 15:03:11 +04:00
Roman Donchenko
924fc070f0
Changed / for Matx to Matx::div, for symmetry with Matx::mul.
2013-07-16 12:25:26 +04:00
Roman Donchenko
feaa12a274
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/initialization.cpp
modules/ocl/test/main.cpp
modules/superres/CMakeLists.txt
modules/superres/src/input_array_utility.cpp
modules/superres/src/input_array_utility.hpp
modules/superres/src/optical_flow.cpp
2013-07-16 11:52:41 +04:00
Nikita Manovich
c55dc3e8ab
Fixed "FileStorage (minor) error in doc (Feature #3151 )"
...
It was just a typo in the documentation.
2013-07-11 16:06:25 +04:00
Roman Donchenko
6f326220d3
Removed the HAVE_LRINT macro, which is never set.
2013-07-11 14:30:46 +04:00
Roman Donchenko
4f9554eead
Removed a few more unused configuration macros.
...
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it.
Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn,
unused, so I've just deleted them all.
2013-07-10 18:29:11 +04:00
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
Andrey Pavlenko
2b2e02166e
setting version to 2.4.6.1 (hot-fix release for Linux camera support)
2013-07-10 15:12:39 +04:00
Roman Donchenko
de58039b46
Merge pull request #1081 from SpecLad:merge-2.4
2013-07-05 13:34:59 +04:00
Roman Donchenko
0daf4b800a
Fix bug: CommandLineParserParams's comparator would fail with equal arguments.
2013-07-04 17:09:29 +04:00
Roman Donchenko
4692d4b36e
Fix bug: cv::String would break if assigned to itself.
2013-07-04 17:06:00 +04:00
Roman Donchenko
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
Andrey Pavlenko
70deda354a
Merge pull request #1047 from jet47:gpustream-remove-obsolete
2013-07-02 18:39:12 +04:00
Andrey Pavlenko
89086bdb8d
Merge pull request #1046 from SpecLad:merge-2.4
2013-07-02 15:39:07 +04:00
Roman Donchenko
4f19216e45
Merge pull request #1036 from jet47:fix-gpu-deviceinfo
2013-06-27 15:37:42 +04:00
Alexander Smorkalov
e241c14b94
OpenCV Library and Manager version incremented.
...
OpenCV Version 2.4.6;
OpenCV Manager Version 2.8;
Doc fixes.
2013-06-27 12:05:25 +04:00
Roman Donchenko
c1f8d9e3d2
Merge pull request #1011 from wecacuee:master
2013-06-27 12:03:07 +04:00
Vikas Dhiman
f15dc72b89
Removed misleading comment and added the divisibility test to ::run function.
2013-06-26 12:16:25 -04:00
Vladislav Vinogradov
3c32fc1329
removed obsolete methods from gpu::Stream
2013-06-25 17:45:23 +04:00
Roman Donchenko
f36f8067bc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/cuda/limits.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/matrix.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/hog.cpp
modules/ocl/test/test_haar.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_pyrup.cpp
modules/ts/src/precomp.hpp
samples/ocl/facedetect.cpp
samples/ocl/hog.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/surf_matcher.cpp
2013-06-25 15:55:52 +04:00
Roman Donchenko
381057eaad
Merge pull request #1002 from asmorkalov:doc_warning_fix
2013-06-25 11:42:00 +04:00
Roman Donchenko
f8e187e1e1
Merge pull request #1035 from SpecLad:cv-concurrency
2013-06-25 11:33:16 +04:00
Roman Donchenko
c16316c4b4
Replaced the semi-public CV_PARALLEL_FRAMEWORK macro with a function.
...
That way, core/internal.hpp doesn't have to depend on cvconfig.h, which we
don't ship.
2013-06-24 12:57:14 +04:00
Vladislav Vinogradov
98bd401534
fix gpu::DeviceInfo compilation under linux
...
glibc defines major and minor macros
which conflict with gpu::DeviceInfo methods with the same name
2013-06-24 10:11:44 +04:00
Roman Donchenko
b20c9ad2d1
Merge pull request #1015 from SpecLad:merge-2.4
2013-06-21 17:38:04 +04:00
peng xiao
290c8db0a8
Revise naming for getOclMat function.
2013-06-21 14:51:23 +08:00
peng xiao
e129638263
Add a workaround to interpolate between oclMat and Input/OutputArray.
2013-06-21 14:05:29 +08:00
