platform/upstream/opencv.git
6 years agoMerge pull request #10495 from alalek:cmake_java
Alexander Alekhin [Sat, 13 Jan 2018 04:31:10 +0000 (04:31 +0000)]
Merge pull request #10495 from alalek:cmake_java

6 years agocmake: ocv_target_include_directories() handle SYSTEM directories
Alexander Alekhin [Thu, 4 Jan 2018 04:39:22 +0000 (04:39 +0000)]
cmake: ocv_target_include_directories() handle SYSTEM directories

6 years agoandroid: fix SDK build
Alexander Alekhin [Wed, 3 Jan 2018 19:07:55 +0000 (19:07 +0000)]
android: fix SDK build

- fix Javadoc:
  - generate Javadoc after gather step to process all Java files (including Android 21)
  - generate into 'OpenCV-android-sdk' directly without additional copy step
- use smart copy/move utility functions ('shutil' doesn't well with existed destination)
- by default move files to reduce pressure on storage I/O (> 800Mb)

6 years agojava: fix MacOS Java problem
Alexander Alekhin [Wed, 3 Jan 2018 18:53:32 +0000 (18:53 +0000)]
java: fix MacOS Java problem

6 years agojava: fix bindings generator
Alexander Alekhin [Wed, 3 Jan 2018 17:18:39 +0000 (17:18 +0000)]
java: fix bindings generator

- fix imports override.
  Problem is observed with BoostDesc.

- add Ptr<> handling (constructor is protected from other packages).
  Observed in ximgproc:
      Ptr<StereoMatcher> createRightMatcher(Ptr<StereoMatcher> matcher_left)"
  where, "StereoMather" is from another package (calib3d)

6 years agojava: disable highgui wrapped code
Alexander Alekhin [Wed, 3 Jan 2018 15:16:35 +0000 (15:16 +0000)]
java: disable highgui wrapped code

6 years agofixes for old CMake (2.8.12.2)
Alexander Alekhin [Wed, 3 Jan 2018 04:33:40 +0000 (04:33 +0000)]
fixes for old CMake (2.8.12.2)

6 years agocmake: Java/Android SDK refactoring
Alexander Alekhin [Fri, 29 Dec 2017 04:15:30 +0000 (04:15 +0000)]
cmake: Java/Android SDK refactoring

6 years agojava: files rename
Alexander Alekhin [Fri, 29 Dec 2017 04:15:00 +0000 (04:15 +0000)]
java: files rename

intermediate commit (to simplify code review)

6 years agojava(test): fix test names
Alexander Alekhin [Fri, 29 Dec 2017 04:14:30 +0000 (04:14 +0000)]
java(test): fix test names

6 years agoMerge pull request #10582 from mshabunin:fix-ocl-concurrent-cache-name
Alexander Alekhin [Fri, 12 Jan 2018 18:43:08 +0000 (18:43 +0000)]
Merge pull request #10582 from mshabunin:fix-ocl-concurrent-cache-name

6 years agoFixed concurrent OpenCL cache folder name generation
Maksim Shabunin [Fri, 12 Jan 2018 16:03:16 +0000 (19:03 +0300)]
Fixed concurrent OpenCL cache folder name generation

6 years agoMerge pull request #10489 from SarenT:offset-mat_put
SarenT [Fri, 12 Jan 2018 15:00:58 +0000 (16:00 +0100)]
Merge pull request #10489 from SarenT:offset-mat_put

Adding capability to parse subsections of a byte array in Java bindings (#10489)

* Adding capability to parse subsections of a byte array in Java bindings. (Because Java lacks pointers. Therefore, reading images within a subsection of a byte array is impossible by Java's nature and limitations. Because of this, many IO functions in Java require additional parameters offset and length to define, which section of an array to be read.)

* Corrected according to the review. Previous interfaces were restored, instead internal interfaces were modified to provide subsampling of java byte arrays.

* Adding tests and test related files.

* Adding missing files for the test.

* Simplified the test

* Check was corrected according to discussion. An OutOfRangeException will be thrown instead of returning.

* java: update MatOfByte implementation checks / tests

6 years agoMerge pull request #10490 from alalek:cmake_android_refactor_copy_project_files
Alexander Alekhin [Fri, 12 Jan 2018 12:23:37 +0000 (12:23 +0000)]
Merge pull request #10490 from alalek:cmake_android_refactor_copy_project_files

6 years agoMerge pull request #10515 from alalek:android_ndk16
Alexander Alekhin [Fri, 12 Jan 2018 12:22:40 +0000 (12:22 +0000)]
Merge pull request #10515 from alalek:android_ndk16

6 years agoMerge pull request #10504 from opentrack:fork
Alexander Alekhin [Thu, 11 Jan 2018 18:47:27 +0000 (18:47 +0000)]
Merge pull request #10504 from opentrack:fork

6 years agomodules/videoio: fix PS3Eye camera property window
Stanislaw Halik [Thu, 4 Jan 2018 06:12:18 +0000 (07:12 +0100)]
modules/videoio: fix PS3Eye camera property window

v2: fix stray trailing whitespace

v3: only allow for up to one property window at the time

Opening multiple windows in the same process will just confuse
the camera filter or outright crash.

Suggested-by: @alalek
Also return whether a dialog was opened at the time.

6 years agoMerge pull request #10391 from ElenaGvozdeva:HAL_minMaxIdx
Alexander Alekhin [Thu, 11 Jan 2018 14:15:40 +0000 (14:15 +0000)]
Merge pull request #10391 from ElenaGvozdeva:HAL_minMaxIdx

6 years agoMerge pull request #10466 from dkurt:reduce_umat_try_2
Dmitry Kurtaev [Wed, 10 Jan 2018 18:50:54 +0000 (21:50 +0300)]
Merge pull request #10466 from dkurt:reduce_umat_try_2

* UMat blobs are wrapped

* Replace getUMat and getMat at OpenCLBackendWrapper

6 years agoMerge pull request #10549 from Sahloul:bug_fix/FLANN
Alexander Alekhin [Wed, 10 Jan 2018 11:39:47 +0000 (11:39 +0000)]
Merge pull request #10549 from Sahloul:bug_fix/FLANN

6 years agoMerge pull request #10568 from alalek:fix_10565
Alexander Alekhin [Wed, 10 Jan 2018 11:35:25 +0000 (11:35 +0000)]
Merge pull request #10568 from alalek:fix_10565

6 years agoMerge pull request #10567 from terfendail:createsample_fix
Alexander Alekhin [Wed, 10 Jan 2018 10:22:19 +0000 (10:22 +0000)]
Merge pull request #10567 from terfendail:createsample_fix

6 years agoMerge pull request #10566 from alalek:jasper_checks
Alexander Alekhin [Wed, 10 Jan 2018 10:15:41 +0000 (10:15 +0000)]
Merge pull request #10566 from alalek:jasper_checks

6 years agoMerge pull request #10563 from alalek:issue_10540
Alexander Alekhin [Wed, 10 Jan 2018 10:15:09 +0000 (10:15 +0000)]
Merge pull request #10563 from alalek:issue_10540

6 years agoMerge pull request #10497 from aaron-bray:msvc2017-findcuda
Aaron Bray [Wed, 10 Jan 2018 09:32:34 +0000 (04:32 -0500)]
Merge pull request #10497 from aaron-bray:msvc2017-findcuda

* Update to properly find the compiler tools for MSVC 2017

* FindCUDA: Fix the MSVC 2017 compiler tool locations

6 years agocore: fix unresolved symbols from utils::fs
Alexander Alekhin [Tue, 9 Jan 2018 18:32:01 +0000 (18:32 +0000)]
core: fix unresolved symbols from utils::fs

6 years agoMerge pull request #10513 from pengli:dnn
Alexander Alekhin [Tue, 9 Jan 2018 19:24:28 +0000 (19:24 +0000)]
Merge pull request #10513 from pengli:dnn

6 years agoFixed exception when ROI for generated sample is evaluated out of image borders
Vitaly Tuzov [Tue, 9 Jan 2018 17:30:39 +0000 (20:30 +0300)]
Fixed exception when ROI for generated sample is evaluated out of image borders

6 years agoimgcodecs: add more Jasper checks for supported and tested cases
Alexander Alekhin [Tue, 9 Jan 2018 14:36:57 +0000 (17:36 +0300)]
imgcodecs: add more Jasper checks for supported and tested cases

6 years agoMerge pull request #10544 from alalek:issue_10535
Alexander Alekhin [Tue, 9 Jan 2018 15:32:42 +0000 (15:32 +0000)]
Merge pull request #10544 from alalek:issue_10535

6 years agoimgcodecs: add overflow checks
Alexander Alekhin [Tue, 9 Jan 2018 14:56:52 +0000 (17:56 +0300)]
imgcodecs: add overflow checks

6 years agoimgcodecs: remove assert() usage
Alexander Alekhin [Tue, 9 Jan 2018 14:48:55 +0000 (17:48 +0300)]
imgcodecs: remove assert() usage

6 years agobatch_norm and blank layer ocl implementation
Li Peng [Thu, 4 Jan 2018 15:14:28 +0000 (23:14 +0800)]
batch_norm and blank layer ocl implementation

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoMerge pull request #10522 from tobycollins:issue10519
tobycollins [Tue, 9 Jan 2018 12:54:36 +0000 (13:54 +0100)]
Merge pull request #10522 from tobycollins:issue10519

6 years agoMerge pull request #10502 from cabelo/save-dnn-yolo
Alessandro de Oliveira Faria (A.K.A.CABELO) [Mon, 8 Jan 2018 19:30:28 +0000 (17:30 -0200)]
Merge pull request #10502 from cabelo/save-dnn-yolo

Save video file (#10502)

6 years agocmake: allow BUILD_FAT_JAVA_LIB for non-Android targets too
Alexander Alekhin [Sun, 7 Jan 2018 18:16:38 +0000 (18:16 +0000)]
cmake: allow BUILD_FAT_JAVA_LIB for non-Android targets too

6 years agoMerge pull request #10550 from dkurt:replace_psroi_pooling_tag
Alexander Alekhin [Mon, 8 Jan 2018 19:18:59 +0000 (19:18 +0000)]
Merge pull request #10550 from dkurt:replace_psroi_pooling_tag

6 years agoMerge pull request #10545 from alalek:dnn_blob_manager_runtime_option
Alexander Alekhin [Mon, 8 Jan 2018 13:22:44 +0000 (13:22 +0000)]
Merge pull request #10545 from alalek:dnn_blob_manager_runtime_option

6 years agoReplace Caffe's psroi_pooling_param tag from 10001 to 10002
Dmitry Kurtaev [Mon, 8 Jan 2018 10:27:57 +0000 (13:27 +0300)]
Replace Caffe's psroi_pooling_param tag from 10001 to 10002

6 years agoresolves #10548 - `FLANN::knnSearch` garbage bug (when kNN is larger than the dataset...
Hamdi Sahloul [Mon, 8 Jan 2018 09:26:10 +0000 (18:26 +0900)]
resolves #10548 - `FLANN::knnSearch` garbage bug (when kNN is larger than the dataset size)

6 years agodnn: add OPENCV_DNN_DISABLE_MEMORY_OPTIMIZATIONS runtime option
Alexander Alekhin [Sun, 7 Jan 2018 18:38:14 +0000 (18:38 +0000)]
dnn: add OPENCV_DNN_DISABLE_MEMORY_OPTIMIZATIONS runtime option

replaces REUSE_DNN_MEMORY compile-time option

6 years agoMerge pull request #10537 from pnemonic78:master_false
Alexander Alekhin [Sun, 7 Jan 2018 12:53:22 +0000 (12:53 +0000)]
Merge pull request #10537 from pnemonic78:master_false

6 years agoBitwise "and false"
Moshe [Sun, 7 Jan 2018 08:12:53 +0000 (10:12 +0200)]
Bitwise "and false"

Bitwise "and false" is always false.

6 years agoMerge pull request #10536 from Sahloul:bug_fix/BLOB
Alexander Alekhin [Sun, 7 Jan 2018 06:50:49 +0000 (06:50 +0000)]
Merge pull request #10536 from Sahloul:bug_fix/BLOB

6 years agoMerge pull request #10534 from ericrwx:videoio-psnr-typo-fix
Alexander Alekhin [Sun, 7 Jan 2018 06:48:05 +0000 (06:48 +0000)]
Merge pull request #10534 from ericrwx:videoio-psnr-typo-fix

6 years agoMerge pull request #10527 from csukuangfj:local
Alexander Alekhin [Sun, 7 Jan 2018 06:46:45 +0000 (06:46 +0000)]
Merge pull request #10527 from csukuangfj:local

6 years agoBLOB - Support RGBA
Hamdi Sahloul [Sun, 7 Jan 2018 05:30:40 +0000 (14:30 +0900)]
BLOB - Support RGBA

6 years agoFix typo in video_input_psnr_ssim
Eric Wang [Sun, 7 Jan 2018 00:15:43 +0000 (16:15 -0800)]
Fix typo in video_input_psnr_ssim

6 years agoMerge pull request #10529 from LaurentBerger:ExampleGoogleNet
LaurentBerger [Sat, 6 Jan 2018 20:44:47 +0000 (21:44 +0100)]
Merge pull request #10529 from LaurentBerger:ExampleGoogleNet

* Add a parameter labels to command line

* default value

* samples: caffe_googlenet.cpp minor refactoring

6 years agoMerge pull request #10514 from alalek:build_warnings
Alexander Alekhin [Fri, 5 Jan 2018 20:54:01 +0000 (20:54 +0000)]
Merge pull request #10514 from alalek:build_warnings

6 years agoMerge pull request #10521 from DabatoIsCool:master
Alexander Alekhin [Fri, 5 Jan 2018 20:56:07 +0000 (23:56 +0300)]
Merge pull request #10521 from DabatoIsCool:master

6 years agoImprove the documentation for cv::Affine3.
Fangjun Kuang [Fri, 5 Jan 2018 18:35:38 +0000 (19:35 +0100)]
Improve the documentation for cv::Affine3.

6 years agocmake(android): refactor copying of Android samples project files
Alexander Alekhin [Wed, 3 Jan 2018 01:40:22 +0000 (01:40 +0000)]
cmake(android): refactor copying of Android samples project files

6 years agocmake(android): fix non-idempotent INSTALL scripts
Alexander Alekhin [Wed, 3 Jan 2018 01:06:12 +0000 (01:06 +0000)]
cmake(android): fix non-idempotent INSTALL scripts

6 years agoFixed missing #include "../precomp.hpp"
Arthur Williams [Fri, 5 Jan 2018 12:49:42 +0000 (12:49 +0000)]
Fixed missing #include "../precomp.hpp"

6 years agoMerge pull request #10432 from GlueCrow:bgfg_knn_fix
Alexander Alekhin [Fri, 5 Jan 2018 14:16:16 +0000 (14:16 +0000)]
Merge pull request #10432 from GlueCrow:bgfg_knn_fix

6 years agoadd normalize_bbox layer ocl implementation
Li Peng [Thu, 4 Jan 2018 11:47:35 +0000 (19:47 +0800)]
add normalize_bbox layer ocl implementation

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoadd eltwise layer ocl implementation
Li Peng [Wed, 3 Jan 2018 18:21:04 +0000 (02:21 +0800)]
add eltwise layer ocl implementation

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoMerge pull request #10517 from alalek:perf_video_bgfg
Alexander Alekhin [Fri, 5 Jan 2018 10:27:24 +0000 (10:27 +0000)]
Merge pull request #10517 from alalek:perf_video_bgfg

6 years agoMerge pull request #10421 from cezheng:patch-1
Alexander Alekhin [Fri, 5 Jan 2018 09:24:33 +0000 (09:24 +0000)]
Merge pull request #10421 from cezheng:patch-1

6 years agovideo(perf): add Mog2/KNN tests, fixed bug in prepareData()
Alexander Alekhin [Fri, 5 Jan 2018 06:50:19 +0000 (06:50 +0000)]
video(perf): add Mog2/KNN tests, fixed bug in prepareData()

prepareData() bug feeds the same image (the latest)
OCL perf test doesn't pass accuracy(!) check now, so this check is disabled.

6 years agocmake(android): update CMAKE_FIND_ROOT_PATH_MODE_* handling
Alexander Alekhin [Fri, 5 Jan 2018 05:46:44 +0000 (05:46 +0000)]
cmake(android): update CMAKE_FIND_ROOT_PATH_MODE_* handling

Avoids this error message with CMake 3.10:
CMake Error: CMake was unable to find a build program corresponding to "Ninja".
CMAKE_MAKE_PROGRAM is not set. You probably need to select a different build tool.

Related changes is that pkg-config tool is found (/usr/bin/pkg-config).

6 years agocmake(android): update zlib alias condition
Alexander Alekhin [Fri, 5 Jan 2018 03:53:00 +0000 (03:53 +0000)]
cmake(android): update zlib alias condition

To use 'z' in Android.mk instead of absolute path from the build machine.

6 years agocmake(android): fix ccache detection (native Android toolchain with NDK_CCACHE)
Alexander Alekhin [Fri, 5 Jan 2018 03:37:25 +0000 (03:37 +0000)]
cmake(android): fix ccache detection (native Android toolchain with NDK_CCACHE)

To prevent this result:
    /usr/bin/ccache ccache <android-ndk-r16.1>/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-gcc ...
with:
    ccache: error: Recursive invocation (the name of the ccache binary must be "ccache")

6 years ago3rdparty(libtiff): fix build with Android NDK 16
Alexander Alekhin [Fri, 5 Jan 2018 02:37:12 +0000 (02:37 +0000)]
3rdparty(libtiff): fix build with Android NDK 16

Compiler message:
tif_unix.c:170:12: error: call to 'mmap' declared with attribute error:
mmap is not available with _FILE_OFFSET_BITS=64 when using GCC until android-21.
Either raise your minSdkVersion, disable _FILE_OFFSET_BITS=64, or switch to Clang.

6 years agoandroid: IPPICV static libraries workarounds for NDK 16
Alexander Alekhin [Fri, 5 Jan 2018 00:24:02 +0000 (00:24 +0000)]
android: IPPICV static libraries workarounds for NDK 16

6 years ago3rdparty(protobuf): fix build with Android NDK 16
Alexander Alekhin [Fri, 5 Jan 2018 00:09:33 +0000 (00:09 +0000)]
3rdparty(protobuf): fix build with Android NDK 16

6 years agoandroid(toolchain): fix find_path() behavior (zlib search problem)
Alexander Alekhin [Thu, 4 Jan 2018 23:43:20 +0000 (23:43 +0000)]
android(toolchain): fix find_path() behavior (zlib search problem)

6 years agoAllow compilation with unified include directory
Erik Man [Mon, 11 Dec 2017 10:52:43 +0000 (11:52 +0100)]
Allow compilation with unified include directory

This makes it possible to compile OpenCV with for instance ndk-r16

6 years agoandroid(toolchain): detailed error message
Alexander Alekhin [Thu, 4 Jan 2018 23:22:46 +0000 (23:22 +0000)]
android(toolchain): detailed error message

6 years agocmake: eliminate ninja generator warning (CMake 3.10), refactor code
Alexander Alekhin [Fri, 5 Jan 2018 04:42:24 +0000 (04:42 +0000)]
cmake: eliminate ninja generator warning (CMake 3.10), refactor code

6 years agobuild: eliminate warning
Alexander Alekhin [Fri, 5 Jan 2018 04:33:30 +0000 (04:33 +0000)]
build: eliminate warning

warning: 'layout.channel_layout::gchan' may be used uninitialized in this function [-Wmaybe-uninitialized]

6 years agobuild: eliminate warnings
Alexander Alekhin [Fri, 5 Jan 2018 04:30:08 +0000 (04:30 +0000)]
build: eliminate warnings

warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

6 years agoMerge pull request #10493 from RachexCoralie:tiff32FC1Codec
Coralie RACHEX [Thu, 4 Jan 2018 12:51:58 +0000 (13:51 +0100)]
Merge pull request #10493 from RachexCoralie:tiff32FC1Codec

* Load and save tiff images in CV_32FC1 format (1 channel of floats).

* Add test

* Fix error handling and resources leak. Improve test.

6 years agoMerge pull request #10488 from alalek:cmake_simplify_configure_macro
Alexander Alekhin [Thu, 4 Jan 2018 08:22:27 +0000 (08:22 +0000)]
Merge pull request #10488 from alalek:cmake_simplify_configure_macro

6 years agoMerge pull request #10492 from pengli:dnn
Alexander Alekhin [Thu, 4 Jan 2018 04:40:02 +0000 (04:40 +0000)]
Merge pull request #10492 from pengli:dnn

6 years agoadd opencl option for resnet_ssd_face sample
Li Peng [Wed, 3 Jan 2018 15:54:11 +0000 (23:54 +0800)]
add opencl option for resnet_ssd_face sample

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoadd ocl implementation of proposal layer
Li Peng [Wed, 3 Jan 2018 13:43:48 +0000 (21:43 +0800)]
add ocl implementation of proposal layer

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agocmake: avoid unnecessary files creation in ocv_cmake_configure()
Alexander Alekhin [Tue, 2 Jan 2018 19:16:51 +0000 (19:16 +0000)]
cmake: avoid unnecessary files creation in ocv_cmake_configure()

6 years agoMerge pull request #10446 from cabelo:style-dnn-yolo
Alessandro de Oliveira Faria (A.K.A.CABELO) [Tue, 2 Jan 2018 14:26:29 +0000 (12:26 -0200)]
Merge pull request #10446 from cabelo:style-dnn-yolo

* add style draw in yolo

* fix sintaxe whitespace

* fix conversion from float to int

* sample refactoring

- minor code style fixes
- avoid confusing "bottom" names
- use cv::format
- always draw object detection/roi

6 years agoMerge pull request #10477 from berak:fix_bg_sub_tutorial
Alexander Alekhin [Tue, 2 Jan 2018 03:21:16 +0000 (03:21 +0000)]
Merge pull request #10477 from berak:fix_bg_sub_tutorial

6 years agoMerge pull request #10483 from dkurt:fix_dnn_ssd_cpp_sample
Alexander Alekhin [Tue, 2 Jan 2018 03:18:39 +0000 (03:18 +0000)]
Merge pull request #10483 from dkurt:fix_dnn_ssd_cpp_sample

6 years agoMerge pull request #10481 from alalek:fix_10474
Alexander Alekhin [Tue, 2 Jan 2018 03:17:58 +0000 (03:17 +0000)]
Merge pull request #10481 from alalek:fix_10474

6 years agoUpdate C++ MobileNet-SSD object detection sample
Dmitry Kurtaev [Mon, 1 Jan 2018 20:01:23 +0000 (23:01 +0300)]
Update C++ MobileNet-SSD object detection sample

6 years agopython: filter modules headers (from <module>/include directory)
Alexander Alekhin [Mon, 1 Jan 2018 15:56:14 +0000 (15:56 +0000)]
python: filter modules headers (from <module>/include directory)

6 years agoMerge pull request #10480 from alalek:fix_10479
Alexander Alekhin [Mon, 1 Jan 2018 15:40:12 +0000 (15:40 +0000)]
Merge pull request #10480 from alalek:fix_10479

6 years agoimgproc(hdr): fix bounds check in HdrDecoder::checkSignature()
Alexander Alekhin [Mon, 1 Jan 2018 13:12:21 +0000 (13:12 +0000)]
imgproc(hdr): fix bounds check in HdrDecoder::checkSignature()

6 years agovideo: clean up bg subtraction tutorial
berak [Sun, 31 Dec 2017 11:23:02 +0000 (12:23 +0100)]
video: clean up bg subtraction tutorial

6 years agoMerge pull request #10473 from alalek:cmake_version_string_timestamp
Alexander Alekhin [Sun, 31 Dec 2017 10:47:33 +0000 (10:47 +0000)]
Merge pull request #10473 from alalek:cmake_version_string_timestamp

6 years agocmake: avoid timestamp change of version_string.inc file
Alexander Alekhin [Sat, 30 Dec 2017 19:58:57 +0000 (19:58 +0000)]
cmake: avoid timestamp change of version_string.inc file

6 years agoMerge pull request #10470 from victor-ludorum:caliper
Alexander Alekhin [Sat, 30 Dec 2017 18:19:39 +0000 (18:19 +0000)]
Merge pull request #10470 from victor-ludorum:caliper

6 years agoMerge pull request #10469 from victor-ludorum:stichingbranch
victor-ludorum [Sat, 30 Dec 2017 18:22:02 +0000 (23:52 +0530)]
Merge pull request #10469 from victor-ludorum:stichingbranch

Updating stiching.cpp to resolve new line issue #10461 (#10469)

6 years agoUpdating rotcalipers.cpp to resolve issue #10096
victor-ludorum [Sat, 30 Dec 2017 04:51:46 +0000 (10:21 +0530)]
Updating rotcalipers.cpp to resolve issue #10096

Updating the documentation of the rotcalipers.cpp to resolve issue #10096

6 years agoMerge pull request #10463 from alalek:avx512skx
Alexander Alekhin [Fri, 29 Dec 2017 15:57:57 +0000 (15:57 +0000)]
Merge pull request #10463 from alalek:avx512skx

6 years agocmake(opt): AVX512_SKX
Alexander Alekhin [Fri, 29 Dec 2017 05:06:52 +0000 (05:06 +0000)]
cmake(opt): AVX512_SKX

6 years agoMerge pull request #10329 from jasjuang:master
Alexander Alekhin [Thu, 28 Dec 2017 16:45:16 +0000 (16:45 +0000)]
Merge pull request #10329 from jasjuang:master

6 years agoMerge pull request #10410 from GlueCrow:master
Alexander Alekhin [Thu, 28 Dec 2017 16:43:17 +0000 (16:43 +0000)]
Merge pull request #10410 from GlueCrow:master

6 years agoMerge pull request #10456 from dkurt:dnn_allocate_mem_for_optimized_concat
Alexander Alekhin [Thu, 28 Dec 2017 16:04:51 +0000 (16:04 +0000)]
Merge pull request #10456 from dkurt:dnn_allocate_mem_for_optimized_concat

6 years agoMerge pull request #10416 from fenrus75:avx512
Alexander Alekhin [Thu, 28 Dec 2017 15:56:56 +0000 (15:56 +0000)]
Merge pull request #10416 from fenrus75:avx512

6 years agoMerge pull request #10429 from wxzs5:fix-documentation
Alexander Alekhin [Thu, 28 Dec 2017 15:30:43 +0000 (18:30 +0300)]
Merge pull request #10429 from wxzs5:fix-documentation