mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 12:10:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,392 Commits 6 Branches 126 Tags 3 GiB
fa5705613d
Commit Graph

6310 Commits

Author SHA1 Message Date
Alexander Shishkov
cc529d971b removed tabs 2014-02-17 17:37:02 +04:00
Evgeniy
8236181c62 Added more colorizing options to XLS generating script 2014-02-17 17:01:23 +04:00
Roman Donchenko
e8d26b02ac Merge pull request #2339 from jet47:gpu-warnings 2014-02-17 13:35:15 +04:00
Marijan Vukcevich
9a98cd6e65 Update cap_ios_abstract_camera.mm 
AVCaptureVideoPreviewLayer setOrientation is depricated. This fixes the warning and provides backward compatibility.
 2014-02-17 13:23:25 +04:00
Roman Donchenko
8cbb284b7b Merge pull request #2348 from ilya-lavrenov:typo 2014-02-17 12:02:59 +04:00
Vladislav Vinogradov
150e522bee fix bug #3552: 
replace std::swap with own code
 2014-02-16 12:17:17 +04:00
Ilya Lavrenov
510680a5df typo 2014-02-16 01:42:02 +04:00
Vladislav Vinogradov
8b8c368148 fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo) 2014-02-14 17:56:03 +04:00
Alexander Alekhin
d1606b4aa3 ocl: added SVM perf test 2014-02-14 16:36:46 +04:00
Roman Donchenko
e0d991cf46 Merge pull request #2335 from jet47:gpu-alphacomp-test 2014-02-14 16:20:45 +04:00
Roman Donchenko
fa272c43c2 Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host 2014-02-14 15:37:09 +04:00
Roman Donchenko
a1de9e9ad5 Merge pull request #2329 from ilya-lavrenov:macosx_ogl 2014-02-14 14:38:37 +04:00
Vladislav Vinogradov
1ce5165cb7 temporary disable performance test for alphaComp function 2014-02-14 14:27:43 +04:00
Roman Donchenko
ecbe843061 Merge pull request #2333 from asmorkalov:java_dead_code_fix 2014-02-13 19:21:56 +04:00
Alexander Smorkalov
dbe7634286 Dead code removed as this cannot be null in Java. 2014-02-13 18:17:47 +04:00
Vladislav Vinogradov
eb247d826f temporary disable perf test for StereoBeliefPropagation 2014-02-13 17:25:59 +04:00
Vladislav Vinogradov
9e69e2a07a increase epsilon for AlphaComp sanity test for integer input 2014-02-13 17:16:43 +04:00
Ilya Lavrenov
879c0196d4 enabled OpenGL on MacOSX 2014-02-13 00:17:15 +04:00
Stuart Cunningham
5d43d3ca88 Fix Windows build of grfmt_tiff.cpp by using libtiff's integer types. 2014-02-12 23:41:38 +11:00
Stuart Cunningham
8bbce0a2a2 Fix reading of 16-bit TIFF images on big endian host. 
Use correct integer types for arguments to TIFFGetField to avoid corruption
of values and failed loads of TIFF file when using cv::imread().

Added test where both big and little endian TIFF files are read using imread().

Fixed build of 3rdparty libtiff on big endian hosts.

Reduced memory required during decode_tile16384x16384 test by not converting
large grayscale test image to color image during read.
 2014-02-12 21:21:06 +11:00
Zhigang Gong
9aef26e2ad Workaround a LLVM/Clang 3.3 bug. 
The LLVM/Clang 3.3 has a bug when compile a cl kernel with
assignment of a scalar to a vector data type. This patch
could work around this bug.

Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
 2014-02-12 13:14:43 +08:00
Roman Donchenko
63dbe66b41 Merge pull request #2308 from jet47:gpu-tests-timeout 2014-02-10 15:10:31 +04:00
Roman Donchenko
3cc27c769c Merge pull request #2309 from Nerei:fixed_cl_exe_hang_with_eigen 2014-02-10 14:59:05 +04:00
Anatoly Baksheev
becbfa6281 Fixed Cl.exe hang for VS2008 x64 with Eigen::exp() function 2014-02-10 13:41:27 +04:00
Vladislav Vinogradov
8b44a42a40 decrease input size for several gpu tests to fix "timed out" error: 
* BruteForceNonLocalMeans
* OpticalFlowBM
 2014-02-10 11:50:14 +04:00
Roman Donchenko
1d68a89947 Merge pull request #2303 from jet47:gpu-canny-fix 2014-02-07 19:03:14 +04:00
Roman Donchenko
48f95d92ae Merge pull request #2294 from jet47:fix-gpu-issues 2014-02-07 16:54:49 +04:00
Vladislav Vinogradov
5dbdadb769 fixed several bugs in CUDA Canny implementation: 
* out of border access in edgesHysteresisLocalKernel
* incorrect usage of atomicAdd
 2014-02-07 16:04:29 +04:00
Vladislav Vinogradov
bfc27271e2 Revert "disable gpu Canny and HoughCircles perf tests:" 
This reverts commit dbce90692a.
 2014-02-07 14:55:06 +04:00
Vladislav Vinogradov
3e1f74f2ca fix nonfree module compilation without CUDA 2014-02-07 13:40:37 +04:00
Vladislav Vinogradov
5d099df578 Revert "disable CUDA generalized Hough Transform" 
This reverts commit 33d42b740c.
 2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
3e4bb371c8 fix epsilons for several gpu tests 2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
b6ba1f226c Revert "disable gpu CvtColor.*2HSV tests:" 
This reverts commit 952027a853.
 2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
da44a2fac1 Revert "disable gpu Subtract_Array test:" 
This reverts commit e91bf95d58.
 2014-02-06 18:02:14 +04:00
Alexander Smorkalov
6ae4a9b09b 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.
 2014-02-06 15:32:57 +04:00
Konstantin Matskevich
435615ba2e update test CascadeClassifier 2014-02-05 12:23:36 +04:00
Vadim Pisarevsky
b8c6adc569 Merge pull request #2178 from Nerei:viz_backport 2014-02-03 16:16:51 +04:00
Roman Donchenko
cd1ffd169c Merge pull request #2261 from jet47:stitching-cuda-android 2014-02-03 15:35:55 +04:00
Andrey Pavlenko
a1ad1f0800 Merge pull request #2259 from ilya-lavrenov:ocl_surf 2014-02-03 14:24:36 +04:00
Vladislav Vinogradov
a138e5a6a5 turn on CUDA part of stitching module on Android for non-dynamic build 2014-02-03 12:35:24 +04:00
Vladislav Vinogradov
d8f7377122 turn on CUDA part of nonfree module on Android for non-dynamic build 2014-02-03 11:52:43 +04:00
Ilya Lavrenov
ede5b23753 rewrote perf tests for SURF 2014-02-03 02:00:29 +04:00
Roman Donchenko
2bef73c968 Merge pull request #2249 from jet47:gpu-tests-disable 2014-01-31 20:49:05 +04:00
Roman Donchenko
a518d7a1cb Merge pull request #2248 from jet47:gpu-npp-disable 2014-01-31 20:48:52 +04:00
Roman Donchenko
9ef8aeadd3 Merge pull request #2247 from jet47:gpu-test-cufft 2014-01-31 20:48:38 +04:00
Roman Donchenko
e2db68f822 Merge pull request #2242 from jet47:gpu-test-fix 2014-01-31 17:24:21 +04:00
Vladislav Vinogradov
952027a853 disable gpu CvtColor.*2HSV tests: 
possible bug in CPU version
 2014-01-31 16:20:45 +04:00
Vladislav Vinogradov
e91bf95d58 disable gpu Subtract_Array test: 
possible bug in CPU version
 2014-01-31 16:15:11 +04:00
Vladislav Vinogradov
dbce90692a disable gpu Canny and HoughCircles perf tests: 
it fails because driver terminates CUDA kernels after time out
 2014-01-31 16:14:07 +04:00
Vladislav Vinogradov
e630be3890 disable NPP for GpuMat methods and for copyMakeBorder 2014-01-31 15:52:06 +04:00
Vladislav Vinogradov
8401ed9395 disable some gpu tests if library was built without CUFFT 2014-01-31 15:40:59 +04:00
Roman Donchenko
7161b5bbad Merge pull request #2241 from asmorkalov:ocv_highgui_test_output_fix 2014-01-31 14:56:10 +04:00
Vladislav Vinogradov
49731ad530 gpu test output files moved from cwd to temp folder 2014-01-31 13:19:15 +04:00
Alexander Smorkalov
87935f3560 Highgui test output fixes. 
Useless output to console fixed;
Test output files moved from cwd to temp folder.
 2014-01-31 12:49:10 +04:00
Vladislav Vinogradov
063d8b4211 disable performance test for gpu generalized hough 2014-01-31 12:40:40 +04:00
Roman Donchenko
40f6f679b8 Merge pull request #2224 from SpecLad:obsolete-immediate 2014-01-30 12:43:51 +04:00
Roman Donchenko
2b3013fd20 Merge pull request #2229 from ilya-lavrenov:possible_memory_leak 2014-01-30 12:23:20 +04:00
Ilya Lavrenov
e7e63fac6c eliminated possible memory leak 2014-01-30 01:21:04 +04:00
Roman Donchenko
0dad2876e2 Removed all use of the obsolete IMMEDIATE parameter to configure_file. 
It's not documented, and it does nothing unless CMake 2.0 compatibility
is enabled (and it isn't):

https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx
 2014-01-29 19:34:02 +04:00
Roman Donchenko
7a0a9d010b Merge pull request #2205 from jet47:bug-3477-fix 2014-01-28 12:23:32 +04:00
Vladislav Vinogradov
c41e8006c7 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.
 2014-01-28 10:28:00 +04:00
Seunghoon Park
eb9d7c4dd5 fixing bug #3345. use norm to make sure two matrices are the same. 2014-01-27 20:57:40 -05:00
Seunghoon Park
73389b2b9c Merge branch '2.4' into blur_border_isolated 2014-01-27 20:44:03 -05:00
Anatoly Baksheev
3dc2dbc17e VTK off by default 2014-01-26 14:48:29 +04:00
Andrey Pavlenko
d093cb54d5 Merge pull request #2194 from apavlenko:2.4_perf_haar_iter 2014-01-24 16:13:19 +04:00
Matti Picus
64fd54ffb4 fix tiled read for reading tiles into partial blocks in image 2014-01-24 13:03:47 +02:00
Andrey Pavlenko
0a4a1d7526 temporary disabling hanging test 2014-01-24 10:07:21 +04:00
Roman Donchenko
7ff9d7eb2d Merge pull request #2188 from jet47:gpumat-copyto-fix 2014-01-23 13:28:12 +04:00
Vladislav Vinogradov
dda999545c fix GpuMat::copyTo method with mask: 
fill destination matrix with zeros if it was reallocated
 2014-01-22 10:40:14 +04:00
Alexander Smorkalov
b75cbfde45 All installed files marked with component names for install customization. 2014-01-21 20:34:36 +04:00
Roman Donchenko
a548a08129 Merge pull request #2183 from jet47:cuda-hough-fix 2014-01-21 19:27:54 +04:00
Andrey Pavlenko
32bc89f094 Merge pull request #2107 from nghiaho12:nn_doc 2014-01-21 19:11:12 +04:00
Vladislav Vinogradov
33d42b740c disable CUDA generalized Hough Transform 2014-01-21 15:07:47 +04:00
Vladislav Vinogradov
d847387694 split CUDA Hough sources 2014-01-21 15:07:47 +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
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
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
Andrey Pavlenko
4d28e8243c 'master'-like Haar perf test 2014-01-10 00:14:48 +04:00
Roman Donchenko
d509165d96 Merge pull request #2118 from ilya-lavrenov:semicolons 2014-01-09 16:21:49 +04:00
Roman Donchenko
7acea48788 Merge pull request #2106 from robbertkl:patch-2 2014-01-09 13:25:59 +04:00
Ilya Lavrenov
6b9ebcbf3d deleted extra semicolons 2014-01-07 02:52:30 +04: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