platform/upstream/opencv.git
8 years agofix for #7510, #7511 and #7512
abratchik [Tue, 18 Oct 2016 18:22:18 +0000 (22:22 +0400)]
fix for #7510, #7511 and #7512

8 years agofix java wrapper autotests
abratchik [Mon, 17 Oct 2016 17:53:59 +0000 (21:53 +0400)]
fix java wrapper autotests

8 years agoMerge pull request #7516 from sovrasov:find_contours_fix
Alexander Alekhin [Sun, 30 Oct 2016 08:33:11 +0000 (08:33 +0000)]
Merge pull request #7516 from sovrasov:find_contours_fix

8 years agoMerge pull request #7574 from Tytan:expcomp_before_seams
Alexander Alekhin [Sun, 30 Oct 2016 08:28:35 +0000 (08:28 +0000)]
Merge pull request #7574 from Tytan:expcomp_before_seams

8 years agoMerge pull request #7580 from seanlis:wrong_diag_comment
Vadim Pisarevsky [Sat, 29 Oct 2016 21:30:26 +0000 (21:30 +0000)]
Merge pull request #7580 from seanlis:wrong_diag_comment

8 years agoMerge pull request #7540 from K-Shinotsuka:issue31
Vadim Pisarevsky [Sat, 29 Oct 2016 21:28:25 +0000 (21:28 +0000)]
Merge pull request #7540 from K-Shinotsuka:issue31

8 years agoMerge pull request #7503 from pengli:box_filter_v2
Vadim Pisarevsky [Sat, 29 Oct 2016 21:20:06 +0000 (21:20 +0000)]
Merge pull request #7503 from pengli:box_filter_v2

8 years agoMerge pull request #7549 from StevenPuttemans:add_sample_content
Vadim Pisarevsky [Sat, 29 Oct 2016 21:13:37 +0000 (21:13 +0000)]
Merge pull request #7549 from StevenPuttemans:add_sample_content

8 years agoCorrect the comment of Mat::diag(const Mat& d).
Sean Li [Sat, 29 Oct 2016 08:01:23 +0000 (16:01 +0800)]
Correct the comment of Mat::diag(const Mat& d).

8 years agoadd SSE code for RGB2Luv_f.
k-shinotsuka [Sat, 22 Oct 2016 10:56:55 +0000 (19:56 +0900)]
add SSE code for RGB2Luv_f.

8 years agoMerge pull request #7572 from tomoaki0705:featureUniversalStereoSgbm
Vadim Pisarevsky [Fri, 28 Oct 2016 15:34:11 +0000 (15:34 +0000)]
Merge pull request #7572 from tomoaki0705:featureUniversalStereoSgbm

8 years agoCompensate exposure before finding seams
Quentin [Wed, 12 Oct 2016 11:53:06 +0000 (13:53 +0200)]
Compensate exposure before finding seams

8 years agoadd universal intrinsic in StereoSGBM
Tomoaki Teshima [Fri, 28 Oct 2016 12:47:13 +0000 (21:47 +0900)]
add universal intrinsic in StereoSGBM
  * add 8 elements version of reduce operation
  * add tests for new universal intrinsic

8 years agoMerge pull request #7561 from paroj:winvisible
Alexander Alekhin [Fri, 28 Oct 2016 11:31:04 +0000 (11:31 +0000)]
Merge pull request #7561 from paroj:winvisible

8 years agohighgui: add property WND_PROP_VISIBLE
Pavel Rojtberg [Thu, 27 Oct 2016 14:22:42 +0000 (16:22 +0200)]
highgui: add property WND_PROP_VISIBLE

checks whether the window exists and is visible. On QT closing a window
merley hides it, so the common hack for checking whether a window exists

exists = cv2.getWindowProperty(.., 0) >= 0

does not work.

8 years agoDisable redundant border initialization in findContours
Vladislav Sovrasov [Tue, 25 Oct 2016 09:20:36 +0000 (12:20 +0300)]
Disable redundant border initialization in findContours

8 years agoMerge pull request #7554 from lupustr3:pvlasov/morph_isolated
Alexander Alekhin [Thu, 27 Oct 2016 16:51:03 +0000 (16:51 +0000)]
Merge pull request #7554 from lupustr3:pvlasov/morph_isolated

8 years agoMerge pull request #7558 from alalek:cv_xadd
Alexander Alekhin [Thu, 27 Oct 2016 15:59:17 +0000 (15:59 +0000)]
Merge pull request #7558 from alalek:cv_xadd

8 years agocore: update CV_XADD
Alexander Alekhin [Thu, 27 Oct 2016 10:22:13 +0000 (13:22 +0300)]
core: update CV_XADD

Allow to use custom implementations of CV_XADD (passed via -D of CXXFLAGS)

8 years agoMerge pull request #7553 from erichkeane:interlocked_add_fix
Alexander Alekhin [Thu, 27 Oct 2016 07:03:18 +0000 (07:03 +0000)]
Merge pull request #7553 from erichkeane:interlocked_add_fix

8 years agoBORDER_ISOLATED support for Laplacian, boxFilter and morphology;
Pavel Vlasov [Wed, 26 Oct 2016 11:07:41 +0000 (14:07 +0300)]
BORDER_ISOLATED support for Laplacian, boxFilter and morphology;

8 years agoRemove Intel Specific CV_XADD Definition
Erich Keane [Wed, 26 Oct 2016 16:37:25 +0000 (09:37 -0700)]
Remove Intel Specific CV_XADD Definition

Intel supports __atomic_fetch_add, so it isn't necessary to use
a specific version otherwise.

8 years agoMerge pull request #7551 from fegorsch:fix_yaml_header
Alexander Alekhin [Wed, 26 Oct 2016 13:30:13 +0000 (13:30 +0000)]
Merge pull request #7551 from fegorsch:fix_yaml_header

8 years agoupdating python tutorials + providing necessary data
StevenPuttemans [Tue, 25 Oct 2016 09:41:03 +0000 (11:41 +0200)]
updating python tutorials + providing necessary data

8 years agoocl kernel performance optimization for box filter
Li Peng [Fri, 14 Oct 2016 07:13:10 +0000 (15:13 +0800)]
ocl kernel performance optimization for box filter

The optimization is for CV_8UC1 format and 3x3 box filter,
it is 15%~87% faster than current ocl kernel with below perf test

./modules/ts/misc/run.py -t imgproc --gtest_filter=OCL_BlurFixture*

Also add test cases for this ocl kernel.

Signed-off-by: Li Peng <peng.li@intel.com>
8 years agoCorrect cast for _InterlockedExchangeAdd on ICC
Erich Keane [Tue, 25 Oct 2016 21:18:55 +0000 (14:18 -0700)]
Correct cast for _InterlockedExchangeAdd on ICC

A bug in ICC improperly identified the first parameter as "void*"
rather than the proper "volatile long*".  This is scheduled to be
fixed in ICC in a future release.

This patch casts only to a "long*" to preserve backwards compatibility
with the ICC 16 and ICC 17 releases.

8 years agoUse colon in "%YAML:1.0" directive when persisting to YAML-files
fegorsch [Tue, 25 Oct 2016 16:18:35 +0000 (18:18 +0200)]
Use colon in "%YAML:1.0" directive when persisting to YAML-files

In YAML 1.0 the colon is mandatory. See http://yaml.org/spec/1.0/#id2558635.

This also allows prior releases to read YAML files created with the current version.

8 years agoMerge pull request #7545 from sovrasov:flood_fill_fix_mask_value
Alexander Alekhin [Tue, 25 Oct 2016 14:24:19 +0000 (14:24 +0000)]
Merge pull request #7545 from sovrasov:flood_fill_fix_mask_value

8 years agoEnable chessboard detector test on Ubuntu
Vladislav Sovrasov [Tue, 25 Oct 2016 08:53:53 +0000 (11:53 +0300)]
Enable chessboard detector test on Ubuntu

8 years agoAdd a regression test, fix documentation
Vladislav Sovrasov [Wed, 19 Oct 2016 10:51:37 +0000 (13:51 +0300)]
Add a regression test, fix documentation

8 years agofindContours: integrate workaroung to allow contours detection on image border
Vladislav Sovrasov [Tue, 18 Oct 2016 11:16:14 +0000 (14:16 +0300)]
findContours: integrate workaroung to allow contours detection on image border

8 years agoFix wrong default mask value in floodFill
Vladislav Sovrasov [Mon, 24 Oct 2016 14:22:44 +0000 (17:22 +0300)]
Fix wrong default mask value in floodFill

8 years agoMerge pull request #7541 from tomoaki0705:fixArmDivCaroteneSaturate
Alexander Alekhin [Mon, 24 Oct 2016 15:35:05 +0000 (15:35 +0000)]
Merge pull request #7541 from tomoaki0705:fixArmDivCaroteneSaturate

8 years agobrush up divSaturate of carotene
Tomoaki Teshima [Sat, 22 Oct 2016 23:51:25 +0000 (08:51 +0900)]
brush up divSaturate of carotene
  * use rounding to nearest same as divSaturateQ

8 years agoMerge pull request #7517 from paroj:pp_dpdf
Alexander Alekhin [Sat, 22 Oct 2016 16:16:24 +0000 (16:16 +0000)]
Merge pull request #7517 from paroj:pp_dpdf

8 years agoMerge pull request #7531 from dtmoodie:cmake_updates
Alexander Alekhin [Sat, 22 Oct 2016 16:13:11 +0000 (16:13 +0000)]
Merge pull request #7531 from dtmoodie:cmake_updates

8 years agoMerge pull request #6933 from hrnr:gsoc_all
Jiri Horner [Sat, 22 Oct 2016 16:10:42 +0000 (18:10 +0200)]
Merge pull request #6933 from hrnr:gsoc_all

[GSOC] New camera model for stitching pipeline

* implement estimateAffine2D

estimates affine transformation using robust RANSAC method.

* uses RANSAC framework in calib3d
* includes accuracy test
* uses SVD decomposition for solving 3 point equation

* implement estimateAffinePartial2D

estimates limited affine transformation

* includes accuracy test

* stitching: add affine matcher

initial version of matcher that estimates affine transformation

* stitching: added affine transform estimator

initial version of estimator that simply chain transformations in homogeneous coordinates

* calib3d: rename estimateAffine3D test

test Calib3d_EstimateAffineTransform rename to Calib3d_EstimateAffine3D. This is more descriptive and prevents confusion with estimateAffine2D tests.

* added perf test for estimateAffine functions

tests both estimateAffine2D and estimateAffinePartial2D

* calib3d: compare error in square in estimateAffine2D

* incorporates fix from #6768

* rerun affine estimation on inliers

* stitching: new API for parallel feature finding

due to ABI breakage new functionality is added to `FeaturesFinder2`, `SurfFeaturesFinder2` and `OrbFeaturesFinder2`

* stitching: add tests for parallel feature find API

* perf test (about linear speed up)
* accuracy test compares results with serial version

* stitching: use dynamic_cast to overcome ABI issues

adding parallel API to FeaturesFinder breaks ABI. This commit uses dynamic_cast and hardcodes thread-safe finders to avoid breaking ABI.

This should be replaced by proper method similar to FeaturesMatcher on next ABI break.

* use estimateAffinePartial2D in AffineBestOf2NearestMatcher

* add constructor to AffineBestOf2NearestMatcher

* allows to choose between full affine transform and partial affine transform. Other params are the as for BestOf2NearestMatcher
* added protected field

* samples: stitching_detailed support affine estimator and matcher

* added new flags to choose matcher and estimator

* stitching: rework affine matcher

represent transformation in homogeneous coordinates

affine matcher: remove duplicite code
rework flow to get rid of duplicite code

affine matcher: do not center points to (0, 0)
it is not needed for affine model. it should not affect estimation in any way.

affine matcher: remove unneeded cv namespacing

* stitching: add stub bundle adjuster

* adds stub bundle adjuster that does nothing
* can be used in place of standard bundle adjusters to omit bundle adjusting step

* samples: stitching detailed, support no budle adjust

* uses new NoBundleAdjuster

* added affine warper

* uses R to get whole affine transformation and propagates rotation and translation to plane warper

* add affine warper factory class

* affine warper: compensate transformation

* samples: stitching_detailed add support for affine warper

* add Stitcher::create method

this method follows similar constructor methods and returns smart pointer. This allows constructing Stitcher according to OpenCV guidelines.

* supports multiple stitcher configurations (PANORAMA and SCANS) for convenient setup
* returns cv::Ptr

* stitcher: dynamicaly determine correct estimator

we need to use affine estimator for affine matcher

* preserves ABI (but add hints for ABI 4)
* uses dynamic_cast hack to inject correct estimator

* sample stitching: add support for multiple modes

shows how to use different configurations of stitcher easily (panorama stitching and scans affine model)

* stitcher: find features in parallel

use new FeatureFinder API to find features in parallel. Parallelized using TBB.

* stitching: disable parallel feature finding for OCL

it does not bring much speedup to run features finder in parallel when OpenCL is enabled, because finder needs to wait for OCL device.

Also, currently ORB is not thread-safe when OCL is enabled.

* stitching: move matcher tests

move matchers tests perf_stich.cpp -> perf_matchers.cpp

* stitching: add affine stiching integration test

test basic affine stitching (SCANS mode of stitcher) with images that have only translation between them

* enable surf for stitching tests

stitching.b12 test was failing with surf

investigated the issue, surf is producing good result. Transformation is only slightly different from ORB, so that resulting pano does not exactly match ORB's result. That caused sanity check to fail.

* added size checks similar to other tests
* sanity check will be applied only for ORB

* stitching: fix wrong estimator choice

if case was exactly wrong, estimators were chosen wrong

added logging for estimated transformation

* enable surf for matchers stitching tests

* enable SURF
* rework sanity checking. Check estimated transform instead of matches. Est. transform should be more stable and comparable between SURF and ORB.
* remove regression checking for VectorFeatures tests. It has a lot if data andtest is the same as previous except it test different vector size for performance, so sanity checking does not add any value here. Added basic sanity asserts instead.

* stitching tests: allow relative error for transform

* allows .01 relative error for estimated homography sanity check in stitching matchers tests
* fix VS warning

stitching tests: increase relative error

increase relative error to make it pass on all platforms (results are still good).

stitching test: allow bigger relative error

transformation can differ in small values (with small absolute difference, but large relative difference). transformation output still looks usable for all platforms. This difference affects only mac and windows, linux passes fine with small difference.

* stitching: add tests for affine matcher

uses s1, s2 images. added also new sanity data.

* stitching tests: use different data for matchers tests

this data should yeild more stable transformation (it has much more matches, especially for surf). Sanity data regenerated.

* stitching test: rework tests for matchers

* separated rotation and translations as they are different by scale.
* use appropriate absolute error for them separately. (relative error does not work for values near zero.)

* stitching: fix affine warper compensation

calculation of rotation and translation extracted for plane warper was wrong

* stitching test: enable surf for opencl integration tests

* enable SURF with correct guard (HAVE_OPENCV_XFEATURES2D)
* add OPENCL guard and correct namespace as usual for opencl tests

* stitching: add ocl accuracy test for affine warper

test consistent results with ocl on and off

* stitching: add affine warper ocl perf test

add affine warper to existing warper perf tests. Added new sanity data.

* stitching: do not overwrite inliers in affine matcher

* estimation is run second time on inliers only, inliers produces in second run will not be therefore correct for all matches

* calib3d: add Levenberg–Marquardt refining to estimateAffine2D* functions

this adds affine Levenberg–Marquardt refining to estimateAffine2D functions similar to what is done in findHomography.

implements Levenberg–Marquardt refinig for both full affine and partial affine transformations.

* stitching: remove reestimation step in affine matcher

reestimation step is not needed. estimateAffine2D* functions are running their own reestimation on inliers using the Levenberg-Marquardt algorithm, which is better than simply rerunning RANSAC on inliers.

* implement partial affine bundle adjuster

bundle adjuster that expect affine transform with 4DOF. Refines parameters for all cameras together.

stitching: fix bug in BundleAdjusterAffinePartial

* use the invers properly
* use static buffer for invers to speed it up

* samples: add affine bundle adjuster option to stitching_detailed

* add support for using affine bundle adjuster with 4DOF
* improve logging of initial intristics

* sttiching: add affine bundle adjuster test

* fix build warnings

* stitching: increase limit on sanity check

prevents spurious test failures on mac. values are still pretty fine.

* stitching: set affine bundle adjuster for SCANS mode

* fix bug with AffineBestOf2NearestMatcher (we want to select affine partial mode)
* select right bundle adjuster

* stitching: increase error bound for matcher tests

* this prevents failure on mac. tranformation is still ok.

* stitching: implement affine bundle adjuster

* implements affine bundle adjuster that is using full affine transform
* existing test case modified to test both affinePartial an full affine bundle adjuster

* add stitching tutorial

* show basic usage of stitching api (Stitcher class)

* stitching: add more integration test for affine stitching

* added new datasets to existing testcase
* removed unused include

* calib3d: move `haveCollinearPoints` to common header

* added comment to make that this also checks too close points

* calib3d: redone checkSubset for estimateAffine* callback

* use common function to check collinearity
* this also ensures that point will not be too close to each other

* calib3d: change estimateAffine* functions API

* more similar to `findHomography`, `findFundamentalMat`, `findEssentialMat` and similar
* follows standard recommended semantic INPUTS, OUTPUTS, FLAGS
* allows to disable refining
* supported LMEDS robust method (tests yet to come) along with RANSAC
* extended docs with some tips

* calib3d: rewrite estimateAffine2D test

* rewrite in googletest style
* parametrize to test both robust methods (RANSAC and LMEDS)
* get rid of boilerplate

* calib3d: rework estimateAffinePartial2D test

* rework in googletest style
* add testing for LMEDS

* calib3d: rework estimateAffine*2D perf test

* test for LMEDS speed
* test with/without Levenberg-Marquart
* remove sanity checking (this is covered by accuracy tests)

* calib3d: improve estimateAffine*2D tests

* test transformations in loop
* improves test by testing more potential transformations

* calib3d: rewrite kernels for estimateAffine*2D functions

* use analytical solution instead of SVD
* this version is faster especially for smaller amount of points

* calib3d: tune up perf of estimateAffine*2D functions

* avoid copying inliers
* avoid converting input points if not necessary
* check only `from` point for collinearity, as `to` does not affect stability of transform

* tutorials: add commands examples to stitching tutorials

* add some examples how to run stitcher sample code
* mention stitching_detailed.cpp

* calib3d: change computeError for estimateAffine*2D

* do error computing in floats instead of doubles

this have required precision + we were storing the result in float anyway. This make code faster and allows auto-vectorization by smart compilers.

* documentation: mention estimateAffine*2D function

* refer to new functions on appropriate places
* prefer estimateAffine*2D over estimateRigidTransform

* stitching: add camera models documentations

* mention camera models in module documentation to give user a better overview and reduce confusion

8 years agoMerge pull request #7518 from ArkadiuszRaj:aravis-buffer-status
Arek [Sat, 22 Oct 2016 16:07:55 +0000 (18:07 +0200)]
Merge pull request #7518 from ArkadiuszRaj:aravis-buffer-status

Aravis several updates

* Fix adressing camera with id=0

* Aravis buffer property control & status added

* Modify of autoexposure algorith, ream frame ID from aravis + new properites

* Change of macro name

* VideoCapture now returns no frame on camera disconnecion

* Allow aravis-0.4 usage, proper camera object release.

8 years agoMerge pull request #7536 from alalek:viz_warn
Alexander Alekhin [Fri, 21 Oct 2016 18:21:50 +0000 (18:21 +0000)]
Merge pull request #7536 from alalek:viz_warn

8 years agoviz: eliminate warnings from tutorial code
Alexander Alekhin [Fri, 21 Oct 2016 15:22:07 +0000 (18:22 +0300)]
viz: eliminate warnings from tutorial code

8 years agoviz: update for VTK6.2+
Alexander Alekhin [Fri, 21 Oct 2016 15:19:15 +0000 (18:19 +0300)]
viz: update for VTK6.2+

PCL PR 1205

8 years agoRevert "Fix for VTK6.2 issue."
Alexander Alekhin [Fri, 21 Oct 2016 14:57:33 +0000 (17:57 +0300)]
Revert "Fix for VTK6.2 issue."

This reverts commit f45da9866a94dbf52f5fb955bea67fce913ca515.

8 years agoMerge pull request #7533 from seanm:master
Alexander Alekhin [Fri, 21 Oct 2016 11:59:51 +0000 (11:59 +0000)]
Merge pull request #7533 from seanm:master

8 years agoEliminated use of obsolete 'register' keyword
Sean McBride [Fri, 21 Oct 2016 00:19:14 +0000 (20:19 -0400)]
Eliminated use of obsolete 'register' keyword

Fixes clang warnings about uses of this obsolete keyword.

8 years agoNewer versions of gstreamer use a slightly different include path on windows.
Dan [Thu, 20 Oct 2016 15:02:18 +0000 (11:02 -0400)]
Newer versions of gstreamer use a slightly different include path on windows.
Newer versions of VTK have moved some of the reader objects into vtkIOGeometry.

8 years agoMerge pull request #7507 from vrabaud:iplimage_overflow
Alexander Alekhin [Thu, 20 Oct 2016 13:04:54 +0000 (13:04 +0000)]
Merge pull request #7507 from vrabaud:iplimage_overflow

8 years agoMerge pull request #7520 from kesinger:memsetform
Alexander Alekhin [Thu, 20 Oct 2016 12:56:18 +0000 (12:56 +0000)]
Merge pull request #7520 from kesinger:memsetform

8 years agoMerge pull request #7524 from tomoaki0705:fixDivFixtureArm
Alexander Alekhin [Thu, 20 Oct 2016 09:37:13 +0000 (09:37 +0000)]
Merge pull request #7524 from tomoaki0705:fixDivFixtureArm

8 years agoFix imageSize overflow in IplImage
Vincent Rabaud [Wed, 21 Sep 2016 14:30:31 +0000 (16:30 +0200)]
Fix imageSize overflow in IplImage

8 years agolet the performance test pass on ARM
Tomoaki Teshima [Wed, 19 Oct 2016 09:22:33 +0000 (18:22 +0900)]
let the performance test pass on ARM
  * use round-to-neaerest in div of carotene

8 years agocalibrateCamera: mask f_x when using FIX_ASPECT_RATIO
Pavel Rojtberg [Tue, 18 Oct 2016 15:48:36 +0000 (17:48 +0200)]
calibrateCamera: mask f_x when using FIX_ASPECT_RATIO

this avoids a singular Jacobian such that LM converges when DECOMP_LU is
used.

8 years agovideoio: Fix for valgrind warning in icvGetPropertyCAM_V4L
Jake Kesinger [Tue, 18 Oct 2016 18:18:35 +0000 (14:18 -0400)]
videoio: Fix for valgrind warning in icvGetPropertyCAM_V4L

https://github.com/opencv/opencv/issues/7380

8 years agoMerge pull request #7513 from abratchik:fix.wrappers.for.video.tracking
Maksim Shabunin [Tue, 18 Oct 2016 12:09:14 +0000 (12:09 +0000)]
Merge pull request #7513 from abratchik:fix.wrappers.for.video.tracking

8 years agoMerge pull request #7509 from lpea:camv4l_segfault
Alexander Alekhin [Tue, 18 Oct 2016 11:32:30 +0000 (11:32 +0000)]
Merge pull request #7509 from lpea:camv4l_segfault

8 years agofix for #7501
abratchik [Tue, 18 Oct 2016 05:38:57 +0000 (09:38 +0400)]
fix for #7501

8 years agovideoio: fix segfault if CONVERT_RGB is false (issue #7465)
Guillaume Jacob [Mon, 17 Oct 2016 20:58:08 +0000 (22:58 +0200)]
videoio: fix segfault if CONVERT_RGB is false (issue #7465)

8 years agoMerge pull request #7506 from mshabunin:x11-collide-warning
Alexander Alekhin [Mon, 17 Oct 2016 19:50:30 +0000 (19:50 +0000)]
Merge pull request #7506 from mshabunin:x11-collide-warning

8 years agoMerge pull request #7508 from alalek:fix_optflow_test
Alexander Alekhin [Mon, 17 Oct 2016 19:49:28 +0000 (19:49 +0000)]
Merge pull request #7508 from alalek:fix_optflow_test

8 years agovideo: fix optflow test: NAN results shouldn't bypass checks
Alexander Alekhin [Mon, 17 Oct 2016 15:13:58 +0000 (18:13 +0300)]
video: fix optflow test: NAN results shouldn't bypass checks

8 years agoMerge pull request #7494 from tomoaki0705:fixVideoLKPyramidARM
Alexander Alekhin [Mon, 17 Oct 2016 17:06:26 +0000 (17:06 +0000)]
Merge pull request #7494 from tomoaki0705:fixVideoLKPyramidARM

8 years agoMerge pull request #7505 from LukeZheZhu:filterSmall_double_support
Alexander Alekhin [Mon, 17 Oct 2016 10:33:52 +0000 (10:33 +0000)]
Merge pull request #7505 from LukeZheZhu:filterSmall_double_support

8 years agoMerge pull request #7443 from Tytan:akaze
Vadim Pisarevsky [Mon, 17 Oct 2016 09:22:52 +0000 (09:22 +0000)]
Merge pull request #7443 from Tytan:akaze

8 years agoAdded warning about possible X11 macro collision
mshabunin [Mon, 17 Oct 2016 09:07:27 +0000 (12:07 +0300)]
Added warning about possible X11 macro collision

8 years agoFix the problem: filterSmall.cl report error with double
LukeZhu [Mon, 17 Oct 2016 07:12:42 +0000 (15:12 +0800)]
Fix the problem: filterSmall.cl report error with double

8 years agoMerge pull request #7496 from abratchik:java.wrapper.fix.3.1
Alexander Alekhin [Sun, 16 Oct 2016 16:49:33 +0000 (16:49 +0000)]
Merge pull request #7496 from abratchik:java.wrapper.fix.3.1

8 years agoMerge pull request #7472 from ArkadiuszRaj:aravis-autoexposure
Arek [Sun, 16 Oct 2016 16:14:58 +0000 (18:14 +0200)]
Merge pull request #7472 from ArkadiuszRaj:aravis-autoexposure

Aravis SDK: Basic software based autoexposure control

* Basic software based autoexposure control

* Aravis autoexposure: skip frame taken while changing exposure setup

8 years agoadd vector_vector_KeyPoint support to python wrappers
abratchik [Sun, 16 Oct 2016 15:09:35 +0000 (19:09 +0400)]
add vector_vector_KeyPoint support to python wrappers

8 years agofix regression issues in Feature2D and DescriptorMatcher interfaces
abratchik [Sun, 16 Oct 2016 09:33:12 +0000 (13:33 +0400)]
fix regression issues in Feature2D and DescriptorMatcher interfaces

8 years agofix error from performance test of LK pyramid
Tomoaki Teshima [Sun, 16 Oct 2016 08:21:37 +0000 (17:21 +0900)]
fix error from performance test of LK pyramid

8 years agoMerge pull request #7476 from abratchik:java.wrapper.fix.3.1
Alexander Alekhin [Sat, 15 Oct 2016 09:21:45 +0000 (09:21 +0000)]
Merge pull request #7476 from abratchik:java.wrapper.fix.3.1

8 years agoMerge pull request #7487 from StevenPuttemans:add_compute_capabilities
Alexander Alekhin [Sat, 15 Oct 2016 09:19:22 +0000 (09:19 +0000)]
Merge pull request #7487 from StevenPuttemans:add_compute_capabilities

8 years agoMerge pull request #7490 from alalek:ios_disable_ippicv
Alexander Alekhin [Sat, 15 Oct 2016 09:18:14 +0000 (09:18 +0000)]
Merge pull request #7490 from alalek:ios_disable_ippicv

8 years agofix for VideoCapture crash
abratchik [Fri, 14 Oct 2016 15:21:17 +0000 (19:21 +0400)]
fix for VideoCapture crash

8 years agoios: disable IPPICV on i386-iPhoneSimulator
Alexander Alekhin [Fri, 14 Oct 2016 23:40:06 +0000 (02:40 +0300)]
ios: disable IPPICV on i386-iPhoneSimulator

8 years agoMerge pull request #7483 from paroj:addtext
Alexander Alekhin [Fri, 14 Oct 2016 14:06:50 +0000 (14:06 +0000)]
Merge pull request #7483 from paroj:addtext

8 years agofix BGR <> RGB swap
Pavel Rojtberg [Thu, 13 Oct 2016 16:26:02 +0000 (18:26 +0200)]
fix BGR <> RGB swap

we are drawing on a BGR image declared as RGB, so we should not swap
components here either.

8 years agohighgui: allow wrapping cv::addText
Pavel Rojtberg [Thu, 13 Oct 2016 16:05:48 +0000 (18:05 +0200)]
highgui: allow wrapping cv::addText

also correctly forward spacing parameter in fontQt

8 years agoMerge pull request #7367 from terfendail:ovxhal_imgprocfix
Maksim Shabunin [Fri, 14 Oct 2016 09:49:28 +0000 (09:49 +0000)]
Merge pull request #7367 from terfendail:ovxhal_imgprocfix

8 years agoadd 5.2 and 6.1 compute capability support
StevenPuttemans [Fri, 14 Oct 2016 08:14:12 +0000 (10:14 +0200)]
add 5.2 and 6.1 compute capability support

8 years agoMerge pull request #7468 from StevenPuttemans:fix_single_scale_detection
Alexander Alekhin [Thu, 13 Oct 2016 16:19:17 +0000 (16:19 +0000)]
Merge pull request #7468 from StevenPuttemans:fix_single_scale_detection

8 years agoMerge pull request #7471 from alalek:fix_java_generator
Maksim Shabunin [Thu, 13 Oct 2016 15:21:39 +0000 (15:21 +0000)]
Merge pull request #7471 from alalek:fix_java_generator

8 years agoMerge pull request #7457 from alalek:cmake_fix_ios
Maksim Shabunin [Thu, 13 Oct 2016 14:59:36 +0000 (14:59 +0000)]
Merge pull request #7457 from alalek:cmake_fix_ios

8 years agoallow minObjectSize==maxObjectSize for single scale detection capability
StevenPuttemans [Wed, 12 Oct 2016 11:59:45 +0000 (13:59 +0200)]
allow minObjectSize==maxObjectSize for single scale detection capability

8 years agofix for legacy FeatureDetector and DescriptorMatcher classes
abratchik [Thu, 13 Oct 2016 09:43:55 +0000 (13:43 +0400)]
fix for legacy FeatureDetector and DescriptorMatcher classes

8 years agocmake: update configuration for iOS
Alexander Alekhin [Tue, 11 Oct 2016 11:37:53 +0000 (14:37 +0300)]
cmake: update configuration for iOS

8 years agoMerge pull request #7432 from abratchik:java.wrapper.fix.3.1
Vadim Pisarevsky [Wed, 12 Oct 2016 19:54:03 +0000 (19:54 +0000)]
Merge pull request #7432 from abratchik:java.wrapper.fix.3.1

8 years agoMerge pull request #7428 from alalek:cmake_fix_compiler_flags_detection
Vadim Pisarevsky [Wed, 12 Oct 2016 19:38:25 +0000 (19:38 +0000)]
Merge pull request #7428 from alalek:cmake_fix_compiler_flags_detection

8 years agojava: integrate code from base modules
Alexander Alekhin [Wed, 12 Oct 2016 14:28:50 +0000 (17:28 +0300)]
java: integrate code from base modules

To resolve undefined "Mat_to_vector_KeyPoint" error

8 years agoMerge pull request #7413 from tomoaki0705:featureUniversalThreshold
Alexander Alekhin [Wed, 12 Oct 2016 10:01:36 +0000 (10:01 +0000)]
Merge pull request #7413 from tomoaki0705:featureUniversalThreshold

8 years agoMerge pull request #7455 from tomoaki0705:featureUniversalLkPyramid
Alexander Alekhin [Wed, 12 Oct 2016 09:57:52 +0000 (09:57 +0000)]
Merge pull request #7455 from tomoaki0705:featureUniversalLkPyramid

8 years agoMerge pull request #7431 from ArkadiuszRaj:pgm-16bit
Alexander Alekhin [Wed, 12 Oct 2016 09:52:04 +0000 (09:52 +0000)]
Merge pull request #7431 from ArkadiuszRaj:pgm-16bit

8 years agoMerge pull request #7466 from Trojahn:master
Alexander Alekhin [Wed, 12 Oct 2016 07:58:37 +0000 (07:58 +0000)]
Merge pull request #7466 from Trojahn:master

8 years agoMerge pull request #7451 from reunanen:issue-7409
Juha Reunanen [Wed, 12 Oct 2016 07:34:51 +0000 (10:34 +0300)]
Merge pull request #7451 from reunanen:issue-7409

Fix findContours crash for very large images (#7451)

* Cast step to size_t in order to avoid integer overflow when processing very large images

* Change assert to CV_Assert

8 years agoMerge pull request #7442 from catree:morphology_additional_information
Alexander Alekhin [Wed, 12 Oct 2016 07:31:21 +0000 (07:31 +0000)]
Merge pull request #7442 from catree:morphology_additional_information

8 years agoMerge pull request #7441 from catree:add_distortion_images
Alexander Alekhin [Wed, 12 Oct 2016 07:30:52 +0000 (07:30 +0000)]
Merge pull request #7441 from catree:add_distortion_images

8 years agoBugfix #7438
viodetools [Tue, 11 Oct 2016 22:42:50 +0000 (19:42 -0300)]
Bugfix #7438

8 years agouse universal intrinsic implementation for calcSharrDeriv
Tomoaki Teshima [Tue, 11 Oct 2016 11:22:23 +0000 (20:22 +0900)]
use universal intrinsic implementation for calcSharrDeriv

8 years agouse universal intrinsic in threshold
Tomoaki Teshima [Mon, 3 Oct 2016 23:42:02 +0000 (08:42 +0900)]
use universal intrinsic in threshold
  * add performance test for 32F and 64F threshold
  * requires update of opencv_extra

8 years agoimproved fix for java wrapper generator (gen_java.py) to avoid generation of java...
abratchik [Fri, 7 Oct 2016 22:13:01 +0000 (02:13 +0400)]
improved fix for java wrapper generator (gen_java.py) to avoid generation of java methods with duplicate signatures(v3)

8 years agoMerge pull request #7447 from alalek:ocl_fix_svm
Alexander Alekhin [Mon, 10 Oct 2016 20:55:08 +0000 (20:55 +0000)]
Merge pull request #7447 from alalek:ocl_fix_svm