platform/upstream/opencv.git
9 years agocleanup after last PR
Dikay900 [Sun, 17 May 2015 22:31:39 +0000 (00:31 +0200)]
cleanup after last PR

9 years agoMerge pull request #3971 from Dikay900:2_4_to_master_3
Vadim Pisarevsky [Sun, 17 May 2015 00:28:30 +0000 (00:28 +0000)]
Merge pull request #3971 from Dikay900:2_4_to_master_3

9 years agoMerge pull request #4011 from cr333:parula
Vadim Pisarevsky [Sat, 16 May 2015 19:11:32 +0000 (19:11 +0000)]
Merge pull request #4011 from cr333:parula

9 years agoMerge pull request #4001 from LaurentBerger:ExampleBLOB
Vadim Pisarevsky [Sat, 16 May 2015 18:11:29 +0000 (18:11 +0000)]
Merge pull request #4001 from LaurentBerger:ExampleBLOB

9 years agoMerge pull request #4005 from MSOpenTech:videoio-contrib
Vadim Pisarevsky [Sat, 16 May 2015 18:08:28 +0000 (18:08 +0000)]
Merge pull request #4005 from MSOpenTech:videoio-contrib

9 years agoMerge pull request #4018 from vpisarev:imgproc_video_fixes
Vadim Pisarevsky [Fri, 15 May 2015 16:15:01 +0000 (16:15 +0000)]
Merge pull request #4018 from vpisarev:imgproc_video_fixes

9 years agoAdded sample Windows Universal application (UAP) using videoio logic for video previe...
Maxim Kostin [Fri, 15 May 2015 13:29:35 +0000 (16:29 +0300)]
Added sample Windows Universal application (UAP) using videoio logic for video preview and processing.

Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
9 years agoAdded configuration changes enabling videoio WinRT support.
Maxim Kostin [Fri, 15 May 2015 13:29:06 +0000 (16:29 +0300)]
Added configuration changes enabling videoio WinRT support.

Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
9 years agoAdded WinRT support for videoio.
Maxim Kostin [Fri, 15 May 2015 13:28:47 +0000 (16:28 +0300)]
Added WinRT support for videoio.

Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
9 years agoMoved old WinRT related wrappers from highgui to videoio fixing long broken logic.
Maxim Kostin [Fri, 15 May 2015 13:28:25 +0000 (16:28 +0300)]
Moved old WinRT related wrappers from highgui to videoio fixing long broken logic.

Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
9 years agohopefully, fixed crash in sparse mat test
Vadim Pisarevsky [Fri, 15 May 2015 13:15:10 +0000 (16:15 +0300)]
hopefully, fixed crash in sparse mat test

9 years agoMerge pull request #3979 from ruslo:fix.cxx11
Vadim Pisarevsky [Fri, 15 May 2015 12:32:45 +0000 (12:32 +0000)]
Merge pull request #3979 from ruslo:fix.cxx11

9 years agoMerge pull request #3982 from patrikhuber:vs2015-support-master
Vadim Pisarevsky [Fri, 15 May 2015 12:32:27 +0000 (12:32 +0000)]
Merge pull request #3982 from patrikhuber:vs2015-support-master

9 years agoMerge pull request #3983 from ruslo:unify.ios
Vadim Pisarevsky [Fri, 15 May 2015 12:32:05 +0000 (12:32 +0000)]
Merge pull request #3983 from ruslo:unify.ios

9 years agoMerge pull request #3917 from yanlend:patch-1
Vadim Pisarevsky [Thu, 14 May 2015 21:16:23 +0000 (21:16 +0000)]
Merge pull request #3917 from yanlend:patch-1

9 years agosignificantly reduced sparse matrix footprint:
Vadim Pisarevsky [Thu, 14 May 2015 20:29:09 +0000 (23:29 +0300)]
significantly reduced sparse matrix footprint:
http://code.opencv.org/issues/2206,
http://code.opencv.org/issues/2924

9 years agoMerge pull request #4009 from mshabunin:fix-ann-moment
Vadim Pisarevsky [Thu, 14 May 2015 18:25:15 +0000 (18:25 +0000)]
Merge pull request #4009 from mshabunin:fix-ann-moment

9 years agoMerge pull request #3992 from nomarek:master
Vadim Pisarevsky [Thu, 14 May 2015 18:24:09 +0000 (18:24 +0000)]
Merge pull request #3992 from nomarek:master

9 years agoMerge pull request #4014 from sgjava:opencv-sgjava
Vadim Pisarevsky [Thu, 14 May 2015 18:23:27 +0000 (18:23 +0000)]
Merge pull request #4014 from sgjava:opencv-sgjava

9 years agoMerge pull request #4012 from mshabunin:doc-fixes
Vadim Pisarevsky [Thu, 14 May 2015 18:22:26 +0000 (18:22 +0000)]
Merge pull request #4012 from mshabunin:doc-fixes

9 years agoMerge pull request #4017 from headupinclouds:master
Vadim Pisarevsky [Thu, 14 May 2015 18:16:23 +0000 (18:16 +0000)]
Merge pull request #4017 from headupinclouds:master

9 years agouse _mm_sad_epu8 instead of _mm_movemask_epi8 in countNonZero. Therefore, we do not...
Vadim Pisarevsky [Thu, 14 May 2015 17:33:53 +0000 (20:33 +0300)]
use _mm_sad_epu8 instead of _mm_movemask_epi8 in countNonZero. Therefore, we do not need any popcount table and this solves code.opencv.org/issues/4333

9 years agoadded extra check in CalibrateDebevec to make sure the points are within the image:
Vadim Pisarevsky [Thu, 14 May 2015 16:54:48 +0000 (19:54 +0300)]
added extra check in CalibrateDebevec to make sure the points are within the image:
http://code.opencv.org/issues/4124

9 years agoavoid possible problems with zero values in tone mapping algorithms (http://code...
Vadim Pisarevsky [Thu, 14 May 2015 16:32:25 +0000 (19:32 +0300)]
avoid possible problems with zero values in tone mapping algorithms (code.opencv.org/issues/4020)

9 years agoadded test to prove that remap does not leak memory (http://code.opencv.org/issues...
Vadim Pisarevsky [Thu, 14 May 2015 15:21:26 +0000 (18:21 +0300)]
added test to prove that remap does not leak memory (code.opencv.org/issues/2502). disabled the test for now to save execution time.

9 years agofixed compile warnings on Linux and Windows
Vadim Pisarevsky [Thu, 14 May 2015 13:42:51 +0000 (16:42 +0300)]
fixed compile warnings on Linux and Windows

9 years agoadded test for http://code.opencv.org/issues/2957
Vadim Pisarevsky [Thu, 14 May 2015 13:25:18 +0000 (16:25 +0300)]
added test for http://code.opencv.org/issues/2957

9 years agosignificantly improved parallel non-local means by using granularity parameter in...
Vadim Pisarevsky [Thu, 14 May 2015 12:39:42 +0000 (15:39 +0300)]
significantly improved parallel non-local means by using granularity parameter in parallel_for_ loop. Because the algorithm deals with sliding sums, it's essential that each thread has enough work to do, otherwise the algorithm gets higher theoretical complexity and thus there is no speedup comparing to 1-thread code (at best).

9 years agoincreased singularity epsilon in LU decomposition. This solved singular case from...
Vadim Pisarevsky [Thu, 14 May 2015 07:42:55 +0000 (10:42 +0300)]
increased singularity epsilon in LU decomposition. This solved singular case from code.opencv.org/issues/3305. Added the respective test.

9 years agoadded support for n-channel (n>4) images in warpAffine/warpPerspective/remap: http...
Vadim Pisarevsky [Thu, 14 May 2015 05:06:46 +0000 (08:06 +0300)]
added support for n-channel (n>4) images in warpAffine/warpPerspective/remap: code.opencv.org/issues/4190

9 years agoAvoid clearing HaarEvaluator::tofs variable (introduced fb8478eb7b6c76f15c106c29a8843...
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.

9 years agoadded test for http://code.opencv.org/issues/2736
Vadim Pisarevsky [Wed, 13 May 2015 19:16:35 +0000 (22:16 +0300)]
added test for http://code.opencv.org/issues/2736

9 years agosome fixes from http://code.opencv.org/issues/3733
Vadim Pisarevsky [Wed, 13 May 2015 19:00:02 +0000 (22:00 +0300)]
some fixes from http://code.opencv.org/issues/3733

9 years agoRemoved finalize() and added n_delete to release()
sgjava [Wed, 13 May 2015 17:45:19 +0000 (13:45 -0400)]
Removed finalize() and added n_delete to release()

9 years agoChanged delete() modifier to public from protected
sgjava [Wed, 13 May 2015 17:44:53 +0000 (13:44 -0400)]
Changed delete() modifier to public from protected

9 years agofixed http://code.opencv.org/issues/4276 - set drawing thickness limit to 32767
Marek Nogacki [Wed, 13 May 2015 16:54:25 +0000 (18:54 +0200)]
fixed code.opencv.org/issues/4276 - set drawing thickness limit to 32767

9 years agoremove example_blob.bmp
laurentBerger [Wed, 13 May 2015 16:06:26 +0000 (18:06 +0200)]
remove example_blob.bmp

9 years agoReorganized user guide
Maksim Shabunin [Wed, 13 May 2015 15:42:31 +0000 (18:42 +0300)]
Reorganized user guide

9 years agoFixed external link in python colorspace tutorial
Maksim Shabunin [Wed, 13 May 2015 14:59:03 +0000 (17:59 +0300)]
Fixed external link in python colorspace tutorial

9 years agoDocs: fixed _dest type in cv::compare
Maksim Shabunin [Tue, 12 May 2015 14:54:31 +0000 (17:54 +0300)]
Docs: fixed _dest type in cv::compare

9 years agoDocumentation for CommandLineParser
Maksim Shabunin [Fri, 8 May 2015 14:28:03 +0000 (17:28 +0300)]
Documentation for CommandLineParser

9 years agoFixed RGB-to-HLS conversion formula in documentation
Maksim Shabunin [Thu, 7 May 2015 15:18:46 +0000 (18:18 +0300)]
Fixed RGB-to-HLS conversion formula in documentation

9 years agoReplaced 'corrected' to 'distorted' in camera calibration tutorials
Maksim Shabunin [Thu, 7 May 2015 15:00:11 +0000 (18:00 +0300)]
Replaced 'corrected' to 'distorted' in camera calibration tutorials

9 years agoAdded color map similar to Matlab's new default color map 'parula'.
Christian Richardt [Wed, 13 May 2015 15:34:14 +0000 (17:34 +0200)]
Added color map similar to Matlab's new default color map 'parula'.

9 years agoFixed ANN_MLP dw initialization when moment is not 0
Maksim Shabunin [Wed, 13 May 2015 09:05:08 +0000 (12:05 +0300)]
Fixed ANN_MLP dw initialization when moment is not 0

9 years agoMerge pull request #4006 from sgjava:opencv-steve
Vadim Pisarevsky [Wed, 13 May 2015 11:36:15 +0000 (11:36 +0000)]
Merge pull request #4006 from sgjava:opencv-steve

9 years agoMerge pull request #4007 from martin-ueding:master
Vadim Pisarevsky [Wed, 13 May 2015 11:35:09 +0000 (11:35 +0000)]
Merge pull request #4007 from martin-ueding:master

9 years agoFix spelling
Martin Ueding [Wed, 13 May 2015 06:16:39 +0000 (08:16 +0200)]
Fix spelling

9 years agoAdded VideoWriter and changed finalize to delete
sgjava [Tue, 12 May 2015 18:18:39 +0000 (14:18 -0400)]
Added VideoWriter and changed finalize to delete

9 years agotry to implement remark included in message
laurentBerger [Tue, 12 May 2015 17:01:05 +0000 (19:01 +0200)]
try to implement remark included in message

9 years agoMerge pull request #3974 from StevenPuttemans:fix_RGB_naming_master
Vadim Pisarevsky [Tue, 12 May 2015 15:12:26 +0000 (15:12 +0000)]
Merge pull request #3974 from StevenPuttemans:fix_RGB_naming_master

9 years agoMerge pull request #3994 from mshabunin:fix-gtk-crash
Vadim Pisarevsky [Tue, 12 May 2015 15:11:07 +0000 (15:11 +0000)]
Merge pull request #3994 from mshabunin:fix-gtk-crash

9 years agoMerge pull request #3996 from Ashod:opengl_context_clip
Vadim Pisarevsky [Tue, 12 May 2015 15:06:31 +0000 (15:06 +0000)]
Merge pull request #3996 from Ashod:opengl_context_clip

9 years agoMerge pull request #3993 from vrabaud:master
Vadim Pisarevsky [Tue, 12 May 2015 15:04:41 +0000 (15:04 +0000)]
Merge pull request #3993 from vrabaud:master

9 years agoMerge pull request #3999 from berak:features2d_tutorial_fix
Vadim Pisarevsky [Tue, 12 May 2015 15:01:54 +0000 (15:01 +0000)]
Merge pull request #3999 from berak:features2d_tutorial_fix

9 years agoMerge pull request #4000 from sdika:HOGSignedGradient
Vadim Pisarevsky [Tue, 12 May 2015 14:47:36 +0000 (14:47 +0000)]
Merge pull request #4000 from sdika:HOGSignedGradient

9 years agoMerge pull request #4002 from marvins:gdal-fix
Vadim Pisarevsky [Tue, 12 May 2015 14:33:06 +0000 (14:33 +0000)]
Merge pull request #4002 from marvins:gdal-fix

9 years agoFixing the gdal include error that Macports seems to only mess up.
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.

9 years agoproblem float constant and position of > in vector
laurentBerger [Mon, 11 May 2015 11:45:08 +0000 (13:45 +0200)]
problem float constant and position of > in vector

9 years agotrailing whitespace
laurentBerger [Mon, 11 May 2015 11:20:52 +0000 (13:20 +0200)]
trailing whitespace

9 years agoExample about BLOB with a new image in data folder
laurentBerger [Mon, 11 May 2015 11:13:20 +0000 (13:13 +0200)]
Example about BLOB with a new image in data folder

9 years agosmall fixes for features2d tutorials
berak [Sun, 10 May 2015 11:44:49 +0000 (13:44 +0200)]
small fixes for features2d tutorials

9 years agoadded the signedGradient varaible to the HOGDescriptor class.
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.

9 years agoPrevent the parent from drawing over OpenGL context.
Ashod Nakashian [Sat, 9 May 2015 16:23:09 +0000 (12:23 -0400)]
Prevent the parent from drawing over OpenGL context.

9 years agoFixed python crash when both cv2.imshow and gtk module are used
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

9 years agoget code to compile on Ubuntu Saucy
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.

9 years agoMerge pull request #3919 from cbalint13:brisk
Vadim Pisarevsky [Thu, 7 May 2015 10:38:31 +0000 (10:38 +0000)]
Merge pull request #3919 from cbalint13:brisk

9 years agofixed http://code.opencv.org/issues/4276 - removed drawing thickness upper limit
Marek Nogacki [Thu, 7 May 2015 09:15:11 +0000 (11:15 +0200)]
fixed code.opencv.org/issues/4276 - removed drawing thickness upper limit

9 years agoMerge pull request #3987 from vpisarev:core_fixes_part_1
Vadim Pisarevsky [Wed, 6 May 2015 15:49:18 +0000 (15:49 +0000)]
Merge pull request #3987 from vpisarev:core_fixes_part_1

9 years agoMerge pull request #3991 from mshabunin:python-underscore
Vadim Pisarevsky [Wed, 6 May 2015 14:48:34 +0000 (14:48 +0000)]
Merge pull request #3991 from mshabunin:python-underscore

9 years agoMerge pull request #3985 from StevenPuttemans:fix_imread_parameters
Vadim Pisarevsky [Wed, 6 May 2015 14:02:32 +0000 (14:02 +0000)]
Merge pull request #3985 from StevenPuttemans:fix_imread_parameters

9 years agoWrap ANN_MLP class into Python
Maksim Shabunin [Wed, 6 May 2015 12:21:23 +0000 (15:21 +0300)]
Wrap ANN_MLP class into Python

9 years agoMerge branch 'brisk' of https://github.com/cbalint13/opencv into brisk
cbalint13 [Wed, 6 May 2015 08:23:50 +0000 (11:23 +0300)]
Merge branch 'brisk' of https://github.com/cbalint13/opencv into brisk

9 years agoSquash all BRISK commits into one.
cbalint13 [Sat, 11 Apr 2015 09:09:13 +0000 (12:09 +0300)]
Squash all BRISK commits into one.

9 years agofixed compile errors on ARM, as well as failures in OCL_Dft* regression tests
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

9 years agofixed random failures in Core_DFT.complex_output2 test (the case of input_mat.cols...
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)

9 years agosome more compile warnings fixed
Vadim Pisarevsky [Tue, 5 May 2015 15:03:40 +0000 (18:03 +0300)]
some more compile warnings fixed

9 years agofixed warning in mathfuncs
Vadim Pisarevsky [Tue, 5 May 2015 14:49:36 +0000 (17:49 +0300)]
fixed warning in mathfuncs

9 years agofixing old variables in documentation and transfering to the new interface
StevenPuttemans [Mon, 4 May 2015 11:24:25 +0000 (13:24 +0200)]
fixing old variables in documentation and transfering to the new interface

9 years agoextended MinProblemSolver::Function to 1) report the space dimensionality, 2) compute...
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

9 years agoForce newer build over buildbot.
cbalint13 [Tue, 5 May 2015 09:19:35 +0000 (12:19 +0300)]
Force newer build over buildbot.

9 years agoForce buildbot to rebuild.
cbalint13 [Mon, 4 May 2015 16:54:08 +0000 (19:54 +0300)]
Force buildbot to rebuild.

9 years agoMerge pull request #3972 from PhilLab:docLineno
Maksim Shabunin [Mon, 4 May 2015 09:48:06 +0000 (09:48 +0000)]
Merge pull request #3972 from PhilLab:docLineno

9 years agofixing all RGB instances to BGR where needed
StevenPuttemans [Thu, 30 Apr 2015 09:27:58 +0000 (11:27 +0200)]
fixing all RGB instances to BGR where needed

9 years agoreenabled conjugate gradient solver test
Vadim Pisarevsky [Sun, 3 May 2015 08:36:24 +0000 (11:36 +0300)]
reenabled conjugate gradient solver test

9 years agook, so probably the failure in downhill simplex has been finally solved
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

9 years agoadded test for http://code.opencv.org/issues/1918
Vadim Pisarevsky [Sat, 2 May 2015 23:46:33 +0000 (02:46 +0300)]
added test for http://code.opencv.org/issues/1918

9 years agorefactored downhill simplex implementation a bit; hopefully, fixed the bug with rando...
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

9 years agoUnify iOS platform check
Ruslan Baratov [Sat, 2 May 2015 21:44:19 +0000 (23:44 +0200)]
Unify iOS platform check

There is only one place that use condition `CMAKE_SYSTEM_NAME STREQUAL iOS`.
All other `if` command use just IOS.

9 years agoFixed getContinuousSize() to handle huge matrices properly. This should solve http...
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

9 years agoimproved randShuffle as suggested by John Stark in http://code.opencv.org/issues...
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

9 years agofixed bug with simplex initialization in Downhill solver (thanks to Toby Rule for...
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

9 years agoadded test checking http://code.opencv.org/issues/4050
Vadim Pisarevsky [Sat, 2 May 2015 17:38:30 +0000 (20:38 +0300)]
added test checking code.opencv.org/issues/4050

9 years agoAdd VS2015 compatibility to CMake scripts
Patrik Huber [Sat, 2 May 2015 14:24:14 +0000 (15:24 +0100)]
Add VS2015 compatibility to CMake scripts

9 years agoForce buildbot rebuild.
cbalint13 [Sat, 2 May 2015 08:25:22 +0000 (11:25 +0300)]
Force buildbot rebuild.

9 years agoFix errors while compiling with c++11 flag
Ruslan Baratov [Fri, 1 May 2015 19:29:20 +0000 (21:29 +0200)]
Fix errors while compiling with c++11 flag

Fix errors in file cap_avfoundation.mm.
Compiled with Xcode 6.2, iOS SDK 8.2

Example:

cap_avfoundation.mm:543:54: error: cannot initialize a parameter of
type 'AVCaptureFocusMode' with an rvalue of type 'int'
    if ([mCaptureDevice isFocusModeSupported:(int)value]){
                                             ^~~~~~~~~~

9 years agoFix bugs in non-max suppression routine.
cbalint13 [Fri, 1 May 2015 19:07:08 +0000 (22:07 +0300)]
Fix bugs in non-max suppression routine.

9 years agorefactored div & pow funcs; added tests for special cases in pow() function.
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

9 years agoMerge pull request #3973 from xsorifc28:patch-1
Roman Donchenko [Thu, 30 Apr 2015 12:48:50 +0000 (12:48 +0000)]
Merge pull request #3973 from xsorifc28:patch-1

9 years agoLeave AGAST at thresold=10, cosmetic for perf tests.
cbalint13 [Wed, 29 Apr 2015 23:23:58 +0000 (02:23 +0300)]
Leave AGAST at thresold=10, cosmetic for perf tests.