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

9197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 8b44a42a40)
 2014-02-10 15:48:52 +04:00
Vladislav Vinogradov
f15b42018c fix nonfree module compilation without CUDA(cherry picked from commit 3e1f74f2ca) 2014-02-10 15:48:52 +04:00
Alexander Smorkalov
f9e9ae85bd dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a. 
(cherry picked from commit b10d4b05ed)
 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 6ae4a9b09b)
 2014-02-10 15:48:52 +04:00
Alexander Smorkalov
51dff5b9e8 project.properties file generation fixed for per-component installation. 
(cherry picked from commit 65b4d77959)
 2014-02-10 15:48:52 +04:00
Alexander Smorkalov
826fc00374 Tests install path fix for Android SDK. 
(cherry picked from commit 0cd0e4749b)
 2014-02-10 15:48:52 +04:00
Vladislav Vinogradov
c10692deff save previous values of LOCAL_* variables and restore them at the end(cherry picked from commit 286fe261d0) 2014-02-10 15:48:52 +04:00
Vladislav Vinogradov
daa7b9ce5f fix path to CUDA libraries (use targets/armv7-linux-androideabi/lib)(cherry picked from commit a098fb1803) 2014-02-10 15:48:52 +04:00
Vladislav Vinogradov
1ab02631b0 update stitching sample 
(cherry picked from commit 214cbabc40)
 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 a138e5a6a5) 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 d8f7377122) 2014-02-10 15:48:51 +04:00
Ilya Lavrenov
f6367a2ea5 eliminated possible memory leak 
(cherry picked from commit e7e63fac6c)
 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 c41e8006c7)
 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 eb9d7c4dd5)
 2014-02-10 15:48:51 +04:00
Andrey Pavlenko
b7c5083a87 removing duplicated legacy license, the actual instance is in 'opencv/LICENSE' 
(cherry picked from commit dca5684145)
 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 dda999545c)
 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 6bf599b1bc)
 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 3f458c6eb1)
 2014-02-10 15:48:51 +04:00
ComFreek
d01e3529a6 Corrected package name in tutorial 
See also #2101(cherry picked from commit ae795e5797)
 2014-02-10 15:48:51 +04:00
Nghia Ho
7c13d3277c 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. 
(cherry picked from commit 601b7d1dd3)
 2014-02-10 15:48:51 +04:00
Robbert Klarenbeek
345b3b0bdd Fix algorithm setter argument validation for uchar(cherry picked from commit e21c6e19db) 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 2ae20c74a2)
 2014-02-10 15:48:51 +04:00
Ilya Lavrenov
5e986f3347 fixed bug #3319 
(cherry picked from commit 4f9c081dc3)
 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 2272a58769)
 2014-02-10 15:48:50 +04:00
Seunghoon Park
7868733002 fixing bug #3345 
(cherry picked from commit b036fc756a)
 2014-02-10 15:48:50 +04:00
Ilya Lavrenov
469aef2e5e fixed bug #3341 
(cherry picked from commit 09d25e11c6)
 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 795c108f2b)
 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 5dbdadb769)
 2014-02-07 20:59:13 +04:00
Vladislav Vinogradov
dc2dbb4173 Revert "disable gpu Canny and HoughCircles perf tests:" 
This reverts commit dbce90692a.
(cherry picked from commit bfc27271e2)
 2014-02-07 20:58:49 +04:00
Vladislav Vinogradov
79e4f7eb78 Revert "disable CUDA generalized Hough Transform" 
This reverts commit 33d42b740c.
(cherry picked from commit 5d099df578)
 2014-02-07 18:24:57 +04:00
Vladislav Vinogradov
cc73c7000f fix epsilons for several gpu tests 
(cherry picked from commit 3e4bb371c8)
 2014-02-07 18:24:44 +04:00
Vladislav Vinogradov
8bb26fa5de Revert "disable gpu CvtColor.*2HSV tests:" 
This reverts commit 952027a853.
(cherry picked from commit b6ba1f226c)
 2014-02-07 18:24:35 +04:00
Vladislav Vinogradov
48612d7c58 Revert "disable gpu Subtract_Array test:" 
This reverts commit e91bf95d58.
(cherry picked from commit da44a2fac1)
 2014-02-07 18:24:23 +04:00
Alexander Smorkalov
8ba84f4b47 Implicit testdata directory permissions setup added. 
(cherry picked from commit b86088b89c)
 2014-02-07 18:24:11 +04:00
Alexander Smorkalov
bc653add74 Absolute path to tests in opencv_run_app_tests.sh fixed. 
(cherry picked from commit 530702c5f2)
 2014-02-06 17:16:21 +04:00
Alexander Smorkalov
215f78eee2 Merge branch 'android_manager_version_inc4' into 2.4.8.1-prep 2.4.8.1 2014-01-31 22:25:36 +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 49731ad530) 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 87935f3560)
 2014-01-31 22:22:33 +04:00
Vladislav Vinogradov
32414afe72 disable performance test for gpu generalized hough(cherry picked from commit 063d8b4211) 2014-01-31 22:22:14 +04:00
Alexander Smorkalov
ed10f50d25 Reports path fix for opencv_run_all_tests.sh.in script. 
(cherry picked from commit 3d261e8a01)
 2014-01-31 22:21:57 +04:00
Alexander Smorkalov
48d9be70d5 Android toolchain file sync with original project. 
Original project: https://github.com/taka-no-me/android-cmake/
Revision: 5db45cfb87fec180b74963d3680dd60d4d8d8c3a
(cherry picked from commit c815043607)
 2014-01-31 22:21:34 +04:00
Alexander Smorkalov
c6b31481b6 OpenCV Manager version++. 2014-01-31 12:15:22 +04:00
Alexander Smorkalov
514b714cc2 opencv_run_all_tests.sh script added to -tests package. 
(cherry picked from commit d45350a06a)
 2014-01-29 17:41:59 +04:00
Alexander Smorkalov
7fec87d3f6 Multiple fixes for tests deb package build. 
Added opencv_testing.sh.in file;
opencv_testing.sh installation guarded by OS check.
(cherry picked from commit d9dc5ffa91)
 2014-01-28 17:56:22 +04:00