Vadim Pisarevsky [Thu, 14 May 2015 18:23:27 +0000 (18:23 +0000)]
Merge pull request #4014 from sgjava:opencv-sgjava
Vadim Pisarevsky [Thu, 14 May 2015 18:22:26 +0000 (18:22 +0000)]
Merge pull request #4012 from mshabunin:doc-fixes
Vadim Pisarevsky [Thu, 14 May 2015 18:16:23 +0000 (18:16 +0000)]
Merge pull request #4017 from headupinclouds:master
David Hirvonen [Wed, 13 May 2015 21:34:16 +0000 (17:34 -0400)]
Avoid clearing HaarEvaluator::tofs variable (introduced
fb8478eb7b6c76f15c106c29a8843d8c3722bb62) in HaarEvaluator::setImage(...) since it won't be recomputed by HaarEvaluator::computeOptFeatures() for cases where the input image dimensions and requested search scales are the same as the previous. If none of the above change then it should be correct, and if they do change it will be computed correctly inside HaarEvaluator::computeOptFeatures() (in commit
952f9dbe629e8e9f310c70c78ed46d484439c1c9)
I'm guessing there is a unit test for this that needs to be called 2x with the same image and search parameters (or another image with the same size) to illustrate the problem.
sgjava [Wed, 13 May 2015 17:45:19 +0000 (13:45 -0400)]
Removed finalize() and added n_delete to release()
sgjava [Wed, 13 May 2015 17:44:53 +0000 (13:44 -0400)]
Changed delete() modifier to public from protected
Maksim Shabunin [Wed, 13 May 2015 15:42:31 +0000 (18:42 +0300)]
Reorganized user guide
Maksim Shabunin [Wed, 13 May 2015 14:59:03 +0000 (17:59 +0300)]
Fixed external link in python colorspace tutorial
Maksim Shabunin [Tue, 12 May 2015 14:54:31 +0000 (17:54 +0300)]
Docs: fixed _dest type in cv::compare
Maksim Shabunin [Fri, 8 May 2015 14:28:03 +0000 (17:28 +0300)]
Documentation for CommandLineParser
Maksim Shabunin [Thu, 7 May 2015 15:18:46 +0000 (18:18 +0300)]
Fixed RGB-to-HLS conversion formula in documentation
Maksim Shabunin [Thu, 7 May 2015 15:00:11 +0000 (18:00 +0300)]
Replaced 'corrected' to 'distorted' in camera calibration tutorials
Vadim Pisarevsky [Wed, 13 May 2015 11:36:15 +0000 (11:36 +0000)]
Merge pull request #4006 from sgjava:opencv-steve
Vadim Pisarevsky [Wed, 13 May 2015 11:35:09 +0000 (11:35 +0000)]
Merge pull request #4007 from martin-ueding:master
Martin Ueding [Wed, 13 May 2015 06:16:39 +0000 (08:16 +0200)]
Fix spelling
sgjava [Tue, 12 May 2015 18:18:39 +0000 (14:18 -0400)]
Added VideoWriter and changed finalize to delete
Vadim Pisarevsky [Tue, 12 May 2015 15:12:26 +0000 (15:12 +0000)]
Merge pull request #3974 from StevenPuttemans:fix_RGB_naming_master
Vadim Pisarevsky [Tue, 12 May 2015 15:11:07 +0000 (15:11 +0000)]
Merge pull request #3994 from mshabunin:fix-gtk-crash
Vadim Pisarevsky [Tue, 12 May 2015 15:06:31 +0000 (15:06 +0000)]
Merge pull request #3996 from Ashod:opengl_context_clip
Vadim Pisarevsky [Tue, 12 May 2015 15:04:41 +0000 (15:04 +0000)]
Merge pull request #3993 from vrabaud:master
Vadim Pisarevsky [Tue, 12 May 2015 15:01:54 +0000 (15:01 +0000)]
Merge pull request #3999 from berak:features2d_tutorial_fix
Vadim Pisarevsky [Tue, 12 May 2015 14:47:36 +0000 (14:47 +0000)]
Merge pull request #4000 from sdika:HOGSignedGradient
Vadim Pisarevsky [Tue, 12 May 2015 14:33:06 +0000 (14:33 +0000)]
Merge pull request #4002 from marvins:gdal-fix
Marvin Smith [Tue, 12 May 2015 03:27:50 +0000 (20:27 -0700)]
Fixing the gdal include error that Macports seems to only mess up.
berak [Sun, 10 May 2015 11:44:49 +0000 (13:44 +0200)]
small fixes for features2d tutorials
Michaël Sdika [Sun, 10 May 2015 07:23:30 +0000 (09:23 +0200)]
added the signedGradient varaible to the HOGDescriptor class.
when true, use signed gradient for the angular histogram computation.
default to false for backward compatibility.
Ashod Nakashian [Sat, 9 May 2015 16:23:09 +0000 (12:23 -0400)]
Prevent the parent from drawing over OpenGL context.
Maksim Shabunin [Thu, 7 May 2015 13:44:45 +0000 (16:44 +0300)]
Fixed python crash when both cv2.imshow and gtk module are used
Vincent Rabaud [Thu, 7 May 2015 11:38:59 +0000 (11:38 +0000)]
get code to compile on Ubuntu Saucy
A define was forgotten for the codecs and there was a typo for
another.
Vadim Pisarevsky [Thu, 7 May 2015 10:38:31 +0000 (10:38 +0000)]
Merge pull request #3919 from cbalint13:brisk
Vadim Pisarevsky [Wed, 6 May 2015 15:49:18 +0000 (15:49 +0000)]
Merge pull request #3987 from vpisarev:core_fixes_part_1
Vadim Pisarevsky [Wed, 6 May 2015 14:48:34 +0000 (14:48 +0000)]
Merge pull request #3991 from mshabunin:python-underscore
Vadim Pisarevsky [Wed, 6 May 2015 14:02:32 +0000 (14:02 +0000)]
Merge pull request #3985 from StevenPuttemans:fix_imread_parameters
Maksim Shabunin [Wed, 6 May 2015 12:21:23 +0000 (15:21 +0300)]
Wrap ANN_MLP class into Python
cbalint13 [Wed, 6 May 2015 08:23:50 +0000 (11:23 +0300)]
Merge branch 'brisk' of https://github.com/cbalint13/opencv into brisk
cbalint13 [Sat, 11 Apr 2015 09:09:13 +0000 (12:09 +0300)]
Squash all BRISK commits into one.
Vadim Pisarevsky [Wed, 6 May 2015 07:00:10 +0000 (10:00 +0300)]
fixed compile errors on ARM, as well as failures in OCL_Dft* regression tests
Vadim Pisarevsky [Tue, 5 May 2015 17:31:30 +0000 (20:31 +0300)]
fixed random failures in Core_DFT.complex_output2 test (the case of input_mat.cols == 1)
Vadim Pisarevsky [Tue, 5 May 2015 15:03:40 +0000 (18:03 +0300)]
some more compile warnings fixed
Vadim Pisarevsky [Tue, 5 May 2015 14:49:36 +0000 (17:49 +0300)]
fixed warning in mathfuncs
StevenPuttemans [Mon, 4 May 2015 11:24:25 +0000 (13:24 +0200)]
fixing old variables in documentation and transfering to the new interface
Vadim Pisarevsky [Tue, 5 May 2015 12:56:06 +0000 (15:56 +0300)]
extended MinProblemSolver::Function to 1) report the space dimensionality, 2) compute gradient if needed
cbalint13 [Tue, 5 May 2015 09:19:35 +0000 (12:19 +0300)]
Force newer build over buildbot.
cbalint13 [Mon, 4 May 2015 16:54:08 +0000 (19:54 +0300)]
Force buildbot to rebuild.
Maksim Shabunin [Mon, 4 May 2015 09:48:06 +0000 (09:48 +0000)]
Merge pull request #3972 from PhilLab:docLineno
StevenPuttemans [Thu, 30 Apr 2015 09:27:58 +0000 (11:27 +0200)]
fixing all RGB instances to BGR where needed
Vadim Pisarevsky [Sun, 3 May 2015 08:36:24 +0000 (11:36 +0300)]
reenabled conjugate gradient solver test
Vadim Pisarevsky [Sun, 3 May 2015 08:31:49 +0000 (11:31 +0300)]
ok, so probably the failure in downhill simplex has been finally solved
Vadim Pisarevsky [Sat, 2 May 2015 23:46:33 +0000 (02:46 +0300)]
added test for http://code.opencv.org/issues/1918
Vadim Pisarevsky [Sat, 2 May 2015 23:29:15 +0000 (02:29 +0300)]
refactored downhill simplex implementation a bit; hopefully, fixed the bug with random failures in the tests
Vadim Pisarevsky [Sat, 2 May 2015 19:12:12 +0000 (22:12 +0300)]
Fixed getContinuousSize() to handle huge matrices properly. This should solve code.opencv.org/issues/3232
Vadim Pisarevsky [Sat, 2 May 2015 18:31:47 +0000 (21:31 +0300)]
improved randShuffle as suggested by John Stark in code.opencv.org/issues/3730
Vadim Pisarevsky [Sat, 2 May 2015 17:59:57 +0000 (20:59 +0300)]
fixed bug with simplex initialization in Downhill solver (thanks to Toby Rule for the patch): code.opencv.org/issues/3990.
re-enabled Downhill solver test, let's see how it goes
Vadim Pisarevsky [Sat, 2 May 2015 17:38:30 +0000 (20:38 +0300)]
added test checking code.opencv.org/issues/4050
cbalint13 [Sat, 2 May 2015 08:25:22 +0000 (11:25 +0300)]
Force buildbot rebuild.
cbalint13 [Fri, 1 May 2015 19:07:08 +0000 (22:07 +0300)]
Fix bugs in non-max suppression routine.
Vadim Pisarevsky [Fri, 1 May 2015 18:49:11 +0000 (21:49 +0300)]
refactored div & pow funcs; added tests for special cases in pow() function.
fixed http://code.opencv.org/issues/3935
possibly fixed http://code.opencv.org/issues/3594
Roman Donchenko [Thu, 30 Apr 2015 12:48:50 +0000 (12:48 +0000)]
Merge pull request #3973 from xsorifc28:patch-1
cbalint13 [Wed, 29 Apr 2015 23:23:58 +0000 (02:23 +0300)]
Leave AGAST at thresold=10, cosmetic for perf tests.
cbalint13 [Wed, 29 Apr 2015 20:54:16 +0000 (23:54 +0300)]
Default AGAST threshold is 40 (as authors recomandation)
cbalint13 [Wed, 29 Apr 2015 20:42:57 +0000 (23:42 +0300)]
Adjust AGAST perftest to be at parity (better) with FAST ones.
Vadim Pisarevsky [Wed, 29 Apr 2015 20:08:22 +0000 (23:08 +0300)]
fixed invalid output of cv::dft when using DFT_ROWS + DFT_COMPLEX_OUTPUT (code.opencv.org/issues/3428)
Vadim Pisarevsky [Wed, 29 Apr 2015 13:09:58 +0000 (16:09 +0300)]
fixed U non-orthogonality in SVD (code.opencv.org/issues/3801)
Vadim Pisarevsky [Wed, 29 Apr 2015 12:36:45 +0000 (15:36 +0300)]
added vector<bool> support (code.opencv.org/issues/3826)
Vadim Pisarevsky [Wed, 29 Apr 2015 10:12:53 +0000 (13:12 +0300)]
fixed code.opencv.org/issues/3828, added test. thanks to berak for the patch
Vadim Pisarevsky [Wed, 29 Apr 2015 08:58:49 +0000 (11:58 +0300)]
fixed http://code.opencv.org/issues/4278
Vadim Pisarevsky [Wed, 29 Apr 2015 08:47:12 +0000 (11:47 +0300)]
fixed http://code.opencv.org/issues/4189
Vadim Pisarevsky [Wed, 29 Apr 2015 08:43:53 +0000 (11:43 +0300)]
fixed compile errors on OSX and other systems where ffmpeg is detected manually, not via pkg-config
Philipp Hasper [Wed, 29 Apr 2015 07:31:53 +0000 (09:31 +0200)]
Doxygen: replaced @includelineno by @include to enable copy-pasting
cbalint13 [Tue, 28 Apr 2015 15:51:13 +0000 (18:51 +0300)]
Merge branch 'master' of https://github.com/Itseez/opencv into brisk
Vadim Pisarevsky [Tue, 28 Apr 2015 14:47:05 +0000 (14:47 +0000)]
Merge pull request #3967 from Belev:fix-typo
Vadim Pisarevsky [Tue, 28 Apr 2015 11:00:57 +0000 (11:00 +0000)]
Merge pull request #3966 from Dikay900:master_diff_to_2_4_2
Vadim Pisarevsky [Tue, 28 Apr 2015 10:55:04 +0000 (10:55 +0000)]
Merge pull request #3954 from martin-ueding:master
Vadim Pisarevsky [Tue, 28 Apr 2015 10:47:35 +0000 (10:47 +0000)]
Merge pull request #3962 from apavlenko:fix_polylines_empty
Maksim Shabunin [Tue, 28 Apr 2015 10:41:14 +0000 (10:41 +0000)]
Merge pull request #3678 from mshabunin:explicit-sse-disable
Vadim Pisarevsky [Tue, 28 Apr 2015 10:38:54 +0000 (10:38 +0000)]
Merge pull request #3964 from Dikay900:master_diff_to_2_4
Belev [Mon, 27 Apr 2015 08:10:47 +0000 (11:10 +0300)]
Fix typo
Fixed difference in the given arguments to the ellipse function and the description after that
Fixed two more typos
Replaced unnecessary the with to
cbalint13 [Tue, 28 Apr 2015 03:48:52 +0000 (06:48 +0300)]
Merge remote-tracking branch 'upstream/master' into brisk
Samed Ozdemir [Tue, 28 Apr 2015 03:00:39 +0000 (23:00 -0400)]
Fixed a typo, "requited" -> "required"
Maksim Shabunin [Mon, 27 Apr 2015 14:05:55 +0000 (17:05 +0300)]
Increased perf_imgproc.moments max error
kalistratovag [Wed, 22 Apr 2015 13:29:10 +0000 (16:29 +0300)]
Adding 1 to moments to avoid tests fails
Maksim Shabunin [Thu, 5 Feb 2015 14:42:24 +0000 (17:42 +0300)]
Use explicit no-sse flags when SSE is off
Also:
- Silence clang warnings about unsupported command line arguments
- Add diagnostic print to calib3d test
- Fixed perf test relative error check
- Fix iOS build problem
Thomas Gabrowski [Fri, 13 Feb 2015 00:51:03 +0000 (00:51 +0000)]
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
Conflicts:
modules/contrib/include/opencv2/contrib/retina.hpp
Mansour Moufid [Sun, 1 Feb 2015 20:51:33 +0000 (15:51 -0500)]
Use the CMake find_library command to find the FFmpeg libraries.
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
Roman Donchenko [Mon, 16 Feb 2015 16:31:51 +0000 (19:31 +0300)]
cap_msmf.hpp: fix a warning about nNull being unused
The two functions featuring nNull are not particularly needed, so
I simply removed them.
Conflicts:
modules/highgui/src/cap_msmf.hpp
Mansour Moufid [Tue, 24 Feb 2015 17:21:34 +0000 (12:21 -0500)]
Cast some image coordinates and sizes to double.
Conflicts:
modules/gpu/perf/perf_imgproc.cpp
Cast a long integer to double explicitly.
Conflicts:
modules/python/src2/cv2.cpp
Cast some matrix sizes to type int.
Change some vector mask types to unsigned.
Conflicts:
modules/core/src/arithm.cpp
Luis Díaz Más [Thu, 19 Mar 2015 20:25:10 +0000 (21:25 +0100)]
Fix a bug that impede to set the trackbar pos using the Qt control panel
Conflicts:
modules/highgui/src/window_QT.cpp
Luis Díaz Más [Wed, 18 Mar 2015 19:07:08 +0000 (20:07 +0100)]
Fixing the bug #4244 that I just reported in code.opencv.org
Craig Reynolds [Fri, 16 Jan 2015 22:57:11 +0000 (14:57 -0800)]
In cvAddText, construct QString from "text" using fromUtf8.
Boris Daskalov [Tue, 17 Mar 2015 14:23:03 +0000 (16:23 +0200)]
Fix a bad free space check in icvGrowSeq.
A difference of two pointers was casted to unsigned which can lead to
overflow on 64-bit systems.
Vladimir Kolesnikov [Wed, 1 Apr 2015 10:52:07 +0000 (13:52 +0300)]
Not block PDB file in multithreaded build on Windows.
If used cl compiler, but generator is not Visual Studio e.g. Ninja,
enable FS option to prevent blocking PDB file in multithreaded build.
Alexander Nitsch [Thu, 19 Feb 2015 23:55:26 +0000 (00:55 +0100)]
Implement CMAKE_CURRENT_LIST_DIR for older CMake
The use of built-in CMAKE_CURRENT_LIST_DIR requires at least
CMake 2.8.3. This fix properly defines the variable to allow its
use in versions < 2.8.3 as well.
Fixes issue #4205.
Exclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR
This avoids violation of possible future CMake policy checks
regarding reserved/read-only variables.
Milania1 [Thu, 12 Mar 2015 15:46:25 +0000 (16:46 +0100)]
fixed error in hough lines tutorial (the point (9,4) is not on the lines, but the point (4,9) is)
Conflicts:
doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst
Ilya Lavrenov [Tue, 7 Apr 2015 08:08:21 +0000 (11:08 +0300)]
typo
Dikay900 [Fri, 24 Apr 2015 16:19:03 +0000 (18:19 +0200)]
update openni sample comments referring #81
Andrey Pavlenko [Fri, 24 Apr 2015 14:11:51 +0000 (17:11 +0300)]
porting polylines with empty `vector<Point>` from 2.4 to master
Alexander Alekhin [Fri, 24 Apr 2015 11:56:47 +0000 (14:56 +0300)]
Merge tag '3.0.0-rc1'
Vadim Pisarevsky [Thu, 23 Apr 2015 17:16:52 +0000 (17:16 +0000)]
Merge pull request #3958 from ilya-lavrenov:cuda_aarch64
Vadim Pisarevsky [Thu, 23 Apr 2015 17:16:25 +0000 (17:16 +0000)]
Merge pull request #3957 from dhood:fm-8pt-bug
Ilya Lavrenov [Thu, 23 Apr 2015 14:57:29 +0000 (17:57 +0300)]
port of aarch64 cuda changes from 2.4