Alexander Alekhin [Wed, 17 Jan 2018 08:58:25 +0000 (08:58 +0000)]
Merge pull request #10602 from pengli:dnn
Li Peng [Wed, 10 Jan 2018 13:56:42 +0000 (21:56 +0800)]
MVN layer ocl implementation
Signed-off-by: Li Peng <peng.li@intel.com>
Li Peng [Thu, 23 Nov 2017 14:39:10 +0000 (22:39 +0800)]
Power, Tanh and Channels ReLU layer ocl support
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Tue, 16 Jan 2018 17:47:30 +0000 (17:47 +0000)]
Merge pull request #10606 from alalek:update_copyright_2018
Woody Chow [Tue, 16 Jan 2018 14:15:23 +0000 (23:15 +0900)]
Propagate calculated Gaussian kernel size(ref). Otherwise, ipp_GaussianBlur will fail if user doesn't specify a kernel size. (#10579)
Alexander Alekhin [Tue, 16 Jan 2018 13:19:32 +0000 (13:19 +0000)]
Merge pull request #10581 from mshabunin:minor-issues-fixes
Maksim Shabunin [Thu, 11 Jan 2018 10:50:35 +0000 (13:50 +0300)]
Add ThinLTO support for clang
Maksim Shabunin [Mon, 25 Dec 2017 13:57:40 +0000 (16:57 +0300)]
Fixed several warnings produced by clang 6 and static analyzers
Alexander Alekhin [Tue, 16 Jan 2018 12:18:18 +0000 (12:18 +0000)]
Merge pull request #10595 from oqtvs:updateProtobuf
Li Peng [Fri, 12 Jan 2018 13:30:19 +0000 (21:30 +0800)]
batch_norm layer ocl update
use a batch_norm ocl kernel to do the work
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Tue, 16 Jan 2018 10:55:42 +0000 (13:55 +0300)]
copyright: 2018
Vadim Pisarevsky [Tue, 16 Jan 2018 10:51:04 +0000 (10:51 +0000)]
Merge pull request #10575 from ioxp:getFontScale
Alexander Alekhin [Mon, 15 Jan 2018 20:28:57 +0000 (20:28 +0000)]
protobuf: drop unused files
Alexander Alekhin [Mon, 15 Jan 2018 19:49:36 +0000 (19:49 +0000)]
dnn: protobuf build warnings
oqtvs [Mon, 15 Jan 2018 15:51:38 +0000 (15:51 +0000)]
dnn: Updated protobuf files (3.5.1)
oqtvs [Mon, 15 Jan 2018 15:51:37 +0000 (13:51 -0200)]
Updated protobuf version to 3.5.1
Alexander Alekhin [Mon, 15 Jan 2018 15:05:32 +0000 (15:05 +0000)]
Merge pull request #10580 from woodychow:parallel_initUndistortRectifyMap
Alexander Alekhin [Mon, 15 Jan 2018 06:07:50 +0000 (06:07 +0000)]
Merge pull request #10585 from dkurt:dnn_weightless_scale
woody.chow [Mon, 15 Jan 2018 00:20:35 +0000 (09:20 +0900)]
Parallelize initUndistortRectifyMap
Alexander Alekhin [Sun, 14 Jan 2018 08:12:28 +0000 (08:12 +0000)]
Merge pull request #10588 from dkurt:dnn_blobFromImage_ext
Dmitry Kurtaev [Sat, 13 Jan 2018 15:17:56 +0000 (18:17 +0300)]
dnn::blobFromImage with OutputArray
Dmitry Kurtaev [Fri, 12 Jan 2018 08:59:05 +0000 (11:59 +0300)]
Untrainable version of Scale layer from Caffe
Alexander Alekhin [Sat, 13 Jan 2018 04:31:10 +0000 (04:31 +0000)]
Merge pull request #10495 from alalek:cmake_java
Alexander Alekhin [Thu, 4 Jan 2018 04:39:22 +0000 (04:39 +0000)]
cmake: ocv_target_include_directories() handle SYSTEM directories
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)
Alexander Alekhin [Wed, 3 Jan 2018 18:53:32 +0000 (18:53 +0000)]
java: fix MacOS Java problem
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)
Alexander Alekhin [Wed, 3 Jan 2018 15:16:35 +0000 (15:16 +0000)]
java: disable highgui wrapped code
Alexander Alekhin [Wed, 3 Jan 2018 04:33:40 +0000 (04:33 +0000)]
fixes for old CMake (2.8.12.2)
Alexander Alekhin [Fri, 29 Dec 2017 04:15:30 +0000 (04:15 +0000)]
cmake: Java/Android SDK refactoring
Alexander Alekhin [Fri, 29 Dec 2017 04:15:00 +0000 (04:15 +0000)]
java: files rename
intermediate commit (to simplify code review)
Alexander Alekhin [Fri, 29 Dec 2017 04:14:30 +0000 (04:14 +0000)]
java(test): fix test names
Alexander Alekhin [Fri, 12 Jan 2018 18:43:08 +0000 (18:43 +0000)]
Merge pull request #10582 from mshabunin:fix-ocl-concurrent-cache-name
Maksim Shabunin [Fri, 12 Jan 2018 16:03:16 +0000 (19:03 +0300)]
Fixed concurrent OpenCL cache folder name generation
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
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
Alexander Alekhin [Fri, 12 Jan 2018 12:22:40 +0000 (12:22 +0000)]
Merge pull request #10515 from alalek:android_ndk16
Alexander Alekhin [Thu, 11 Jan 2018 18:47:27 +0000 (18:47 +0000)]
Merge pull request #10504 from opentrack:fork
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.
Alexander Alekhin [Thu, 11 Jan 2018 14:15:40 +0000 (14:15 +0000)]
Merge pull request #10391 from ElenaGvozdeva:HAL_minMaxIdx
Philipp Hasper [Thu, 11 Jan 2018 12:27:16 +0000 (13:27 +0100)]
Added getFontScaleFromHeight()
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
Alexander Alekhin [Wed, 10 Jan 2018 11:39:47 +0000 (11:39 +0000)]
Merge pull request #10549 from Sahloul:bug_fix/FLANN
Alexander Alekhin [Wed, 10 Jan 2018 11:35:25 +0000 (11:35 +0000)]
Merge pull request #10568 from alalek:fix_10565
Alexander Alekhin [Wed, 10 Jan 2018 10:22:19 +0000 (10:22 +0000)]
Merge pull request #10567 from terfendail:createsample_fix
Alexander Alekhin [Wed, 10 Jan 2018 10:15:41 +0000 (10:15 +0000)]
Merge pull request #10566 from alalek:jasper_checks
Alexander Alekhin [Wed, 10 Jan 2018 10:15:09 +0000 (10:15 +0000)]
Merge pull request #10563 from alalek:issue_10540
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
Alexander Alekhin [Tue, 9 Jan 2018 18:32:01 +0000 (18:32 +0000)]
core: fix unresolved symbols from utils::fs
Alexander Alekhin [Tue, 9 Jan 2018 19:24:28 +0000 (19:24 +0000)]
Merge pull request #10513 from pengli:dnn
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
Alexander Alekhin [Tue, 9 Jan 2018 14:36:57 +0000 (17:36 +0300)]
imgcodecs: add more Jasper checks for supported and tested cases
Alexander Alekhin [Tue, 9 Jan 2018 15:32:42 +0000 (15:32 +0000)]
Merge pull request #10544 from alalek:issue_10535
Alexander Alekhin [Tue, 9 Jan 2018 14:56:52 +0000 (17:56 +0300)]
imgcodecs: add overflow checks
Alexander Alekhin [Tue, 9 Jan 2018 14:48:55 +0000 (17:48 +0300)]
imgcodecs: remove assert() usage
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>
tobycollins [Tue, 9 Jan 2018 12:54:36 +0000 (13:54 +0100)]
Merge pull request #10522 from tobycollins:issue10519
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)
Alexander Alekhin [Sun, 7 Jan 2018 18:16:38 +0000 (18:16 +0000)]
cmake: allow BUILD_FAT_JAVA_LIB for non-Android targets too
Alexander Alekhin [Mon, 8 Jan 2018 19:18:59 +0000 (19:18 +0000)]
Merge pull request #10550 from dkurt:replace_psroi_pooling_tag
Alexander Alekhin [Mon, 8 Jan 2018 13:22:44 +0000 (13:22 +0000)]
Merge pull request #10545 from alalek:dnn_blob_manager_runtime_option
Dmitry Kurtaev [Mon, 8 Jan 2018 10:27:57 +0000 (13:27 +0300)]
Replace Caffe's psroi_pooling_param tag from 10001 to 10002
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)
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
Alexander Alekhin [Sun, 7 Jan 2018 12:53:22 +0000 (12:53 +0000)]
Merge pull request #10537 from pnemonic78:master_false
Moshe [Sun, 7 Jan 2018 08:12:53 +0000 (10:12 +0200)]
Bitwise "and false"
Bitwise "and false" is always false.
Alexander Alekhin [Sun, 7 Jan 2018 06:50:49 +0000 (06:50 +0000)]
Merge pull request #10536 from Sahloul:bug_fix/BLOB
Alexander Alekhin [Sun, 7 Jan 2018 06:48:05 +0000 (06:48 +0000)]
Merge pull request #10534 from ericrwx:videoio-psnr-typo-fix
Alexander Alekhin [Sun, 7 Jan 2018 06:46:45 +0000 (06:46 +0000)]
Merge pull request #10527 from csukuangfj:local
Hamdi Sahloul [Sun, 7 Jan 2018 05:30:40 +0000 (14:30 +0900)]
BLOB - Support RGBA
Eric Wang [Sun, 7 Jan 2018 00:15:43 +0000 (16:15 -0800)]
Fix typo in video_input_psnr_ssim
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
Alexander Alekhin [Fri, 5 Jan 2018 20:54:01 +0000 (20:54 +0000)]
Merge pull request #10514 from alalek:build_warnings
Alexander Alekhin [Fri, 5 Jan 2018 20:56:07 +0000 (23:56 +0300)]
Merge pull request #10521 from DabatoIsCool:master
Fangjun Kuang [Fri, 5 Jan 2018 18:35:38 +0000 (19:35 +0100)]
Improve the documentation for cv::Affine3.
Alexander Alekhin [Wed, 3 Jan 2018 01:40:22 +0000 (01:40 +0000)]
cmake(android): refactor copying of Android samples project files
Alexander Alekhin [Wed, 3 Jan 2018 01:06:12 +0000 (01:06 +0000)]
cmake(android): fix non-idempotent INSTALL scripts
Arthur Williams [Fri, 5 Jan 2018 12:49:42 +0000 (12:49 +0000)]
Fixed missing #include "../precomp.hpp"
Alexander Alekhin [Fri, 5 Jan 2018 14:16:16 +0000 (14:16 +0000)]
Merge pull request #10432 from GlueCrow:bgfg_knn_fix
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>
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>
Alexander Alekhin [Fri, 5 Jan 2018 10:27:24 +0000 (10:27 +0000)]
Merge pull request #10517 from alalek:perf_video_bgfg
Alexander Alekhin [Fri, 5 Jan 2018 09:24:33 +0000 (09:24 +0000)]
Merge pull request #10421 from cezheng:patch-1
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.
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).
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.
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")
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.
Alexander Alekhin [Fri, 5 Jan 2018 00:24:02 +0000 (00:24 +0000)]
android: IPPICV static libraries workarounds for NDK 16
Alexander Alekhin [Fri, 5 Jan 2018 00:09:33 +0000 (00:09 +0000)]
3rdparty(protobuf): fix build with Android NDK 16
Alexander Alekhin [Thu, 4 Jan 2018 23:43:20 +0000 (23:43 +0000)]
android(toolchain): fix find_path() behavior (zlib search problem)
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
Alexander Alekhin [Thu, 4 Jan 2018 23:22:46 +0000 (23:22 +0000)]
android(toolchain): detailed error message
Alexander Alekhin [Fri, 5 Jan 2018 04:42:24 +0000 (04:42 +0000)]
cmake: eliminate ninja generator warning (CMake 3.10), refactor code
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]
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]
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.
Alexander Alekhin [Thu, 4 Jan 2018 08:22:27 +0000 (08:22 +0000)]
Merge pull request #10488 from alalek:cmake_simplify_configure_macro
Alexander Alekhin [Thu, 4 Jan 2018 04:40:02 +0000 (04:40 +0000)]
Merge pull request #10492 from pengli:dnn
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>