platform/upstream/opencv.git
7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 years agoMerge pull request #7392 from K-Shinotsuka:issue25
Vadim Pisarevsky [Wed, 5 Oct 2016 11:19:43 +0000 (11:19 +0000)]
Merge pull request #7392 from K-Shinotsuka:issue25

7 years agoMerge pull request #7393 from alalek:cmake_pch_update
Vadim Pisarevsky [Wed, 5 Oct 2016 11:12:34 +0000 (11:12 +0000)]
Merge pull request #7393 from alalek:cmake_pch_update

7 years agomake sure that the empty mat is copied to UMat properly - i.e. UMat becomes empty...
Vadim Pisarevsky [Wed, 5 Oct 2016 11:07:50 +0000 (14:07 +0300)]
make sure that the empty mat is copied to UMat properly - i.e. UMat becomes empty. Before the patch such copy operation crashed

7 years agoremove duplicated include
Tomoaki Teshima [Tue, 4 Oct 2016 21:53:34 +0000 (06:53 +0900)]
remove duplicated include

7 years agocmake: update PCH
Alexander Alekhin [Tue, 4 Oct 2016 15:11:46 +0000 (18:11 +0300)]
cmake: update PCH

1) fix include directories
2) don't use PCH for source file with custom COMPILE_FLAGS

7 years agoadd simd code when scn equals 4 at RGB2Luv_b().
k-shinotsuka [Tue, 4 Oct 2016 13:27:48 +0000 (22:27 +0900)]
add simd code when scn equals 4 at RGB2Luv_b().

7 years agoMerge pull request #7356 from mshabunin:extend-openvx
Alexander Alekhin [Tue, 4 Oct 2016 15:14:51 +0000 (15:14 +0000)]
Merge pull request #7356 from mshabunin:extend-openvx

7 years agoMerge pull request #7282 from alalek:fix_calculations
Vadim Pisarevsky [Tue, 4 Oct 2016 15:05:42 +0000 (15:05 +0000)]
Merge pull request #7282 from alalek:fix_calculations

7 years agoAdded support for OpenVX 1.0, updated cmake part, minor fixes
mshabunin [Wed, 28 Sep 2016 12:27:11 +0000 (15:27 +0300)]
Added support for OpenVX 1.0, updated cmake part, minor fixes

7 years agoFix for OpenVX-based implementation of HAL multiplication API
Vitaly Tuzov [Tue, 27 Sep 2016 11:06:18 +0000 (14:06 +0300)]
Fix for OpenVX-based implementation of HAL multiplication API

7 years agoMerge pull request #7336 from K-Shinotsuka:issue23
Vadim Pisarevsky [Tue, 4 Oct 2016 12:29:46 +0000 (12:29 +0000)]
Merge pull request #7336 from K-Shinotsuka:issue23

7 years agoMerge pull request #7214 from mshabunin:hal_integral
Vadim Pisarevsky [Tue, 4 Oct 2016 12:26:58 +0000 (12:26 +0000)]
Merge pull request #7214 from mshabunin:hal_integral

7 years agoMerge pull request #7374 from catree:fix_hitmiss_doc_link
Vadim Pisarevsky [Tue, 4 Oct 2016 12:15:58 +0000 (12:15 +0000)]
Merge pull request #7374 from catree:fix_hitmiss_doc_link

7 years agoMerge pull request #7382 from alalek:ocl_build_fix_warnings
Vadim Pisarevsky [Tue, 4 Oct 2016 12:08:22 +0000 (12:08 +0000)]
Merge pull request #7382 from alalek:ocl_build_fix_warnings

7 years agoMerge pull request #7384 from K-Shinotsuka:issue24
Vadim Pisarevsky [Tue, 4 Oct 2016 12:06:37 +0000 (12:06 +0000)]
Merge pull request #7384 from K-Shinotsuka:issue24

7 years agoMerge pull request #7390 from alalek:fix_7388
Vadim Pisarevsky [Tue, 4 Oct 2016 12:04:54 +0000 (12:04 +0000)]
Merge pull request #7390 from alalek:fix_7388

7 years agoMerge pull request #7373 from tomoaki0705:featureCannyUniversalIntrinsic
Alexander Alekhin [Tue, 4 Oct 2016 10:52:13 +0000 (10:52 +0000)]
Merge pull request #7373 from tomoaki0705:featureCannyUniversalIntrinsic

7 years agoMerge pull request #7389 from alalek:fix_defines_typo
Alexander Alekhin [Mon, 3 Oct 2016 17:03:24 +0000 (17:03 +0000)]
Merge pull request #7389 from alalek:fix_defines_typo

7 years agocmake: fix for GCC 6.x
Alexander Alekhin [Mon, 3 Oct 2016 16:38:19 +0000 (19:38 +0300)]
cmake: fix for GCC 6.x

7 years agofix defines typo
Alexander Alekhin [Mon, 3 Oct 2016 15:28:31 +0000 (18:28 +0300)]
fix defines typo

7 years agouse universal intrinsic in canny
Tomoaki Teshima [Fri, 30 Sep 2016 15:22:24 +0000 (00:22 +0900)]
use universal intrinsic in canny
  * add v_abs for universal intrinsic
  * add test of v_abs in test_intrin
  * fix compile error on gcc
  * fix bool OR operation

7 years agoadd simd code when dcn equals 4 at Luv2RGB_b().
k-shinotsuka [Sun, 2 Oct 2016 09:38:15 +0000 (18:38 +0900)]
add simd code when dcn equals 4 at Luv2RGB_b().

7 years agoMerge pull request #7358 from convoyinc:ios-framework-module-exclusion
Alexander Alekhin [Sun, 2 Oct 2016 11:38:59 +0000 (11:38 +0000)]
Merge pull request #7358 from convoyinc:ios-framework-module-exclusion

7 years agoocl: autogenerated code
Alexander Alekhin [Sat, 1 Oct 2016 23:36:26 +0000 (02:36 +0300)]
ocl: autogenerated code

7 years agoocl: eliminate build warning
Alexander Alekhin [Sat, 1 Oct 2016 23:33:41 +0000 (02:33 +0300)]
ocl: eliminate build warning

Templates are replaced by macro

7 years agoMerge pull request #7353 from alalek:ocl_update_canny_test_threshold
Vadim Pisarevsky [Sat, 1 Oct 2016 15:48:21 +0000 (15:48 +0000)]
Merge pull request #7353 from alalek:ocl_update_canny_test_threshold

7 years agoMerge pull request #7368 from berak:py_tutorials_fix
Vadim Pisarevsky [Sat, 1 Oct 2016 15:40:54 +0000 (15:40 +0000)]
Merge pull request #7368 from berak:py_tutorials_fix

7 years agoMerge pull request #7371 from mshabunin:aruco-java-wrap
Vadim Pisarevsky [Sat, 1 Oct 2016 15:38:59 +0000 (15:38 +0000)]
Merge pull request #7371 from mshabunin:aruco-java-wrap

7 years agoMerge pull request #7376 from alalek:fix_gcc_pch
Vadim Pisarevsky [Sat, 1 Oct 2016 15:37:33 +0000 (15:37 +0000)]
Merge pull request #7376 from alalek:fix_gcc_pch

7 years agoMerge pull request #7370 from souch55:Fixxn
Alexander Alekhin [Sat, 1 Oct 2016 10:44:55 +0000 (10:44 +0000)]
Merge pull request #7370 from souch55:Fixxn

7 years agoMerge pull request #7377 from alalek:fix_cuda_fp16
Alexander Alekhin [Sat, 1 Oct 2016 10:34:58 +0000 (10:34 +0000)]
Merge pull request #7377 from alalek:fix_cuda_fp16

7 years agofixed the difference of the calculation result for findStereoCorrespondenceBM_SSE2...
k-shinotsuka [Sat, 24 Sep 2016 16:06:39 +0000 (01:06 +0900)]
fixed the difference of the calculation result for findStereoCorrespondenceBM_SSE2() and findStereoCorrespondenceBM_().

7 years agocuda: fix fp16 compilation
Alexander Alekhin [Fri, 30 Sep 2016 20:55:39 +0000 (23:55 +0300)]
cuda: fix fp16 compilation

7 years agocmake: repair GCC PCH
Alexander Alekhin [Fri, 30 Sep 2016 20:37:43 +0000 (23:37 +0300)]
cmake: repair GCC PCH

7 years agoFix dead link for hit or miss documentation.
catree [Fri, 30 Sep 2016 18:34:30 +0000 (20:34 +0200)]
Fix dead link for hit or miss documentation.

7 years agoFixed java wrappers
mshabunin [Fri, 30 Sep 2016 13:21:04 +0000 (16:21 +0300)]
Fixed java wrappers

7 years agopython tutorials: removed remainders of former Algorithm interface
berak [Fri, 30 Sep 2016 07:57:44 +0000 (09:57 +0200)]
python tutorials: removed remainders of former Algorithm interface

7 years ago Fixed identifiers warns
sourin [Fri, 30 Sep 2016 09:46:29 +0000 (15:16 +0530)]
 Fixed identifiers warns

7 years agoMerge pull request #7360 from alalek:fix_aarch64_fp16
Alexander Alekhin [Thu, 29 Sep 2016 16:37:45 +0000 (16:37 +0000)]
Merge pull request #7360 from alalek:fix_aarch64_fp16

7 years agobuild: fix aarch64 build with aarch64-linux-gnu-g++-4.8
Alexander Alekhin [Thu, 29 Sep 2016 11:00:27 +0000 (14:00 +0300)]
build: fix aarch64 build with aarch64-linux-gnu-g++-4.8

7 years agoMerge pull request #7361 from StevenPuttemans:fix_documentation_link_OPENNI
Maksim Shabunin [Thu, 29 Sep 2016 13:50:11 +0000 (13:50 +0000)]
Merge pull request #7361 from StevenPuttemans:fix_documentation_link_OPENNI

7 years agofix issue 7352
StevenPuttemans [Thu, 29 Sep 2016 12:59:43 +0000 (14:59 +0200)]
fix issue 7352

7 years agoMerge remote-tracking branch 'upstream/master' into pr7050
mshabunin [Thu, 29 Sep 2016 09:57:28 +0000 (12:57 +0300)]
Merge remote-tracking branch 'upstream/master' into pr7050

7 years agoHAL interface for cv::integral
Maksim Shabunin [Wed, 31 Aug 2016 15:43:43 +0000 (18:43 +0300)]
HAL interface for cv::integral

7 years agoSupport for blacklisting modules when building iOS and OS X frameworks
Ian MacLeod [Wed, 28 Sep 2016 21:32:23 +0000 (14:32 -0700)]
Support for blacklisting modules when building iOS and OS X frameworks

7 years agoMerge pull request #7347 from tomoaki0705:fixClang3rdparty
Alexander Alekhin [Wed, 28 Sep 2016 12:10:40 +0000 (12:10 +0000)]
Merge pull request #7347 from tomoaki0705:fixClang3rdparty

7 years agoocl: update Canny test threshold
Alexander Alekhin [Wed, 28 Sep 2016 10:38:02 +0000 (13:38 +0300)]
ocl: update Canny test threshold

OpenCL Device:
- Intel(R) HD Graphics (OpenCL 2.0: r2.0.54425)

7 years agoMerge pull request #7342 from terfendail:OVXHAL_redundant_consts
Alexander Alekhin [Wed, 28 Sep 2016 10:31:22 +0000 (10:31 +0000)]
Merge pull request #7342 from terfendail:OVXHAL_redundant_consts

7 years agolet the build available using clang
Tomoaki Teshima [Tue, 27 Sep 2016 23:51:01 +0000 (08:51 +0900)]
let the build available using clang
  * add if section for clang

7 years agoMerge pull request #6956 from mshabunin:fix-chessboard-bug
Alexander Alekhin [Tue, 27 Sep 2016 13:33:42 +0000 (13:33 +0000)]
Merge pull request #6956 from mshabunin:fix-chessboard-bug

7 years agoMerge pull request #7334 from daB0bby:patch-3
Alexander Alekhin [Tue, 27 Sep 2016 13:29:50 +0000 (13:29 +0000)]
Merge pull request #7334 from daB0bby:patch-3

7 years agoMerge pull request #7333 from daB0bby:patch-2
Alexander Alekhin [Tue, 27 Sep 2016 13:29:32 +0000 (13:29 +0000)]
Merge pull request #7333 from daB0bby:patch-2

7 years agoRemove redundant constant definitions
Vitaly Tuzov [Mon, 26 Sep 2016 14:13:18 +0000 (17:13 +0300)]
Remove redundant constant definitions

7 years agoMerge pull request #7317 from tomoaki0705:fixIfdefFp16
Alexander Alekhin [Mon, 26 Sep 2016 10:59:32 +0000 (10:59 +0000)]
Merge pull request #7317 from tomoaki0705:fixIfdefFp16

7 years agobypass macro
daB0bby [Fri, 23 Sep 2016 11:01:19 +0000 (13:01 +0200)]
bypass macro

7 years agobypass macro
daB0bby [Fri, 23 Sep 2016 11:00:30 +0000 (13:00 +0200)]
bypass macro

7 years agocheck FP16 build condition correctly
Tomoaki Teshima [Wed, 21 Sep 2016 06:42:54 +0000 (15:42 +0900)]
check FP16 build condition correctly
  * use __GNUC_MINOR__ in correct place to check the version of GCC
  * check processor support of FP16 at run time
  * check compiler support of FP16 and pass correct compiler option
  * rely on ENABLE_AVX on gcc since AVX is generated when mf16c is passed
  * guard correctly using ifdef in case of various configuration
  * use v_float16x4 correctly by including the right header file

7 years agoMerge pull request #7321 from sovrasov:python_test_update
Alexander Alekhin [Thu, 22 Sep 2016 16:43:28 +0000 (16:43 +0000)]
Merge pull request #7321 from sovrasov:python_test_update

7 years agoSeveral chessboard detector improvements:
Maksim Shabunin [Tue, 19 Jul 2016 14:24:55 +0000 (17:24 +0300)]
Several chessboard detector improvements:
- fixed uninitialized memory access and memory leaks
- extracted several code blocks to separate functions
- updated part of algorithm to use cv::Mat instead of CvMat and IplImage

7 years agoMerge pull request #7322 from alalek:fix_test_crash
Maksim Shabunin [Thu, 22 Sep 2016 15:55:19 +0000 (15:55 +0000)]
Merge pull request #7322 from alalek:fix_test_crash

7 years agoMerge pull request #7328 from alalek:fix_win32_2
Maksim Shabunin [Thu, 22 Sep 2016 15:52:06 +0000 (15:52 +0000)]
Merge pull request #7328 from alalek:fix_win32_2

7 years agotest: fix test crash (exception in destructor)
Alexander Alekhin [Wed, 21 Sep 2016 14:50:42 +0000 (17:50 +0300)]
test: fix test crash (exception in destructor)

7 years agoimgproc: use target type for calculations
Alexander Alekhin [Wed, 14 Sep 2016 13:22:23 +0000 (16:22 +0300)]
imgproc: use target type for calculations

reduce scope of "i" variable

7 years agoMerge pull request #6845 from jbosch:master
Vadim Pisarevsky [Thu, 22 Sep 2016 11:57:06 +0000 (11:57 +0000)]
Merge pull request #6845 from jbosch:master

7 years agoimgproc: fix win32 build
Alexander Alekhin [Thu, 22 Sep 2016 11:51:53 +0000 (14:51 +0300)]
imgproc: fix win32 build

7 years agoMerge pull request #6820 from grochefort:fix_backgroundsubstractormog2_master
Vadim Pisarevsky [Thu, 22 Sep 2016 11:56:23 +0000 (11:56 +0000)]
Merge pull request #6820 from grochefort:fix_backgroundsubstractormog2_master

7 years agoLSD: Use a fixed size array instead of using std::vector
Francisco Facioni [Wed, 21 Sep 2016 13:57:17 +0000 (14:57 +0100)]
LSD: Use a fixed size array instead of using std::vector

7 years agoLSD: Avoid re allocating the histogram for multiple calls of LineSegmentDetector...
Francisco Facioni [Tue, 20 Sep 2016 14:37:25 +0000 (15:37 +0100)]
LSD: Avoid re allocating the histogram for multiple calls of LineSegmentDetector::detect in ll_angle

This is useful when reusing the same instance of LineSegmentDetector for multiple images

7 years agoLSD: Avoid pre allocating a big region, std::vector allocations is quite expensive
Francisco Facioni [Tue, 20 Sep 2016 08:36:09 +0000 (09:36 +0100)]
LSD: Avoid pre allocating a big region, std::vector allocations is quite expensive

7 years agoLSD: Avoid using pointers directly, image could be non continuous
Francisco Facioni [Sun, 18 Sep 2016 21:48:23 +0000 (22:48 +0100)]
LSD: Avoid using pointers directly, image could be non continuous

7 years agoLSD: Optimization, avoid converting the image to double
Francisco Facioni [Sun, 18 Sep 2016 21:32:33 +0000 (22:32 +0100)]
LSD: Optimization, avoid converting the image to double

7 years agoMerge pull request #7323 from lupustr3:pvlasov/rgb_to_gray_array_fix
Alexander Alekhin [Thu, 22 Sep 2016 09:52:16 +0000 (09:52 +0000)]
Merge pull request #7323 from lupustr3:pvlasov/rgb_to_gray_array_fix

7 years agoMerge pull request #7309 from K-Shinotsuka:issue22
Alexander Alekhin [Wed, 21 Sep 2016 14:46:53 +0000 (14:46 +0000)]
Merge pull request #7309 from K-Shinotsuka:issue22

7 years agoRGB2Gray array size fix;
Pavel Vlasov [Wed, 21 Sep 2016 14:46:51 +0000 (17:46 +0300)]
RGB2Gray array size fix;

7 years agoMake test_texture_flow.py more robust
Vladislav Sovrasov [Wed, 21 Sep 2016 14:11:00 +0000 (17:11 +0300)]
Make test_texture_flow.py more robust

7 years agoMerge pull request #7306 from K-Shinotsuka:issue21
Alexander Alekhin [Wed, 21 Sep 2016 12:47:33 +0000 (12:47 +0000)]
Merge pull request #7306 from K-Shinotsuka:issue21

7 years agoMerge pull request #7305 from K-Shinotsuka:issue20
Alexander Alekhin [Wed, 21 Sep 2016 12:47:15 +0000 (12:47 +0000)]
Merge pull request #7305 from K-Shinotsuka:issue20

7 years agoMerge pull request #7304 from K-Shinotsuka:issue19
Alexander Alekhin [Wed, 21 Sep 2016 12:46:30 +0000 (12:46 +0000)]
Merge pull request #7304 from K-Shinotsuka:issue19

7 years agoMerge pull request #7303 from K-Shinotsuka:issue18
Alexander Alekhin [Wed, 21 Sep 2016 12:45:16 +0000 (12:45 +0000)]
Merge pull request #7303 from K-Shinotsuka:issue18

7 years agoMerge pull request #7300 from K-Shinotsuka:issue17
Alexander Alekhin [Wed, 21 Sep 2016 12:44:42 +0000 (12:44 +0000)]
Merge pull request #7300 from K-Shinotsuka:issue17

7 years agoMerge pull request #7320 from daB0bby:patch-1
daB0bby [Wed, 21 Sep 2016 11:22:58 +0000 (13:22 +0200)]
Merge pull request #7320 from daB0bby:patch-1

* bypass makro

* syntax

7 years agoLSD: Removes unused code
Francisco Facioni [Sun, 18 Sep 2016 22:24:54 +0000 (23:24 +0100)]
LSD: Removes unused code

7 years agoMerge pull request #7252 from terfendail:transparent_sobel_fix
Alexander Alekhin [Mon, 19 Sep 2016 12:24:50 +0000 (12:24 +0000)]
Merge pull request #7252 from terfendail:transparent_sobel_fix

7 years agoMerge pull request #7307 from Jeroonk:fix_detect_python_majorversion
Alexander Alekhin [Mon, 19 Sep 2016 12:23:06 +0000 (12:23 +0000)]
Merge pull request #7307 from Jeroonk:fix_detect_python_majorversion

7 years agoimprove RGB2HLS_b()
k-shinotsuka [Sun, 18 Sep 2016 07:45:31 +0000 (16:45 +0900)]
improve RGB2HLS_b()

7 years agoimprove HSV2RGB_b()
k-shinotsuka [Sun, 18 Sep 2016 14:07:09 +0000 (23:07 +0900)]
improve HSV2RGB_b()

7 years agoDetect the correct Python major version
Jeroen Kromwijk [Sun, 18 Sep 2016 10:02:33 +0000 (12:02 +0200)]
Detect the correct Python major version

7 years agoimprove HLS2RGB_b()
k-shinotsuka [Sun, 18 Sep 2016 06:46:00 +0000 (15:46 +0900)]
improve HLS2RGB_b()

7 years agoimprove Lab2RGB_b()
k-shinotsuka [Sun, 18 Sep 2016 05:48:40 +0000 (14:48 +0900)]
improve Lab2RGB_b()

7 years agoimprove RGB2Luv_b()
k-shinotsuka [Sun, 18 Sep 2016 01:05:11 +0000 (10:05 +0900)]
improve RGB2Luv_b()

7 years agoimprove Luv2RGB_b()
k-shinotsuka [Sat, 17 Sep 2016 07:32:34 +0000 (16:32 +0900)]
improve Luv2RGB_b()

7 years agoMerge pull request #7266 from alalek:pr7159
Vadim Pisarevsky [Fri, 16 Sep 2016 21:18:26 +0000 (21:18 +0000)]
Merge pull request #7266 from alalek:pr7159

7 years agoMerge pull request #7294 from tomoaki0705:fixBuildCudaAarch64
Alexander Alekhin [Fri, 16 Sep 2016 14:27:18 +0000 (14:27 +0000)]
Merge pull request #7294 from tomoaki0705:fixBuildCudaAarch64