platform/upstream/opencv.git
7 years agoMerge pull request #9014 from sovrasov:compare_scalars_fix
Vadim Pisarevsky [Thu, 29 Jun 2017 11:14:44 +0000 (11:14 +0000)]
Merge pull request #9014 from sovrasov:compare_scalars_fix

7 years agoMerge pull request #9017 from sovrasov:parallel_for_cxx11
Vadim Pisarevsky [Thu, 29 Jun 2017 11:12:57 +0000 (11:12 +0000)]
Merge pull request #9017 from sovrasov:parallel_for_cxx11

7 years agoMerge pull request #9020 from arrybn:fix_googlenet_python_sample
Vadim Pisarevsky [Thu, 29 Jun 2017 11:10:46 +0000 (11:10 +0000)]
Merge pull request #9020 from arrybn:fix_googlenet_python_sample

7 years agoMerge pull request #9022 from dkurt:keep_conv_weights_for_halide
Vadim Pisarevsky [Thu, 29 Jun 2017 11:09:17 +0000 (11:09 +0000)]
Merge pull request #9022 from dkurt:keep_conv_weights_for_halide

7 years agoMerge pull request #9029 from alalek:dnn_cleanup_torch
Vadim Pisarevsky [Thu, 29 Jun 2017 11:07:35 +0000 (11:07 +0000)]
Merge pull request #9029 from alalek:dnn_cleanup_torch

7 years agoMerge pull request #9031 from huangqinjin:gtk
Maksim Shabunin [Thu, 29 Jun 2017 07:59:56 +0000 (07:59 +0000)]
Merge pull request #9031 from huangqinjin:gtk

7 years agoMerge pull request #9028 from alalek:dnn_experimental_namespace
Maksim Shabunin [Thu, 29 Jun 2017 07:37:04 +0000 (07:37 +0000)]
Merge pull request #9028 from alalek:dnn_experimental_namespace

7 years agoMerge pull request #8895 from lewisjb:python-docstrings
Maksim Shabunin [Thu, 29 Jun 2017 07:35:33 +0000 (07:35 +0000)]
Merge pull request #8895 from lewisjb:python-docstrings

7 years agoMerge pull request #9019 from alalek:dnn_trace
Maksim Shabunin [Thu, 29 Jun 2017 07:33:46 +0000 (07:33 +0000)]
Merge pull request #9019 from alalek:dnn_trace

7 years agoMerge pull request #9026 from alalek:remove_danger_define
Maksim Shabunin [Thu, 29 Jun 2017 07:28:38 +0000 (07:28 +0000)]
Merge pull request #9026 from alalek:remove_danger_define

7 years agoMerge pull request #8903 from StevenPuttemans:fix_models
Maksim Shabunin [Thu, 29 Jun 2017 07:27:48 +0000 (07:27 +0000)]
Merge pull request #8903 from StevenPuttemans:fix_models

7 years agogtk: check NULL before unref
huangqinjin [Thu, 29 Jun 2017 03:35:34 +0000 (11:35 +0800)]
gtk: check NULL before unref

7 years agodnn: cleanup torch integration code
Alexander Alekhin [Wed, 28 Jun 2017 21:35:10 +0000 (21:35 +0000)]
dnn: cleanup torch integration code

7 years agoMerge pull request #9025 from mshabunin:fix-static-3
Alexander Alekhin [Wed, 28 Jun 2017 20:50:21 +0000 (20:50 +0000)]
Merge pull request #9025 from mshabunin:fix-static-3

7 years agodnn: added "hidden" experimental namespace
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).

7 years agobuild: remove #define to prevent unexpected impact on user applications
Alexander Alekhin [Wed, 28 Jun 2017 15:49:15 +0000 (18:49 +0300)]
build: remove #define to prevent unexpected impact on user applications

7 years agoFixed several issues found by static analysis
Maksim Shabunin [Wed, 28 Jun 2017 13:26:55 +0000 (16:26 +0300)]
Fixed several issues found by static analysis

7 years agoAlign convolutional layer weights separately from origin ones
dkurt [Wed, 28 Jun 2017 14:05:56 +0000 (17:05 +0300)]
Align convolutional layer weights separately from origin ones

7 years agocore: add CV_CXX_11 flag to cvdef.h
Vladislav Sovrasov [Wed, 28 Jun 2017 13:07:07 +0000 (16:07 +0300)]
core: add CV_CXX_11 flag to cvdef.h

7 years agocore: add an ability to use cxx11 lambda as a parallel_for_ body
Vladislav Sovrasov [Wed, 28 Jun 2017 10:57:24 +0000 (13:57 +0300)]
core: add an ability to use cxx11 lambda as a parallel_for_ body

7 years agoMerge pull request #8993 from Cartucho:compiling_java_code
Alexander Alekhin [Wed, 28 Jun 2017 12:26:29 +0000 (12:26 +0000)]
Merge pull request #8993 from Cartucho:compiling_java_code

7 years agoMerge pull request #8585 from tonyke1993:ap3p
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

7 years agoFixed python sample for googlenet in dnn
Aleksandr Rybnikov [Wed, 28 Jun 2017 12:07:56 +0000 (15:07 +0300)]
Fixed python sample for googlenet in dnn

7 years agocore: fix infinite recursion in compare
Vladislav Sovrasov [Wed, 28 Jun 2017 09:03:07 +0000 (12:03 +0300)]
core: fix infinite recursion in compare

7 years agodnn: added trace macros
Alexander Alekhin [Wed, 28 Jun 2017 11:46:58 +0000 (14:46 +0300)]
dnn: added trace macros

7 years agoMerge pull request #8543 from csukuangfj:fix-String
Alexander Alekhin [Wed, 28 Jun 2017 11:20:28 +0000 (11:20 +0000)]
Merge pull request #8543 from csukuangfj:fix-String

7 years agoMerge pull request #8953 from mattmyne:cocoa_window_32_64_objc_fix
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

7 years agoMerge pull request #9013 from arrybn:ssd_last_layers_optim
Vadim Pisarevsky [Wed, 28 Jun 2017 10:38:55 +0000 (10:38 +0000)]
Merge pull request #9013 from arrybn:ssd_last_layers_optim

7 years agoformating style and making changes accordingly to review
tribta [Tue, 27 Jun 2017 17:39:32 +0000 (18:39 +0100)]
formating style and making changes accordingly to review

7 years agoMerge pull request #9003 from dkurt:halide_bug_fixes
Vadim Pisarevsky [Wed, 28 Jun 2017 08:48:27 +0000 (08:48 +0000)]
Merge pull request #9003 from dkurt:halide_bug_fixes

7 years agoRemoved usage of std::map in DetectionOutput layer
Aleksandr Rybnikov [Wed, 28 Jun 2017 08:31:38 +0000 (11:31 +0300)]
Removed usage of std::map in DetectionOutput layer

7 years agoMerge pull request #9009 from alalek:fix_dnn_initialization
Vadim Pisarevsky [Wed, 28 Jun 2017 08:26:29 +0000 (08:26 +0000)]
Merge pull request #9009 from alalek:fix_dnn_initialization

7 years agoanother round of dnn optimization (#9011)
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

7 years agodnn: fix LayerFactory initialization
Alexander Alekhin [Tue, 27 Jun 2017 17:34:17 +0000 (20:34 +0300)]
dnn: fix LayerFactory initialization

7 years agoMerge pull request #8990 from mshabunin:fix-static-2
Alexander Alekhin [Tue, 27 Jun 2017 14:53:25 +0000 (14:53 +0000)]
Merge pull request #8990 from mshabunin:fix-static-2

7 years agoMerge pull request #9007 from alalek:issue_9001
Maksim Shabunin [Tue, 27 Jun 2017 14:38:43 +0000 (14:38 +0000)]
Merge pull request #9007 from alalek:issue_9001

7 years agoMerge pull request #9006 from alalek:videoio_synchronize_ffmpeg_open
Maksim Shabunin [Tue, 27 Jun 2017 14:19:07 +0000 (14:19 +0000)]
Merge pull request #9006 from alalek:videoio_synchronize_ffmpeg_open

7 years agoMerge pull request #9004 from alalek:fix_build_flann_sdl
Vadim Pisarevsky [Tue, 27 Jun 2017 14:05:23 +0000 (14:05 +0000)]
Merge pull request #9004 from alalek:fix_build_flann_sdl

7 years agodispatch: added CV_TRY_${OPT} macro, fix dnn build
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

7 years agovideoio: synchronize ffmpeg open() call
Alexander Alekhin [Tue, 27 Jun 2017 13:32:32 +0000 (16:32 +0300)]
videoio: synchronize ffmpeg open() call

7 years agoflann: fix build with MSVC /sdl option
Alexander Alekhin [Tue, 27 Jun 2017 12:25:19 +0000 (15:25 +0300)]
flann: fix build with MSVC /sdl option

7 years agoMerge pull request #8963 from likan999:fix-java-camera-view
Alexander Alekhin [Tue, 27 Jun 2017 11:57:13 +0000 (11:57 +0000)]
Merge pull request #8963 from likan999:fix-java-camera-view

7 years agoFixed some bugs from Halide tests
dkurt [Tue, 27 Jun 2017 11:52:46 +0000 (14:52 +0300)]
Fixed some bugs from Halide tests

7 years agoFixing some static analysis issues
Maksim Shabunin [Mon, 26 Jun 2017 11:09:21 +0000 (14:09 +0300)]
Fixing some static analysis issues

7 years agoMerge pull request #9000 from alalek:fix_winpack_build
Alexander Alekhin [Tue, 27 Jun 2017 11:10:46 +0000 (11:10 +0000)]
Merge pull request #9000 from alalek:fix_winpack_build

7 years agoMerge pull request #8997 from alalek:fix_build_warnings
Alexander Alekhin [Tue, 27 Jun 2017 09:57:38 +0000 (09:57 +0000)]
Merge pull request #8997 from alalek:fix_build_warnings

7 years agoMerge pull request #8996 from alalek:fix_viz_build
Alexander Alekhin [Tue, 27 Jun 2017 09:57:20 +0000 (09:57 +0000)]
Merge pull request #8996 from alalek:fix_viz_build

7 years agodnn: fix build
Alexander Alekhin [Tue, 27 Jun 2017 06:04:50 +0000 (09:04 +0300)]
dnn: fix build

- winpack
- opencv_world

7 years agobuild: eliminate warning
Alexander Alekhin [Tue, 27 Jun 2017 05:16:40 +0000 (08:16 +0300)]
build: eliminate warning

7 years agobuild: fix viz tests
Alexander Alekhin [Tue, 27 Jun 2017 05:01:40 +0000 (08:01 +0300)]
build: fix viz tests

removed test_precomp.cpp

7 years agoMerge branch 'master' into compiling_java_code
Cartucho [Tue, 27 Jun 2017 01:32:11 +0000 (02:32 +0100)]
Merge branch 'master' into compiling_java_code

7 years agoCompiling the Java tutorials codes using Apache Ant.
tribta [Mon, 26 Jun 2017 15:24:10 +0000 (16:24 +0100)]
Compiling the Java tutorials codes using Apache Ant.

7 years agoMerge pull request #8988 from sovrasov:repeat_src_eq_dst_fix
Vadim Pisarevsky [Mon, 26 Jun 2017 21:58:26 +0000 (21:58 +0000)]
Merge pull request #8988 from sovrasov:repeat_src_eq_dst_fix

7 years agoMerge pull request #8989 from alalek:move_dnn_module
Vadim Pisarevsky [Mon, 26 Jun 2017 21:57:25 +0000 (21:57 +0000)]
Merge pull request #8989 from alalek:move_dnn_module

7 years agodnn: fix failed Torch tests
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.

7 years agoMerge pull request #8995 from savuor:fix/trace_ovx_build
Alexander Alekhin [Mon, 26 Jun 2017 18:47:31 +0000 (18:47 +0000)]
Merge pull request #8995 from savuor:fix/trace_ovx_build

7 years agofixed typo
Rostislav Vasilikhin [Mon, 26 Jun 2017 17:19:18 +0000 (20:19 +0300)]
fixed typo

7 years agodnn: AVX2 fix invalid unaligned read
Alexander Alekhin [Mon, 26 Jun 2017 15:52:09 +0000 (18:52 +0300)]
dnn: AVX2 fix invalid unaligned read

7 years agodnn: fix build warnings
Alexander Alekhin [Mon, 26 Jun 2017 13:22:50 +0000 (16:22 +0300)]
dnn: fix build warnings

7 years agoMerge pull request #8766 from alalek:trace
Alexander Alekhin [Mon, 26 Jun 2017 16:03:43 +0000 (16:03 +0000)]
Merge pull request #8766 from alalek:trace

7 years agotrace: initial support for code trace
Alexander Alekhin [Thu, 25 May 2017 15:59:01 +0000 (18:59 +0300)]
trace: initial support for code trace

7 years ago3rdparty: add ittnotify sources
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

7 years agoviz: fix tests build
Alexander Alekhin [Fri, 26 May 2017 14:05:46 +0000 (17:05 +0300)]
viz: fix tests build

7 years agodnn: fix dnn python test files
Alexander Alekhin [Mon, 26 Jun 2017 12:13:00 +0000 (15:13 +0300)]
dnn: fix dnn python test files

7 years agodnn: remove obsolete "build opencv_contrib with dnn module" tutorial
Alexander Alekhin [Mon, 26 Jun 2017 12:12:00 +0000 (15:12 +0300)]
dnn: remove obsolete "build opencv_contrib with dnn module" tutorial

7 years agodnn: fix documentation links
Alexander Alekhin [Mon, 26 Jun 2017 12:01:30 +0000 (15:01 +0300)]
dnn: fix documentation links

7 years agodnn: move samples
Alexander Alekhin [Mon, 26 Jun 2017 11:36:40 +0000 (14:36 +0300)]
dnn: move samples

7 years agodnn: remove unused README
Alexander Alekhin [Mon, 26 Jun 2017 11:42:38 +0000 (14:42 +0300)]
dnn: remove unused README

7 years agodnn: fix public headers guards
Alexander Alekhin [Mon, 26 Jun 2017 11:21:33 +0000 (14:21 +0300)]
dnn: fix public headers guards

7 years agocore: forbid handling of the case when src=dst in cv::repeat
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

7 years agodnn: move module from opencv_contrib
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

7 years agoMerge pull request #8966 from alalek:protobuf_sources
Vadim Pisarevsky [Mon, 26 Jun 2017 10:27:40 +0000 (10:27 +0000)]
Merge pull request #8966 from alalek:protobuf_sources

7 years agoMerge pull request #8986 from alalek:build_disable_avx512
Maksim Shabunin [Mon, 26 Jun 2017 09:26:49 +0000 (09:26 +0000)]
Merge pull request #8986 from alalek:build_disable_avx512

7 years agoMerge pull request #8981 from alalek:port_8979
Maksim Shabunin [Mon, 26 Jun 2017 09:25:23 +0000 (09:25 +0000)]
Merge pull request #8981 from alalek:port_8979

7 years agoMerge pull request #8985 from alalek:update_videoio
Maksim Shabunin [Mon, 26 Jun 2017 09:22:44 +0000 (09:22 +0000)]
Merge pull request #8985 from alalek:update_videoio

7 years agoMerge pull request #8984 from alalek:update_videowriter_apipreference
Maksim Shabunin [Mon, 26 Jun 2017 09:18:33 +0000 (09:18 +0000)]
Merge pull request #8984 from alalek:update_videowriter_apipreference

7 years agobuild: disable AVX512
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.

7 years agovideoio: do not mix `CV_CAP` and `CAP_` APIs enum values
Alexander Alekhin [Sun, 25 Jun 2017 20:27:33 +0000 (23:27 +0300)]
videoio: do not mix `CV_CAP` and `CAP_` APIs enum values

7 years agovideoio: drop changes from legacy C-API header
Alexander Alekhin [Sun, 25 Jun 2017 20:05:07 +0000 (23:05 +0300)]
videoio: drop changes from legacy C-API header

7 years agovideoio: update VideoWriter apiPreference parameter position
Alexander Alekhin [Sun, 25 Jun 2017 19:53:11 +0000 (22:53 +0300)]
videoio: update VideoWriter apiPreference parameter position

7 years agoMerge pull request #8982 from catree:morphologyEx_iterations_doc
Alexander Alekhin [Sun, 25 Jun 2017 11:13:49 +0000 (11:13 +0000)]
Merge pull request #8982 from catree:morphologyEx_iterations_doc

7 years agoAdd a note to morphologyEx documentation to clarify the behavior when iterations...
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.

7 years agovideoio(macosx): fix array access exception in AVFoundation
Alexander Alekhin [Sat, 24 Jun 2017 08:07:57 +0000 (11:07 +0300)]
videoio(macosx): fix array access exception in AVFoundation

7 years agoMerge pull request #8976 from jrtc27:fast-math-asm
Alexander Alekhin [Fri, 23 Jun 2017 15:51:48 +0000 (15:51 +0000)]
Merge pull request #8976 from jrtc27:fast-math-asm

7 years agofast_math.hpp: Use __asm__ rather than asm; fixes including with -std=c99
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

7 years agoMerge pull request #8900 from alalek:update_android_build
Vadim Pisarevsky [Fri, 23 Jun 2017 10:58:52 +0000 (10:58 +0000)]
Merge pull request #8900 from alalek:update_android_build

7 years agoMerge pull request #8969 from alalek:fix_typo
Alexander Alekhin [Thu, 22 Jun 2017 16:32:12 +0000 (19:32 +0300)]
Merge pull request #8969 from alalek:fix_typo

7 years agocmake: fix typo
Alexander Alekhin [Thu, 22 Jun 2017 16:21:59 +0000 (19:21 +0300)]
cmake: fix typo

7 years ago3rdparty: update CMake scripts for protobuf
Alexander Alekhin [Thu, 22 Jun 2017 13:39:48 +0000 (16:39 +0300)]
3rdparty: update CMake scripts for protobuf

7 years ago3rdparty: protobuf 3.1.0 sources
Alexander Alekhin [Thu, 22 Jun 2017 13:37:49 +0000 (16:37 +0300)]
3rdparty: protobuf 3.1.0 sources

without tests, testdata, .proto files

7 years agoMerge pull request #8856 from mshabunin:media-tests-upgrade
Maksim Shabunin [Thu, 22 Jun 2017 11:45:52 +0000 (11:45 +0000)]
Merge pull request #8856 from mshabunin:media-tests-upgrade

7 years agoMerge pull request #8965 from mshabunin:fix-vs-issue-tiff
Maksim Shabunin [Thu, 22 Jun 2017 11:40:07 +0000 (11:40 +0000)]
Merge pull request #8965 from mshabunin:fix-vs-issue-tiff

7 years agoFix possible uninitialized memory in libtiff
Maksim Shabunin [Thu, 22 Jun 2017 11:04:30 +0000 (14:04 +0300)]
Fix possible uninitialized memory in libtiff

7 years agoMerge pull request #8958 from alalek:update_download
Alexander Alekhin [Thu, 22 Jun 2017 09:28:16 +0000 (09:28 +0000)]
Merge pull request #8958 from alalek:update_download

7 years agoMore accurate condition to detect emulator
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.

7 years agoMerge pull request #8960 from dkurt:halide_support_opencl
Alexander Alekhin [Wed, 21 Jun 2017 19:56:40 +0000 (19:56 +0000)]
Merge pull request #8960 from dkurt:halide_support_opencl

7 years agoCatch SkipTestException in performance tests
dkurt [Wed, 21 Jun 2017 18:30:52 +0000 (21:30 +0300)]
Catch SkipTestException in performance tests

7 years agocmake: additional messages on download errors
Alexander Alekhin [Wed, 21 Jun 2017 16:04:27 +0000 (19:04 +0300)]
cmake: additional messages on download errors

7 years ago.gitignore: added ".cache" directory back
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

7 years agocmake: add Halide support (#8794)
Dmitry Kurtaev [Wed, 21 Jun 2017 11:33:47 +0000 (14:33 +0300)]
cmake: add Halide support (#8794)