Roman Donchenko
890f1baff0
Merge pull request #2132 from ComFreek:patch-2
2014-01-10 11:44:46 +04:00
ComFreek
ae795e5797
Corrected package name in tutorial
...
See also #2101
2014-01-09 17:24:20 +01:00
Roman Donchenko
a13e32f5ab
Merge pull request #2115 from nghiaho12:kmeans_sample
2014-01-09 16:58:29 +04:00
Roman Donchenko
d509165d96
Merge pull request #2118 from ilya-lavrenov:semicolons
2014-01-09 16:21:49 +04:00
Nghia Ho
bf4994554d
Removed unecessary initialisation of Mat centers.
2014-01-09 21:04:17 +11:00
Roman Donchenko
7acea48788
Merge pull request #2106 from robbertkl:patch-2
2014-01-09 13:25:59 +04:00
Roman Donchenko
58882e5c22
Merge pull request #2114 from kazuki-ma:SparseMat_convertTo_typofix_24
2014-01-09 13:24:20 +04:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Nghia Ho
601b7d1dd3
Fixed a valgrind 'Conditional jump or move depends on uninitialised value(s)' on cv::kmeans(...). The original code used points(sampleCount, 1, CV_32FC2), which confused generateCentersPP into thinking it is a 1 dimensional center, instead of 2. As a result it would set only the x variable and leave y unitialised.
2014-01-06 20:19:07 +11: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
Robbert Klarenbeek
e21c6e19db
Fix algorithm setter argument validation for uchar
2014-01-02 21:17:55 +01:00
Roman Donchenko
5327482b46
Merge pull request #2084 from ilya-lavrenov:cont
2013-12-31 16:51:30 +04:00
Ilya Lavrenov
4f9c081dc3
fixed bug #3319
2013-12-31 13:56:59 +04:00
Roman Donchenko
157202fc8d
Merge pull request #2094 from SpecLad:multimon-be-gone
2013-12-31 11:40:44 +04:00
Roman Donchenko
4ce684e61c
Merge pull request #2087 from ilya-lavrenov:remap_sse2_cond
2013-12-30 18:18:42 +04:00
Roman Donchenko
795c108f2b
Fixed MinGW build by declaring the minimal required Windows version.
...
Also deleted miscellaneous remaining multimon cruft.
Deleted #include <winuser.h>, because <windows.h> includes it
already.
This should have a nice side effect of preventing us from
accidentally using any Windows API that's too new.
2013-12-30 18:13:42 +04:00
Roman Donchenko
6811d2ab24
Merge pull request #2086 from ilya-lavrenov:mul_fix
2013-12-30 17:57:43 +04:00
Ilya Lavrenov
5db1754d49
SSE2 optimization of cv::remap doesn't work with big images
2013-12-30 17:13:40 +04:00
Ilya Lavrenov
09d25e11c6
fixed bug #3341
2013-12-30 16:47:54 +04:00
Roman Donchenko
a0c98dcefa
Merge pull request #2092 from alalek:fix_mingw_warn
2013-12-30 15:34:16 +04:00
Alexander Alekhin
44970ddf56
eliminate MINGW pragma warning
2013-12-30 12:31:00 +04:00
Roman Donchenko
05b9c991dd
Merge pull request #2083 from jet47:gpu_android_tests
2013-12-27 21:09:18 +04:00
Roman Donchenko
46be47cb4b
Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix
2013-12-27 20:53:42 +04:00
Roman Donchenko
4eb9b9d6cf
Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix
2013-12-27 19:58:57 +04:00
Vladislav Vinogradov
53494ba397
increase thresholds for some tests
2013-12-27 18:20:14 +04:00
Vladislav Vinogradov
15678efe84
disable 2 problematic tests
2013-12-27 18:20:01 +04:00
Vladislav Vinogradov
8399568edf
disabled GEMM test if library was built without CUBLAS
2013-12-27 18:19:29 +04:00
Roman Donchenko
0566ab4d3d
Merge pull request #2078 from ilya-lavrenov:warn
2013-12-27 18:17:21 +04:00
Alexander Smorkalov
df63060e4d
Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules.
2013-12-27 18:04:10 +04:00
Alexander Smorkalov
4175916b2a
dynamicuda became private module.
2013-12-27 17:19:38 +04:00
Andrey Pavlenko
d649f47eeb
Merge pull request #2072 from pengx17:patch-3
2013-12-27 15:36:24 +04:00
Ilya Lavrenov
d014cb8fb4
fixed warning [-Wempty-body]
2013-12-27 14:44:58 +04:00
Roman Donchenko
c45492371a
Merge pull request #2036 from GregoryMorse:patch-1
2013-12-27 12:44:02 +04:00
Roman Donchenko
719149877e
Merge pull request #2074 from asmorkalov:android_nonfree_cuda
2013-12-27 12:43:49 +04:00
Roman Donchenko
ee36717db4
Merge pull request #2037 from GregoryMorse:patch-2
2013-12-27 12:11:52 +04:00
Alexander Smorkalov
c48777a1c3
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
2013-12-27 11:18:10 +04:00
Peng Xiao
0ccc903647
fixed a buffer overrun of ocl canny
...
the `map` buffer does not have the same size with CUDA and index starts at [1, 1] instead of [0, 0].
2013-12-27 11:54:08 +08:00
Andrey Pavlenko
41fd711ab0
Merge pull request #2069 from asmorkalov:android_ocl_1_1_fix
2013-12-26 23:07:25 +04:00
Andrey Pavlenko
4b885e2067
Merge pull request #2068 from akarsakov:disable_ipp
2013-12-26 22:41:52 +04:00
Alexander Smorkalov
4f6f6e8cac
static function qualifier replaced on inline to enable kernel compilation with OpenCL 1.1 embedded profile.
2013-12-26 21:20:32 +04:00
Alexander Karsakov
6ef0253fb7
Disabled some IPP implementation since it breaks tests
2013-12-26 19:53:53 +04:00
Andrey Pavlenko
f7b5e6544f
Merge pull request #2061 from apavlenko:2.4_fix_build_vs12
2013-12-26 19:38:57 +04:00
Roman Donchenko
648facccd6
Merge pull request #2064 from dpen2000:patch-2
2013-12-26 17:47:09 +04:00
Roman Donchenko
709e8e8e07
Merge pull request #2057 from asmorkalov:android_cuda_sample
2013-12-26 16:59:56 +04:00
Andrey Pavlenko
734bf8babd
removing legacy stuff
2013-12-26 15:49:12 +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
Alexander Smorkalov
cea9a97434
CUDA support check added.
2013-12-26 14:52:41 +04:00
Alexander Smorkalov
b3eee49451
New sample for CUDA on Android added.
2013-12-26 14:52:41 +04:00
Roman Donchenko
60906d9175
Merge pull request #2060 from asmorkalov:ocv_ts_cuda
2013-12-26 14:39:51 +04:00
dpen2000
d6a88397b4
Fix python sample path
2013-12-26 10:36:24 +00:00
