Vladislav Sovrasov [Mon, 24 Oct 2016 14:22:44 +0000 (17:22 +0300)]
Fix wrong default mask value in floodFill
Alexander Alekhin [Sat, 22 Oct 2016 16:16:24 +0000 (16:16 +0000)]
Merge pull request #7517 from paroj:pp_dpdf
Alexander Alekhin [Sat, 22 Oct 2016 16:13:11 +0000 (16:13 +0000)]
Merge pull request #7531 from dtmoodie:cmake_updates
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
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.
Alexander Alekhin [Fri, 21 Oct 2016 18:21:50 +0000 (18:21 +0000)]
Merge pull request #7536 from alalek:viz_warn
Alexander Alekhin [Fri, 21 Oct 2016 15:22:07 +0000 (18:22 +0300)]
viz: eliminate warnings from tutorial code
Alexander Alekhin [Fri, 21 Oct 2016 15:19:15 +0000 (18:19 +0300)]
viz: update for VTK6.2+
PCL PR 1205
Alexander Alekhin [Fri, 21 Oct 2016 14:57:33 +0000 (17:57 +0300)]
Revert "Fix for VTK6.2 issue."
This reverts commit
f45da9866a94dbf52f5fb955bea67fce913ca515.
Alexander Alekhin [Fri, 21 Oct 2016 11:59:51 +0000 (11:59 +0000)]
Merge pull request #7533 from seanm:master
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.
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.
Alexander Alekhin [Thu, 20 Oct 2016 13:04:54 +0000 (13:04 +0000)]
Merge pull request #7507 from vrabaud:iplimage_overflow
Alexander Alekhin [Thu, 20 Oct 2016 12:56:18 +0000 (12:56 +0000)]
Merge pull request #7520 from kesinger:memsetform
Alexander Alekhin [Thu, 20 Oct 2016 09:37:13 +0000 (09:37 +0000)]
Merge pull request #7524 from tomoaki0705:fixDivFixtureArm
Vincent Rabaud [Wed, 21 Sep 2016 14:30:31 +0000 (16:30 +0200)]
Fix imageSize overflow in IplImage
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
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.
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
Maksim Shabunin [Tue, 18 Oct 2016 12:09:14 +0000 (12:09 +0000)]
Merge pull request #7513 from abratchik:fix.wrappers.for.video.tracking
Alexander Alekhin [Tue, 18 Oct 2016 11:32:30 +0000 (11:32 +0000)]
Merge pull request #7509 from lpea:camv4l_segfault
abratchik [Tue, 18 Oct 2016 05:38:57 +0000 (09:38 +0400)]
fix for #7501
Guillaume Jacob [Mon, 17 Oct 2016 20:58:08 +0000 (22:58 +0200)]
videoio: fix segfault if CONVERT_RGB is false (issue #7465)
Alexander Alekhin [Mon, 17 Oct 2016 19:50:30 +0000 (19:50 +0000)]
Merge pull request #7506 from mshabunin:x11-collide-warning
Alexander Alekhin [Mon, 17 Oct 2016 19:49:28 +0000 (19:49 +0000)]
Merge pull request #7508 from alalek:fix_optflow_test
Alexander Alekhin [Mon, 17 Oct 2016 15:13:58 +0000 (18:13 +0300)]
video: fix optflow test: NAN results shouldn't bypass checks
Alexander Alekhin [Mon, 17 Oct 2016 17:06:26 +0000 (17:06 +0000)]
Merge pull request #7494 from tomoaki0705:fixVideoLKPyramidARM
Alexander Alekhin [Mon, 17 Oct 2016 10:33:52 +0000 (10:33 +0000)]
Merge pull request #7505 from LukeZheZhu:filterSmall_double_support
Vadim Pisarevsky [Mon, 17 Oct 2016 09:22:52 +0000 (09:22 +0000)]
Merge pull request #7443 from Tytan:akaze
mshabunin [Mon, 17 Oct 2016 09:07:27 +0000 (12:07 +0300)]
Added warning about possible X11 macro collision
LukeZhu [Mon, 17 Oct 2016 07:12:42 +0000 (15:12 +0800)]
Fix the problem: filterSmall.cl report error with double
Alexander Alekhin [Sun, 16 Oct 2016 16:49:33 +0000 (16:49 +0000)]
Merge pull request #7496 from abratchik:java.wrapper.fix.3.1
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
abratchik [Sun, 16 Oct 2016 15:09:35 +0000 (19:09 +0400)]
add vector_vector_KeyPoint support to python wrappers
abratchik [Sun, 16 Oct 2016 09:33:12 +0000 (13:33 +0400)]
fix regression issues in Feature2D and DescriptorMatcher interfaces
Tomoaki Teshima [Sun, 16 Oct 2016 08:21:37 +0000 (17:21 +0900)]
fix error from performance test of LK pyramid
Alexander Alekhin [Sat, 15 Oct 2016 09:21:45 +0000 (09:21 +0000)]
Merge pull request #7476 from abratchik:java.wrapper.fix.3.1
Alexander Alekhin [Sat, 15 Oct 2016 09:19:22 +0000 (09:19 +0000)]
Merge pull request #7487 from StevenPuttemans:add_compute_capabilities
Alexander Alekhin [Sat, 15 Oct 2016 09:18:14 +0000 (09:18 +0000)]
Merge pull request #7490 from alalek:ios_disable_ippicv
abratchik [Fri, 14 Oct 2016 15:21:17 +0000 (19:21 +0400)]
fix for VideoCapture crash
Alexander Alekhin [Fri, 14 Oct 2016 23:40:06 +0000 (02:40 +0300)]
ios: disable IPPICV on i386-iPhoneSimulator
Alexander Alekhin [Fri, 14 Oct 2016 14:06:50 +0000 (14:06 +0000)]
Merge pull request #7483 from paroj:addtext
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.
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
Maksim Shabunin [Fri, 14 Oct 2016 09:49:28 +0000 (09:49 +0000)]
Merge pull request #7367 from terfendail:ovxhal_imgprocfix
StevenPuttemans [Fri, 14 Oct 2016 08:14:12 +0000 (10:14 +0200)]
add 5.2 and 6.1 compute capability support
Alexander Alekhin [Thu, 13 Oct 2016 16:19:17 +0000 (16:19 +0000)]
Merge pull request #7468 from StevenPuttemans:fix_single_scale_detection
Maksim Shabunin [Thu, 13 Oct 2016 15:21:39 +0000 (15:21 +0000)]
Merge pull request #7471 from alalek:fix_java_generator
Maksim Shabunin [Thu, 13 Oct 2016 14:59:36 +0000 (14:59 +0000)]
Merge pull request #7457 from alalek:cmake_fix_ios
StevenPuttemans [Wed, 12 Oct 2016 11:59:45 +0000 (13:59 +0200)]
allow minObjectSize==maxObjectSize for single scale detection capability
abratchik [Thu, 13 Oct 2016 09:43:55 +0000 (13:43 +0400)]
fix for legacy FeatureDetector and DescriptorMatcher classes
Alexander Alekhin [Tue, 11 Oct 2016 11:37:53 +0000 (14:37 +0300)]
cmake: update configuration for iOS
Vadim Pisarevsky [Wed, 12 Oct 2016 19:54:03 +0000 (19:54 +0000)]
Merge pull request #7432 from abratchik:java.wrapper.fix.3.1
Vadim Pisarevsky [Wed, 12 Oct 2016 19:38:25 +0000 (19:38 +0000)]
Merge pull request #7428 from alalek:cmake_fix_compiler_flags_detection
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
Alexander Alekhin [Wed, 12 Oct 2016 10:01:36 +0000 (10:01 +0000)]
Merge pull request #7413 from tomoaki0705:featureUniversalThreshold
Alexander Alekhin [Wed, 12 Oct 2016 09:57:52 +0000 (09:57 +0000)]
Merge pull request #7455 from tomoaki0705:featureUniversalLkPyramid
Alexander Alekhin [Wed, 12 Oct 2016 09:52:04 +0000 (09:52 +0000)]
Merge pull request #7431 from ArkadiuszRaj:pgm-16bit
Alexander Alekhin [Wed, 12 Oct 2016 07:58:37 +0000 (07:58 +0000)]
Merge pull request #7466 from Trojahn:master
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
Alexander Alekhin [Wed, 12 Oct 2016 07:31:21 +0000 (07:31 +0000)]
Merge pull request #7442 from catree:morphology_additional_information
Alexander Alekhin [Wed, 12 Oct 2016 07:30:52 +0000 (07:30 +0000)]
Merge pull request #7441 from catree:add_distortion_images
viodetools [Tue, 11 Oct 2016 22:42:50 +0000 (19:42 -0300)]
Bugfix #7438
Tomoaki Teshima [Tue, 11 Oct 2016 11:22:23 +0000 (20:22 +0900)]
use universal intrinsic implementation for calcSharrDeriv
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
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)
Alexander Alekhin [Mon, 10 Oct 2016 20:55:08 +0000 (20:55 +0000)]
Merge pull request #7447 from alalek:ocl_fix_svm
Alexander Alekhin [Mon, 10 Oct 2016 20:54:14 +0000 (20:54 +0000)]
Merge pull request #7430 from ArkadiuszRaj:aravis
Alexander Alekhin [Mon, 10 Oct 2016 17:52:30 +0000 (20:52 +0300)]
ocl: fix SVM code
Alexander Alekhin [Mon, 10 Oct 2016 10:45:27 +0000 (10:45 +0000)]
Merge pull request #7440 from mschoeneck:Prefer_OCL_befor_IPP_for_Sobel_and_Scharr
Alexander Alekhin [Mon, 10 Oct 2016 10:43:04 +0000 (10:43 +0000)]
Merge pull request #7416 from StevenPuttemans:add_comment_medianBlur
StevenPuttemans [Thu, 6 Oct 2016 13:59:16 +0000 (15:59 +0200)]
add border replicate note
catree [Sun, 9 Oct 2016 21:45:04 +0000 (23:45 +0200)]
Try to clarify the morphological operations in the tutorial to avoid possible confusions.
ArkadiuszRaj [Sun, 9 Oct 2016 18:40:00 +0000 (20:40 +0200)]
Chenge arv_camera_abort_acquisition to arv_camera_stop_acquisition
catree [Sun, 9 Oct 2016 18:35:58 +0000 (20:35 +0200)]
Add distortion example images for calib3d documentation.
ArkadiuszRaj [Sun, 9 Oct 2016 14:58:30 +0000 (16:58 +0200)]
fourcc support, improved buffer handling, check if exposure, gain & fps properties are available
matze [Sun, 9 Oct 2016 13:37:22 +0000 (15:37 +0200)]
Adding check for IPP if UMat and OpenCL is available in Sobel and Scharr.
ArkadiuszRaj [Sat, 8 Oct 2016 11:01:01 +0000 (13:01 +0200)]
Support for MONO8 & MONO12 pixel formats
Alexander Alekhin [Fri, 7 Oct 2016 19:29:10 +0000 (22:29 +0300)]
java: fix Ptr<> code generation
Before:
Ptr<Dictionary>((cv::aruco::Dictionary*)dictionary_nativeObj)
After:
Ptr<cv::aruco::Dictionary>((cv::aruco::Dictionary*)dictionary_nativeObj)
Alexander Alekhin [Fri, 7 Oct 2016 15:49:52 +0000 (18:49 +0300)]
eliminate compiler warnings
Alexander Alekhin [Fri, 7 Oct 2016 14:31:21 +0000 (17:31 +0300)]
cmake: fix ocv_check_compiler_flag
ArkadiuszRaj [Fri, 7 Oct 2016 20:22:46 +0000 (22:22 +0200)]
Missing declaration
abratchik [Fri, 7 Oct 2016 19:58:57 +0000 (23:58 +0400)]
fix for #7420, #7421
ArkadiuszRaj [Fri, 7 Oct 2016 19:55:49 +0000 (21:55 +0200)]
Basic support for GigE cameras via Aravis SDK
ArkadiuszRaj [Fri, 7 Oct 2016 19:29:08 +0000 (21:29 +0200)]
Solution to issue #7408
Quentin [Thu, 6 Oct 2016 13:40:05 +0000 (15:40 +0200)]
Added AKAZE features in the stitcher pipeline (issue #6474)
Vadim Pisarevsky [Thu, 6 Oct 2016 13:40:33 +0000 (13:40 +0000)]
Merge pull request #7410 from pylbert:doc_DectectPython
Vadim Pisarevsky [Thu, 6 Oct 2016 13:31:05 +0000 (13:31 +0000)]
Merge pull request #7399 from K-Shinotsuka:issue27
Vadim Pisarevsky [Thu, 6 Oct 2016 13:30:30 +0000 (13:30 +0000)]
Merge pull request #7401 from K-Shinotsuka:issue28
Vadim Pisarevsky [Thu, 6 Oct 2016 13:29:56 +0000 (13:29 +0000)]
Merge pull request #7402 from K-Shinotsuka:issue29
Vadim Pisarevsky [Thu, 6 Oct 2016 13:29:00 +0000 (13:29 +0000)]
Merge pull request #7404 from K-Shinotsuka:issue30
Vadim Pisarevsky [Thu, 6 Oct 2016 13:25:28 +0000 (13:25 +0000)]
Merge pull request #7415 from StevenPuttemans:fix_issue_7409
Jcrist99 [Thu, 6 Oct 2016 12:48:26 +0000 (16:48 +0400)]
fix for feature2d java wrappers as described in this post: ans… (#7372)
* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/
* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/
* rollback of one change as requested (similar change already merged)
StevenPuttemans [Thu, 6 Oct 2016 12:09:26 +0000 (14:09 +0200)]
replace principle by principal
Noel Eck [Wed, 5 Oct 2016 23:52:28 +0000 (16:52 -0700)]
doc: Small change to documentation in DectectPython.cmake
Fixed small typo for python 3 default version.
Signed-off-by: Noel Eck <noel.eck@intel.com>
Vadim Pisarevsky [Wed, 5 Oct 2016 17:27:23 +0000 (17:27 +0000)]
Merge pull request #6078 from PolarNick239:master
Vadim Pisarevsky [Wed, 5 Oct 2016 17:23:32 +0000 (21:23 +0400)]
normHamming done with AVX 2 intrinsics (ver 2) (#7405)
* normHamming done with AVX 2 intrinsics.
* fixed compiling AVX2-optimized norm hamming with MSVC
Alexander Alekhin [Wed, 5 Oct 2016 17:20:44 +0000 (17:20 +0000)]
Merge pull request #7403 from tomoaki0705:fixDuplicateInclude
k-shinotsuka [Wed, 5 Oct 2016 13:48:27 +0000 (22:48 +0900)]
add simd code when dcn equals 4 at HSV2RGB_b().
k-shinotsuka [Wed, 5 Oct 2016 13:01:33 +0000 (22:01 +0900)]
add simd code when scn equals 4 at RGB2HLS_b().