Alexander Smorkalov [Thu, 30 Jan 2014 07:08:49 +0000 (11:08 +0400)]
Android toolchain file sync with original project.
Original project: https://github.com/taka-no-me/android-cmake/
Revision:
5db45cfb87fec180b74963d3680dd60d4d8d8c3a
Roman Donchenko [Wed, 29 Jan 2014 13:09:28 +0000 (17:09 +0400)]
Merge pull request #2221 from asmorkalov:ocv_test_install_custom
Alexander Smorkalov [Wed, 29 Jan 2014 08:01:06 +0000 (12:01 +0400)]
opencv_run_all_tests.sh script added to -tests package.
Roman Donchenko [Tue, 28 Jan 2014 13:51:06 +0000 (17:51 +0400)]
Merge pull request #2215 from asmorkalov:ocv_testpack_fix
Alexander Smorkalov [Tue, 28 Jan 2014 10:05:26 +0000 (14:05 +0400)]
Multiple fixes for tests deb package build.
Added opencv_testing.sh.in file;
opencv_testing.sh installation guarded by OS check.
Roman Donchenko [Tue, 28 Jan 2014 08:23:32 +0000 (12:23 +0400)]
Merge pull request #2205 from jet47:bug-3477-fix
Andrey Pavlenko [Tue, 28 Jan 2014 06:51:11 +0000 (10:51 +0400)]
Merge pull request #2097 from pclove1:blur_border_isolated
Vladislav Vinogradov [Tue, 28 Jan 2014 06:28:00 +0000 (10:28 +0400)]
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.
Seunghoon Park [Tue, 28 Jan 2014 01:57:40 +0000 (20:57 -0500)]
fixing bug #3345. use norm to make sure two matrices are the same.
Seunghoon Park [Tue, 28 Jan 2014 01:44:03 +0000 (20:44 -0500)]
Merge branch '2.4' into blur_border_isolated
Roman Donchenko [Mon, 27 Jan 2014 16:59:53 +0000 (20:59 +0400)]
Merge pull request #2209 from asmorkalov:ocv_test_install
Alexander Smorkalov [Mon, 27 Jan 2014 13:57:11 +0000 (17:57 +0400)]
Code review notes fixed.
Env setup for testing package implemented using /etc/profile.d;
Variable with path for all native samples added;
Path for test binaries and test data updated.
Alexander Smorkalov [Mon, 27 Jan 2014 10:20:30 +0000 (14:20 +0400)]
OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.
Andrey Pavlenko [Fri, 24 Jan 2014 12:13:19 +0000 (16:13 +0400)]
Merge pull request #2194 from apavlenko:2.4_perf_haar_iter
Roman Donchenko [Fri, 24 Jan 2014 10:27:44 +0000 (14:27 +0400)]
Merge pull request #2197 from asmorkalov:ocv_packaging2
Alexander Smorkalov [Thu, 23 Jan 2014 16:57:30 +0000 (20:57 +0400)]
Improvements in package build.
Andrey Pavlenko [Fri, 24 Jan 2014 06:07:21 +0000 (10:07 +0400)]
temporary disabling hanging test
Roman Donchenko [Thu, 23 Jan 2014 13:13:51 +0000 (17:13 +0400)]
Merge pull request #2193 from apavlenko:2.4_lic_remove
Andrey Pavlenko [Wed, 22 Jan 2014 17:47:50 +0000 (21:47 +0400)]
removing duplicated legacy license, the actual instance is in 'opencv/LICENSE'
Roman Donchenko [Thu, 23 Jan 2014 09:28:12 +0000 (13:28 +0400)]
Merge pull request #2188 from jet47:gpumat-copyto-fix
Roman Donchenko [Thu, 23 Jan 2014 09:27:37 +0000 (13:27 +0400)]
Merge pull request #2175 from vrabaud:2.4
Vincent Rabaud [Wed, 22 Jan 2014 14:26:14 +0000 (15:26 +0100)]
fix message sent to user during cross_compilation
Roman Donchenko [Wed, 22 Jan 2014 07:54:07 +0000 (11:54 +0400)]
Merge pull request #2181 from asmorkalov:ocv_packaging
Vladislav Vinogradov [Wed, 22 Jan 2014 06:40:14 +0000 (10:40 +0400)]
fix GpuMat::copyTo method with mask:
fill destination matrix with zeros if it was reallocated
Alexander Smorkalov [Sat, 18 Jan 2014 19:50:07 +0000 (23:50 +0400)]
Initial Linux packages build rools for CPack.
Alexander Smorkalov [Fri, 17 Jan 2014 12:30:31 +0000 (16:30 +0400)]
All installed files marked with component names for install customization.
Roman Donchenko [Tue, 21 Jan 2014 15:27:54 +0000 (19:27 +0400)]
Merge pull request #2183 from jet47:cuda-hough-fix
Andrey Pavlenko [Tue, 21 Jan 2014 15:11:11 +0000 (19:11 +0400)]
Merge pull request #2107 from nghiaho12:nn_doc
Vladislav Vinogradov [Tue, 21 Jan 2014 10:35:51 +0000 (14:35 +0400)]
disable CUDA generalized Hough Transform
Vladislav Vinogradov [Tue, 21 Jan 2014 10:35:34 +0000 (14:35 +0400)]
split CUDA Hough sources
Vincent Rabaud [Tue, 21 Jan 2014 09:01:52 +0000 (10:01 +0100)]
reorder the if's for clarity
Vincent Rabaud [Mon, 20 Jan 2014 09:23:46 +0000 (10:23 +0100)]
fix cross-compilation issue with Numpy
Roman Donchenko [Mon, 20 Jan 2014 15:30:29 +0000 (19:30 +0400)]
Merge pull request #2171 from djetter99:fix_static_init_order
Drew Jetter [Sat, 18 Jan 2014 23:39:50 +0000 (16:39 -0700)]
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.
Roman Donchenko [Fri, 17 Jan 2014 14:23:53 +0000 (18:23 +0400)]
Merge pull request #2159 from SpecLad:1xN
Roman Donchenko [Fri, 17 Jan 2014 10:57:57 +0000 (14:57 +0400)]
Merge pull request #2140 from Daniil-Osokin:fix_saving_untrained_svm_model
Roman Donchenko [Fri, 17 Jan 2014 10:18:31 +0000 (14:18 +0400)]
Added a test for matrix-to-vector copy and convert.
Roman Donchenko [Fri, 17 Jan 2014 10:16:22 +0000 (14:16 +0400)]
Removed an unnecessary workaround for matrix-to-vector copyTo.
Roman Donchenko [Fri, 17 Jan 2014 10:13:21 +0000 (14:13 +0400)]
Re-fix bug #3319 with less side effects.
Roman Donchenko [Fri, 17 Jan 2014 09:02:35 +0000 (13:02 +0400)]
Revert "fixed bug #3319"
See 092f916 for explanation.
This reverts commit
4f9c081dc313f8fdfee3f0a4572779ae13e27e40.
Andrey Pavlenko [Fri, 17 Jan 2014 06:43:39 +0000 (10:43 +0400)]
Merge pull request #2143 from Daniil-Osokin:fix_docs_cvt_color_alpha_channel
Daniil Osokin [Mon, 13 Jan 2014 10:20:42 +0000 (14:20 +0400)]
Fixed cvtColor alpha channel docs
Seunghoon Park [Wed, 15 Jan 2014 01:47:23 +0000 (20:47 -0500)]
fixing bug #3345. don't use BORDER_ISOLATED alone. it should be combined with some border type
Roman Donchenko [Tue, 14 Jan 2014 07:55:28 +0000 (11:55 +0400)]
Merge pull request #2145 from andreasBihlmaier:2.4
Roman Donchenko [Mon, 13 Jan 2014 15:28:09 +0000 (19:28 +0400)]
Merge pull request #2133 from apavlenko:2.4-perf_haar
ahb [Mon, 13 Jan 2014 15:09:42 +0000 (16:09 +0100)]
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.
Andrey Pavlenko [Mon, 13 Jan 2014 14:12:30 +0000 (18:12 +0400)]
adding `finish()` to flush CL queue, renaming the test to match 'master' branch
Roman Donchenko [Mon, 13 Jan 2014 12:33:15 +0000 (16:33 +0400)]
Merge pull request #2137 from ilya-lavrenov:gitignore
Roman Donchenko [Mon, 13 Jan 2014 12:26:02 +0000 (16:26 +0400)]
Merge pull request #2108 from pemmanuelviel:flannMemoryLeak
Daniil Osokin [Mon, 13 Jan 2014 07:41:54 +0000 (11:41 +0400)]
Added throwing exception when saving untrained SVM model
Andrey Pavlenko [Mon, 13 Jan 2014 07:20:17 +0000 (11:20 +0400)]
refactoring the test as it should be in 2.4
Ilya Lavrenov [Fri, 10 Jan 2014 14:59:06 +0000 (18:59 +0400)]
updated .gitignore
Roman Donchenko [Fri, 10 Jan 2014 07:44:45 +0000 (11:44 +0400)]
Merge pull request #2132 from ComFreek:patch-2
Andrey Pavlenko [Thu, 9 Jan 2014 20:14:48 +0000 (00:14 +0400)]
'master'-like Haar perf test
ComFreek [Thu, 9 Jan 2014 16:24:20 +0000 (17:24 +0100)]
Corrected package name in tutorial
See also #2101
Roman Donchenko [Thu, 9 Jan 2014 12:58:29 +0000 (16:58 +0400)]
Merge pull request #2115 from nghiaho12:kmeans_sample
Roman Donchenko [Thu, 9 Jan 2014 12:21:48 +0000 (16:21 +0400)]
Merge pull request #2118 from ilya-lavrenov:semicolons
Nghia Ho [Thu, 9 Jan 2014 10:04:17 +0000 (21:04 +1100)]
Removed unecessary initialisation of Mat centers.
Roman Donchenko [Thu, 9 Jan 2014 09:25:59 +0000 (13:25 +0400)]
Merge pull request #2106 from robbertkl:patch-2
Roman Donchenko [Thu, 9 Jan 2014 09:24:20 +0000 (13:24 +0400)]
Merge pull request #2114 from kazuki-ma:SparseMat_convertTo_typofix_24
Ilya Lavrenov [Mon, 6 Jan 2014 22:38:41 +0000 (02:38 +0400)]
deleted extra semicolons
Nghia Ho [Mon, 6 Jan 2014 09:19:07 +0000 (20:19 +1100)]
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.
Kazuki Matsuda [Sun, 5 Jan 2014 17:24:14 +0000 (02:24 +0900)]
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
Pierre-Emmanuel Viel [Fri, 3 Jan 2014 12:16:36 +0000 (13:16 +0100)]
Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified
Nghia Ho [Fri, 3 Jan 2014 03:18:07 +0000 (14:18 +1100)]
Improved documentation for neural network
Robbert Klarenbeek [Thu, 2 Jan 2014 20:17:55 +0000 (21:17 +0100)]
Fix algorithm setter argument validation for uchar
Roman Donchenko [Tue, 31 Dec 2013 12:51:29 +0000 (16:51 +0400)]
Merge pull request #2084 from ilya-lavrenov:cont
Ilya Lavrenov [Fri, 27 Dec 2013 21:40:21 +0000 (01:40 +0400)]
fixed bug #3319
Roman Donchenko [Tue, 31 Dec 2013 07:40:43 +0000 (11:40 +0400)]
Merge pull request #2094 from SpecLad:multimon-be-gone
Seunghoon Park [Sat, 28 Dec 2013 19:45:41 +0000 (14:45 -0500)]
fixing bug #3345
Roman Donchenko [Mon, 30 Dec 2013 14:18:41 +0000 (18:18 +0400)]
Merge pull request #2087 from ilya-lavrenov:remap_sse2_cond
Roman Donchenko [Mon, 30 Dec 2013 14:00:29 +0000 (18:00 +0400)]
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.
Roman Donchenko [Mon, 30 Dec 2013 13:57:43 +0000 (17:57 +0400)]
Merge pull request #2086 from ilya-lavrenov:mul_fix
Ilya Lavrenov [Sat, 28 Dec 2013 12:28:17 +0000 (16:28 +0400)]
SSE2 optimization of cv::remap doesn't work with big images
Ilya Lavrenov [Sat, 28 Dec 2013 11:09:45 +0000 (15:09 +0400)]
fixed bug #3341
Roman Donchenko [Mon, 30 Dec 2013 11:34:16 +0000 (15:34 +0400)]
Merge pull request #2092 from alalek:fix_mingw_warn
Alexander Alekhin [Mon, 30 Dec 2013 08:31:00 +0000 (12:31 +0400)]
eliminate MINGW pragma warning
Roman Donchenko [Fri, 27 Dec 2013 17:09:18 +0000 (21:09 +0400)]
Merge pull request #2083 from jet47:gpu_android_tests
Roman Donchenko [Fri, 27 Dec 2013 16:53:42 +0000 (20:53 +0400)]
Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix
Roman Donchenko [Fri, 27 Dec 2013 15:58:57 +0000 (19:58 +0400)]
Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix
Vladislav Vinogradov [Fri, 27 Dec 2013 14:20:14 +0000 (18:20 +0400)]
increase thresholds for some tests
Vladislav Vinogradov [Fri, 27 Dec 2013 14:20:01 +0000 (18:20 +0400)]
disable 2 problematic tests
Vladislav Vinogradov [Fri, 27 Dec 2013 14:19:29 +0000 (18:19 +0400)]
disabled GEMM test if library was built without CUBLAS
Roman Donchenko [Fri, 27 Dec 2013 14:17:21 +0000 (18:17 +0400)]
Merge pull request #2078 from ilya-lavrenov:warn
Alexander Smorkalov [Fri, 27 Dec 2013 12:49:26 +0000 (16:49 +0400)]
Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules.
Alexander Smorkalov [Fri, 27 Dec 2013 13:19:38 +0000 (17:19 +0400)]
dynamicuda became private module.
Andrey Pavlenko [Fri, 27 Dec 2013 11:36:24 +0000 (15:36 +0400)]
Merge pull request #2072 from pengx17:patch-3
Ilya Lavrenov [Fri, 27 Dec 2013 10:44:58 +0000 (14:44 +0400)]
fixed warning [-Wempty-body]
Roman Donchenko [Fri, 27 Dec 2013 08:44:02 +0000 (12:44 +0400)]
Merge pull request #2036 from GregoryMorse:patch-1
Roman Donchenko [Fri, 27 Dec 2013 08:43:49 +0000 (12:43 +0400)]
Merge pull request #2074 from asmorkalov:android_nonfree_cuda
Roman Donchenko [Fri, 27 Dec 2013 08:11:51 +0000 (12:11 +0400)]
Merge pull request #2037 from GregoryMorse:patch-2
Alexander Smorkalov [Fri, 27 Dec 2013 07:18:10 +0000 (11:18 +0400)]
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
Peng Xiao [Fri, 27 Dec 2013 03:54:08 +0000 (11:54 +0800)]
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].
Andrey Pavlenko [Thu, 26 Dec 2013 19:07:24 +0000 (23:07 +0400)]
Merge pull request #2069 from asmorkalov:android_ocl_1_1_fix
Andrey Pavlenko [Thu, 26 Dec 2013 18:41:52 +0000 (22:41 +0400)]
Merge pull request #2068 from akarsakov:disable_ipp
Alexander Smorkalov [Thu, 26 Dec 2013 17:20:32 +0000 (21:20 +0400)]
static function qualifier replaced on inline to enable kernel compilation with OpenCL 1.1 embedded profile.
Alexander Karsakov [Thu, 26 Dec 2013 15:53:53 +0000 (19:53 +0400)]
Disabled some IPP implementation since it breaks tests
Andrey Pavlenko [Thu, 26 Dec 2013 15:38:56 +0000 (19:38 +0400)]
Merge pull request #2061 from apavlenko:2.4_fix_build_vs12
Roman Donchenko [Thu, 26 Dec 2013 13:47:09 +0000 (17:47 +0400)]
Merge pull request #2064 from dpen2000:patch-2
Roman Donchenko [Thu, 26 Dec 2013 12:59:56 +0000 (16:59 +0400)]
Merge pull request #2057 from asmorkalov:android_cuda_sample