platform/upstream/opencv.git
8 years agoImprove the efficiency as suggested by vpisarev.
Tetragramm [Wed, 2 Nov 2016 22:44:13 +0000 (17:44 -0500)]
Improve the efficiency as suggested by vpisarev.
Alter the Rotation enum to be unambiguous as to direction.

8 years agoAdd 90 degree rotation methods. This provides a quick simple way of doing 90 degree...
Tetragramm [Sat, 22 Oct 2016 01:01:12 +0000 (20:01 -0500)]
Add 90 degree rotation methods. This provides a quick simple way of doing 90 degree rotations.
Also fix warnings that show up on other compilers in test builds.

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 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 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

8 years agoMerge pull request #7430 from ArkadiuszRaj:aravis
Alexander Alekhin [Mon, 10 Oct 2016 20:54:14 +0000 (20:54 +0000)]
Merge pull request #7430 from ArkadiuszRaj:aravis

8 years agoocl: fix SVM code
Alexander Alekhin [Mon, 10 Oct 2016 17:52:30 +0000 (20:52 +0300)]
ocl: fix SVM code

8 years agoMerge pull request #7440 from mschoeneck:Prefer_OCL_befor_IPP_for_Sobel_and_Scharr
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

8 years agoMerge pull request #7416 from StevenPuttemans:add_comment_medianBlur
Alexander Alekhin [Mon, 10 Oct 2016 10:43:04 +0000 (10:43 +0000)]
Merge pull request #7416 from StevenPuttemans:add_comment_medianBlur

8 years agoadd border replicate note
StevenPuttemans [Thu, 6 Oct 2016 13:59:16 +0000 (15:59 +0200)]
add border replicate note

8 years agoTry to clarify the morphological operations in the tutorial to avoid possible confusions.
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.

8 years agoChenge arv_camera_abort_acquisition to arv_camera_stop_acquisition
ArkadiuszRaj [Sun, 9 Oct 2016 18:40:00 +0000 (20:40 +0200)]
Chenge arv_camera_abort_acquisition to arv_camera_stop_acquisition

8 years agoAdd distortion example images for calib3d documentation.
catree [Sun, 9 Oct 2016 18:35:58 +0000 (20:35 +0200)]
Add distortion example images for calib3d documentation.

8 years agofourcc support, improved buffer handling, check if exposure, gain & fps properties...
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

8 years agoAdding check for IPP if UMat and OpenCL is available in Sobel and Scharr.
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.

8 years agoSupport for MONO8 & MONO12 pixel formats
ArkadiuszRaj [Sat, 8 Oct 2016 11:01:01 +0000 (13:01 +0200)]
Support for MONO8 & MONO12 pixel formats

8 years agojava: fix Ptr<> code generation
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)

8 years agoeliminate compiler warnings
Alexander Alekhin [Fri, 7 Oct 2016 15:49:52 +0000 (18:49 +0300)]
eliminate compiler warnings

8 years agocmake: fix ocv_check_compiler_flag
Alexander Alekhin [Fri, 7 Oct 2016 14:31:21 +0000 (17:31 +0300)]
cmake: fix ocv_check_compiler_flag

8 years agoMissing declaration
ArkadiuszRaj [Fri, 7 Oct 2016 20:22:46 +0000 (22:22 +0200)]
Missing declaration

8 years agofix for #7420, #7421
abratchik [Fri, 7 Oct 2016 19:58:57 +0000 (23:58 +0400)]
fix for #7420, #7421

8 years agoBasic support for GigE cameras via Aravis SDK
ArkadiuszRaj [Fri, 7 Oct 2016 19:55:49 +0000 (21:55 +0200)]
Basic support for GigE cameras via Aravis SDK

8 years agoSolution to issue #7408
ArkadiuszRaj [Fri, 7 Oct 2016 19:29:08 +0000 (21:29 +0200)]
Solution to issue #7408

8 years agoAdded AKAZE features in the stitcher pipeline (issue #6474)
Quentin [Thu, 6 Oct 2016 13:40:05 +0000 (15:40 +0200)]
Added AKAZE features in the stitcher pipeline (issue #6474)

8 years agoMerge pull request #7410 from pylbert:doc_DectectPython
Vadim Pisarevsky [Thu, 6 Oct 2016 13:40:33 +0000 (13:40 +0000)]
Merge pull request #7410 from pylbert:doc_DectectPython

8 years agoMerge pull request #7399 from K-Shinotsuka:issue27
Vadim Pisarevsky [Thu, 6 Oct 2016 13:31:05 +0000 (13:31 +0000)]
Merge pull request #7399 from K-Shinotsuka:issue27

8 years agoMerge pull request #7401 from K-Shinotsuka:issue28
Vadim Pisarevsky [Thu, 6 Oct 2016 13:30:30 +0000 (13:30 +0000)]
Merge pull request #7401 from K-Shinotsuka:issue28

8 years agoMerge pull request #7402 from K-Shinotsuka:issue29
Vadim Pisarevsky [Thu, 6 Oct 2016 13:29:56 +0000 (13:29 +0000)]
Merge pull request #7402 from K-Shinotsuka:issue29

8 years agoMerge pull request #7404 from K-Shinotsuka:issue30
Vadim Pisarevsky [Thu, 6 Oct 2016 13:29:00 +0000 (13:29 +0000)]
Merge pull request #7404 from K-Shinotsuka:issue30

8 years agoMerge pull request #7415 from StevenPuttemans:fix_issue_7409
Vadim Pisarevsky [Thu, 6 Oct 2016 13:25:28 +0000 (13:25 +0000)]
Merge pull request #7415 from StevenPuttemans:fix_issue_7409

8 years agofix for feature2d java wrappers as described in this post: http://ans… (#7372)
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)

8 years agoreplace principle by principal
StevenPuttemans [Thu, 6 Oct 2016 12:09:26 +0000 (14:09 +0200)]
replace principle by principal

8 years agodoc: Small change to documentation in DectectPython.cmake
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>
8 years agoMerge pull request #6078 from PolarNick239:master
Vadim Pisarevsky [Wed, 5 Oct 2016 17:27:23 +0000 (17:27 +0000)]
Merge pull request #6078 from PolarNick239:master

8 years agonormHamming done with AVX 2 intrinsics (ver 2) (#7405)
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

8 years agoMerge pull request #7403 from tomoaki0705:fixDuplicateInclude
Alexander Alekhin [Wed, 5 Oct 2016 17:20:44 +0000 (17:20 +0000)]
Merge pull request #7403 from tomoaki0705:fixDuplicateInclude

8 years agoadd simd code when dcn equals 4 at HSV2RGB_b().
k-shinotsuka [Wed, 5 Oct 2016 13:48:27 +0000 (22:48 +0900)]
add simd code when dcn equals 4 at HSV2RGB_b().

8 years agoadd simd code when scn equals 4 at RGB2HLS_b().
k-shinotsuka [Wed, 5 Oct 2016 13:01:33 +0000 (22:01 +0900)]
add simd code when scn equals 4 at RGB2HLS_b().

8 years agoMerge pull request #7398 from vpisarev:mat2umat_copy_fix
Vadim Pisarevsky [Wed, 5 Oct 2016 12:21:41 +0000 (12:21 +0000)]
Merge pull request #7398 from vpisarev:mat2umat_copy_fix

8 years agoadd simd code when dcn equals 4 at HLS2RGB_b().
k-shinotsuka [Wed, 5 Oct 2016 12:02:53 +0000 (21:02 +0900)]
add simd code when dcn equals 4 at HLS2RGB_b().

8 years agoMerge pull request #7311 from fran6co:lsd
Vadim Pisarevsky [Wed, 5 Oct 2016 11:27:43 +0000 (11:27 +0000)]
Merge pull request #7311 from fran6co:lsd

8 years agoMerge pull request #6961 from K-Shinotsuka:issue5
Vadim Pisarevsky [Wed, 5 Oct 2016 11:23:35 +0000 (11:23 +0000)]
Merge pull request #6961 from K-Shinotsuka:issue5

8 years agoMerge pull request #7222 from mschoeneck:Improve_findContours_with_SSE2
Vadim Pisarevsky [Wed, 5 Oct 2016 11:21:37 +0000 (11:21 +0000)]
Merge pull request #7222 from mschoeneck:Improve_findContours_with_SSE2