Daniel Fernandes [Wed, 11 Jun 2014 07:00:21 +0000 (02:00 -0500)]
Changing #include to generic video.hpp
Per https://github.com/Itseez/opencv/pull/2783#discussion_r13573590
Daniel Fernandes [Wed, 21 May 2014 22:59:10 +0000 (17:59 -0500)]
Merge branch 'master' of https://github.com/Itseez/opencv
Daniel Fernandes [Wed, 21 May 2014 22:57:35 +0000 (17:57 -0500)]
Fixed MATLAB bridge
MATLAB bridge.hpp was missing definition for Ptr<DenseOpticalFlow>
Alexander Alekhin [Wed, 21 May 2014 15:56:00 +0000 (19:56 +0400)]
Merge pull request #2723 from ilya-lavrenov:tapi_intel_vector_width
Alexander Alekhin [Wed, 21 May 2014 13:43:28 +0000 (17:43 +0400)]
Merge pull request #2776 from ilya-lavrenov:tapi_meanstddev
Ilya Lavrenov [Wed, 21 May 2014 07:50:31 +0000 (11:50 +0400)]
added performance test for cv::meanStdDev with mask
Alexander Alekhin [Wed, 21 May 2014 07:44:25 +0000 (11:44 +0400)]
Merge pull request #2763 from ilya-lavrenov:tapi_perf_norm_relative
Roman Donchenko [Tue, 20 May 2014 07:50:49 +0000 (11:50 +0400)]
Merge pull request #2767 from SpecLad:merge-2.4
Roman Donchenko [Mon, 19 May 2014 14:39:20 +0000 (18:39 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
Vadim Pisarevsky [Mon, 19 May 2014 13:36:38 +0000 (17:36 +0400)]
Merge pull request #2509 from euphrat:mog2_bgimg_gray
Vadim Pisarevsky [Mon, 19 May 2014 13:36:19 +0000 (17:36 +0400)]
Merge pull request #2630 from isarandi:concat_corr
Vadim Pisarevsky [Mon, 19 May 2014 13:35:21 +0000 (17:35 +0400)]
Merge pull request #2673 from BloodAxe:kaze
Vadim Pisarevsky [Mon, 19 May 2014 13:35:03 +0000 (17:35 +0400)]
Merge pull request #2680 from adrians:remove_cv_err
Vadim Pisarevsky [Mon, 19 May 2014 13:34:45 +0000 (17:34 +0400)]
Merge pull request #2701 from thoinvil:BugfixFilterEngineApplyROI
Vadim Pisarevsky [Mon, 19 May 2014 13:33:36 +0000 (17:33 +0400)]
Merge pull request #2739 from StevenPuttemans:bug_1523
Vadim Pisarevsky [Mon, 19 May 2014 13:33:22 +0000 (17:33 +0400)]
Merge pull request #2738 from kevmitch:2.4
Vadim Pisarevsky [Mon, 19 May 2014 13:33:09 +0000 (17:33 +0400)]
Merge pull request #2744 from jet47:kmeans-fix
Vadim Pisarevsky [Mon, 19 May 2014 13:30:32 +0000 (17:30 +0400)]
Merge pull request #2752 from jet47:pr-2746
Vadim Pisarevsky [Mon, 19 May 2014 13:30:18 +0000 (17:30 +0400)]
Merge pull request #2764 from hbadino:Feature_3692
Roman Donchenko [Mon, 19 May 2014 11:41:27 +0000 (15:41 +0400)]
Merge pull request #2754 from thoinvil:patch-1
StevenPuttemans [Tue, 13 May 2014 09:43:02 +0000 (11:43 +0200)]
fix coordinate problem with large images - bug 1523
Roman Donchenko [Mon, 19 May 2014 11:04:36 +0000 (15:04 +0400)]
Merge pull request #2741 from alalek:icv_android
Roman Donchenko [Mon, 19 May 2014 10:52:58 +0000 (14:52 +0400)]
Merge pull request #2698 from GregoryMorse:patch-2
Roman Donchenko [Mon, 19 May 2014 10:25:46 +0000 (14:25 +0400)]
Merge pull request #2735 from StevenPuttemans:bug_2000
StevenPuttemans [Mon, 12 May 2014 14:45:42 +0000 (16:45 +0200)]
added documentation for findContours
Roman Donchenko [Mon, 19 May 2014 09:38:36 +0000 (13:38 +0400)]
Merge pull request #2685 from znah:ocl_control_py
Roman Donchenko [Mon, 19 May 2014 09:04:54 +0000 (13:04 +0400)]
Merge pull request #2733 from StevenPuttemans:bug_2162
Roman Donchenko [Mon, 19 May 2014 09:00:32 +0000 (13:00 +0400)]
Merge pull request #2719 from yashdv:patch-1
Hernan Badino [Fri, 16 May 2014 22:49:45 +0000 (18:49 -0400)]
Switched insertion of connected components in filterSpecklesImpl
Roman Donchenko [Fri, 16 May 2014 13:40:41 +0000 (17:40 +0400)]
Merge pull request #2753 from shahurik:2.4
Ilya Lavrenov [Fri, 16 May 2014 10:15:31 +0000 (14:15 +0400)]
added performance test for cv::norm with NORM_RELATIVE
Alexander Alekhin [Thu, 15 May 2014 14:50:00 +0000 (18:50 +0400)]
Merge pull request #2756 from ElenaGvozdeva:ippi_matchTemplate
Elena Gvozdeva [Thu, 15 May 2014 09:05:27 +0000 (13:05 +0400)]
IPP: fixed ipp_matchTemplate
Vladislav Vinogradov [Thu, 15 May 2014 08:08:38 +0000 (12:08 +0400)]
add additional tests for different input cases
Vladislav Vinogradov [Thu, 15 May 2014 08:08:01 +0000 (12:08 +0400)]
use more accurate reshape
thoinvil [Thu, 15 May 2014 06:40:13 +0000 (08:40 +0200)]
Added condition to 1st test in cv::GaussianBlur
Consistent with the test made in cv::boxFilter, it adjusts the kernel size to the source size only if the border is not BORDER_CONSTANT and if BORDER_ISOLATED is set. Otherwise, the source has to be considered possibly in a larger image (i.e. the source being a ROI) in witch the kernel should apply.
Vlad Shakhuro [Thu, 8 May 2014 14:14:48 +0000 (18:14 +0400)]
Fix svm intro tutorial
Roman Donchenko [Wed, 14 May 2014 15:49:27 +0000 (19:49 +0400)]
Merge pull request #2743 from StevenPuttemans:bugfix_3549
Alexander Mordvintsev [Wed, 14 May 2014 13:44:40 +0000 (17:44 +0400)]
exposed TVL1 optical flow to python
Alexander Mordvintsev [Tue, 29 Apr 2014 12:57:19 +0000 (16:57 +0400)]
exposed OpenCL-control functions to python
Roman Donchenko [Wed, 14 May 2014 13:25:18 +0000 (17:25 +0400)]
Merge pull request #2749 from jet47:fix-bug-3678
Roman Donchenko [Wed, 14 May 2014 12:34:47 +0000 (16:34 +0400)]
Merge pull request #2747 from jet47:gpu-resize-stream-fix
ZlodeiBaal [Tue, 13 May 2014 19:46:17 +0000 (12:46 -0700)]
Create haarcascade_russian_plate_number.xml
Detector for russsian vehicle registration plate
Vladislav Vinogradov [Wed, 14 May 2014 08:48:12 +0000 (12:48 +0400)]
fix bug #3678 (cuda::integral failures)
Roman Donchenko [Wed, 14 May 2014 08:40:19 +0000 (12:40 +0400)]
Merge pull request #2740 from ilya-lavrenov:tapi_norm_fix
Roman Donchenko [Wed, 14 May 2014 08:38:43 +0000 (12:38 +0400)]
Merge pull request #2745 from yashdv:patch-3
Roman Donchenko [Wed, 14 May 2014 08:35:04 +0000 (12:35 +0400)]
Merge pull request #2748 from jet47:fix-bug-3690
Alexander Alekhin [Wed, 14 May 2014 08:30:04 +0000 (12:30 +0400)]
Merge pull request #2663 from ilya-lavrenov:ipp_slow
Vladislav Vinogradov [Wed, 14 May 2014 06:47:28 +0000 (10:47 +0400)]
fix bug #3690
removed invalid condition, it is always false
Vladislav Vinogradov [Wed, 14 May 2014 06:31:28 +0000 (10:31 +0400)]
fix cv::gpu::resize function
add missing stream parameter to call_resize_linear_glob
Ievgen Khvedchenia [Tue, 13 May 2014 18:07:30 +0000 (21:07 +0300)]
Fix "WARNING: Block quote ends without a blank line"
Roman Donchenko [Tue, 13 May 2014 15:50:00 +0000 (19:50 +0400)]
Merge pull request #2724 from znah:python_autowrap
Yash Vadalia [Tue, 13 May 2014 14:29:37 +0000 (19:59 +0530)]
fixed a syntax error in cap_giganetix.cpp
Ticket 3458 (http://code.opencv.org/issues/3458)
Alexander Alekhin [Tue, 13 May 2014 11:09:10 +0000 (15:09 +0400)]
icv: android x86 build
Yash Vadalia [Sun, 11 May 2014 13:39:37 +0000 (19:09 +0530)]
Added doc for LinearPolar Transform
Vladislav Vinogradov [Tue, 13 May 2014 13:59:20 +0000 (17:59 +0400)]
fix cv::kmeans function
reshape input matrix, since the function works with data
as with [N x dims] matrix
Alexander Mordvintsev [Tue, 13 May 2014 13:55:57 +0000 (17:55 +0400)]
find -> rindex
StevenPuttemans [Tue, 13 May 2014 13:34:30 +0000 (15:34 +0200)]
adding bugfix 3549
Ilya Lavrenov [Thu, 24 Apr 2014 10:15:37 +0000 (14:15 +0400)]
disabled IPP functions that slower than OpenCV
Roman Donchenko [Tue, 13 May 2014 10:39:09 +0000 (14:39 +0400)]
Merge pull request #2737 from jet47:fix-opencv-cmake-config
Roman Donchenko [Tue, 13 May 2014 10:21:36 +0000 (14:21 +0400)]
Merge pull request #2731 from StevenPuttemans:bug_2626
Ilya Lavrenov [Tue, 13 May 2014 10:21:07 +0000 (14:21 +0400)]
fix for cv::norm (norm_inf)
Roman Donchenko [Tue, 13 May 2014 10:19:42 +0000 (14:19 +0400)]
Merge pull request #2730 from StevenPuttemans:bug_2740
Roman Donchenko [Tue, 13 May 2014 10:17:09 +0000 (14:17 +0400)]
Merge pull request #2729 from StevenPuttemans:bug_3252
Roman Donchenko [Tue, 13 May 2014 10:15:37 +0000 (14:15 +0400)]
Merge pull request #2728 from StevenPuttemans:bug_3434
Ievgen Khvedchenia [Tue, 13 May 2014 10:15:24 +0000 (13:15 +0300)]
Fix "WARNING: Block quote ends without a blank line"
Kevin Mitchell [Mon, 12 May 2014 21:48:34 +0000 (14:48 -0700)]
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
StevenPuttemans [Mon, 12 May 2014 13:39:40 +0000 (15:39 +0200)]
Fixing as suggested in bug 2626, made naming same for both C, C++ and python API
Roman Donchenko [Tue, 13 May 2014 07:58:25 +0000 (11:58 +0400)]
Merge pull request #2699 from GregoryMorse:patch-1
Roman Donchenko [Tue, 13 May 2014 07:56:12 +0000 (11:56 +0400)]
Merge pull request #2692 from 1Hyena:2.4
Roman Donchenko [Tue, 13 May 2014 07:55:16 +0000 (11:55 +0400)]
Merge pull request #2727 from StevenPuttemans:bug_3484
Roman Donchenko [Tue, 13 May 2014 07:53:30 +0000 (11:53 +0400)]
Merge pull request #2725 from SpecLad:merge-2.4
Vladislav Vinogradov [Tue, 13 May 2014 07:37:21 +0000 (11:37 +0400)]
fix OpenCVConfig.cmake template - missing parentheses
1Hyena [Mon, 12 May 2014 20:01:44 +0000 (23:01 +0300)]
Changed ostringstream to ostream for new print_params and added the old
version of print_params for backwards compatibility.
Roman Donchenko [Mon, 12 May 2014 14:53:10 +0000 (18:53 +0400)]
Merge pull request #2714 from asmorkalov:ocv_cmake_config
Roman Donchenko [Mon, 12 May 2014 14:48:01 +0000 (18:48 +0400)]
Merge pull request #2721 from zarrabeitia:2.4
StevenPuttemans [Mon, 12 May 2014 13:39:40 +0000 (15:39 +0200)]
fixed bug 2626
StevenPuttemans [Mon, 12 May 2014 12:47:10 +0000 (14:47 +0200)]
fix bug 3434
Roman Donchenko [Mon, 12 May 2014 11:05:58 +0000 (15:05 +0400)]
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
StevenPuttemans [Mon, 12 May 2014 13:26:56 +0000 (15:26 +0200)]
bug 2740 added fix
StevenPuttemans [Mon, 12 May 2014 13:01:15 +0000 (15:01 +0200)]
fix bug 3252
StevenPuttemans [Mon, 12 May 2014 12:40:12 +0000 (14:40 +0200)]
fixed bug 3484
Ilya Lavrenov [Mon, 12 May 2014 08:45:52 +0000 (12:45 +0400)]
heuristic for Intel
Alexander Mordvintsev [Mon, 12 May 2014 10:58:54 +0000 (14:58 +0400)]
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")
Alexander Smorkalov [Thu, 8 May 2014 11:55:30 +0000 (15:55 +0400)]
Fix non-Android cross compilation with OpenCVConfig.cmake
Roman Donchenko [Mon, 12 May 2014 11:14:53 +0000 (15:14 +0400)]
Merge pull request #2717 from StevenPuttemans:2.4
Alexander Alekhin [Mon, 12 May 2014 09:03:36 +0000 (13:03 +0400)]
Merge pull request #2722 from ilya-lavrenov:tapi_luv_eps
Alexander Alekhin [Mon, 12 May 2014 09:03:19 +0000 (13:03 +0400)]
Merge pull request #2715 from akarsakov:fix_corner_min_eigen
Ilya Lavrenov [Mon, 12 May 2014 07:54:15 +0000 (11:54 +0400)]
increased eps to pass tests
Luis Zarrabeitia [Sun, 11 May 2014 23:00:14 +0000 (19:00 -0400)]
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.
Ievgen Khvedchenia [Sat, 10 May 2014 20:06:23 +0000 (23:06 +0300)]
FixFix documentation warnings
Ievgen Khvedchenia [Sat, 10 May 2014 17:57:37 +0000 (20:57 +0300)]
Remove GSURF descriptor from KAZE algorithm
Ievgen Khvedchenia [Fri, 9 May 2014 19:53:28 +0000 (22:53 +0300)]
Fix "Title underline too short" warning
Ievgen Khvedchenia [Fri, 9 May 2014 19:31:20 +0000 (22:31 +0300)]
Fix documentation warnings
Ievgen Khvedchenia [Fri, 9 May 2014 19:21:26 +0000 (22:21 +0300)]
Fix documentation warnings
Ievgen Khvedchenia [Fri, 9 May 2014 16:35:41 +0000 (19:35 +0300)]
Initial commit of the KAZE & AKAZE docs
Ievgen Khvedchenia [Fri, 9 May 2014 16:34:54 +0000 (19:34 +0300)]
Temporary remove of CV_WRAP
Ievgen Khvedchenia [Fri, 9 May 2014 15:46:00 +0000 (18:46 +0300)]
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
StevenPuttemans [Fri, 9 May 2014 11:44:12 +0000 (13:44 +0200)]
add suggestion of feature 2619
Alexander Alekhin [Thu, 8 May 2014 13:33:26 +0000 (17:33 +0400)]
Merge pull request #2710 from ilya-lavrenov:ipp_threshold
projects / platform / upstream / opencv.git / log