Maksim Shabunin [Wed, 3 Jun 2015 17:16:51 +0000 (17:16 +0000)]
Merge pull request #4089 from alalek:video_mp4
Alexander Alekhin [Wed, 3 Jun 2015 14:01:45 +0000 (17:01 +0300)]
videoio: VideoWriter H264/.mp4 support via ffmpeg/libav
Vadim Pisarevsky [Wed, 3 Jun 2015 07:25:51 +0000 (07:25 +0000)]
Merge pull request #4084 from berak:patch-2
berak [Wed, 3 Jun 2015 05:44:46 +0000 (07:44 +0200)]
http://code.opencv.org/issues/4359, for master
Vadim Pisarevsky [Tue, 2 Jun 2015 19:11:54 +0000 (19:11 +0000)]
Merge pull request #4082 from diogorolo:patch-1
Diogo Rolo [Tue, 2 Jun 2015 13:34:15 +0000 (14:34 +0100)]
Update cuda.markdown
Small typo fix in the documentation.
It was written 'devie' instead of 'device' in: 'Switching active device can be done using cuda::setDevice() function'
Vadim Pisarevsky [Tue, 2 Jun 2015 08:36:03 +0000 (08:36 +0000)]
Merge pull request #4081 from vpisarev:30_small_fixes
Vadim Pisarevsky [Mon, 1 Jun 2015 22:30:00 +0000 (01:30 +0300)]
made improvements in ECC code (comments from https://github.com/Itseez/opencv/pull/3845), as well as minor tweak in pthread's based parallel for.
Vadim Pisarevsky [Mon, 1 Jun 2015 20:35:29 +0000 (20:35 +0000)]
Merge pull request #3845 from ellbur:findTransformECC-mask
Vadim Pisarevsky [Mon, 1 Jun 2015 16:53:49 +0000 (16:53 +0000)]
Merge pull request #4076 from kalistratovag:parallel_pthreads
kalistratovag [Fri, 29 May 2015 18:58:45 +0000 (21:58 +0300)]
parallel for on pthreads initial commit
removing trailing whitespaces
Compilation error on Mac fix & warning on android
Warnings fixed on iOs
Vadim Pisarevsky [Mon, 1 Jun 2015 11:42:18 +0000 (11:42 +0000)]
Merge pull request #4079 from Dikay900:2_4_to_master
Alexander Smorkalov [Tue, 19 May 2015 10:23:55 +0000 (13:23 +0300)]
Precise default CUDA version for Tegra X1 chips.
Vadim Pisarevsky [Fri, 29 May 2015 21:38:09 +0000 (21:38 +0000)]
Merge pull request #3998 from msandler:master
Vadim Pisarevsky [Fri, 29 May 2015 21:36:43 +0000 (21:36 +0000)]
Merge pull request #3984 from LaurentBerger:ExampleCppORB
Vadim Pisarevsky [Fri, 29 May 2015 13:23:23 +0000 (13:23 +0000)]
Merge pull request #4075 from MSOpenTech:backslash-upd
Evgeny Agafonchikov [Thu, 28 May 2015 13:16:24 +0000 (16:16 +0300)]
Adding backslash in macro-based paths
of WINRT samples
This removes requirement to add OPENCV_WINRT_INSTALL_DIR with backslash in the end
in case trailing slash is presented VS handles duplicated slashes w/o issues
Vadim Pisarevsky [Thu, 28 May 2015 19:43:51 +0000 (19:43 +0000)]
Merge pull request #4074 from vpisarev:objdetect_fixes
Vadim Pisarevsky [Thu, 28 May 2015 18:06:17 +0000 (18:06 +0000)]
Merge pull request #4070 from techfort:fixpythonsample
Vadim Pisarevsky [Thu, 28 May 2015 18:02:27 +0000 (21:02 +0300)]
clip the found objects in HOG as well (code.opencv.org/issues/3825); added test to check CascadeClassifier on small images (http://code.opencv.org/issues/3710)
Vadim Pisarevsky [Thu, 28 May 2015 17:15:22 +0000 (20:15 +0300)]
make sure the returned rectangles are inside the image (code.opencv.org/issues/3136)
Vadim Pisarevsky [Thu, 28 May 2015 16:33:21 +0000 (19:33 +0300)]
improvements in Haar CascadeClassifier: 1) use CV_32S instead of CV_32F for the integral of squares (which is more accurate and more efficient); 2) skip the window if its contrast is too low
Vadim Pisarevsky [Thu, 28 May 2015 16:01:56 +0000 (19:01 +0300)]
make facedetect.py work when the nested cascade is not specified
Vadim Pisarevsky [Thu, 28 May 2015 15:00:36 +0000 (15:00 +0000)]
Merge pull request #4022 from LaurentBerger:ExampleBLOB_MSER
Vadim Pisarevsky [Thu, 28 May 2015 15:00:07 +0000 (15:00 +0000)]
Merge pull request #4056 from apavlenko:java_memory_release
Vadim Pisarevsky [Thu, 28 May 2015 14:49:13 +0000 (14:49 +0000)]
Merge pull request #4063 from Dikay900:2_4_to_master
Vadim Pisarevsky [Thu, 28 May 2015 14:48:00 +0000 (14:48 +0000)]
Merge pull request #4069 from MSOpenTech:sample-face-contrib
Vadim Pisarevsky [Thu, 28 May 2015 14:44:36 +0000 (14:44 +0000)]
Merge pull request #4071 from sergarrido:fix_isContourConvex
Vadim Pisarevsky [Thu, 28 May 2015 14:41:40 +0000 (14:41 +0000)]
Merge pull request #4073 from MSOpenTech:video-sample-face
Vadim Pisarevsky [Thu, 28 May 2015 14:24:22 +0000 (17:24 +0300)]
report an error when trying to load HOG cascade
Joe Minichino [Thu, 28 May 2015 14:20:08 +0000 (15:20 +0100)]
fixed outdated params setting
Vadim Pisarevsky [Thu, 28 May 2015 14:05:43 +0000 (17:05 +0300)]
added simple HAL test; added RHO homography test
Maxim Kostin [Wed, 27 May 2015 11:29:05 +0000 (14:29 +0300)]
Added video face detection. Restructured code.
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
S. Garrido [Wed, 27 May 2015 18:51:53 +0000 (20:51 +0200)]
fix isContourConvex
Joe Minichino [Wed, 27 May 2015 14:43:52 +0000 (15:43 +0100)]
fixed digits.py sample to work with opencv 3
Maxim Kostin [Tue, 26 May 2015 15:10:12 +0000 (18:10 +0300)]
Adding WinRT face tracking sample. Works with asset images. Created by @ericmitt.
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Vadim Pisarevsky [Wed, 27 May 2015 11:50:58 +0000 (11:50 +0000)]
Merge pull request #4055 from rajithr:patch-1
Vadim Pisarevsky [Wed, 27 May 2015 11:26:57 +0000 (11:26 +0000)]
Merge pull request #4065 from gongzg:master
Vadim Pisarevsky [Wed, 27 May 2015 11:24:35 +0000 (11:24 +0000)]
Merge pull request #4067 from PhilLab:patch-3
Vadim Pisarevsky [Wed, 27 May 2015 11:24:17 +0000 (11:24 +0000)]
Merge pull request #4068 from PhilLab:patch-4
rajithr [Wed, 27 May 2015 09:42:04 +0000 (15:12 +0530)]
Fix for a potential data race condition
code changes to handle the failed build
rajithr [Wed, 27 May 2015 09:30:21 +0000 (15:00 +0530)]
Fix for a potential data race condition
Philipp Hasper [Wed, 27 May 2015 05:55:41 +0000 (07:55 +0200)]
Adding missing docs for VideoWriter::release
Philipp Hasper [Wed, 27 May 2015 05:34:27 +0000 (07:34 +0200)]
Fixed doc typo
Vadim Pisarevsky [Tue, 26 May 2015 17:24:32 +0000 (17:24 +0000)]
Merge pull request #4062 from ilya-lavrenov:android_master
Alexander Alekhin [Tue, 26 May 2015 16:26:57 +0000 (16:26 +0000)]
Merge pull request #4058 from mshabunin:latch-sample
Andrew Senin [Fri, 6 Feb 2015 21:48:37 +0000 (00:48 +0300)]
Fixing XIMEA parameters mapping (issue #4176)
Conflicts:
modules/highgui/src/cap_ximea.cpp
Ilya Lavrenov [Wed, 3 Dec 2014 11:59:51 +0000 (14:59 +0300)]
ability to enable OpenMP simultaneously with other parallel framework
Samyak Datta [Wed, 12 Nov 2014 18:05:02 +0000 (23:35 +0530)]
C++ sample code to detect facial features
StevenPuttemans [Fri, 14 Nov 2014 13:09:43 +0000 (14:09 +0100)]
added extra BUFFERSIZE doc and getter
Conflicts:
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/highgui/src/cap_dc1394_v2.cpp
StevenPuttemans [Wed, 12 Nov 2014 09:48:24 +0000 (10:48 +0100)]
adding extra buffer parameter
Conflicts:
modules/highgui/include/opencv2/highgui/highgui_c.h
modules/highgui/src/cap_dc1394_v2.cpp
fix typo
StevenPuttemans [Wed, 29 Oct 2014 12:50:20 +0000 (13:50 +0100)]
fixing SVM negative value rounding
Conflicts:
modules/objdetect/src/hog.cpp
fix android build
Vicente Olivert Riera [Mon, 27 Oct 2014 13:39:35 +0000 (13:39 +0000)]
superres: Fix \ 1\ 1return value VideoFrameSource_GPU
superres module fails to compile with the following error messages:
[100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o
/opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)':
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int*)operator new(4ul)' from 'int*' to 'cv::Ptr<cv::superres::FrameSource>'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope
/opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type]
cc1plus: some warnings being treated as errors
make[3]: *** [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1
make[3]: *** Waiting for unfinished jobs....
This is caused because the return value of the \ 1createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.
Conflicts:
modules/superres/src/frame_source.cpp
Ilya Lavrenov [Tue, 26 May 2015 14:47:03 +0000 (17:47 +0300)]
port of MR #4061 to master
Zhigang Gong [Tue, 26 May 2015 14:06:18 +0000 (22:06 +0800)]
Fixed the race condition between inc and dec on the l_counter.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
Maksim Shabunin [Tue, 26 May 2015 12:58:27 +0000 (15:58 +0300)]
Added cvconfig.h copy during the build
Maksim Shabunin [Tue, 26 May 2015 12:57:07 +0000 (15:57 +0300)]
Fixed latch sample build without contrib
Vadim Pisarevsky [Tue, 26 May 2015 12:47:14 +0000 (12:47 +0000)]
Merge pull request #4032 from mshabunin:fix-pkg-config
Vadim Pisarevsky [Tue, 26 May 2015 11:23:50 +0000 (11:23 +0000)]
Merge pull request #4053 from vpisarev:calib3d_fixes
Andrey Pavlenko [Tue, 26 May 2015 10:50:56 +0000 (13:50 +0300)]
releasing native memory of temp `Mat` objects in generated Java code
Andrey Pavlenko [Tue, 26 May 2015 10:10:54 +0000 (13:10 +0300)]
releasing native memory in Java converters
Vadim Pisarevsky [Tue, 26 May 2015 09:43:18 +0000 (12:43 +0300)]
for some reason Calib3d_Homography.fromImages on ARM gives much smaller number of inliers than on x86/x64. Need to investigate more carefully, but let's decrease the tolerance threshold for now
Vadim Pisarevsky [Tue, 26 May 2015 07:46:03 +0000 (07:46 +0000)]
Merge pull request #4054 from gongzg:master
Vadim Pisarevsky [Tue, 26 May 2015 07:29:13 +0000 (10:29 +0300)]
fixed another compile warning from MSVC
rajithr [Tue, 26 May 2015 06:01:31 +0000 (11:31 +0530)]
Fix for a potential data race condition
Zhigang Gong [Tue, 26 May 2015 00:13:23 +0000 (08:13 +0800)]
Avoid negative index for a local buffer in Canny.cl.
int pix_per_thr = l_counter / LOCAL_TOTAL + ((lid < mod) ? 1 : 0);
The pix_per_thr * LOCAL_TOTAL may be larger than l_counter.
Thus the index of l_stack may be negative which may cause serious
problems. Let's skip the loop when we get negative index and we need
to add back the lcounter to keep its balance and avoid potential
negative counter.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
Vadim Pisarevsky [Mon, 25 May 2015 21:19:58 +0000 (00:19 +0300)]
fixed compile warnings; reenabled solvePnPRansac.concurrency test
Vadim Pisarevsky [Mon, 25 May 2015 20:43:39 +0000 (23:43 +0300)]
hack solvePoly to finds roots of polynoms with zero higher-order coefficients. The roots are populated in this case, which is not valid, strictly speaking, but good enough for function like correctMatches. This solves code.opencv.org/issues/4330
Vadim Pisarevsky [Mon, 25 May 2015 19:40:10 +0000 (22:40 +0300)]
fixed useExtrinsicGuess=true case with single-precision input (code.opencv.org/issues/2734)
Vadim Pisarevsky [Mon, 25 May 2015 19:03:25 +0000 (22:03 +0300)]
fixed bug http://code.opencv.org/issues/3882
Vadim Pisarevsky [Mon, 25 May 2015 18:46:05 +0000 (21:46 +0300)]
added tests for code.opencv.org/issues/4011 and http://code.opencv.org/issues/3057; fixed random subset generation in both methods to increase chance for a good subset
Vadim Pisarevsky [Mon, 25 May 2015 17:06:50 +0000 (17:06 +0000)]
Merge pull request #4049 from mshabunin:transition-hint
Maksim Shabunin [Mon, 25 May 2015 15:05:20 +0000 (18:05 +0300)]
Transition guide: removed one of the version check methods
Vadim Pisarevsky [Mon, 25 May 2015 13:09:27 +0000 (13:09 +0000)]
Merge pull request #4015 from GilLevi:AddingLATCH
Vadim Pisarevsky [Mon, 25 May 2015 13:07:34 +0000 (13:07 +0000)]
Merge pull request #4052 from ilya-lavrenov:typo
Vadim Pisarevsky [Mon, 25 May 2015 13:06:37 +0000 (13:06 +0000)]
Merge pull request #4051 from Dikay900:2_4_to_master_2
Ilya Lavrenov [Mon, 25 May 2015 08:21:02 +0000 (11:21 +0300)]
typo
GilLevi [Sun, 24 May 2015 22:28:05 +0000 (01:28 +0300)]
fixed whitespace issue
Andreas Stührk [Sat, 18 Oct 2014 23:22:04 +0000 (01:22 +0200)]
TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.
Conflicts:
modules/highgui/src/grfmt_tiff.cpp
floodfill return value removed
Vladislav Vinogradov [Fri, 17 Oct 2014 09:23:23 +0000 (13:23 +0400)]
fix installation layout for debian packages:
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
Ilya Lavrenov [Mon, 6 Oct 2014 07:56:30 +0000 (07:56 +0000)]
TCP instead of UDP
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
Andreas Stührk [Wed, 8 Oct 2014 21:31:30 +0000 (23:31 +0200)]
Don't allocate lots of memory when reading TIFFs with infinite rows per strip.
Some TIFF images consist of only one strip. The magic value 2**32-1 for the
"rows per strip" tag reflects that fact, effectively meaning "infinite".
Conflicts:
modules/highgui/src/grfmt_tiff.cpp
modules/highgui/test/test_grfmt.cpp
fix whitespace
fix compile error
Niklas Frisk [Tue, 7 Oct 2014 07:40:56 +0000 (09:40 +0200)]
Fixes #3910, flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.
Conflicts:
modules/features2d/src/draw.cpp
Alexander Smorkalov [Wed, 1 Oct 2014 05:13:35 +0000 (09:13 +0400)]
Turn off superres accuracy tests if video i/o is not supported.
Alexander Smorkalov [Tue, 30 Sep 2014 10:34:00 +0000 (14:34 +0400)]
Test fisheye.rectify disabled for Tegra.
jormansa [Mon, 15 Sep 2014 16:09:44 +0000 (18:09 +0200)]
bug fixed
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
StevenPuttemans [Mon, 18 Aug 2014 11:33:40 +0000 (13:33 +0200)]
fixing GT and GE comparison symbol
Conflicts:
modules/gpu/doc/per_element_operations.rst
Alexander Smorkalov [Wed, 13 Aug 2014 09:46:43 +0000 (13:46 +0400)]
GCC 4.8 warning array subscript is above array bounds fixed.
tiff test fixed
Alexander Smorkalov [Mon, 14 Jul 2014 17:27:23 +0000 (21:27 +0400)]
Deb package build fix for CUDA 6.5 and newer.
(cherry picked from commit
e650d87e470b2e6a8f87ad4dd81977748a136aee)
(cherry picked from commit
ca9c52ac9778d01eba933a786b4303c79d0162be)
Conflicts:
cmake/OpenCVPackaging.cmake
Martijn Liem [Wed, 23 Jul 2014 10:33:51 +0000 (12:33 +0200)]
Bugfix for bug #3767
Fixed a memory leak in cap_dshow.cpp in videoInput::setVideoSettingCamera(). The leak was caused by not releasing an IBaseFilter object created in a call to getDevice(). Tho object is now properly released.
Conflicts:
modules/highgui/src/cap_dshow.cpp
Vadim Pisarevsky [Sun, 24 May 2015 09:30:46 +0000 (09:30 +0000)]
Merge pull request #4050 from Dikay900:2_4_to_master
Ruslan Baratov [Sat, 12 Jul 2014 15:35:22 +0000 (19:35 +0400)]
Doc: fix definition of macro CV_MAKETYPE
At least this is how it's defined in core/types_c.h
Conflicts:
modules/core/doc/intro.rst
Leonid Beynenson [Fri, 11 Jul 2014 11:47:41 +0000 (15:47 +0400)]
Fixed bug in cv::detail::waveCorrect
The function makes wave correction of a stitched panorama.
Earlier it gave wrong results for panorama made from 1 frame.
Camille [Wed, 9 Jul 2014 20:35:56 +0000 (22:35 +0200)]
bug fix 3696
Mike Maraya [Sat, 28 Jun 2014 03:26:09 +0000 (23:26 -0400)]
Fixes resizeWindow() on OS X (Bug #3200)
Dikay900 [Sat, 23 May 2015 13:26:18 +0000 (15:26 +0200)]
typos in comments
Aleksandr Petrikov [Wed, 4 Jun 2014 08:06:33 +0000 (12:06 +0400)]
add NEON realization for StereoBM(findCorrespondence, prefilterXSobel)
Conflicts:
modules/calib3d/src/stereobm.cpp
Add CV_Assert (ndisp % 8 == 0) to NEON version
Ehren Metcalfe [Sat, 31 May 2014 23:41:16 +0000 (19:41 -0400)]
Fix resource leak with iOS camera due to failure to remove AVCaptureSession input/outputs on stop (Bug #3389)
Conflicts:
modules/highgui/src/cap_ios_abstract_camera.mm
aletheios [Sat, 31 May 2014 16:44:32 +0000 (18:44 +0200)]
Bugfix #3705: params.setRecordingHint(true) breaks camera preview on Samsung Galaxy S2
Jüri Aedla [Thu, 1 May 2014 12:37:12 +0000 (15:37 +0300)]
Android camera qcom HAL doesn't like it when no consumer usage bits are set. Set a usage bit for preview BufferQueue.