Alexander Alekhin [Sat, 18 Nov 2017 18:07:14 +0000 (18:07 +0000)]
Merge pull request #10087 from mshabunin:small-cmake-fixes
Jonathan Viney [Sat, 18 Nov 2017 18:08:41 +0000 (07:08 +1300)]
Merge pull request #10011 from jviney:master
Fix build with FFmpeg master. Some deprecated APIs have been removed. (#10011)
* Fix build with FFmpeg master.
* ffmpeg: update AVFMT_RAWPICTURE support removal
Alexander Alekhin [Fri, 17 Nov 2017 20:09:08 +0000 (20:09 +0000)]
Merge pull request #10108 from mshabunin:fix-eigen-stride
Alexander Alekhin [Fri, 17 Nov 2017 19:01:38 +0000 (19:01 +0000)]
Merge pull request #10102 from seiko2plus:coreVsxPacksFix
Maksim Shabunin [Fri, 17 Nov 2017 15:27:09 +0000 (18:27 +0300)]
Eigen: fix Mat construction stride
Alexander Alekhin [Fri, 17 Nov 2017 13:57:36 +0000 (13:57 +0000)]
Merge pull request #10104 from wzw-intel:fusion_debug
Maksim Shabunin [Fri, 17 Nov 2017 13:37:28 +0000 (13:37 +0000)]
Merge pull request #9997 from ElenaGvozdeva:GaussianBlur_bug
Maksim Shabunin [Fri, 3 Nov 2017 14:57:08 +0000 (17:57 +0300)]
Do not reset step for single-row Mat created on user data
elenagvo [Thu, 2 Nov 2017 14:05:17 +0000 (17:05 +0300)]
test for GaussianBlur with border
Alexander Alekhin [Fri, 17 Nov 2017 09:16:34 +0000 (09:16 +0000)]
Merge pull request #10099 from alalek:fix_js_tests
Maksim Shabunin [Tue, 14 Nov 2017 14:07:04 +0000 (17:07 +0300)]
cmake: simplified configuration output
Wu Zhiwen [Fri, 17 Nov 2017 08:21:56 +0000 (16:21 +0800)]
dnn(ocl4dnn): Fix relu fusion bug
Incorrect type of negative_slope result in this bug.
Also and OCL test for darknet to validate this patch.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Alexander Alekhin [Fri, 17 Nov 2017 05:41:18 +0000 (05:41 +0000)]
Merge pull request #10008 from Smorodov:master
Sayed Adel [Thu, 16 Nov 2017 21:54:56 +0000 (21:54 +0000)]
core:vsx Fix vec_packs in gcc-5
Alexander Alekhin [Thu, 16 Nov 2017 19:39:33 +0000 (19:39 +0000)]
Merge pull request #10094 from amroamroamro:mingw-pkgconfig-fix
Maksim Shabunin [Thu, 16 Nov 2017 15:20:44 +0000 (15:20 +0000)]
Merge pull request #10078 from justdoitqd:master
Maksim Shabunin [Thu, 16 Nov 2017 15:20:15 +0000 (15:20 +0000)]
Merge pull request #9907 from seiko2plus:vsxFixesImproves
Jcrist99 [Thu, 16 Nov 2017 13:48:12 +0000 (17:48 +0400)]
Merge pull request #9698 from abratchik:parse.doxygen
Support @deprecated tag in java wrappers (#9698)
Alexander Alekhin [Wed, 15 Nov 2017 20:46:38 +0000 (20:46 +0000)]
js: fix tests (qunit -> node-qunit)
Alexander Alekhin [Thu, 16 Nov 2017 10:17:39 +0000 (10:17 +0000)]
Merge pull request #10091 from alalek:build_python_reduce_global_symbols
Alexander Alekhin [Thu, 16 Nov 2017 09:34:42 +0000 (09:34 +0000)]
Merge pull request #10097 from wzw-intel:tuning_time
Wu Zhiwen [Thu, 16 Nov 2017 02:40:23 +0000 (10:40 +0800)]
dnn(ocl4dnn): Fix wrong measurement for tuning time
convolution kernel use default queue to run, so that ocl::Timer
, to measure the kernel run time, should use the default queue too.
Also remove useless parameter for convolve()
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Amro [Wed, 15 Nov 2017 16:54:46 +0000 (18:54 +0200)]
fix pkg-config generation for mingw
Alexander Alekhin [Wed, 15 Nov 2017 16:08:56 +0000 (16:08 +0000)]
Merge pull request #10083 from alalek:core_intrinsics_load_low
Alexander Alekhin [Mon, 13 Nov 2017 11:14:08 +0000 (14:14 +0300)]
core(intrinsics): v_load_low
Alexander Alekhin [Tue, 14 Nov 2017 16:25:16 +0000 (19:25 +0300)]
build: avoid exporting of unnecessary symbols from Python bindings
Akhilesh Kumar [Tue, 14 Nov 2017 10:44:01 +0000 (16:14 +0530)]
Merge pull request #10056 from akhilesh-k:master
Added Python setup docs for Ubuntu Machines (#10056)
Alexander Alekhin [Mon, 13 Nov 2017 11:26:13 +0000 (11:26 +0000)]
Merge pull request #10073 from alalek:cmake_fix_overiding_compile_options
Alexander Alekhin [Mon, 13 Nov 2017 09:18:42 +0000 (09:18 +0000)]
Merge pull request #10068 from paroj:fs_doc
Simon Guo [Wed, 8 Nov 2017 09:37:29 +0000 (17:37 +0800)]
core:ppc Fix 2 interleave logic errors in vsx_utils.hpp
When elements are 64 bits, the vec_st_interleave()/vec_ld_deinterleave()
doesn't interleave 4 elements correctly.
For vec_st_interleave(), following is saved into mem:
a0 b0 a1 b1 c0 d0 c1 d1
-> we expected:
a0 b0 c0 d0 a1 b1 c1 d1
for vec_ld_deinterleave(), following is loaded into a b c d for memory
string { 1 2 3 4 5 6 7 8 }:
a: 1 3
b: 2 4
c: 5 7
d: 6 8
-> we expected:
a: 1 5
b: 2 6
c: 3 7
d: 4 8
This patch corrects this behavior.
Signed-off-by: Simon Guo <wei.guo.simon@gmail.com>
Alexander Alekhin [Sun, 12 Nov 2017 08:12:27 +0000 (11:12 +0300)]
cmake: drop amending of compilation options
Allow to specify optimization level via CMake.
Alexander Alekhin [Sun, 12 Nov 2017 07:11:34 +0000 (07:11 +0000)]
Merge pull request #10072 from sturkmen72:upd_lsd_cpp
Suleyman TURKMEN [Sat, 11 Nov 2017 08:59:55 +0000 (11:59 +0300)]
Update lsd.cpp
Florian Echtler [Fri, 10 Nov 2017 19:35:32 +0000 (20:35 +0100)]
Merge pull request #10050 from floe/android-studio-3.3.1
Add Android Mat constructor with support for native buffer (#10050)
Alexander Alekhin [Fri, 10 Nov 2017 19:04:36 +0000 (19:04 +0000)]
Merge pull request #10057 from LaurentBerger:ParaCalcError
Pavel Rojtberg [Fri, 10 Nov 2017 12:06:36 +0000 (13:06 +0100)]
FileStorage: use copydoc to add base64 info to constructor
Alexander Alekhin [Fri, 10 Nov 2017 05:05:52 +0000 (05:05 +0000)]
Merge pull request #10061 from Sahloul:dnn_torch_fix
Alexander Alekhin [Fri, 10 Nov 2017 05:04:55 +0000 (05:04 +0000)]
Merge pull request #10062 from alalek:gtest_show_params
LaurentBerger [Thu, 9 Nov 2017 11:19:04 +0000 (12:19 +0100)]
Parallel version of calcError in statmodel
Alexander Alekhin [Thu, 9 Nov 2017 18:54:43 +0000 (18:54 +0000)]
Merge pull request #9882 from pengli:ocl4dnn
Alexander Alekhin [Thu, 9 Nov 2017 16:09:46 +0000 (19:09 +0300)]
ts: dump test parameters value
Hamdi Sahloul [Thu, 9 Nov 2017 15:44:06 +0000 (00:44 +0900)]
DNN Torch - workaround when torch importer is disabled
Alexander Alekhin [Thu, 9 Nov 2017 11:05:56 +0000 (11:05 +0000)]
Merge pull request #10053 from terfendail:intersectconvex_fix
Li Peng [Thu, 9 Nov 2017 04:57:37 +0000 (12:57 +0800)]
Add new layer forward interface
Add layer forward interface with InputArrayOfArrays and
OutputArrayOfArrays parameters, it allows UMat buffer to be
processed and transferred in the layers.
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Wed, 8 Nov 2017 19:01:05 +0000 (19:01 +0000)]
Merge pull request #10048 from alalek:fix_macos_pkg_config
Vitaly Tuzov [Wed, 8 Nov 2017 17:27:07 +0000 (20:27 +0300)]
Fix for intersectConvexConvex nested contours check
Fakabbir Amin [Wed, 8 Nov 2017 16:55:48 +0000 (22:25 +0530)]
Merge pull request #9979 from fakabbir:ImproveDoc
* Improve Documentation
Fixes Spelling Mistakes.
Alexander Alekhin [Wed, 8 Nov 2017 16:48:04 +0000 (16:48 +0000)]
Merge pull request #10051 from sturkmen72:upd_grfmt_gdal_cpp
Suleyman TURKMEN [Wed, 8 Nov 2017 14:47:43 +0000 (17:47 +0300)]
update grfmt_gdal.cpp
Alexander Alekhin [Wed, 8 Nov 2017 14:13:23 +0000 (14:13 +0000)]
Merge pull request #10047 from meganetaaan:master
Fix sample code in js_tutorials
Alexander Alekhin [Wed, 8 Nov 2017 13:06:48 +0000 (16:06 +0300)]
cmake: fix pkg-config generation for MacOSX
Shinya Ishikawa [Wed, 8 Nov 2017 12:57:00 +0000 (21:57 +0900)]
Fix sample code in js_tutorials
Alexander Alekhin [Tue, 7 Nov 2017 19:59:53 +0000 (19:59 +0000)]
Merge pull request #10037 from alalek:update_gitignore
git: .gitignore update
Alexander Alekhin [Tue, 7 Nov 2017 19:17:20 +0000 (19:17 +0000)]
Merge pull request #10036 from alalek:fix_ocl4dnn_invalid_kernel
Alexander Alekhin [Tue, 7 Nov 2017 16:52:15 +0000 (16:52 +0000)]
Merge pull request #10003 from sturkmen72:documentation_updates
Suleyman TURKMEN [Tue, 31 Oct 2017 20:10:29 +0000 (23:10 +0300)]
updates documentation and samples
Alexander Alekhin [Tue, 7 Nov 2017 14:24:19 +0000 (17:24 +0300)]
git: .gitignore update
ignore all "dot" files/directories by default.
'ignored' files can be added via 'git add -f' command if necessary.
Alexander Alekhin [Tue, 7 Nov 2017 14:02:17 +0000 (17:02 +0300)]
dnn(ocl4dnn/conv): bailout on missing kernel configuration
Alexander Alekhin [Tue, 7 Nov 2017 13:37:24 +0000 (13:37 +0000)]
Merge pull request #9999 from mshabunin:fix-gcc72-warnings
Alexander Alekhin [Tue, 7 Nov 2017 13:37:07 +0000 (13:37 +0000)]
Merge pull request #9970 from mshabunin:media-sdk-convert
Alexander Alekhin [Tue, 7 Nov 2017 13:35:16 +0000 (13:35 +0000)]
Merge pull request #10002 from alalek:cmake_ios_disable_ipp
Alexander Alekhin [Tue, 7 Nov 2017 13:35:00 +0000 (13:35 +0000)]
Merge pull request #10001 from alalek:cmake_exclude_java_from_cpp_modules
Alexander Alekhin [Tue, 7 Nov 2017 13:26:04 +0000 (13:26 +0000)]
Merge pull request #10025 from Mixaill:msvs-2017u5
Alexander Alekhin [Tue, 7 Nov 2017 11:00:47 +0000 (11:00 +0000)]
Merge pull request #10031 from meganetaaan:doc-typo-js
Fix typo in js_tutorials
Alexander Alekhin [Tue, 7 Nov 2017 10:55:13 +0000 (13:55 +0300)]
cmake: allow custom OpenCV_ARCH / OpenCV_RUNTIME values
Alexander Alekhin [Tue, 7 Nov 2017 10:52:06 +0000 (13:52 +0300)]
cmake: MSVC_VERSION use pattern matching
Shinya Ishikawa [Mon, 6 Nov 2017 12:30:33 +0000 (21:30 +0900)]
Fix typo in js_tutorials
Mikhail Paulyshka [Sat, 4 Nov 2017 20:52:37 +0000 (23:52 +0300)]
cmake: add support for MSVS 2017 update 5
Cartucho [Sat, 4 Nov 2017 03:38:18 +0000 (23:38 -0400)]
Merge pull request #9736 from Cartucho/const_and_class_to_json
* Adding constants to json file
* adding sub-module to constants name
* adding namespace to functions
* adding namespace to classes
* remove namespace from methods
* static methods
* python signatures generation
* python: more fixes for signatures generation
Python names existence can be checked via command:
python -c "import cv2 as cv; print(repr(<py_name>))"
Maksim Shabunin [Thu, 2 Nov 2017 14:16:30 +0000 (17:16 +0300)]
Fixed minor issues reported by GCC 7.2
Alexander Alekhin [Fri, 3 Nov 2017 15:05:46 +0000 (15:05 +0000)]
Merge pull request #9988 from alalek:ocl_verbose_api_errors
Alexander Alekhin [Fri, 3 Nov 2017 09:23:18 +0000 (12:23 +0300)]
ocl: drop CV_OclDbgAssert
Alexander Alekhin [Wed, 1 Nov 2017 15:18:54 +0000 (18:18 +0300)]
ocl: improve debug information
Alexander Alekhin [Fri, 3 Nov 2017 09:16:38 +0000 (09:16 +0000)]
Merge pull request #9998 from alalek:ocl_fix_dnn_softmax_9991
Alexander Alekhin [Thu, 2 Nov 2017 18:27:00 +0000 (18:27 +0000)]
Merge pull request #10007 from alalek:videoio_gst_mjpeg_fix
Alexander Alekhin [Thu, 2 Nov 2017 15:27:30 +0000 (18:27 +0300)]
videoio: improve condition for MJPEG gstreamer sink
Alexander Alekhin [Thu, 2 Nov 2017 14:36:53 +0000 (17:36 +0300)]
cmake: disable IPP on iOS
IPP is used on iPhoneSimulator only.
Alexander Alekhin [Thu, 2 Nov 2017 12:01:07 +0000 (15:01 +0300)]
dnn(ocl): fix softmax global/local size consistency
Alexander Alekhin [Thu, 2 Nov 2017 14:01:22 +0000 (17:01 +0300)]
cmake: exclude opencv_java (JNI) from OpenCV C++ modules list
for non-ANDROID platforms
Andrey Smorodov [Thu, 2 Nov 2017 12:47:45 +0000 (15:47 +0300)]
Matrices in colorizeSegmentation were not initialized.
Alexander Alekhin [Thu, 2 Nov 2017 12:01:39 +0000 (12:01 +0000)]
Merge pull request #9983 from dkurt:fix_halide_copy_to_device
Alexander Alekhin [Thu, 2 Nov 2017 11:45:09 +0000 (11:45 +0000)]
Merge pull request #9995 from alalek:ocl_fix_moments_9990
Alexander Alekhin [Thu, 2 Nov 2017 11:44:41 +0000 (11:44 +0000)]
Merge pull request #9993 from alalek:ocl_fix_gemm_9989
Alexander Alekhin [Thu, 2 Nov 2017 10:36:04 +0000 (13:36 +0300)]
test: extract OpenCL Moments tests, drop 'coi' parameter
Alexander Alekhin [Thu, 2 Nov 2017 10:35:28 +0000 (13:35 +0300)]
ocl: fix moments global_size (should be >= local_size)
Alexander Alekhin [Thu, 2 Nov 2017 09:50:32 +0000 (12:50 +0300)]
core(ocl): fix parameters for 'intelblas_gemm_buffer_NT' kernel
Alexander Alekhin [Wed, 1 Nov 2017 13:06:00 +0000 (16:06 +0300)]
Merge tag '3.3.1-cvsdk'
Maksim Shabunin [Thu, 26 Oct 2017 12:03:53 +0000 (15:03 +0300)]
MediaSDK: fixed Linux build, improved BGR<->NV12 conversions
Vadim Pisarevsky [Wed, 1 Nov 2017 11:03:08 +0000 (11:03 +0000)]
Merge pull request #9627 from dtmoodie:pyrlk_bugfix
Dmitry Kurtaev [Wed, 1 Nov 2017 11:01:54 +0000 (14:01 +0300)]
Fixed Halide's copy_to_device invocation
Vadim Pisarevsky [Tue, 31 Oct 2017 12:27:18 +0000 (12:27 +0000)]
Merge pull request #9963 from dkurt:fix_caffe_shrinker
Alexander Alekhin [Tue, 31 Oct 2017 10:03:54 +0000 (10:03 +0000)]
Merge pull request #9971 from csukuangfj:fix-doc
Dmitry Kurtaev [Mon, 30 Oct 2017 12:39:19 +0000 (15:39 +0300)]
Specify layer types for Caffe FP32->FP16 weights converter
KUANG Fangjun [Mon, 30 Oct 2017 16:13:59 +0000 (17:13 +0100)]
improve doc.
Vadim Pisarevsky [Tue, 31 Oct 2017 09:28:54 +0000 (09:28 +0000)]
Merge pull request #9854 from opalmirror:test_stereo_min_disparity_master
Vadim Pisarevsky [Tue, 31 Oct 2017 09:26:42 +0000 (09:26 +0000)]
Merge pull request #9959 from dkurt:reset_detection_outputs
Vadim Pisarevsky [Tue, 31 Oct 2017 09:20:52 +0000 (09:20 +0000)]
Merge pull request #9969 from mshabunin:dispatch-vs-folders
Alexander Alekhin [Mon, 30 Oct 2017 15:43:41 +0000 (15:43 +0000)]
Merge pull request #9864 from mapreri:multiarch
Alexander Alekhin [Mon, 30 Oct 2017 15:41:36 +0000 (15:41 +0000)]
Merge pull request #9877 from mapreri:non-linux
Alexander Alekhin [Mon, 30 Oct 2017 15:33:46 +0000 (15:33 +0000)]
Merge pull request #9968 from alalek:fix_9960