Vadim Pisarevsky [Wed, 17 Jun 2015 11:55:07 +0000 (11:55 +0000)]
Merge pull request #4093 from mshabunin:python-bases
Vadim Pisarevsky [Wed, 17 Jun 2015 11:29:32 +0000 (11:29 +0000)]
Merge pull request #4100 from alalek:fix_ffmpeg
Vadim Pisarevsky [Wed, 17 Jun 2015 11:26:53 +0000 (11:26 +0000)]
Merge pull request #4114 from alalek:ocl_generator_error_processing
Vadim Pisarevsky [Wed, 17 Jun 2015 11:22:41 +0000 (11:22 +0000)]
Merge pull request #4090 from MSOpenTech:highgui_winrt
Vadim Pisarevsky [Wed, 17 Jun 2015 11:13:27 +0000 (11:13 +0000)]
Merge pull request #4122 from alalek:fix_issue_3891
Alexander Alekhin [Wed, 17 Jun 2015 10:11:50 +0000 (10:11 +0000)]
Merge pull request #4123 from rajithr:patch-1
rajithr [Wed, 17 Jun 2015 05:37:49 +0000 (11:07 +0530)]
Fixing resource leaks
Alexander Alekhin [Tue, 16 Jun 2015 14:56:00 +0000 (17:56 +0300)]
fix issue 3891
Vadim Pisarevsky [Tue, 16 Jun 2015 13:26:47 +0000 (13:26 +0000)]
Merge pull request #4108 from Reen:patch-1
Vadim Pisarevsky [Tue, 16 Jun 2015 13:06:36 +0000 (13:06 +0000)]
Merge pull request #4109 from alalek:fix_build_dbt_bindings
Vadim Pisarevsky [Tue, 16 Jun 2015 12:29:44 +0000 (12:29 +0000)]
Merge pull request #4119 from D-Alex:master
Vadim Pisarevsky [Tue, 16 Jun 2015 12:18:13 +0000 (12:18 +0000)]
Merge pull request #4112 from sturkmen72:patch-1
Vadim Pisarevsky [Tue, 16 Jun 2015 12:15:27 +0000 (12:15 +0000)]
Merge pull request #4121 from sbokov:addingAloeGT
Vadim Pisarevsky [Tue, 16 Jun 2015 12:08:42 +0000 (12:08 +0000)]
Merge pull request #4116 from alalek:fix-pthread-pf
Maxim Kostin [Tue, 2 Jun 2015 15:33:21 +0000 (18:33 +0300)]
Added dummy highgui WinRT implementation
sbokov [Sun, 14 Jun 2015 20:59:48 +0000 (23:59 +0300)]
Added ground-truth disparity map for 'aloe'
Alexander Duda [Fri, 12 Jun 2015 11:50:43 +0000 (13:50 +0200)]
cv::stereoRectify: fix segfault in case of empty distCoeffs
cvStereoRectify assumes that NULL is provided in case of no distCoeffs
Alexander Alekhin [Thu, 11 Jun 2015 13:53:07 +0000 (16:53 +0300)]
fix support for pthreads parallel_for
Alexander Alekhin [Thu, 11 Jun 2015 12:36:29 +0000 (15:36 +0300)]
ocl: added errors processing in OpenCL code generator, resolve space issue
Suleyman TURKMEN [Thu, 11 Jun 2015 08:46:42 +0000 (11:46 +0300)]
Update imgproc.hpp
Suleyman TURKMEN [Thu, 11 Jun 2015 08:03:14 +0000 (11:03 +0300)]
Update imgproc.hpp
Suleyman TURKMEN [Wed, 10 Jun 2015 10:18:40 +0000 (13:18 +0300)]
Update imgproc.hpp
Alexander Alekhin [Tue, 9 Jun 2015 13:58:58 +0000 (16:58 +0300)]
remove bindings generation for DetectionBasedTracker
René [Tue, 9 Jun 2015 15:23:22 +0000 (17:23 +0200)]
Fix bug in distanceATS_L1_8u and typos.
The inner loop of the backward scan got the wrong initial "a".
Alexander Alekhin [Mon, 8 Jun 2015 10:06:29 +0000 (13:06 +0300)]
videoio: fix some issues in ffmpeg error processing
Alexander Alekhin [Mon, 8 Jun 2015 09:58:02 +0000 (12:58 +0300)]
videoio: update ffmpeg backend
- fix compilation for old libraries
- update codec/tag selection logic
- add documentation note about MP4 container tags
Maksim Shabunin [Tue, 9 Jun 2015 10:59:48 +0000 (13:59 +0300)]
Fixed compilation of pthread-based parallel_for with gcc 4.4.3
Maksim Shabunin [Fri, 5 Jun 2015 09:41:23 +0000 (12:41 +0300)]
Python generator: moved base class handling to the generate step
Maksim Shabunin [Thu, 4 Jun 2015 11:54:50 +0000 (14:54 +0300)]
Merge tag '3.0.0'
OpenCV 3.0.0
* tag '3.0.0':
Version for 3.0.0 release
Maksim Shabunin [Wed, 3 Jun 2015 17:21:34 +0000 (20:21 +0300)]
Version for 3.0.0 release
Maksim Shabunin [Wed, 3 Jun 2015 17:17:36 +0000 (17:17 +0000)]
Merge pull request #4083 from mshabunin:java-engine
Maksim Shabunin [Wed, 3 Jun 2015 17:16:51 +0000 (17:16 +0000)]
Merge pull request #4089 from alalek:video_mp4
Maksim Shabunin [Wed, 3 Jun 2015 16:01:48 +0000 (19:01 +0300)]
AndroidMgr: fixed package build
Alexander Alekhin [Wed, 3 Jun 2015 14:01:45 +0000 (17:01 +0300)]
videoio: VideoWriter H264/.mp4 support via ffmpeg/libav
Maksim Shabunin [Wed, 3 Jun 2015 09:47:42 +0000 (12:47 +0300)]
AndroidMgr: fixed library version check
Maksim Shabunin [Wed, 3 Jun 2015 08:53:29 +0000 (11:53 +0300)]
AndroidMgr: fixed typos and package name
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
Maksim Shabunin [Tue, 2 Jun 2015 15:34:30 +0000 (18:34 +0300)]
AndroidMgr: Reversed file existence checking
Maksim Shabunin [Wed, 20 May 2015 14:59:42 +0000 (17:59 +0300)]
Updated Manager for Android
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