Vadim Pisarevsky [Thu, 29 Jun 2017 11:07:35 +0000 (11:07 +0000)]
Merge pull request #9029 from alalek:dnn_cleanup_torch
Maksim Shabunin [Thu, 29 Jun 2017 07:59:56 +0000 (07:59 +0000)]
Merge pull request #9031 from huangqinjin:gtk
Maksim Shabunin [Thu, 29 Jun 2017 07:37:04 +0000 (07:37 +0000)]
Merge pull request #9028 from alalek:dnn_experimental_namespace
Maksim Shabunin [Thu, 29 Jun 2017 07:35:33 +0000 (07:35 +0000)]
Merge pull request #8895 from lewisjb:python-docstrings
Maksim Shabunin [Thu, 29 Jun 2017 07:33:46 +0000 (07:33 +0000)]
Merge pull request #9019 from alalek:dnn_trace
Maksim Shabunin [Thu, 29 Jun 2017 07:28:38 +0000 (07:28 +0000)]
Merge pull request #9026 from alalek:remove_danger_define
Maksim Shabunin [Thu, 29 Jun 2017 07:27:48 +0000 (07:27 +0000)]
Merge pull request #8903 from StevenPuttemans:fix_models
huangqinjin [Thu, 29 Jun 2017 03:35:34 +0000 (11:35 +0800)]
gtk: check NULL before unref
Alexander Alekhin [Wed, 28 Jun 2017 21:35:10 +0000 (21:35 +0000)]
dnn: cleanup torch integration code
Alexander Alekhin [Wed, 28 Jun 2017 20:50:21 +0000 (20:50 +0000)]
Merge pull request #9025 from mshabunin:fix-static-3
Alexander Alekhin [Wed, 28 Jun 2017 19:59:02 +0000 (19:59 +0000)]
dnn: added "hidden" experimental namespace
Main purpose of this namespace is to avoid using of incompatible
binaries that will cause applications crashes.
This additional namespace will not impact "Source code API".
This change allows to maintain ABI checks (with easy filtering out).
Alexander Alekhin [Wed, 28 Jun 2017 15:49:15 +0000 (18:49 +0300)]
build: remove #define to prevent unexpected impact on user applications
Maksim Shabunin [Wed, 28 Jun 2017 13:26:55 +0000 (16:26 +0300)]
Fixed several issues found by static analysis
Alexander Alekhin [Wed, 28 Jun 2017 12:26:29 +0000 (12:26 +0000)]
Merge pull request #8993 from Cartucho:compiling_java_code
Tong Ke [Wed, 28 Jun 2017 12:27:30 +0000 (05:27 -0700)]
Merge pull request #8585 from tonyke1993:ap3p
Enable p3p and ap3p in solvePnPRansac (#8585)
* add paper info
* allow p3p and ap3p being RANSAC kernel
* keep previous code
* apply catrees comment
* fix getMat
* add comment
* add solvep3p test
* test return value
* fix warnings
Alexander Alekhin [Wed, 28 Jun 2017 11:46:58 +0000 (14:46 +0300)]
dnn: added trace macros
Alexander Alekhin [Wed, 28 Jun 2017 11:20:28 +0000 (11:20 +0000)]
Merge pull request #8543 from csukuangfj:fix-String
Vadim Pisarevsky [Wed, 28 Jun 2017 10:56:20 +0000 (10:56 +0000)]
Merge pull request #8953 from mattmyne:cocoa_window_32_64_objc_fix
Vadim Pisarevsky [Wed, 28 Jun 2017 10:38:55 +0000 (10:38 +0000)]
Merge pull request #9013 from arrybn:ssd_last_layers_optim
tribta [Tue, 27 Jun 2017 17:39:32 +0000 (18:39 +0100)]
formating style and making changes accordingly to review
Vadim Pisarevsky [Wed, 28 Jun 2017 08:48:27 +0000 (08:48 +0000)]
Merge pull request #9003 from dkurt:halide_bug_fixes
Aleksandr Rybnikov [Wed, 28 Jun 2017 08:31:38 +0000 (11:31 +0300)]
Removed usage of std::map in DetectionOutput layer
Vadim Pisarevsky [Wed, 28 Jun 2017 08:26:29 +0000 (08:26 +0000)]
Merge pull request #9009 from alalek:fix_dnn_initialization
Vadim Pisarevsky [Wed, 28 Jun 2017 08:15:22 +0000 (11:15 +0300)]
another round of dnn optimization (#9011)
* another round of dnn optimization:
* increased malloc alignment across OpenCV from 16 to 64 bytes to make it AVX2 and even AVX-512 friendly
* improved SIMD optimization of pooling layer, optimized average pooling
* cleaned up convolution layer implementation
* made activation layer "attacheable" to all other layers, including fully connected and addition layer.
* fixed bug in the fusion algorithm: "LayerData::consumers" should not be cleared, because it desctibes the topology.
* greatly optimized permutation layer, which improved SSD performance
* parallelized element-wise binary/ternary/... ops (sum, prod, max)
* also, added missing copyrights to many of the layer implementation files
* temporarily disabled (again) the check for intermediate blobs consistency; fixed warnings from various builders
Alexander Alekhin [Tue, 27 Jun 2017 17:34:17 +0000 (20:34 +0300)]
dnn: fix LayerFactory initialization
Alexander Alekhin [Tue, 27 Jun 2017 14:53:25 +0000 (14:53 +0000)]
Merge pull request #8990 from mshabunin:fix-static-2
Maksim Shabunin [Tue, 27 Jun 2017 14:38:43 +0000 (14:38 +0000)]
Merge pull request #9007 from alalek:issue_9001
Maksim Shabunin [Tue, 27 Jun 2017 14:19:07 +0000 (14:19 +0000)]
Merge pull request #9006 from alalek:videoio_synchronize_ffmpeg_open
Vadim Pisarevsky [Tue, 27 Jun 2017 14:05:23 +0000 (14:05 +0000)]
Merge pull request #9004 from alalek:fix_build_flann_sdl
Alexander Alekhin [Tue, 27 Jun 2017 14:05:15 +0000 (17:05 +0300)]
dispatch: added CV_TRY_${OPT} macro, fix dnn build
- 1: OPT is available directly or via dispatcher
- 0: optimization is not compiled at all
Alexander Alekhin [Tue, 27 Jun 2017 13:32:32 +0000 (16:32 +0300)]
videoio: synchronize ffmpeg open() call
Alexander Alekhin [Tue, 27 Jun 2017 12:25:19 +0000 (15:25 +0300)]
flann: fix build with MSVC /sdl option
Alexander Alekhin [Tue, 27 Jun 2017 11:57:13 +0000 (11:57 +0000)]
Merge pull request #8963 from likan999:fix-java-camera-view
dkurt [Tue, 27 Jun 2017 11:52:46 +0000 (14:52 +0300)]
Fixed some bugs from Halide tests
Maksim Shabunin [Mon, 26 Jun 2017 11:09:21 +0000 (14:09 +0300)]
Fixing some static analysis issues
Alexander Alekhin [Tue, 27 Jun 2017 11:10:46 +0000 (11:10 +0000)]
Merge pull request #9000 from alalek:fix_winpack_build
Alexander Alekhin [Tue, 27 Jun 2017 09:57:38 +0000 (09:57 +0000)]
Merge pull request #8997 from alalek:fix_build_warnings
Alexander Alekhin [Tue, 27 Jun 2017 09:57:20 +0000 (09:57 +0000)]
Merge pull request #8996 from alalek:fix_viz_build
Alexander Alekhin [Tue, 27 Jun 2017 06:04:50 +0000 (09:04 +0300)]
dnn: fix build
- winpack
- opencv_world
Alexander Alekhin [Tue, 27 Jun 2017 05:16:40 +0000 (08:16 +0300)]
build: eliminate warning
Alexander Alekhin [Tue, 27 Jun 2017 05:01:40 +0000 (08:01 +0300)]
build: fix viz tests
removed test_precomp.cpp
Cartucho [Tue, 27 Jun 2017 01:32:11 +0000 (02:32 +0100)]
Merge branch 'master' into compiling_java_code
tribta [Mon, 26 Jun 2017 15:24:10 +0000 (16:24 +0100)]
Compiling the Java tutorials codes using Apache Ant.
Vadim Pisarevsky [Mon, 26 Jun 2017 21:58:26 +0000 (21:58 +0000)]
Merge pull request #8988 from sovrasov:repeat_src_eq_dst_fix
Vadim Pisarevsky [Mon, 26 Jun 2017 21:57:25 +0000 (21:57 +0000)]
Merge pull request #8989 from alalek:move_dnn_module
Alexander Alekhin [Mon, 26 Jun 2017 16:27:05 +0000 (19:27 +0300)]
dnn: fix failed Torch tests
"Torch invalid argument 2: position must be smaller than LLONG_MAX"
These conditions are always true for "long position" argument.
Alexander Alekhin [Mon, 26 Jun 2017 18:47:31 +0000 (18:47 +0000)]
Merge pull request #8995 from savuor:fix/trace_ovx_build
Rostislav Vasilikhin [Mon, 26 Jun 2017 17:19:18 +0000 (20:19 +0300)]
fixed typo
Alexander Alekhin [Mon, 26 Jun 2017 15:52:09 +0000 (18:52 +0300)]
dnn: AVX2 fix invalid unaligned read
Alexander Alekhin [Mon, 26 Jun 2017 13:22:50 +0000 (16:22 +0300)]
dnn: fix build warnings
Alexander Alekhin [Mon, 26 Jun 2017 16:03:43 +0000 (16:03 +0000)]
Merge pull request #8766 from alalek:trace
Alexander Alekhin [Thu, 25 May 2017 15:59:01 +0000 (18:59 +0300)]
trace: initial support for code trace
Alexander Alekhin [Mon, 22 May 2017 07:40:58 +0000 (07:40 +0000)]
3rdparty: add ittnotify sources
https://github.com/01org/IntelSEAPI/tree/master/ittnotify
Alexander Alekhin [Fri, 26 May 2017 14:05:46 +0000 (17:05 +0300)]
viz: fix tests build
Alexander Alekhin [Mon, 26 Jun 2017 12:13:00 +0000 (15:13 +0300)]
dnn: fix dnn python test files
Alexander Alekhin [Mon, 26 Jun 2017 12:12:00 +0000 (15:12 +0300)]
dnn: remove obsolete "build opencv_contrib with dnn module" tutorial
Alexander Alekhin [Mon, 26 Jun 2017 12:01:30 +0000 (15:01 +0300)]
dnn: fix documentation links
Alexander Alekhin [Mon, 26 Jun 2017 11:36:40 +0000 (14:36 +0300)]
dnn: move samples
Alexander Alekhin [Mon, 26 Jun 2017 11:42:38 +0000 (14:42 +0300)]
dnn: remove unused README
Alexander Alekhin [Mon, 26 Jun 2017 11:21:33 +0000 (14:21 +0300)]
dnn: fix public headers guards
Vladislav Sovrasov [Mon, 26 Jun 2017 09:30:03 +0000 (12:30 +0300)]
core: forbid handling of the case when src=dst in cv::repeat
Alexander Alekhin [Mon, 26 Jun 2017 10:35:51 +0000 (13:35 +0300)]
dnn: move module from opencv_contrib
https://github.com/opencv/opencv_contrib/tree/
e6f63c7a38ca40c5dc33e38736e3027e3528d6cb/modules/dnn
Vadim Pisarevsky [Mon, 26 Jun 2017 10:27:40 +0000 (10:27 +0000)]
Merge pull request #8966 from alalek:protobuf_sources
Maksim Shabunin [Mon, 26 Jun 2017 09:26:49 +0000 (09:26 +0000)]
Merge pull request #8986 from alalek:build_disable_avx512
Maksim Shabunin [Mon, 26 Jun 2017 09:25:23 +0000 (09:25 +0000)]
Merge pull request #8981 from alalek:port_8979
Maksim Shabunin [Mon, 26 Jun 2017 09:22:44 +0000 (09:22 +0000)]
Merge pull request #8985 from alalek:update_videoio
Maksim Shabunin [Mon, 26 Jun 2017 09:18:33 +0000 (09:18 +0000)]
Merge pull request #8984 from alalek:update_videowriter_apipreference
Alexander Alekhin [Sun, 25 Jun 2017 21:31:24 +0000 (00:31 +0300)]
build: disable AVX512
Currently it is not supported.
All builds are broken with enabled AVX512 option.
Alexander Alekhin [Sun, 25 Jun 2017 20:27:33 +0000 (23:27 +0300)]
videoio: do not mix `CV_CAP` and `CAP_` APIs enum values
Alexander Alekhin [Sun, 25 Jun 2017 20:05:07 +0000 (23:05 +0300)]
videoio: drop changes from legacy C-API header
Alexander Alekhin [Sun, 25 Jun 2017 19:53:11 +0000 (22:53 +0300)]
videoio: update VideoWriter apiPreference parameter position
Alexander Alekhin [Sun, 25 Jun 2017 11:13:49 +0000 (11:13 +0000)]
Merge pull request #8982 from catree:morphologyEx_iterations_doc
catree [Sat, 24 Jun 2017 22:16:16 +0000 (00:16 +0200)]
Add a note to morphologyEx documentation to clarify the behavior when iterations > 1.
Alexander Alekhin [Sat, 24 Jun 2017 08:07:57 +0000 (11:07 +0300)]
videoio(macosx): fix array access exception in AVFoundation
Alexander Alekhin [Fri, 23 Jun 2017 15:51:48 +0000 (15:51 +0000)]
Merge pull request #8976 from jrtc27:fast-math-asm
James Clarke [Fri, 23 Jun 2017 14:28:09 +0000 (15:28 +0100)]
fast_math.hpp: Use __asm__ rather than asm; fixes including with -std=c99
Vadim Pisarevsky [Fri, 23 Jun 2017 10:58:52 +0000 (10:58 +0000)]
Merge pull request #8900 from alalek:update_android_build
Alexander Alekhin [Thu, 22 Jun 2017 16:32:12 +0000 (19:32 +0300)]
Merge pull request #8969 from alalek:fix_typo
Alexander Alekhin [Thu, 22 Jun 2017 16:21:59 +0000 (19:21 +0300)]
cmake: fix typo
Alexander Alekhin [Thu, 22 Jun 2017 13:39:48 +0000 (16:39 +0300)]
3rdparty: update CMake scripts for protobuf
Alexander Alekhin [Thu, 22 Jun 2017 13:37:49 +0000 (16:37 +0300)]
3rdparty: protobuf 3.1.0 sources
without tests, testdata, .proto files
Maksim Shabunin [Thu, 22 Jun 2017 11:45:52 +0000 (11:45 +0000)]
Merge pull request #8856 from mshabunin:media-tests-upgrade
Maksim Shabunin [Thu, 22 Jun 2017 11:40:07 +0000 (11:40 +0000)]
Merge pull request #8965 from mshabunin:fix-vs-issue-tiff
Maksim Shabunin [Thu, 22 Jun 2017 11:04:30 +0000 (14:04 +0300)]
Fix possible uninitialized memory in libtiff
Alexander Alekhin [Thu, 22 Jun 2017 09:28:16 +0000 (09:28 +0000)]
Merge pull request #8958 from alalek:update_download
likan999 [Thu, 22 Jun 2017 07:47:15 +0000 (00:47 -0700)]
More accurate condition to detect emulator
Previous commit, 6f39f9a, tries to fix the color issue for emulator. But the condition for detecting emulator is incomplete, e.g. it stops working for emulators using Google Play, whose Build.BRAND=="google". https://stackoverflow.com/a/
21505193 shows a more accurate condition for this.
Alexander Alekhin [Wed, 21 Jun 2017 19:56:40 +0000 (19:56 +0000)]
Merge pull request #8960 from dkurt:halide_support_opencl
dkurt [Wed, 21 Jun 2017 18:30:52 +0000 (21:30 +0300)]
Catch SkipTestException in performance tests
Alexander Alekhin [Wed, 21 Jun 2017 16:04:27 +0000 (19:04 +0300)]
cmake: additional messages on download errors
Alexander Alekhin [Wed, 21 Jun 2017 16:03:17 +0000 (19:03 +0300)]
.gitignore: added ".cache" directory back
It is necessary for proper work of "git clean" command
Dmitry Kurtaev [Wed, 21 Jun 2017 11:33:47 +0000 (14:33 +0300)]
cmake: add Halide support (#8794)
Jiri Horner [Wed, 21 Jun 2017 11:33:09 +0000 (13:33 +0200)]
Merge pull request #8869 from hrnr:akaze_part1
[GSOC] Speeding-up AKAZE, part #1 (#8869)
* ts: expand arguments before stringifications in CV_ENUM and CV_FLAGS
added protective macros to always force macro expansion of arguments. This allows using CV_ENUM and CV_FLAGS with macro arguments.
* feature2d: unify perf test
use the same test for all detectors/descriptors we have.
* added AKAZE tests
* features2d: extend perf tests
* add BRISK, KAZE, MSER
* run all extract tests on AKAZE keypoints, so that the test si more comparable for the speed of extraction
* feature2d: rework opencl perf tests
use the same configuration as cpu tests
* feature2d: fix descriptors allocation for AKAZE and KAZE
fix crash when descriptors are UMat
* feature2d: name enum to fix build with older gcc
* Revert "ts: expand arguments before stringifications in CV_ENUM and CV_FLAGS"
This reverts commit
19538cac1e45b0cec98190cf06a5ecb07d9b596e.
This wasn't a great idea after all. There is a lot of flags implemented as #define, that we don't want to expand.
* feature2d: fix expansion problems with CV_ENUM in perf
* expand arguments before passing them to CV_ENUM. This does not need modifications of CV_ENUM.
* added include guards to `perf_feature2d.hpp`
* feature2d: fix crash in AKAZE when using KAZE descriptors
* out-of-bound access in Get_MSURF_Descriptor_64
* this happened reliably when running on provided keypoints (not computed by the same instance)
* feature2d: added regression tests for AKAZE
* test with both MLDB and KAZE keypoints
* feature2d: do not compute keypoints orientation twice
* always compute keypoints orientation, when computing keypoints
* do not recompute keypoint orientation when computing descriptors
this allows to test detection and extraction separately
* features2d: fix crash in AKAZE
* out-of-bound reads near the image edge
* same as the bug in KAZE descriptors
* feature2d: refactor invariance testing
* split detectors and descriptors tests
* rewrite to google test to simplify debugging
* add tests for AKAZE and one test for ORB
* stitching: add tests with AKAZE feature finder
* added basic stitching cpu and ocl tests
* fix bug in AKAZE wrapper for stitching pipeline causing lots of
! OPENCV warning: getUMat()/getMat() call chain possible problem.
! Base object is dead, while nested/derived object is still alive or processed.
! Please check lifetime of UMat/Mat objects!
Vadim Pisarevsky [Wed, 21 Jun 2017 11:23:10 +0000 (11:23 +0000)]
Merge pull request #8949 from alalek:fix_sortIdx
Matt Bennett [Wed, 21 Jun 2017 11:00:26 +0000 (12:00 +0100)]
remove ARC and auto synthesize assumptions in cocoa_window.mm
Alexander Alekhin [Mon, 12 Jun 2017 16:10:13 +0000 (16:10 +0000)]
android: make optional "cpufeatures", build fixes for NDK r15
Vadim Pisarevsky [Wed, 21 Jun 2017 09:33:51 +0000 (09:33 +0000)]
Merge pull request #8947 from alalek:vs_version
Vadim Pisarevsky [Wed, 21 Jun 2017 09:32:01 +0000 (09:32 +0000)]
Merge pull request #8950 from alalek:cmake_mkl_detection
Alexander Alekhin [Wed, 21 Jun 2017 01:59:51 +0000 (01:59 +0000)]
core: fix IPP optimization for sortIdx
Alexander Alekhin [Wed, 21 Jun 2017 01:59:07 +0000 (01:59 +0000)]
core(test): added cv::sortIdx accuracy tests
Alexander Alekhin [Wed, 21 Jun 2017 02:35:06 +0000 (02:35 +0000)]
cmake: guard scanning of default MKL system-wide paths
- WITH_MKL option is enabled
- user doesn't specify MKLROOT/MKL_ROOT_DIR variables