Alexander Karsakov [Thu, 17 Jul 2014 11:11:06 +0000 (15:11 +0400)]
Revert changes by PR#2930 since it breaks logic of inverse mode.
Vadim Pisarevsky [Wed, 16 Jul 2014 19:26:46 +0000 (19:26 +0000)]
Merge pull request #2970 from PhilLab:patch-3
unknown [Fri, 11 Jul 2014 17:43:04 +0000 (19:43 +0200)]
Function for drawing arrows
Vadim Pisarevsky [Tue, 15 Jul 2014 09:47:52 +0000 (09:47 +0000)]
Merge pull request #2909 from StevenPuttemans:bugfix_profileface_model
Vadim Pisarevsky [Tue, 15 Jul 2014 09:44:32 +0000 (09:44 +0000)]
Merge pull request #2965 from soulslicer:patch-2
Vadim Pisarevsky [Tue, 15 Jul 2014 08:10:33 +0000 (08:10 +0000)]
Merge pull request #2966 from PhilLab:patch-2
Vadim Pisarevsky [Tue, 15 Jul 2014 08:10:04 +0000 (08:10 +0000)]
Merge pull request #2967 from LeonidBeynenson:bugfix_wave_correction_wrong_result
Vadim Pisarevsky [Mon, 14 Jul 2014 19:00:52 +0000 (19:00 +0000)]
Merge pull request #2780 from hbadino:Feature_3692_2.4
Vadim Pisarevsky [Mon, 14 Jul 2014 18:47:13 +0000 (18:47 +0000)]
Merge pull request #2959 from StevenPuttemans:add_notice_loaded_parameters
Vadim Pisarevsky [Mon, 14 Jul 2014 18:42:49 +0000 (18:42 +0000)]
Merge pull request #2957 from cambyse:2.4
Vadim Pisarevsky [Mon, 14 Jul 2014 18:40:38 +0000 (18:40 +0000)]
Merge pull request #2971 from ruslo:docfix
Vadim Pisarevsky [Mon, 14 Jul 2014 18:35:37 +0000 (18:35 +0000)]
Merge pull request #2972 from apavlenko:24_face_rec_sample
Roman Donchenko [Mon, 14 Jul 2014 12:19:31 +0000 (12:19 +0000)]
Merge pull request #2815 from Aletheios:Bugfix#3705
Roman Donchenko [Mon, 14 Jul 2014 12:11:49 +0000 (12:11 +0000)]
Merge pull request #2975 from asmorkalov:ocv_cuda_6.5_fix
Alexander Smorkalov [Mon, 14 Jul 2014 10:26:50 +0000 (14:26 +0400)]
Build fixes for CUDA 6.5
Roman Donchenko [Mon, 14 Jul 2014 08:21:24 +0000 (08:21 +0000)]
Merge pull request #2955 from SpecLad:find-libv4l2
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
Andrey Pavlenko [Sat, 12 Jul 2014 15:28:43 +0000 (19:28 +0400)]
improving face-rec sample:
* CSV can contain dir-s and wildcards
* save trained model
Roman Donchenko [Fri, 11 Jul 2014 14:15:59 +0000 (14:15 +0000)]
Merge pull request #2903 from mmaraya:2.4
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.
StevenPuttemans [Thu, 10 Jul 2014 11:28:32 +0000 (13:28 +0200)]
added extra warning about the automatic parameter loading for traincascade application when the param.xml file already exists
PhilLab [Fri, 11 Jul 2014 07:22:55 +0000 (09:22 +0200)]
Added publication reference
Raaj [Fri, 11 Jul 2014 00:44:40 +0000 (17:44 -0700)]
Update facedetect.cpp
Somebody forgot to add curly brackets
Camille [Wed, 9 Jul 2014 20:35:56 +0000 (22:35 +0200)]
bug fix 3696
Alexander Alekhin [Wed, 9 Jul 2014 14:57:46 +0000 (14:57 +0000)]
Merge pull request #2954 from ilya-lavrenov:doc_fix
Ilya Lavrenov [Wed, 9 Jul 2014 13:46:22 +0000 (17:46 +0400)]
fixed docs
Roman Donchenko [Wed, 9 Jul 2014 12:55:40 +0000 (16:55 +0400)]
cap_libv4l.cpp depends on both libv4l 1 and 2, so search for both
How this worked before, I do not know.
Roman Donchenko [Wed, 9 Jul 2014 07:49:47 +0000 (07:49 +0000)]
Merge pull request #2883 from berak:b_3756_24
berak [Tue, 8 Jul 2014 15:26:23 +0000 (17:26 +0200)]
added missing impl for multi-dim Mat::ones, Mat::zeros (issue #3756)
Roman Donchenko [Tue, 8 Jul 2014 12:14:54 +0000 (12:14 +0000)]
Merge pull request #2558 from asmorkalov:ocv_matop_init_fix
Vadim Pisarevsky [Mon, 7 Jul 2014 13:29:38 +0000 (13:29 +0000)]
Merge pull request #2908 from mmaraya:bug_3737
Vadim Pisarevsky [Mon, 7 Jul 2014 11:21:11 +0000 (11:21 +0000)]
Merge pull request #2930 from akarsakov:dft_dst_size_fix
Alexander Karsakov [Thu, 3 Jul 2014 06:27:53 +0000 (10:27 +0400)]
Fixed dst size
Vadim Pisarevsky [Wed, 2 Jul 2014 14:25:52 +0000 (14:25 +0000)]
Merge pull request #2915 from SpecLad:core-useless-casts
Vadim Pisarevsky [Wed, 2 Jul 2014 14:24:09 +0000 (14:24 +0000)]
Merge pull request #2071 from pemmanuelviel:LshOrthogonalSubvectors
Alexander Alekhin [Wed, 2 Jul 2014 12:18:10 +0000 (12:18 +0000)]
Merge pull request #2922 from ilya-lavrenov:mac_fix
Alexander Alekhin [Tue, 1 Jul 2014 16:02:02 +0000 (20:02 +0400)]
ocl: fix mac and superres test
Ilya Lavrenov [Tue, 1 Jul 2014 10:53:39 +0000 (14:53 +0400)]
fix for fisheye
Vadim Pisarevsky [Tue, 1 Jul 2014 18:41:14 +0000 (18:41 +0000)]
Merge pull request #2905 from Jazmann:2.4
Vadim Pisarevsky [Tue, 1 Jul 2014 16:40:08 +0000 (16:40 +0000)]
Merge pull request #2917 from mmaraya:bug_3872
Vadim Pisarevsky [Tue, 1 Jul 2014 11:02:04 +0000 (11:02 +0000)]
Merge pull request #2914 from alalek:fix2.4
Ilya Lavrenov [Tue, 1 Jul 2014 10:31:25 +0000 (14:31 +0400)]
fixed warnings
StevenPuttemans [Fri, 27 Jun 2014 12:53:43 +0000 (14:53 +0200)]
fixed two models, adding xml identifier to correct position
Mike Maraya [Tue, 1 Jul 2014 02:17:52 +0000 (22:17 -0400)]
test.py: Check if camera_calibration.tar.gz file exists before downloading it, opencv bug #3782
Roman Donchenko [Mon, 30 Jun 2014 12:12:04 +0000 (16:12 +0400)]
Remove a couple of useless casts in core headers
This helps users who compile their code with -Wuseless-cast.
Alexander Alekhin [Mon, 30 Jun 2014 12:03:20 +0000 (16:03 +0400)]
fix bug with invalid signature size (should not be less than signatureLength())
Alexander Alekhin [Mon, 30 Jun 2014 12:03:07 +0000 (16:03 +0400)]
fix python tests
Mike Maraya [Fri, 27 Jun 2014 12:34:40 +0000 (08:34 -0400)]
Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737)
Mike Maraya [Fri, 27 Jun 2014 12:20:22 +0000 (08:20 -0400)]
Revert "Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737)"
This reverts commit
56683e6d112a808fbd51c74917f0c4d9d752f502.
Mike Maraya [Fri, 27 Jun 2014 12:02:01 +0000 (08:02 -0400)]
Fixes build failure on Mac OS X 10.10 Yosemite Beta due to highgui/src/window_cocoa.mm (Bug #3737)
Mike Maraya [Sat, 28 Jun 2014 03:26:09 +0000 (23:26 -0400)]
Fixes resizeWindow() on OS X (Bug #3200)
Roman Donchenko [Thu, 26 Jun 2014 13:28:44 +0000 (17:28 +0400)]
Merge pull request #2766 from akarsakov:pyr_border_constant
Roman Donchenko [Wed, 25 Jun 2014 12:32:17 +0000 (16:32 +0400)]
Merge pull request #2880 from GravityJack:SparseMatIterator-build-fix
Roman Donchenko [Wed, 25 Jun 2014 12:27:33 +0000 (16:27 +0400)]
Merge pull request #2891 from nisargthakkar:dims_zero_on_release
Vadim Pisarevsky [Tue, 24 Jun 2014 12:06:19 +0000 (12:06 +0000)]
Merge pull request #2889 from Ilya-Krylov:fisheye
Jasper [Tue, 24 Jun 2014 10:52:56 +0000 (11:52 +0100)]
Fix for VTK6.2 issue.
Nisarg Thakkar [Mon, 23 Jun 2014 14:45:23 +0000 (20:15 +0530)]
Fix for Bug#3757: All dimension values are 0 after release is called
Ilya Krylov [Mon, 23 Jun 2014 13:06:40 +0000 (17:06 +0400)]
Fixed android and windows x64 build issues
Marc Rollins [Thu, 19 Jun 2014 21:14:10 +0000 (14:14 -0700)]
Fixing build error when using post-increment operator.
Roman Donchenko [Thu, 19 Jun 2014 12:52:00 +0000 (16:52 +0400)]
Merge pull request #2870 from 23pointsNorth:patch-5
Roman Donchenko [Thu, 19 Jun 2014 12:51:37 +0000 (16:51 +0400)]
Merge pull request #2868 from neo008:2.4
Andrey Pavlenko [Thu, 19 Jun 2014 09:08:32 +0000 (09:08 +0000)]
Merge pull request #2843 from berak:f_export_bow_24
Alexander Alekhin [Wed, 18 Jun 2014 13:19:11 +0000 (13:19 +0000)]
Merge pull request #2846 from alalek:2.4_fix_python_warnings
Daniel Angelov [Mon, 16 Jun 2014 12:05:17 +0000 (13:05 +0100)]
Updated findHomography docs branch 2.4
Updated the documents to give warning to the users of `findHomography` that the function may return an empty matrix in some cases.
The user must take care of checking that.
Neo Alienson [Mon, 16 Jun 2014 10:48:10 +0000 (18:48 +0800)]
Fix typos
Vadim Pisarevsky [Thu, 12 Jun 2014 17:37:46 +0000 (21:37 +0400)]
Merge pull request #2726 from Ilya-Krylov:2.4
Vadim Pisarevsky [Thu, 12 Jun 2014 17:35:27 +0000 (21:35 +0400)]
Merge pull request #2779 from pemmanuelviel:kmeansppSquareDist
berak [Wed, 11 Jun 2014 09:50:22 +0000 (11:50 +0200)]
add Bag of Words to python wrapper
Alexander Alekhin [Tue, 10 Jun 2014 14:12:38 +0000 (18:12 +0400)]
fix -Wmaybe-uninitialized warning (initialize pointers to NULL)
Roman Donchenko [Tue, 10 Jun 2014 08:24:56 +0000 (12:24 +0400)]
Merge pull request #2705 from KonstantinMatskevich:face_recognition_labels_info
Roman Donchenko [Mon, 9 Jun 2014 10:29:44 +0000 (14:29 +0400)]
Merge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4
Roman Donchenko [Mon, 9 Jun 2014 09:37:38 +0000 (13:37 +0400)]
Merge pull request #2818 from StevenPuttemans:fix_linux_tutorial
Andrey Pavlenko [Mon, 9 Jun 2014 09:26:45 +0000 (13:26 +0400)]
moving FaceRecognizer2 from public header to .cpp
berak [Sat, 7 Jun 2014 14:34:53 +0000 (16:34 +0200)]
export BOW to script wrappers
atinfinity [Fri, 6 Jun 2014 22:29:22 +0000 (07:29 +0900)]
fixed calculation method of "cv::TickMeter"
Konstantin Matskevich [Wed, 28 May 2014 11:28:54 +0000 (15:28 +0400)]
facerec2
StevenPuttemans [Mon, 2 Jun 2014 07:35:19 +0000 (09:35 +0200)]
fix typo in linux tutorial
aletheios [Sat, 31 May 2014 16:44:32 +0000 (18:44 +0200)]
Bugfix #3705: params.setRecordingHint(true) breaks camera preview on Samsung Galaxy S2
Roman Donchenko [Thu, 29 May 2014 10:50:42 +0000 (14:50 +0400)]
Merge pull request #2771 from SpecLad:pvs-checks-opencv
Alexander Alekhin [Wed, 28 May 2014 09:28:30 +0000 (13:28 +0400)]
Merge pull request #2796 from berak:b_3674_24
berak [Wed, 28 May 2014 08:37:16 +0000 (10:37 +0200)]
2 fixed unassigned reshapes in em (#3674)
Roman Donchenko [Tue, 27 May 2014 09:35:10 +0000 (13:35 +0400)]
Merge pull request #2793 from alalek:run_android_env
Alexander Alekhin [Mon, 26 May 2014 10:32:52 +0000 (14:32 +0400)]
run.py: propagate OPENCV* env variables only with --android_propagate_opencv_env flag
Alexander Alekhin [Sun, 25 May 2014 21:19:16 +0000 (01:19 +0400)]
run.py: added --android_env parameter
Roman Donchenko [Thu, 22 May 2014 14:03:56 +0000 (18:03 +0400)]
Merge pull request #2742 from StevenPuttemans:feature_3176
StevenPuttemans [Tue, 13 May 2014 12:35:08 +0000 (14:35 +0200)]
Added more info on the data input variable of kmeans
Pierre-Emmanuel Viel [Wed, 21 May 2014 11:16:12 +0000 (13:16 +0200)]
Add the ensureSimpleDistance() method to ensure the user the returned distance is not ^2 (the default for L2 for instance)
Pierre-Emmanuel Viel [Wed, 21 May 2014 10:27:38 +0000 (12:27 +0200)]
Fix local variable shadowing
Konstantin Matskevich [Tue, 20 May 2014 14:03:20 +0000 (18:03 +0400)]
fixed binary compatibility
Pierre-Emmanuel Viel [Tue, 20 May 2014 23:31:52 +0000 (01:31 +0200)]
Merge remote-tracking branch 'upstream/2.4' into LshOrthogonalSubvectors
Pierre-Emmanuel Viel [Tue, 20 May 2014 20:52:11 +0000 (22:52 +0200)]
Allows to choose orthogonal sub-vectors for LSH without using a static table among LshTable instances
Alexander Karsakov [Mon, 19 May 2014 14:15:04 +0000 (18:15 +0400)]
Disabled BORDER_CONSTANT for pyramid functions.
Hernan Badino [Tue, 20 May 2014 13:28:11 +0000 (09:28 -0400)]
Merge branch 'Itseez-2.4' into Feature_3692_2.4
Hernan Badino [Tue, 20 May 2014 13:27:59 +0000 (09:27 -0400)]
Merge branch '2.4' of https://github.com/Itseez/opencv into Itseez-2.4
Roman Donchenko [Tue, 20 May 2014 09:54:00 +0000 (13:54 +0400)]
Fixed several problems found by PVS-Studio.
This fixes all problems from the article "Checking OpenCV with PVS-Studio"
<http://www.viva64.com/en/b/0191/> that are not already fixed and are
not in 3rdparty or the legacy module.
The problems fixed are two instances of useless code and one instance
of unspecified behavior (right-shifting a negative number).
Ilya Krylov [Tue, 20 May 2014 08:37:37 +0000 (12:37 +0400)]
Added license to source files
Roman Donchenko [Tue, 20 May 2014 07:50:29 +0000 (11:50 +0400)]
Merge pull request #2768 from SpecLad:useless-loop
Ilya Krylov [Mon, 19 May 2014 14:16:00 +0000 (18:16 +0400)]
Changed documentation for namespace fisheye
Hernan Badino [Mon, 19 May 2014 14:12:07 +0000 (10:12 -0400)]
Switched insertion of connected components in filterSpecklesImpl
Ilya Krylov [Mon, 19 May 2014 13:55:32 +0000 (17:55 +0400)]
Refactored class Fisheye to namespace fisheye