Alexander Alekhin
f92e880d3d
Merge pull request #10544 from alalek:issue_10535
2018-01-09 15:32:42 +00:00
Alexander Alekhin
8a76fadaa3
imgcodecs: add overflow checks
2018-01-09 18:05:24 +03:00
Alexander Alekhin
be5247921d
imgcodecs: remove assert() usage
2018-01-09 17:49:38 +03:00
Li Peng
e3b42bf93b
batch_norm and blank layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-09 21:58:46 +08:00
tobycollins
f34a0a874a
Merge pull request #10522 from tobycollins:issue10519
2018-01-09 15:54:36 +03:00
Alessandro de Oliveira Faria (A.K.A.CABELO)
c71dc78cd4
Merge pull request #10502 from cabelo/save-dnn-yolo
...
Save video file (#10502 )
2018-01-08 22:30:28 +03:00
Alexander Alekhin
f3dde79ed6
cmake: allow BUILD_FAT_JAVA_LIB for non-Android targets too
2018-01-08 19:24:39 +00:00
Alexander Alekhin
da0904df2d
Merge pull request #10550 from dkurt:replace_psroi_pooling_tag
2018-01-08 19:19:00 +00:00
Alexander Alekhin
c08a0edea1
Merge pull request #10545 from alalek:dnn_blob_manager_runtime_option
2018-01-08 13:22:44 +00:00
Dmitry Kurtaev
27b55ea761
Replace Caffe's psroi_pooling_param tag from 10001 to 10002
2018-01-08 13:29:20 +03:00
Hamdi Sahloul
8943441115
resolves #10548 - FLANN::knnSearch
garbage bug (when kNN is larger than the dataset size)
2018-01-08 18:58:55 +09:00
Alexander Alekhin
6674a024fc
dnn: add OPENCV_DNN_DISABLE_MEMORY_OPTIMIZATIONS runtime option
...
replaces REUSE_DNN_MEMORY compile-time option
2018-01-07 18:38:14 +00:00
Alexander Alekhin
ee35263e48
Merge pull request #10537 from pnemonic78:master_false
2018-01-07 12:53:22 +00:00
Moshe
84596bff09
Bitwise "and false"
...
Bitwise "and false" is always false.
2018-01-07 10:12:53 +02:00
Alexander Alekhin
e3a6d74945
Merge pull request #10536 from Sahloul:bug_fix/BLOB
2018-01-07 06:50:49 +00:00
Alexander Alekhin
dd3c1d3b8c
Merge pull request #10534 from ericrwx:videoio-psnr-typo-fix
2018-01-07 06:48:05 +00:00
Alexander Alekhin
3a5cd12dee
Merge pull request #10527 from csukuangfj:local
2018-01-07 06:46:45 +00:00
Hamdi Sahloul
2d2499f610
BLOB - Support RGBA
2018-01-07 14:30:40 +09:00
Eric Wang
c11895f529
Fix typo in video_input_psnr_ssim
2018-01-06 16:15:43 -08:00
LaurentBerger
004a1cd64a
Merge pull request #10529 from LaurentBerger:ExampleGoogleNet
...
* Add a parameter labels to command line
* default value
* samples: caffe_googlenet.cpp minor refactoring
2018-01-06 23:44:47 +03:00
Alexander Alekhin
d0b2e60edc
Merge pull request #10514 from alalek:build_warnings
2018-01-05 20:54:01 +00:00
Alexander Alekhin
8e1f31f543
Merge pull request #10521 from DabatoIsCool:master
2018-01-05 23:56:07 +03:00
Fangjun Kuang
a2869109f0
Improve the documentation for cv::Affine3.
2018-01-05 19:35:38 +01:00
Alexander Alekhin
431b3b4323
cmake(android): refactor copying of Android samples project files
2018-01-05 17:32:27 +00:00
Alexander Alekhin
9966903ae1
cmake(android): fix non-idempotent INSTALL scripts
2018-01-05 17:19:37 +00:00
Arthur Williams
8a67858068
Fixed missing #include "../precomp.hpp"
2018-01-05 15:10:39 +00:00
Alexander Alekhin
f5862dacb6
Merge pull request #10432 from GlueCrow:bgfg_knn_fix
2018-01-05 14:16:17 +00:00
Li Peng
67f9406cbe
add normalize_bbox layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-05 19:38:36 +08:00
Li Peng
f99a135eda
add eltwise layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-05 19:38:30 +08:00
Alexander Alekhin
e1ec45c948
Merge pull request #10517 from alalek:perf_video_bgfg
2018-01-05 10:27:24 +00:00
Alexander Alekhin
8acd05f12a
Merge pull request #10421 from cezheng:patch-1
2018-01-05 09:24:33 +00:00
Alexander Alekhin
be01ea734d
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.
2018-01-05 08:50:38 +00:00
Alexander Alekhin
d01a2038ae
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).
2018-01-05 05:59:08 +00:00
Alexander Alekhin
0e6dd32858
cmake(android): update zlib alias condition
...
To use 'z' in Android.mk instead of absolute path from the build machine.
2018-01-05 04:52:17 +00:00
Alexander Alekhin
bc7923e382
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")
2018-01-05 04:52:17 +00:00
Alexander Alekhin
c608c232a2
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.
2018-01-05 04:52:17 +00:00
Alexander Alekhin
5f9bb6249e
android: IPPICV static libraries workarounds for NDK 16
2018-01-05 04:52:17 +00:00
Alexander Alekhin
b76a691bcf
3rdparty(protobuf): fix build with Android NDK 16
2018-01-05 04:52:17 +00:00
Alexander Alekhin
bc6a355370
android(toolchain): fix find_path() behavior (zlib search problem)
2018-01-05 04:52:17 +00:00
Erik Man
37911e60d8
Allow compilation with unified include directory
...
This makes it possible to compile OpenCV with for instance ndk-r16
2018-01-05 04:52:17 +00:00
Alexander Alekhin
c92aa95726
android(toolchain): detailed error message
2018-01-05 04:52:17 +00:00
Alexander Alekhin
59c6661db0
cmake: eliminate ninja generator warning (CMake 3.10), refactor code
2018-01-05 04:42:24 +00:00
Alexander Alekhin
f0453bd853
build: eliminate warning
...
warning: 'layout.channel_layout::gchan' may be used uninitialized in this function [-Wmaybe-uninitialized]
2018-01-05 04:33:30 +00:00
Alexander Alekhin
116c8d0ddf
build: eliminate warnings
...
warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
2018-01-05 04:30:08 +00:00
Coralie RACHEX
16821b877c
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.
2018-01-04 15:51:58 +03:00
Alexander Alekhin
45c5f0a549
Merge pull request #10488 from alalek:cmake_simplify_configure_macro
2018-01-04 08:22:27 +00:00
Alexander Alekhin
f46eff4eb0
Merge pull request #10492 from pengli:dnn
2018-01-04 04:40:02 +00:00
Li Peng
1073175c77
add opencl option for resnet_ssd_face sample
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-04 18:40:56 +08:00
Li Peng
34bfd7ef51
add ocl implementation of proposal layer
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-04 18:40:51 +08:00
Alexander Alekhin
94b236872c
cmake: avoid unnecessary files creation in ocv_cmake_configure()
2018-01-02 19:16:51 +00:00