Anatoly Baksheev
9145985ff4
added guard to prevent linking VTK with Qt5
11 years ago
Anatoly Baksheev
130914d9f4
fixed documentation warnings
11 years ago
Anatoly Baksheev
02ebc4368c
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
11 years ago
Roman Donchenko
088535fa56
Merge pull request #2159 from SpecLad:1xN
11 years ago
Roman Donchenko
58afe5dd17
Merge pull request #2140 from Daniil-Osokin:fix_saving_untrained_svm_model
11 years ago
Roman Donchenko
5f8d8c0069
Added a test for matrix-to-vector copy and convert.
11 years ago
Roman Donchenko
4e4a7d0353
Removed an unnecessary workaround for matrix-to-vector copyTo.
11 years ago
Roman Donchenko
ee97a5e757
Re-fix bug #3319 with less side effects.
11 years ago
Roman Donchenko
f02204847a
Revert "fixed bug #3319"
...
See 092f916
for explanation.
This reverts commit 4f9c081dc3
.
11 years ago
Andrey Pavlenko
8dbc96fed8
Merge pull request #2143 from Daniil-Osokin:fix_docs_cvt_color_alpha_channel
11 years ago
Daniil Osokin
8ce691e679
Fixed cvtColor alpha channel docs
11 years ago
Roman Donchenko
2fde4d8a94
Merge pull request #2145 from andreasBihlmaier:2.4
11 years ago
Roman Donchenko
2443e8090e
Merge pull request #2133 from apavlenko:2.4-perf_haar
11 years ago
ahb
49dfa5a17f
Fix the following error for ocl::getOpenCLPlatforms() on Ubuntu 12.04 with gcc 4.8
...
OpenCV Error: Unknown error code -6 (OpenCL function is not available: [clGetPlatformIDs]) in opencl_check_fn, file /home/ahb/software/opencv/modules/ocl/src/cl_runtime/cl_runtime.cpp, line 83
The issue results from modules/ocl/src/cl_runtime/cl_runtime.cpp checking for
"linux" instead of "__linux__" (cp. http://sourceforge.net/p/predef/wiki/OperatingSystems/ )
Adjust all other occurrences of "defined(linux)" as well.
11 years ago
Andrey Pavlenko
4c99196399
adding `finish()` to flush CL queue, renaming the test to match 'master' branch
11 years ago
Roman Donchenko
9628abc786
Merge pull request #2137 from ilya-lavrenov:gitignore
11 years ago
Roman Donchenko
87e0c26129
Merge pull request #2108 from pemmanuelviel:flannMemoryLeak
11 years ago
Daniil Osokin
5d2edced26
Added throwing exception when saving untrained SVM model
11 years ago
Andrey Pavlenko
a7821c60e5
refactoring the test as it should be in 2.4
11 years ago
Ilya Lavrenov
f197d8b91c
updated .gitignore
11 years ago
Roman Donchenko
890f1baff0
Merge pull request #2132 from ComFreek:patch-2
11 years ago
Andrey Pavlenko
4d28e8243c
'master'-like Haar perf test
11 years ago
ComFreek
ae795e5797
Corrected package name in tutorial
...
See also #2101
11 years ago
Roman Donchenko
a13e32f5ab
Merge pull request #2115 from nghiaho12:kmeans_sample
11 years ago
Roman Donchenko
d509165d96
Merge pull request #2118 from ilya-lavrenov:semicolons
11 years ago
Nghia Ho
bf4994554d
Removed unecessary initialisation of Mat centers.
11 years ago
Roman Donchenko
7acea48788
Merge pull request #2106 from robbertkl:patch-2
11 years ago
Roman Donchenko
58882e5c22
Merge pull request #2114 from kazuki-ma:SparseMat_convertTo_typofix_24
11 years ago
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
11 years ago
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.
11 years ago
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
11 years ago
Pierre-Emmanuel Viel
3f458c6eb1
Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified
11 years ago
Robbert Klarenbeek
e21c6e19db
Fix algorithm setter argument validation for uchar
11 years ago
Roman Donchenko
5327482b46
Merge pull request #2084 from ilya-lavrenov:cont
11 years ago
Ilya Lavrenov
4f9c081dc3
fixed bug #3319
11 years ago
Roman Donchenko
157202fc8d
Merge pull request #2094 from SpecLad:multimon-be-gone
11 years ago
Roman Donchenko
4ce684e61c
Merge pull request #2087 from ilya-lavrenov:remap_sse2_cond
11 years ago
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.
11 years ago
Roman Donchenko
6811d2ab24
Merge pull request #2086 from ilya-lavrenov:mul_fix
11 years ago
Ilya Lavrenov
5db1754d49
SSE2 optimization of cv::remap doesn't work with big images
11 years ago
Ilya Lavrenov
09d25e11c6
fixed bug #3341
11 years ago
Roman Donchenko
a0c98dcefa
Merge pull request #2092 from alalek:fix_mingw_warn
11 years ago
Alexander Alekhin
44970ddf56
eliminate MINGW pragma warning
11 years ago
Roman Donchenko
05b9c991dd
Merge pull request #2083 from jet47:gpu_android_tests
11 years ago
Roman Donchenko
46be47cb4b
Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix
11 years ago
Roman Donchenko
4eb9b9d6cf
Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix
11 years ago
Vladislav Vinogradov
53494ba397
increase thresholds for some tests
11 years ago
Vladislav Vinogradov
15678efe84
disable 2 problematic tests
11 years ago
Vladislav Vinogradov
8399568edf
disabled GEMM test if library was built without CUBLAS
11 years ago
Roman Donchenko
0566ab4d3d
Merge pull request #2078 from ilya-lavrenov:warn
11 years ago