Commit Graph

469 Commits

Author SHA1 Message Date
Vladislav Vinogradov
51d5959aca added gpu add, subtract, multiply, divide, absdiff with Scalar.
added gpu exp, log, magnitude, based on NPP.
updated setTo with new NPP functions.
minor fix in tests and comments.
2010-09-27 12:44:57 +00:00
Alexey Spizhevoy
037002d3c1 added copyright for split_merge files 2010-09-27 12:27:27 +00:00
Vladislav Vinogradov
e1e5047b6e added gpu::LUT for CV_8UC3 type, added gpu::cvtColor for BGR2BGR5x5, minor fix in tests. 2010-09-27 09:37:43 +00:00
Anatoly Baksheev
1b8c00000c added black list for gpu tests 2010-09-27 06:57:25 +00:00
Maria Dimashova
21e22962d9 fixed grammar error 2010-09-24 17:03:25 +00:00
Maria Dimashova
98763247d9 added DenseFeatureDetector 2010-09-24 16:55:12 +00:00
Anatoly Baksheev
a5910ac068 modified according to NPP for CUDA 3.2 API updates. 2010-09-24 16:41:34 +00:00
Anatoly Baksheev
a8161b7888 FindNPP.cmake: added support of NPP 3.2 2010-09-24 15:34:36 +00:00
Anatoly Baksheev
782f25a5a0 search in env var CUDA_NPP_ROOT 2010-09-24 12:01:26 +00:00
Anatoly Baksheev
99f90ffc9e fixed if condition syntax: ! -> NOT 2010-09-24 11:33:06 +00:00
Vadim Pisarevsky
6c3d45d9df fixed compile errors with MSVC2010 2010-09-24 10:52:21 +00:00
Vadim Pisarevsky
e812a02c0b remove #include <Eigen/Core> from eigen.hpp 2010-09-23 20:03:47 +00:00
Maria Dimashova
26dbbcc070 added bag of words; did some renaming 2010-09-23 16:17:48 +00:00
Maria Dimashova
8462deed30 split descriptors.cpp 2010-09-23 13:44:23 +00:00
Maria Dimashova
9e9d4b9e49 added OpponentColorDescriptorExtractor 2010-09-23 10:53:36 +00:00
Vadim Pisarevsky
1a2fee0d56 include Eigen2/3 headers optionally, for greater flexibility 2010-09-22 20:45:01 +00:00
Vadim Pisarevsky
d72d11d09d improved matrix expressions efficiency in some cases & simplified the code 2010-09-22 13:07:51 +00:00
Vladislav Vinogradov
4100cbd997 added gpu version of LUT, integral, boxFilter and cvtColor (RGB <-> YCrCb), based on NPP.
minor refactoring of GPU module and GPU tests, split arithm and imgproc parts.
2010-09-22 10:58:01 +00:00
Maria Dimashova
0c771221a3 fixed problem with surrogate splits in decision trees training 2010-09-22 06:55:51 +00:00
Ethan Rublee
2f3f677ffe woops, broke cmake for a bit... 2010-09-22 03:36:45 +00:00
Ethan Rublee
8ee50c422b adding some small changes to support android build,
mainly cmake stuff, but in persistance the wcstombs
is not supported on android, and in
sift.cpp there was and ifdef that affected arm and this
causes undefined symbols on android.
2010-09-22 02:16:33 +00:00
Vadim Pisarevsky
ec314cf232 moved the matrix expressions from mat.hpp to matop.cpp. That should improve build times 2010-09-21 15:15:44 +00:00
Alexey Spizhevoy
b2cdb7fa39 implemented cv::gpu::merge and cv::gpu::split functions 2010-09-20 13:20:25 +00:00
Vladislav Vinogradov
a2f8817df1 minor refactoring of GPU module and GPU tests
added gpu compare version for CMP_NE operation
2010-09-20 10:34:46 +00:00
Anatoly Baksheev
4ffb519cdd GPU module: minor interface changes 2010-09-17 17:18:41 +00:00
Anatoly Baksheev
1387bfcde0 added GPU implementation of morphology functions (using NPP) and tests for it.
added npp_error function
added check_and_treat_gpu_exception function for tests_gpu
2010-09-17 15:28:59 +00:00
Maria Dimashova
97f2972fc0 uncommented fix of write/read keypoints 2010-09-17 12:32:57 +00:00
Maria Dimashova
8ab3fdbcca merged regression tests for FeatureDetector, DescriptorExtractor from branch .features2d;
renamed createDetector to createFeatureDetector
2010-09-17 11:26:58 +00:00
Yannick Verdie
54ba887432 Qt fix: cvAddText ticket #561 2010-09-16 17:52:10 +00:00
Vladislav Vinogradov
b803c24345 added nppSafeCall 2010-09-15 14:34:41 +00:00
Maria Dimashova
912f8ff34c commented fix write/read keypoints temporarily 2010-09-15 13:57:13 +00:00
Vladislav Vinogradov
b181d78ca5 Added implementation and test for the GPU version of warpAffine, warpPerspective, rotate, based on NPP.
Renamed copyConstBorder to copyMakeBorder.
Fixed warnings when HAVE_CUDA is not defined.
2010-09-15 12:47:59 +00:00
Maria Dimashova
b8753db512 merged fix of write/read keypoints from branch 2010-09-15 12:14:35 +00:00
Vladislav Vinogradov
b5c92a7dc0 Added implementation and test for the GPU version of flip, resize, sum, minMax, copyConstBorder, setTo, based on NPP. 2010-09-15 08:26:18 +00:00
Vadim Pisarevsky
16ae6fa6ad excluded from Android build 2010-09-14 18:20:27 +00:00
Anatoly Baksheev
b5b00d9ad4 minor (unset NPP library variables if not found) 2010-09-14 08:58:39 +00:00
Vladislav Vinogradov
37d39bd9de Added implementation and test for the GPU version of subtract, multiply, divide, transpose, absdiff, threshold, compare, meanStdDev, norm, based on NPP. 2010-09-13 14:30:09 +00:00
Andrey Morozov
88a7a8f567 fixed build npp for linux 2010-09-13 07:40:34 +00:00
Anatoly Baksheev
74c4b5a5a9 Added compilation with NPP to GPU module(FindNPP script). Tested only on win32, but it does not influence on OpenCV compilation if WITH_CUDA flag unset. 2010-09-12 15:17:37 +00:00
Maria Dimashova
7d94f256e6 fixed CvDTree and CvForestTree find_best_split() methods 2010-09-10 15:44:46 +00:00
Kirill Kornyakov
8e38063965 gpu::add now supports 8UC4 and 32FC1 2010-09-10 15:04:54 +00:00
Maria Dimashova
a2a3ec69cb Fixed FernClassifier 2010-09-10 11:40:28 +00:00
Andrey Morozov
bbc2015014 created build infrastructure for NPP linking in CMake. 2010-09-10 11:02:52 +00:00
Kirill Kornyakov
01eac6d3e3 Added initial implementation and test for the GPU version of add, based on NPP. Need to implement for other depths. Also waiting NPP at CMake. 2010-09-09 15:34:16 +00:00
Andrey Morozov
1feb5b4d02 added async version of postfilter_textureness and prefilter_xsobel, modified async test and added test for async version of stereobm 2010-09-08 15:13:23 +00:00
Vadim Pisarevsky
31dbefc865 added 3-camera rectification and 8-coeff distortion model 2010-09-07 15:38:48 +00:00
Kirill Kornyakov
6960e1544d GPU module update: _GPU suffix removed, some namespaces renamed, minor refactorings. 2010-09-06 14:27:23 +00:00
Kirill Kornyakov
ec7e937481 meanShiftFiltering_GPU output parameters changed to CV_8UC4. This is a start for moving from 3 channel to C4 images within GPU module. 2010-09-03 14:32:12 +00:00
Vadim Pisarevsky
bf94db5b16 fixed 2 bugs in the recently modified Lapack functions 2010-08-31 12:39:00 +00:00
Anatoly Baksheev
e65234b8be minor compilation fix 2010-08-31 08:42:36 +00:00
Maria Dimashova
05d702b139 fixed compile error when HAVE_CUDA is not defined 2010-08-31 07:23:03 +00:00
Vadim Pisarevsky
eb6994f58a fixed Mat(const Matx&) constructor; added SVD(Matx) 2010-08-30 18:05:05 +00:00
Andrey Morozov
fea66d9384 fixed cvtColorGPU on linux 2010-08-30 15:26:24 +00:00
Anatoly Baksheev
2a0909acfd fixed bugs in STEREOBM (added syncs and volatiles, prevent reading from uninitialized memory) 2010-08-30 14:17:53 +00:00
Vladislav Vinogradov
0a73af8e22 added cvtColor on gpu (supports conversion between RGB, BGR and GRAY) 2010-08-30 13:41:26 +00:00
Andrey Morozov
7357852434 added test stereo_bm and added "volatile" in constantspacebp 2010-08-30 12:30:08 +00:00
Vladislav Vinogradov
34135a85f3 fixed 3 bytes reading/writing in remap 2010-08-26 12:30:41 +00:00
Vladislav Vinogradov
304caab746 added remap version for 3-channels input images 2010-08-26 09:19:47 +00:00
Andrey Morozov
6bea9f5ec4 minor fix for windows 2010-08-25 15:00:17 +00:00
Anatoly Baksheev
33bd1da589 compilation errors under win32 2010-08-25 14:39:34 +00:00
Andrey Morozov
199ffc632d added flags OpenCV_COMPUTE_CAPABILITIES, which stores the version compute capability from which it is compiled opencv
now use opencv with cuda in your application  in the such way : set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ${OpenCV_COMPUTE_CAPABILITIES})
2010-08-25 12:49:17 +00:00
Andrey Morozov
096080de70 added methods estimateRecopmmendedParams for StereoBP and StereoCSBP 2010-08-25 07:27:17 +00:00
Vladislav Vinogradov
1febf345bf renamed colorizeDisp to drawColorDisp, added acync version of drawColorDisp and reprojectImageTo3D_GPU. 2010-08-25 06:30:11 +00:00
Yannick Verdie
24427d593f Qt add byte per line information to fix a bug 2010-08-24 16:18:32 +00:00
Maria Dimashova
601e9af9f8 added match() 2010-08-24 12:52:29 +00:00
Yannick Verdie
411e16074e Qt Ticket #520 2010-08-24 12:23:37 +00:00
Vladislav Vinogradov
4104c3fd0b fixed bug in StereoBeliefPropagation with user allocated disparity 2010-08-24 09:36:25 +00:00
Anatoly Baksheev
eee3a35133 uploadConstant function for gpu 2010-08-24 09:15:45 +00:00
Vladislav Vinogradov
ec4ce050f9 added reprojectImageTo3D_GPU 2010-08-23 14:19:22 +00:00
Yannick Verdie
69e6294854 Qt ticket #537
Forgot to update so code after previous fix
2010-08-20 13:06:14 +00:00
Vladislav Vinogradov
6cafec8861 added colorizeDisp, fixed DisparityBilateralFilter 2010-08-20 06:47:11 +00:00
Yannick Verdie
3e8a8f7942 Qt weird bug with QLabel (is it really fixed ?) 2010-08-19 22:59:32 +00:00
Vladislav Vinogradov
e693f4b408 fixed bug in DisparityBilateralFilter 2010-08-19 15:29:56 +00:00
Yannick Verdie
45daaa6e11 Qt bug with buttons 2010-08-19 10:36:57 +00:00
Vladislav Vinogradov
1f04ea477f added DisparityBilateralFilter to gpu module 2010-08-19 08:44:06 +00:00
Yannick Verdie
48090fd37e Qt bug fixed #534 2010-08-18 18:56:22 +00:00
Anatoly Baksheev
97d17d8ad1 fixed warnings
added comments in gpu.hpp
2010-08-18 17:13:01 +00:00
Yannick Verdie
3746c48451 Bug in calibration.cpp sample
This was crashing my code:
    for( size_t i = 1; i < imagePoints.size(); i++ )
        objectPoints.push_back(objectPoints[0]);

Changed by:
objectPoints.resize(imagePoints.size(),objectPoints[0]);

Plus clean up on Qt code
2010-08-18 15:35:56 +00:00
Yannick Verdie
8ada1da08c 2010-08-18 14:45:38 +00:00
Yannick Verdie
94b588099c Qt test (some code disabled for debugging) 2010-08-18 14:07:02 +00:00
Andrey Morozov
aaa8678cff fixed some warnings 2010-08-18 13:47:10 +00:00
Yannick Verdie
a3582b4780 Qt Python binding -- #512 2010-08-18 11:02:11 +00:00
Vladislav Vinogradov
fe8b95ed80 fixed get_first_k_initial_global 2010-08-18 06:12:00 +00:00
Yannick Verdie
b530a2cba9 Qt ticket #531 2010-08-17 17:22:21 +00:00
Andrey Morozov
28030952fa added get_first_k_initial_global_init_global_cost in gpu::SCBP 2010-08-17 15:53:00 +00:00
Anatoly Baksheev
9a669b1ceb fixed bugs in page locked memory allocation
avoid extra gpu memory allocation in BP and CSBP
2010-08-17 10:39:18 +00:00
Yannick Verdie
e65823fac2 Qt sample code and some fixes 2010-08-16 16:49:24 +00:00
Vladislav Vinogradov
9ddb373614 added version of StereoBeliefPropagation::operator() for user specified data term 2010-08-16 14:47:17 +00:00
Vladislav Vinogradov
a3f3de3391 fixed problem with parameters in constant space belief propagation with short type of messages 2010-08-16 09:23:15 +00:00
Maria Dimashova
cd28d5d812 minor changes 2010-08-16 09:15:15 +00:00
Andrey Morozov
1ac097ce57 fixed build without cuda 2010-08-16 08:49:34 +00:00
Andrey Morozov
001bbfb4f9 fixed build without cuda 2010-08-16 08:47:29 +00:00
Anatoly Baksheev
4c4871e34d GCC warning: new line at the end of file 2010-08-16 08:47:06 +00:00
Andrey Morozov
79e1c6f188 fixed build without cuda 2010-08-16 08:30:23 +00:00
Yannick Verdie
662c58ca86 Qt bug fixed with cvWaitKey(0) 2010-08-15 20:43:54 +00:00
Yannick Verdie
dec6f2c393 Qt fixed bug with OpenGL, and save issue reported in #520 2010-08-14 18:36:53 +00:00
Anatoly Baksheev
ef9a9d43a4 a lot of refactoring 2010-08-13 16:50:07 +00:00
Andrey Morozov
35ebeb21bd added implement MatPL with serocopy and writecombited 2010-08-13 14:52:50 +00:00
Anatoly Baksheev
024283ceae warning level switched to W3 fpr gpu module 2010-08-13 12:53:34 +00:00
Anatoly Baksheev
77ce659154 2010-08-13 12:51:55 +00:00
Vladislav Vinogradov
22a8dd379e minor fix 2010-08-13 11:43:34 +00:00
Vladislav Vinogradov
6062fad7d8 added minimum disparity threshold parameter to StereoConstantSpaceBP 2010-08-13 11:17:51 +00:00
Vladislav Vinogradov
26712fad72 gpu::StereoConstantSpaceBP:
fixed some bugs in init_data_cost on first level (added non-reduction version for first level)
  optimized compute_data_cost like init_data_cost (used reduction scheme)
  avoid temp matrix
2010-08-13 08:30:06 +00:00
Vladislav Vinogradov
906a590a41 minor fix 2010-08-12 13:47:53 +00:00
Vladislav Vinogradov
ee104c27d8 added gpu implementation of constant space belief propagation stereo matching.
some refactoring of StereoBeliefPropagation.
2010-08-12 12:15:37 +00:00
Andrey Morozov
53057afcb8 minor fix 2010-08-12 10:59:51 +00:00
Andrey Morozov
b5e3cb0f9b minor fix 2010-08-12 08:06:17 +00:00
Andrey Morozov
c27397dba1 minor fix 2010-08-12 07:57:53 +00:00
Andrey Morozov
789b02ad76 added choise in compute capability 2010-08-11 15:52:55 +00:00
Anatoly Baksheev
2a385be0ef meanShiftFilteringGPU: performance and bug with type conversions 2010-08-10 12:18:47 +00:00
Anatoly Baksheev
d1fc3e6b5a cv::gpu::CudaStream -> cv::gpu::Stream
some refactoring
added gpu module to compilation
2010-08-10 09:44:50 +00:00
Maria Dimashova
c56085917b added todo for descriptors evaluation 2010-08-09 16:33:44 +00:00
Maria Dimashova
82a98521ed fixed SVM 2010-08-09 15:43:06 +00:00
Maria Dimashova
a2950d5d44 fixed texture binding and warning on linux 2010-08-09 11:12:58 +00:00
Anatoly Baksheev
9ee159462d meanShiftFiltering added (by masha)
get free memory function
2010-08-06 17:02:06 +00:00
Vadim Pisarevsky
bc4532bd07 added initWideAngleProjMap() function 2010-08-06 10:20:49 +00:00
Vadim Pisarevsky
26c6b955a8 updated ffmpeg to 0.6.0 2010-08-05 17:24:41 +00:00
Maria Dimashova
4395bad911 fixed linker errors on Win and some warnings 2010-08-05 13:29:43 +00:00
Maria Dimashova
121e51d35b replaced detector/descriptor evaluation functions from test to features2d; modified VectorDescriptorMatch constructor; removed commented calonder descriptor implementation 2010-08-05 12:19:26 +00:00
Ilya Lysenkov
20e407b235 Fixed bugs in BruteForceMatcher and its specialization 2010-08-04 08:26:30 +00:00
Maria Dimashova
4e60decad3 added GridAdaptedFeatureDetector, PyramidAdaptedFeatureDetector and funcs to draw keypoints and matches 2010-08-03 16:28:52 +00:00
Yannick Verdie
2505e7e267 Qt: disable KEEP_RATIO with OpenGL to avoid a blinking bug
Qt: Now OpenGL rendering is ok
2010-08-02 17:10:43 +00:00
Vladislav Vinogradov
34565c281a added support of 3 channels images to StereoBeliefPropagation_GPU 2010-08-02 14:26:07 +00:00
Andrey Morozov
6da2573b77 minor fix 2010-08-02 13:56:04 +00:00
Andrey Morozov
8c77e5faad optimized gpumat::setTo(), get rid of division operation 2010-08-02 13:10:21 +00:00
Vadim Pisarevsky
3510b4c81e fixed "undefined cvCreateCameraCapture_V4L" linker errors on some linux distros (thanks to miguelinux for the patch) 2010-08-02 12:55:20 +00:00
Vladislav Vinogradov
788ac96f8b added optimized belief propagation implementation (used short for messages) 2010-08-02 11:10:29 +00:00
Yannick Verdie
d6bbaea28a Qt imgRegion bug fixed
Qt compilation pb with OpenGL flags fixed
2010-08-02 10:58:25 +00:00
James Bowman
5b7b6d9195 #509, patch for GetTrackbarPos 2010-08-01 16:18:59 +00:00
Yannick Verdie
e8aad75446 Fixed bugs on Qt 2010-07-31 18:04:28 +00:00
Maria Dimashova
f6c8e237f0 fixed compile error on VS2008 2010-07-30 14:36:04 +00:00
Maria Dimashova
5e84ab0222 replaced KeyPoint::overlap implementation by faster version (thanks to Suat Gedikli) 2010-07-30 14:21:55 +00:00
Yannick Verdie
8f8aba9c88 fixed Qt bug 2010-07-30 14:13:20 +00:00
Vadim Pisarevsky
3bd00085f7 made MatConstIterator STL compliant 2010-07-29 13:52:22 +00:00
Vadim Pisarevsky
808190c02e fixed LineIterator constructor in order to make LineIterator::pos() work properly (#408) 2010-07-29 13:26:01 +00:00
Vadim Pisarevsky
686e28eeee fixed roi handling in HOGDescriptor::computeGradient (ticket #295). 2010-07-29 13:06:34 +00:00
Vadim Pisarevsky
6da8d7cb52 temporarily disable 16-bit input in cap_dc1394_v2.cpp (ticket #296). thanks to sebastians for the patch! 2010-07-29 12:44:23 +00:00
Vadim Pisarevsky
62fa7f6620 avoid crash in cvCalcEMD() when one of the histograms has only one non-zero element (ticket #396). Thanks to nburrus for the patch 2010-07-29 11:00:52 +00:00
Vadim Pisarevsky
0faa75da11 inserted missing std:: (ticket #333). Thanks to trisk for the patch! 2010-07-29 10:55:09 +00:00
Andrey Morozov
97254a7b45 minor fix 2010-07-29 10:28:10 +00:00
Anatoly Baksheev
9ac1741555 speckle filtering added 2010-07-29 08:50:19 +00:00
Vladislav Vinogradov
63fed0f831 changed StereoBeliefPropagation_GPU output disparity default type to CV_32S 2010-07-29 08:47:06 +00:00
Maria Dimashova
7083f0f815 fixed compile error when HAVE_EIGEN2 (#500) 2010-07-29 08:24:51 +00:00
Vladislav Vinogradov
84f51332dd implemented asynchronous call for StereoBeliefPropagation_GPU 2010-07-29 07:20:35 +00:00
Vadim Pisarevsky
70a2c8f50a added conversion operators Mat->vector<T>, Mat->Vec<T,n>, Mat->Matx<T,m,n> 2010-07-29 06:51:19 +00:00
Yannick Verdie
8f33e89d46 working on OpenGL for Windows 2010-07-28 21:55:55 +00:00
Yannick Verdie
7ce53adac9 Qt:
Fixed bug with exclusive buttons
Fixed memory leaks
2010-07-28 20:59:41 +00:00
Maria Dimashova
cba926a428 added c++ interface for cvPyrMeanShiftFiltering; added sample on meanshift segmentation 2010-07-28 16:41:12 +00:00
Vladislav Vinogradov
5bd128fac8 added gpu belief propagation stereo matching 2010-07-28 14:46:44 +00:00
Anatoly Baksheev
dc69cf3ab4 minor fixes 2010-07-28 13:38:37 +00:00