Vincent Rabaud
6cb90c0e97
fix cross-compilation issue with Numpy
2014-01-21 10:07:19 +01:00
Anatoly Baksheev
130914d9f4
fixed documentation warnings
2014-01-21 02:15:37 +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
64244e160b
Merge pull request #2171 from djetter99:fix_static_init_order
2014-01-20 19:30:29 +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
Roman Donchenko
088535fa56
Merge pull request #2159 from SpecLad:1xN
2014-01-17 18:23:53 +04:00
Roman Donchenko
58afe5dd17
Merge pull request #2140 from Daniil-Osokin:fix_saving_untrained_svm_model
2014-01-17 14:57:57 +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 092f916
for explanation.
This reverts commit 4f9c081dc3
.
2014-01-17 13:43:00 +04:00
Andrey Pavlenko
8dbc96fed8
Merge pull request #2143 from Daniil-Osokin:fix_docs_cvt_color_alpha_channel
2014-01-17 10:43:40 +04:00
Daniil Osokin
8ce691e679
Fixed cvtColor alpha channel docs
2014-01-16 18:36:06 +04:00
Seunghoon Park
2272a58769
fixing bug #3345 . don't use BORDER_ISOLATED alone. it should be combined with some border type
2014-01-14 20:47:23 -05:00
Roman Donchenko
2fde4d8a94
Merge pull request #2145 from andreasBihlmaier:2.4
2014-01-14 11:55:29 +04:00
Roman Donchenko
2443e8090e
Merge pull request #2133 from apavlenko:2.4-perf_haar
2014-01-13 19:28:09 +04:00
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.
2014-01-13 16:09:42 +01:00
Andrey Pavlenko
4c99196399
adding finish()
to flush CL queue, renaming the test to match 'master' branch
2014-01-13 18:12:30 +04:00
Roman Donchenko
9628abc786
Merge pull request #2137 from ilya-lavrenov:gitignore
2014-01-13 16:33:16 +04:00
Roman Donchenko
87e0c26129
Merge pull request #2108 from pemmanuelviel:flannMemoryLeak
2014-01-13 16:26:02 +04:00
Daniil Osokin
5d2edced26
Added throwing exception when saving untrained SVM model
2014-01-13 13:50:30 +04:00
Andrey Pavlenko
a7821c60e5
refactoring the test as it should be in 2.4
2014-01-13 11:20:17 +04:00
Ilya Lavrenov
f197d8b91c
updated .gitignore
2014-01-10 18:59:06 +04:00
Roman Donchenko
890f1baff0
Merge pull request #2132 from ComFreek:patch-2
2014-01-10 11:44:46 +04:00
Andrey Pavlenko
4d28e8243c
'master'-like Haar perf test
2014-01-10 00:14:48 +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
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
2014-01-03 13:16:36 +01:00
Nghia Ho
d3e24f3cbf
Improved documentation for neural network
2014-01-03 14:18:07 +11: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
Seunghoon Park
b036fc756a
fixing bug #3345
2013-12-30 21:10:06 -05: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