Commit Graph

9880 Commits

Author SHA1 Message Date
Alexander Alekhin
9e47672b2b Merge pull request #2658 from akarsakov:ipp_hough 2014-05-07 17:07:22 +04:00
Alexander Alekhin
e2c7adc7c4 Merge pull request #2703 from jet47:subtract-create-dst-mat 2014-05-07 16:50:50 +04:00
Alexander Alekhin
d54aa307fd Merge pull request #2676 from ilya-lavrenov:ipp_gaussianblur 2014-05-07 16:49:59 +04:00
Ilya Lavrenov
abf905154f cv::fitler2D 2014-05-07 15:47:10 +04:00
Ilya Lavrenov
1ad69aba35 changes sigma in perf tests 2014-05-07 14:59:03 +04:00
Alexander Alekhin
0e1bf58195 Merge pull request #2634 from ElenaGvozdeva:ippiDCT 2014-05-07 14:49:13 +04:00
Vladislav Vinogradov
4c66614e07 fix cv::subtract function:
call dst.create(...) before using it
2014-05-07 13:15:19 +04:00
Alexander Alekhin
b1a28a52fa Merge pull request #2693 from mvukad:bugfix_ippmorphop 2014-05-07 13:15:09 +04:00
GregoryMorse
38db7a78df WinRT core compatibility fixes
Update system.cpp

Update system.cpp

Update system.cpp

Update matching.cpp

Update matching.cpp
2014-05-07 06:17:37 +08:00
GregoryMorse
b1443bc1bc WinRT core compatibility fixes
Update system.cpp

Update system.cpp

Update ocl.cpp

Update matching.cpp

Update ocl.cpp

Update matching.cpp
2014-05-07 06:15:54 +08:00
Thierry Hoinville
5efd2056f0 Bugfix #3668 in FilterEngine::apply(), use the ROI properly 2014-05-06 15:33:07 +02:00
Alexander Karsakov
f6a8ac2f6c Changed check condition in tests in case ipp disabled. 2014-05-06 15:24:54 +04:00
Elena Gvozdeva
12279e2631 fixed 2014-05-06 14:49:03 +04:00
Alexander Alekhin
01f31dc007 Merge pull request #2687 from ilya-lavrenov:tapi_norm_inf_234cn 2014-05-06 13:27:03 +04:00
Elena Gvozdeva
e362c3fb38 fixed 2014-05-06 13:09:45 +04:00
Alexander Alekhin
03b1d133df Merge pull request #2660 from arkunze:pullreq/140423-filter2D 2014-05-06 12:59:03 +04:00
Ievgen Khvedchenia
220de14077 Clean-up from the dead code 2014-05-05 21:48:54 +03:00
PhilLab
4ffeb01cfd Update solvepnp.cpp
Clarified assert message for allowed PnP flags
2014-05-05 17:44:59 +02:00
Alexander Alekhin
e9be486534 Merge pull request #2694 from rokm:matlab 2014-05-05 19:24:07 +04:00
Alexander Alekhin
787815fd00 Merge pull request #2619 from GregoryMorse:patch-3 2014-05-05 18:00:40 +04:00
Alexander Alekhin
59cf62ad9e Merge pull request #2636 from atrebbi:#3653 2014-05-05 18:00:18 +04:00
Alexander Alekhin
a5378186e5 Merge pull request #2688 from akarsakov:ipp_disable_resize_8u 2014-05-05 15:21:13 +04:00
Alexander Alekhin
d9d9de75db Merge pull request #2686 from vbystricky:ippicv_integral 2014-05-05 15:20:47 +04:00
Alexander Alekhin
347d5b96f3 Merge pull request #2635 from akarsakov:gaussian_float_intel 2014-05-05 15:20:20 +04:00
Alexander Karsakov
eda084e123 Used AutoBuffer instead ippsMalloc 2014-05-05 14:40:59 +04:00
Rok Mandeljc
c35fd55b0e Matlab bindings: CMakeLists.txt: use "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}" as MEX_LIB_DIR only when compiling with MSVC, otherwise, use only "${LIBRARY_OUTPUT_PATH}" 2014-05-03 17:37:48 +02:00
Rok Mandeljc
fa075c50a1 Matlab bindings: fixed the functional template to perform an explicit cast to the type of an input option that is expected. This avoids issues with ternary operator not having the same type in rvalue and lvalue, such as in the case below:
Ptr_FeatureDetector blobDetector = inputs[3].empty() ? makePtr<SimpleBlobDetector>() : inputs[3].toPtrFeatureDetector();

Which after the patch, would be:

Ptr_FeatureDetector blobDetector = inputs[3].empty() ? (Ptr_FeatureDetector) makePtr<SimpleBlobDetector>() : inputs[3].toPtrFeatureDetector();
2014-05-03 17:37:48 +02:00
Rok Mandeljc
2d47dd7038 Matlab bindings: added missing compound type declarations from photo module 2014-05-03 17:37:47 +02:00
Ievgen Khvedchenia
e7e00201f1 Enabled parallel processing of the nld_step_scalar function 2014-05-02 14:07:30 +03:00
Ievgen Khvedchenia
9fc90f4069 Merged nldiffusion functions into one module with removal of duplicate functions 2014-05-01 22:24:15 +03:00
Michael Vukadinovic
c1aee0c312 Fixed bug in IPPMorphOp function when looping over elements of the morphology kernel. 2014-05-01 11:52:49 -07:00
1Hyena
dfdb09386f Autotuned_index now prints all info into logger instead of couting it. 2014-05-01 20:55:49 +03:00
Ievgen Khvedchenia
2df7242646 Prepare to merge KAZE and AKAZE nldiffusion_functions source files (work in progress). 2014-05-01 18:27:24 +03:00
Ievgen Khvedchenia
30f73623ce Replace runtime checks with assertions 2014-05-01 18:24:13 +03:00
Ievgen Khvedchenia
3e51da38fb Removed Feature_Suppression_Distance function that is not used anywhere. 2014-05-01 10:58:34 +03:00
Alexander Alekhin
71f871fafd replaced sanity check condition for stitching perf test 2014-04-30 18:02:06 +04:00
Alexander Karsakov
4ebe76098e Disabled IPP resize for CV_8U 2014-04-30 17:28:35 +04:00
Ilya Lavrenov
c80faff42f added cn>1 support to cv::norm (NORM_INF) 2014-04-30 14:59:37 +04:00
vbystricky
c9103730b6 Disable ipp integral in IPPICV version 2014-04-30 12:55:34 +04:00
Ievgen Khvedchenia
ab1ef08f0e Rename file config.h to KAZEConfig.h 2014-04-29 22:17:18 +03:00
Ievgen Khvedchenia
4509fe55c2 Clean-up of getters/setters that are not needed by OpenCV 2014-04-29 21:39:27 +03:00
Ievgen Khvedchenia
2daa14e3c7 Clean-up from dead code. 2014-04-29 21:07:53 +03:00
Alexander Alekhin
e8d3ebecc7 fix IPPDerivSobel condition 2014-04-29 15:36:45 +04:00
Alexander Alekhin
b62e59aac0 icv: enable functions 2014-04-29 15:36:43 +04:00
Alexander Alekhin
5658ba0002 icv: update package 2014-04-29 15:35:27 +04:00
Alexander Alekhin
dacf63a888 Merge pull request #2682 from ElenaGvozdeva:ippiDFT 2014-04-29 15:34:01 +04:00
Alexander Alekhin
0f22df2b0d Merge pull request #2667 from akarsakov:ipp_otsu 2014-04-29 15:15:33 +04:00
Alexander Alekhin
06746ba645 Merge pull request #2677 from ilya-lavrenov:ipp_compilation 2014-04-29 12:26:49 +04:00
Elena Gvozdeva
043b917c7d IPP: cv::dft fixed 2014-04-29 12:23:23 +04:00
Adrian Stratulat
cbf3c1fbf1 remove unused macros 2014-04-28 19:40:11 +00:00
Ievgen Khvedchenia
a134e068ef Fix wrong checking of returned descriptor type 2014-04-28 22:25:27 +03:00
Ievgen Khvedchenia
c1bf453266 Wrapped nldiffusion functions with details::kaze or details::amaze namespace to avoid collision of function names 2014-04-28 20:41:44 +03:00
Ievgen Khvedchenia
c68cbfced3 Fix size_t to int conversion 2014-04-28 19:32:29 +03:00
Ievgen Khvedchenia
0e3bbd7026 Fix "conditional expression constant" warning 2014-04-28 19:32:04 +03:00
Ievgen Khvedchenia
a941d25f6d Fix size_t to int conversion 2014-04-28 16:46:09 +03:00
Ievgen Khvedchenia
5662294319 Rename KAZE to KAZEFeatures to fix MSVS x64 compiler error (Duplicate file name confused it) 2014-04-28 16:34:35 +03:00
Ievgen Khvedchenia
599bcfb591 Fix size_t to int conversion 2014-04-28 16:24:35 +03:00
Ievgen Khvedchenia
cc0a94c536 Fix "conditional expression constant" warning 2014-04-28 16:23:58 +03:00
Elena Gvozdeva
507ea95265 fixed 2014-04-28 16:46:11 +04:00
Ievgen Khvedchenia
2162aab0e9 Remove AKAZEFeatures desctructor 2014-04-28 15:17:09 +03:00
Ievgen Khvedchenia
f9d3c49023 Bugfix: wrong variable name 2014-04-28 15:14:03 +03:00
Ievgen Khvedchenia
f9422f60a6 Fix Fix casting from/to int/float that caused lot of compiler warnings. 2014-04-28 15:13:42 +03:00
Elena Gvozdeva
16629bff4c Added parallel version for DCT_ROWS 2014-04-28 16:05:19 +04:00
Elena Gvozdeva
6880dbfd95 IPP: cv::dct 2014-04-28 16:05:19 +04:00
Ievgen Khvedchenia
3c596184e4 Added copyright headers for KAZE and AKAZE wrappers 2014-04-28 15:01:42 +03:00
Ievgen Khvedchenia
f97e38d8a6 Fix casting from/to int/float that caused lot of compiler warnings. 2014-04-28 15:00:14 +03:00
Alexander Alekhin
649935596e Merge pull request #2653 from alalek:ipp_lut 2014-04-28 15:15:11 +04:00
Alexander Alekhin
0e5b0677c9 Merge pull request #2654 from ElenaGvozdeva:ipp_DFT 2014-04-28 15:14:40 +04:00
Alexander Alekhin
5d50917961 Merge pull request #2674 from akarsakov:ocl_hog_fix_epsilon 2014-04-28 15:06:05 +04:00
Ilya Lavrenov
59876cfb34 fixed compilation 2014-04-28 14:04:41 +04:00
Roman Donchenko
c6e91e4736 Merge pull request #2675 from SpecLad:merge-2.4 2014-04-28 13:51:44 +04:00
Ilya Lavrenov
55bbca2d09 added more types to cv::GaussianBlur 2014-04-28 13:50:28 +04:00
Roman Donchenko
47d903d968 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-28 12:08:21 +04:00
Ievgen Khvedchenia
61f79c2632 Fix line ending at EOF 2014-04-28 10:53:09 +03:00
Ievgen Khvedchenia
3cfc22ae4e Fix initialisation order of parallel loop classes for AKAZE descriptor extraction 2014-04-28 10:52:05 +03:00
Ievgen Khvedchenia
f3f0e06c4d Fix parenthesis in assert statements 2014-04-28 10:51:09 +03:00
Ievgen Khvedchenia
0e243541f9 Fix shadowed variable warnings 2014-04-28 10:50:46 +03:00
Alexander Karsakov
b046210296 Changed epsilon for hog test, because hog detector is sensible to resize accuracy. 2014-04-28 11:37:46 +04:00
Ievgen Khvedchenia
ba5bec1de2 Fix mutable compilation error 2014-04-27 23:07:48 +03:00
Ievgen Khvedchenia
eada0f4b48 Fix shadowed i variable warning 2014-04-27 23:04:31 +03:00
Ievgen Khvedchenia
503bd38963 Enable multithreaded extraction of features using cv::parallel_for_ 2014-04-27 22:28:18 +03:00
Ievgen Khvedchenia
d37220e8ff Clean-up of the iostream manipulator in AKAZEConfig. 2014-04-26 23:34:38 +03:00
Ievgen Khvedchenia
d8c9bb777e Fix return value of descriptorType() 2014-04-26 23:34:07 +03:00
Istvan Sarandi
4bf1df7da3 Suppress warning in constructor. 2014-04-26 00:42:26 +02:00
Alexander Karsakov
7bd9b2ac26 Added setIppErrorStatus() 2014-04-25 20:24:37 +04:00
vbystricky
a13e6ab79f Fix problem with sanity check of transform ecc with ipp resize 2014-04-25 17:33:38 +04:00
Alexander Karsakov
232c37e827 Added ippiComputeThreshold_Otsu to cv::threshold 2014-04-25 17:31:45 +04:00
Alexander Alekhin
7ee1d5f69b ipp: added LUT optimization 2014-04-25 12:09:06 +04:00
Elena Gvozdeva
10d1b3a534 Added parallel version for DFT_ROWS 2014-04-25 11:39:19 +04:00
Ievgen Khvedchenia
86888bdf77 Replace swap with clear (more efficient) 2014-04-24 22:01:45 +01:00
Ievgen Khvedchenia
3e24822fff Bugfix: clear input vector of key points for detection stage 2014-04-24 22:01:29 +01:00
Ievgen Khvedchenia
33b9e4b4a3 Added missing operator() 2014-04-24 22:00:51 +01:00
Ievgen Khvedchenia
36db97068c Added missing operator() 2014-04-24 22:00:37 +01:00
Alexander Alekhin
32b25de583 Merge pull request #2656 from ilya-lavrenov:ipp_copymakeborder 2014-04-24 20:30:34 +04:00
Alexander Karsakov
dc91be86b2 Disabled ippiHoughLine_Region for cv::HoughLines 2014-04-24 18:00:03 +04:00
Alexander Karsakov
5580d08c6e Added setIppErrorStatus() 2014-04-24 16:48:46 +04:00
Ilya Lavrenov
46e8d9d02d cv::copyMakeBorder 2014-04-24 14:27:51 +04:00
Alexander Karsakov
1909978f7d Added ippiHoughProbLine to cv::HoughLinesP 2014-04-24 12:28:23 +04:00
vbystricky
82a198a8f2 Fix epsilon calculation for sanity check in x32 build 2014-04-24 10:48:32 +04:00
Istvan Sarandi
c20cab9ec1 Added test for concatenation with empty matrices. 2014-04-24 03:09:07 +02:00
Ievgen Khvedchenia
6d500cc6f7 Merge KAZE and AKAZE features with most recent version 2014-04-23 23:02:02 +01:00
Ievgen Khvedchenia
d27ed856f2 Replace config with AKAZEConfig.h 2014-04-23 22:44:03 +01:00
Adrian Stratulat
4fb5680d91 Documentation - minor fix-ups 2014-04-23 17:30:27 +00:00
Aaron Kunze
1f8b41f390 Optimizes filter2D for Intel GPUs 2014-04-23 10:20:09 -07:00
Alexander Alekhin
dcc4d3640b Merge pull request #2651 from ilya-lavrenov:ipp_minmaxidx_3cn 2014-04-23 20:06:55 +04:00
Andrey Pavlenko
8114e071c2 Merge pull request #2655 from akarsakov:ipp_fix_pyramid 2014-04-23 16:27:33 +04:00
Elena Gvozdeva
2d71c094b3 IPP: CV::dft 2014-04-23 15:52:05 +04:00
Andrey Pavlenko
d93161812b Merge pull request #2620 from ilya-lavrenov:ipp_integration 2014-04-23 15:12:45 +04:00
Alexander Karsakov
f3d1001c5d Changed tests for support intersection between expected and actual lists of lines. 2014-04-23 13:18:47 +04:00
Alexander Karsakov
751264f88a Added ippiHoughLine_Region to cv::HoughLines 2014-04-23 11:59:36 +04:00
Alexander Alekhin
9badfa1f83 Merge pull request #2646 from ilya-lavrenov:ipp_remap 2014-04-23 11:51:01 +04:00
Alexander Alekhin
ba0ab8edb0 Merge pull request #2647 from vbystricky:ipp_norm 2014-04-23 11:50:13 +04:00
Alexander Alekhin
c2319285a9 Merge pull request #2649 from ilya-lavrenov:gabor_eps 2014-04-23 11:49:43 +04:00
Alexander Karsakov
92f855f0c3 Added checking destination size for pyrUp, pyrDown. 2014-04-23 11:47:15 +04:00
Alexander Karsakov
01123aaa36 Changed integer operations to float for Intel devices 2014-04-23 11:00:32 +04:00
Ilya Lavrenov
493679dc56 cv::minMaxIdx for cn > 1 2014-04-22 23:47:04 +04:00
Alexander Alekhin
e42057c487 Merge pull request #2648 from ilya-lavrenov:ipp_dist 2014-04-22 19:00:02 +04:00
Andrey Pavlenko
cd01d705c9 Merge pull request #2627 from akarsakov:ipp_pyramids 2014-04-22 17:19:27 +04:00
Ilya Lavrenov
5c0a4878d7 changes eps 2014-04-22 15:49:17 +04:00
vbystricky
dfe6adebb9 Fix error in arguments of ipp function 2014-04-22 15:07:03 +04:00
Alexander Alekhin
580559e1e6 Merge pull request #2618 from vbystricky:ipp_Scharr 2014-04-22 15:02:13 +04:00
Ilya Lavrenov
640c9667c7 fix for IPP ICV 2014-04-22 14:55:28 +04:00
Ilya Lavrenov
51e2a8ec96 fixes 2014-04-22 14:51:39 +04:00
vbystricky
e68a55cca2 Fix error in ipp function call 2014-04-22 14:35:27 +04:00
Ilya Lavrenov
46e40343f2 cv::remap 2014-04-22 14:33:55 +04:00
Alexander Alekhin
caf3ed284d Merge pull request #2645 from vbystricky:ipp_Convert 2014-04-22 13:45:31 +04:00
vbystricky
9cdb330452 Change test conditions 2014-04-22 13:27:20 +04:00
Roman Donchenko
4211d8fbd9 Merge pull request #2641 from SpecLad:merge-2.4 2014-04-22 12:01:03 +04:00
Andrey Pavlenko
6b986489ec Merge pull request #2643 from vbystricky:ipp_GaussianBorder 2014-04-22 11:55:06 +04:00
Andrey Pavlenko
34afc72c23 Merge pull request #2642 from vbystricky:ipp_resize 2014-04-22 11:53:26 +04:00
Andrey Pavlenko
6823b36974 Merge pull request #2624 from ElenaGvozdeva:ipp_DistanceTransform 2014-04-22 11:48:25 +04:00
vbystricky
f5c729396d Fix call of ippiConvert. 2014-04-22 10:50:35 +04:00
Andrey Pavlenko
7c3d5b056a Merge pull request #2612 from grkutty:pullreq/140319-bilateral-b 2014-04-22 09:32:39 +04:00
Artur Wieczorek
f27a886314 Fix for issue #3645 (http://code.opencv.org/issues/3645).
Implement missing features in CvCaptureCAM_VFW class.

Implemented missing CvCaptureCAM_VFW::setProperty() member function (handling CV_CAP_PROP_FRAME_WIDTH, CV_CAP_PROP_FRAME_HEIGHT, CV_CAP_PROP_FPS properties).
Extended CvCaptureCAM_VFW::setProperty()/getProperty() functions to handle also CV_CAP_PROP_FPS property.
Minor refactoring of CvCaptureCAM_VFW class.
2014-04-21 17:10:58 +02:00
vbystricky
bb12293251 Convert opencv border type to ipp border. Check supported border before call ipp function 2014-04-21 18:32:53 +04:00
vbystricky
42079b899c Fix error in call of ippResize 2014-04-21 17:26:03 +04:00
Elena Gvozdeva
3d7872b904 fixed 2014-04-21 16:59:55 +04:00
Roman Donchenko
4db12032dc Merge remote-tracking branch 'origin/2.4' into merge-2.4
No conflicts! Amazing!
2014-04-21 16:47:35 +04:00
Elena Gvozdeva
b4830d896c added ippiTrueDistanceTransform_8u32f_C1R 2014-04-21 15:17:56 +04:00
Elena Gvozdeva
0265247504 Added ippiDistanceTransform for cv::distanceTransform, maskSize=3,5 2014-04-21 15:17:55 +04:00
vbystricky
d9ef5bb5a7 Fix compile warnings 2014-04-21 15:02:38 +04:00
vbystricky
f52126725f Disable scharr in icv only configuration 2014-04-21 14:43:56 +04:00
vbystricky
d97f7da7a9 Fix setIppErrorStatus placement 2014-04-21 14:19:25 +04:00
Ilya Lavrenov
fe644ede19 cv::multiply 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
9cc80a68db fixed warnings 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
76c415ff49 cv::filterSpeckles 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
04abffeb16 cv::cornerHarris 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
8603c58f37 Mat::setTo(with mask) 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
0b678c2451 Mat::setTo(Scalar::all(0)) 2014-04-21 13:14:55 +04:00
Ilya Lavrenov
3bd8211a72 Mat::copyTo 2014-04-21 13:14:55 +04:00