generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,204 Commits 3 Branches 47 Tags
Commit Graph

6191 Commits

Author SHA1 Message Date
Vladislav Vinogradov
b4845d8c9f temporary disable performance test for alphaComp function(cherry picked from commit 1ce5165cb7ccabdd0280970e3f1b6bc180055a3d) 2014-02-14 17:12:31 +04:00
Alexander Smorkalov
ea51396731 Dead code removed as this cannot be null in Java. 
(cherry picked from commit dbe7634286d405161adb30677aa4d07cc17e0de2)
 2014-02-13 20:13:47 +04:00
Vladislav Vinogradov
aa82f921cc temporary disable perf test for StereoBeliefPropagation(cherry picked from commit eb247d826f04673a23e4d050ee5cf0395bde82c2) 2014-02-13 20:13:38 +04:00
Vladislav Vinogradov
2da7eae2c4 increase epsilon for AlphaComp sanity test for integer input(cherry picked from commit 9e69e2a07a9798d75a0949ab2b4ad063dd84e8f2) 2014-02-13 20:13:27 +04:00
Alexander Smorkalov
f1ef3a4865 OpenCV version++. 2014-02-11 10:15:02 +04:00
Vladislav Vinogradov
9997aa8187 decrease input size for several gpu tests to fix "timed out" error: 
* BruteForceNonLocalMeans
* OpticalFlowBM(cherry picked from commit 8b44a42a403548c244aaea6852fb09935a0741e9)
 2014-02-10 15:48:52 +04:00
Vladislav Vinogradov
f15b42018c fix nonfree module compilation without CUDA(cherry picked from commit 3e1f74f2cafc5c38d0e64928149edb87d9b28d28) 2014-02-10 15:48:52 +04:00
Alexander Smorkalov
a49beb7c73 Multiple improvements in OpenCV examples build. 
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
(cherry picked from commit 6ae4a9b09bf4b3572b2d31136528f1faa809a065)
 2014-02-10 15:48:52 +04:00
Vladislav Vinogradov
3e755b2290 turn on CUDA part of stitching module on Android for non-dynamic build(cherry picked from commit a138e5a6a585e9dfc686d76b9769adeff02672b3) 2014-02-10 15:48:51 +04:00
Vladislav Vinogradov
f15a167df4 turn on CUDA part of nonfree module on Android for non-dynamic build(cherry picked from commit d8f7377122a65512db2f443535a9d01ea336470c) 2014-02-10 15:48:51 +04:00
Ilya Lavrenov
f6367a2ea5 eliminated possible memory leak 
(cherry picked from commit e7e63fac6c3eaa65a8eb0926c7c9557f0614ab03)
 2014-02-10 15:48:51 +04:00
Vladislav Vinogradov
5f88e2b496 fix #3477: 
CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING property is not supported
by all VideoCapture backends. Some backends can return 0.0 or -1.0.(cherry picked from commit c41e8006c7e9a3e796b5f78d3bfc5a97a9e87c4c)
 2014-02-10 15:48:51 +04:00
Seunghoon Park
2c7cf52e3b fixing bug #3345. use norm to make sure two matrices are the same. 
(cherry picked from commit eb9d7c4dd54eea87950d98b843b349db7a95c951)
 2014-02-10 15:48:51 +04:00
Vladislav Vinogradov
d5d88efd5d fix GpuMat::copyTo method with mask: 
fill destination matrix with zeros if it was reallocated(cherry picked from commit dda999545c9dd1cca56081a4b2d56755210b840a)
 2014-02-10 15:48:51 +04:00
Drew Jetter
6cb7a7be18 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. 
(cherry picked from commit 6bf599b1bca8a58c7a656ddc169f7be0fc3094c6)
 2014-02-10 15:48:51 +04:00
Pierre-Emmanuel Viel
cdea6b532f Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified 
(cherry picked from commit 3f458c6eb114bd46ce7f08b8ca471822ea16d26e)
 2014-02-10 15:48:51 +04:00
Robbert Klarenbeek
345b3b0bdd Fix algorithm setter argument validation for uchar(cherry picked from commit e21c6e19db0183e40d12b6634aec2d1923496336) 2014-02-10 15:48:51 +04:00
Kazuki Matsuda
a65d7d4dd3 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
(cherry picked from commit 2ae20c74a2661d5975529211f4c95206e8558243)
 2014-02-10 15:48:51 +04:00
Ilya Lavrenov
5e986f3347 fixed bug #3319 
(cherry picked from commit 4f9c081dc313f8fdfee3f0a4572779ae13e27e40)
 2014-02-10 15:48:50 +04:00
Seunghoon Park
27a8bb471b fixing bug #3345. don't use BORDER_ISOLATED alone. it should be combined with some border type 
(cherry picked from commit 2272a5876972f74684c43f2069c3046bd2888d01)
 2014-02-10 15:48:50 +04:00
Seunghoon Park
7868733002 fixing bug #3345 
(cherry picked from commit b036fc756a65c8be5b9b0e4d77d94b6f8099fc20)
 2014-02-10 15:48:50 +04:00
Ilya Lavrenov
469aef2e5e fixed bug #3341 
(cherry picked from commit 09d25e11c65fa20f9ddba1d25ee4f3344ba4e655)
 2014-02-10 15:48:50 +04:00
Roman Donchenko
5e00fc6afe 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.
(cherry picked from commit 795c108f2bf2880a81a8d0db1ddc2da71c91864e)
 2014-02-10 15:48:50 +04:00
Vladislav Vinogradov
5170f0b5da fixed several bugs in CUDA Canny implementation: 
* out of border access in edgesHysteresisLocalKernel
* incorrect usage of atomicAdd(cherry picked from commit 5dbdadb769e97f47b64655b5b3144787c57e2740)
 2014-02-07 20:59:13 +04:00
Vladislav Vinogradov
dc2dbb4173 Revert "disable gpu Canny and HoughCircles perf tests:" 
This reverts commit dbce90692acd84fbf46bde4da4b1726049f42857.
(cherry picked from commit bfc27271e2543bb0807f6dc000f770993a740581)
 2014-02-07 20:58:49 +04:00
Vladislav Vinogradov
79e4f7eb78 Revert "disable CUDA generalized Hough Transform" 
This reverts commit 33d42b740c6fe938b63a0b25c9ad51741aba48c3.
(cherry picked from commit 5d099df57864d083881f026ffe32637afac6ba2e)
 2014-02-07 18:24:57 +04:00
Vladislav Vinogradov
cc73c7000f fix epsilons for several gpu tests 
(cherry picked from commit 3e4bb371c8a364315dec18df14674d9164b7523d)
 2014-02-07 18:24:44 +04:00
Vladislav Vinogradov
8bb26fa5de Revert "disable gpu CvtColor.*2HSV tests:" 
This reverts commit 952027a8536215a5e4308c79a59308c6b3426354.
(cherry picked from commit b6ba1f226c3da6ba726416f92550410145e89c10)
 2014-02-07 18:24:35 +04:00
Vladislav Vinogradov
48612d7c58 Revert "disable gpu Subtract_Array test:" 
This reverts commit e91bf95d5832e87aa70240c50f0bf7fcc587e8c8.
(cherry picked from commit da44a2fac1c0be45d2a987c165298a9629757723)
 2014-02-07 18:24:23 +04:00
Vladislav Vinogradov
4425dac7f4 disable gpu CvtColor.*2HSV tests: 
possible bug in CPU version(cherry picked from commit 3cb8b352e52f85847d98d2b0ece32ba5bdb5c31b)
 2014-01-31 22:24:20 +04:00
Vladislav Vinogradov
4f79b9de48 disable gpu Subtract_Array test: 
possible bug in CPU version(cherry picked from commit 59155c1eefb6f22e362e34a8d73b31841eb3413a)
 2014-01-31 22:23:55 +04:00
Vladislav Vinogradov
397ac5e68f disable gpu Canny and HoughCircles perf tests: 
it fails because driver terminates CUDA kernels after time out
(cherry picked from commit fa5bbb5f8dc1a86cfe004fb258d66e56c90560d6)
 2014-01-31 22:23:39 +04:00
Vladislav Vinogradov
43c75c64b5 disable NPP for GpuMat methods and for copyMakeBorder(cherry picked from commit 316d49fc0fb7a609ebb0a65efc207faea6b978a4) 2014-01-31 22:23:22 +04:00
Vladislav Vinogradov
c319625a07 disable some gpu tests if library was built without CUFFT(cherry picked from commit b4b929d27cc25822dd15b5b96b8d335c59d4408c) 2014-01-31 22:23:05 +04:00
Vladislav Vinogradov
a7d0448faa gpu test output files moved from cwd to temp folder(cherry picked from commit 49731ad5303a714302ff053aaeb32900845304bf) 2014-01-31 22:22:49 +04:00
Alexander Smorkalov
ca10e5e8ae Highgui test output fixes. 
Useless output to console fixed;
Test output files moved from cwd to temp folder.
(cherry picked from commit 87935f35600228a746d8a29cb1a5c108e710429d)
 2014-01-31 22:22:33 +04:00
Vladislav Vinogradov
32414afe72 disable performance test for gpu generalized hough(cherry picked from commit 063d8b421136b2ed0f537c663b89828f6a2b263c) 2014-01-31 22:22:14 +04:00
Alexander Smorkalov
3ebdcafdd3 All installed files marked with component names for install customization. 
(cherry picked from commit b75cbfde45c00fc956f033d0af7fe6d63312fd33)

Conflicts:

	cmake/OpenCVModule.cmake
 2014-01-24 17:13:22 +04:00
Alexander Smorkalov
a348f3eeaa OpenCV version++ 2014-01-24 14:49:56 +04:00
Vladislav Vinogradov
e9638d0997 disable CUDA generalized Hough Transform 
(cherry picked from commit 33d42b740c6fe938b63a0b25c9ad51741aba48c3)
 2014-01-24 14:46:36 +04:00
Vladislav Vinogradov
5cb0084547 split CUDA Hough sources 
(cherry picked from commit d84738769422aad33038d90681c47486e47a0380)
 2014-01-24 14:46:16 +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