Roman Donchenko
4a24ecd176
Merge pull request #2731 from StevenPuttemans:bug_2626
2014-05-13 14:21:36 +04:00
Ilya Lavrenov
f64dfeb222
fix for cv::norm (norm_inf)
2014-05-13 14:21:07 +04:00
Roman Donchenko
2cf6cea90f
Merge pull request #2730 from StevenPuttemans:bug_2740
2014-05-13 14:19:42 +04:00
Roman Donchenko
c607dadc49
Merge pull request #2729 from StevenPuttemans:bug_3252
2014-05-13 14:17:09 +04:00
Ievgen Khvedchenia
87972d0d7c
Fix "WARNING: Block quote ends without a blank line"
2014-05-13 13:15:24 +03:00
Kevin Mitchell
63e508abd2
doc: update/clarify behaviour of mask in floodFill
...
Clarify how the mask parameter is set on output and how this is
affected by the flags parameter.
resolves Feature #2942
2014-05-13 02:26:59 -07:00
StevenPuttemans
006956c324
Fixing as suggested in bug 2626, made naming same for both C, C++ and python API
2014-05-13 11:02:01 +02:00
Roman Donchenko
ff2d76ec0d
Merge pull request #2699 from GregoryMorse:patch-1
2014-05-13 11:58:25 +04:00
Roman Donchenko
bc7b21609a
Merge pull request #2692 from 1Hyena:2.4
2014-05-13 11:56:12 +04:00
Roman Donchenko
f0547e5e05
Merge pull request #2727 from StevenPuttemans:bug_3484
2014-05-13 11:55:17 +04:00
Roman Donchenko
ea5b411c0f
Merge pull request #2725 from SpecLad:merge-2.4
2014-05-13 11:53:30 +04:00
1Hyena
6c118ebc51
Changed ostringstream to ostream for new print_params and added the old
...
version of print_params for backwards compatibility.
2014-05-12 23:01:44 +03:00
StevenPuttemans
a0a8fb4fd9
fixed bug 2626
2014-05-12 16:43:07 +02:00
Roman Donchenko
313a0ad255
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/internal.hpp
modules/core/src/arithm.cpp
modules/imgproc/src/imgwarp.cpp
modules/objdetect/src/hog.cpp
2014-05-12 17:38:07 +04:00
StevenPuttemans
e96de8821c
bug 2740 added fix
2014-05-12 15:26:56 +02:00
StevenPuttemans
b382984810
fix bug 3252
2014-05-12 15:01:15 +02:00
StevenPuttemans
2b4241c10b
fixed bug 3484
2014-05-12 14:40:12 +02:00
Ilya Lavrenov
1e5694e082
heuristic for Intel
2014-05-12 16:08:39 +04:00
Alexander Mordvintsev
120b3a1e77
Work on python wrapped generation automation:
...
- all parsed headers are included into "cv2.cpp" with "pyopencv_generated_include.h"
- types starting with "Ptr_" converted to "Ptr<...>" form (avoids many typedefs in "cv2.cpp")
2014-05-12 15:49:54 +04:00
Alexander Alekhin
e1b5a547cc
Merge pull request #2722 from ilya-lavrenov:tapi_luv_eps
2014-05-12 13:03:36 +04:00
Alexander Alekhin
7ac5c367e9
Merge pull request #2715 from akarsakov:fix_corner_min_eigen
2014-05-12 13:03:19 +04:00
Ilya Lavrenov
e2558e5ee5
increased eps to pass tests
2014-05-12 11:54:15 +04:00
Luis Zarrabeitia
bb5a22c504
highgui: fix segfault on CvCapture_GStreamer::retrieveFrame
...
CvCapture_GStreamer::retrieveFrame assumes that RGB videos are 24BPP.
This is not necesarily the case, unless we explicitly tell GStreamer
that we want 24BPP RGB streams.
Adding bpp=(int)24 to the appsink caps.
2014-05-11 19:00:14 -04:00
Ievgen Khvedchenia
03db61b33b
FixFix documentation warnings
2014-05-10 23:06:23 +03:00
Ievgen Khvedchenia
029a8c443a
Remove GSURF descriptor from KAZE algorithm
2014-05-10 20:57:37 +03:00
Ievgen Khvedchenia
a068ccbf51
Fix "Title underline too short" warning
2014-05-09 22:53:28 +03:00
Ievgen Khvedchenia
616c348536
Fix documentation warnings
2014-05-09 22:31:20 +03:00
Ievgen Khvedchenia
3a8e15fad9
Fix documentation warnings
2014-05-09 22:21:26 +03:00
Ievgen Khvedchenia
c4e49463a9
Initial commit of the KAZE & AKAZE docs
2014-05-09 19:35:41 +03:00
Ievgen Khvedchenia
b42c268164
Temporary remove of CV_WRAP
2014-05-09 19:34:54 +03:00
Ievgen Khvedchenia
1a5fcd715d
Refactor of KAZE and AKAZE:
...
1) Clean-up from the unused code
2) Remove of SURF extraction method
3) Enabled threading for KAZE extraction
4) Exposed new properties for runtime configuration
2014-05-09 18:46:00 +03:00
Alexander Alekhin
eba1be711c
Merge pull request #2710 from ilya-lavrenov:ipp_threshold
2014-05-08 17:33:27 +04:00
Alexander Karsakov
4e7f62fd24
Fixed ipp check for cornerMinEigenVal
2014-05-08 17:32:21 +04:00
Alexander Alekhin
c74fed1fcf
Merge pull request #2706 from ilya-lavrenov:ipp_2.4_warnings
2014-05-08 17:04:18 +04:00
Alexander Alekhin
a82dd8ce48
Merge pull request #2700 from ilya-lavrenov:tapi_cvtColor
2014-05-08 17:01:38 +04:00
Alexander Alekhin
eb240cc206
Merge pull request #2697 from PhilLab:master
2014-05-08 16:57:50 +04:00
Ilya Lavrenov
11b01cd8b9
added ipp threshold inplace
2014-05-08 13:51:25 +04:00
Ilya Lavrenov
19a2495067
fixed IPP related warnings
2014-05-08 13:31:27 +04:00
Vladislav Vinogradov
77275031ab
finally fix cv::subtract
2014-05-08 13:11:42 +04:00
thoinvil
e50ef2dab5
Bugfix #3668 removed the comment
2014-05-07 18:27:08 +02:00
Vladislav Vinogradov
629461c836
fix output matrix allocation in cv::subtract
2014-05-07 19:52:35 +04:00
Alexander Alekhin
72e095b8a5
Merge pull request #2665 from ilya-lavrenov:ipp_filter2d
2014-05-07 19:17:57 +04:00
Alexander Alekhin
07d5f56707
Merge pull request #2679 from alalek:ippicv_update
2014-05-07 18:24:41 +04:00
Ilya Lavrenov
3ccaa5294e
added OpenCL RGB <-> Luv conversions
2014-05-07 18:09:57 +04:00
Alexander Alekhin
9c780260c2
Merge pull request #2605 from akarsakov:ipp_min_eigen_val
2014-05-07 18:01:44 +04:00
Alexander Alekhin
849228ac6a
Merge pull request #2684 from ElenaGvozdeva:ippiDFT
2014-05-07 17:57:17 +04:00
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