platform/upstream/opencv.git
7 years agocalib3d: fix not working CALIB_FIX_TANGENT_DIST flag
Vladislav Sovrasov [Thu, 13 Jul 2017 07:49:35 +0000 (10:49 +0300)]
calib3d: fix not working CALIB_FIX_TANGENT_DIST flag

7 years agoMerge pull request #9115 from alalek:ocl_async_cleanup_queue
Maksim Shabunin [Fri, 7 Jul 2017 12:05:34 +0000 (12:05 +0000)]
Merge pull request #9115 from alalek:ocl_async_cleanup_queue

7 years agoocl: async cl_buffer cleanup queue (for event callback)
Alexander Alekhin [Thu, 6 Jul 2017 14:57:05 +0000 (17:57 +0300)]
ocl: async cl_buffer cleanup queue (for event callback)

7 years agoMerge pull request #9105 from alalek:ocl_update_event_callback
Maksim Shabunin [Fri, 7 Jul 2017 08:23:46 +0000 (08:23 +0000)]
Merge pull request #9105 from alalek:ocl_update_event_callback

7 years agoocl: rework events handling with clSetEventCallback
Alexander Alekhin [Thu, 6 Jul 2017 10:25:32 +0000 (13:25 +0300)]
ocl: rework events handling with clSetEventCallback

7 years agoMerge pull request #9089 from alalek:cmake_fix_sdl_linker_flags
Maksim Shabunin [Tue, 4 Jul 2017 14:23:39 +0000 (14:23 +0000)]
Merge pull request #9089 from alalek:cmake_fix_sdl_linker_flags

7 years agocmake: fix linker flags
Alexander Alekhin [Tue, 4 Jul 2017 12:04:42 +0000 (15:04 +0300)]
cmake: fix linker flags

7 years agoMerge pull request #9080 from alalek:version_3.3.0-rc
Alexander Alekhin [Mon, 3 Jul 2017 16:21:45 +0000 (16:21 +0000)]
Merge pull request #9080 from alalek:version_3.3.0-rc

version 3.3.0-rc

7 years agoMerge pull request #9067 from D-Alex:master
Alexander Alekhin [Mon, 3 Jul 2017 16:20:03 +0000 (16:20 +0000)]
Merge pull request #9067 from D-Alex:master

Fix error message fisheye CALIB_CHECK_COND

7 years agoMerge pull request #9081 from catree:fix_tutorial_pca_intro
Alexander Alekhin [Mon, 3 Jul 2017 16:18:15 +0000 (16:18 +0000)]
Merge pull request #9081 from catree:fix_tutorial_pca_intro

Fix wrong mat access in introduction_to_pca.cpp

7 years agoMerge pull request #9077 from alalek:cmake_enable_cxx11
Alexander Alekhin [Mon, 3 Jul 2017 16:15:29 +0000 (16:15 +0000)]
Merge pull request #9077 from alalek:cmake_enable_cxx11

7 years agoMerge pull request #9076 from mshabunin:fix-doc-from-mail
Alexander Alekhin [Mon, 3 Jul 2017 16:12:46 +0000 (16:12 +0000)]
Merge pull request #9076 from mshabunin:fix-doc-from-mail

7 years agoMerge pull request #9075 from TonyLianLong:master
Tony Lian [Mon, 3 Jul 2017 16:14:17 +0000 (09:14 -0700)]
Merge pull request #9075 from TonyLianLong:master

Remove unnecessary Non-ASCII characters from source code (#9075)

* Remove unnecessary Non-ASCII characters from source code

Remove unnecessary Non-ASCII characters and replace them with ASCII
characters

* Remove dashes in the @param statement

Remove dashes and place single space in the @param statement to keep
coding style

* misc: more fixes for non-ASCII symbols

* misc: fix non-ASCII symbol in CMake file

7 years agoMerge pull request #9073 from berak:dnn_fix_tutorial_links
Alexander Alekhin [Mon, 3 Jul 2017 16:11:09 +0000 (16:11 +0000)]
Merge pull request #9073 from berak:dnn_fix_tutorial_links

7 years agoMerge pull request #9070 from catree:imshow_64bits_doc
Alexander Alekhin [Mon, 3 Jul 2017 16:10:13 +0000 (16:10 +0000)]
Merge pull request #9070 from catree:imshow_64bits_doc

7 years agoMerge pull request #9069 from catree:ffmpeg_warnings_errors
Alexander Alekhin [Mon, 3 Jul 2017 16:09:27 +0000 (16:09 +0000)]
Merge pull request #9069 from catree:ffmpeg_warnings_errors

7 years agoMerge pull request #9068 from dkurt:mkl_with_openmp
Alexander Alekhin [Mon, 3 Jul 2017 16:09:11 +0000 (16:09 +0000)]
Merge pull request #9068 from dkurt:mkl_with_openmp

7 years agoMerge pull request #9064 from sadika9:patch-1
Alexander Alekhin [Mon, 3 Jul 2017 16:07:53 +0000 (16:07 +0000)]
Merge pull request #9064 from sadika9:patch-1

7 years agoMerge pull request #9060 from alalek:canny_inplace_bug
Alexander Alekhin [Mon, 3 Jul 2017 16:06:50 +0000 (16:06 +0000)]
Merge pull request #9060 from alalek:canny_inplace_bug

7 years agoMerge pull request #9057 from alalek:static_build_workaround
Alexander Alekhin [Mon, 3 Jul 2017 16:05:31 +0000 (16:05 +0000)]
Merge pull request #9057 from alalek:static_build_workaround

7 years agoMerge pull request #9055 from fdebrabander:master
Alexander Alekhin [Mon, 3 Jul 2017 16:06:59 +0000 (16:06 +0000)]
Merge pull request #9055 from fdebrabander:master

how_to_scan_images.markdown: fix grammar mistakes

7 years agoMerge pull request #9054 from zhmu:upstream
Alexander Alekhin [Mon, 3 Jul 2017 16:04:11 +0000 (16:04 +0000)]
Merge pull request #9054 from zhmu:upstream

7 years agoMerge pull request #9052 from jqly:patch-1
Alexander Alekhin [Mon, 3 Jul 2017 16:03:46 +0000 (16:03 +0000)]
Merge pull request #9052 from jqly:patch-1

7 years agoMerge pull request #8998 from abratchik:DNN.java.wrappers.fix
Alexander Alekhin [Mon, 3 Jul 2017 16:02:49 +0000 (16:02 +0000)]
Merge pull request #8998 from abratchik:DNN.java.wrappers.fix

7 years agoFix wrong mat access.
catree [Mon, 3 Jul 2017 14:56:53 +0000 (16:56 +0200)]
Fix wrong mat access.

7 years agoversion 3.3.0-rc
Alexander Alekhin [Mon, 3 Jul 2017 13:47:05 +0000 (16:47 +0300)]
version 3.3.0-rc

7 years agocmake: update CXX11 compiler flag
Alexander Alekhin [Mon, 3 Jul 2017 11:39:25 +0000 (14:39 +0300)]
cmake: update CXX11 compiler flag

7 years agoMerge pull request #9032 from sovrasov:mat_doc_update
Alexander Alekhin [Mon, 3 Jul 2017 12:46:42 +0000 (12:46 +0000)]
Merge pull request #9032 from sovrasov:mat_doc_update

7 years agoFixed minor doc issue
Maksim Shabunin [Mon, 3 Jul 2017 09:56:22 +0000 (12:56 +0300)]
Fixed minor doc issue

7 years agocore: add a test of iteration through the Mat_ with range-based for
Vladislav Sovrasov [Mon, 3 Jul 2017 09:42:47 +0000 (12:42 +0300)]
core: add a test of iteration through the Mat_ with range-based for

7 years agoAdd a note about cxx11 range-based loop in Mat_ documentation
Vladislav Sovrasov [Thu, 29 Jun 2017 08:26:54 +0000 (11:26 +0300)]
Add a note about cxx11 range-based loop in Mat_ documentation

7 years agodnn: fix links
Alexander Alekhin [Mon, 3 Jul 2017 09:44:27 +0000 (12:44 +0300)]
dnn: fix links

7 years agoMerge pull request #9066 from mshabunin:fix-static-5
Maksim Shabunin [Mon, 3 Jul 2017 09:03:40 +0000 (09:03 +0000)]
Merge pull request #9066 from mshabunin:fix-static-5

7 years agodnn: fix some tutorial links
berak [Sun, 2 Jul 2017 08:09:27 +0000 (10:09 +0200)]
dnn: fix some tutorial links

7 years agoadd java wrappers to dnn module
abratchik [Tue, 27 Jun 2017 06:52:44 +0000 (10:52 +0400)]
add java wrappers to dnn module

7 years agoFix ffmpeg detection with -D OPENCV_WARNINGS_ARE_ERRORS=ON option.
catree [Sat, 1 Jul 2017 23:59:41 +0000 (01:59 +0200)]
Fix ffmpeg detection with -D OPENCV_WARNINGS_ARE_ERRORS=ON option.

7 years agoAdd 64-bit imshow behavior in the documentation.
catree [Sat, 1 Jul 2017 22:41:29 +0000 (00:41 +0200)]
Add 64-bit imshow behavior in the documentation.

7 years agoFix MKL linkage with enabled OpenMP
dkurt [Sat, 1 Jul 2017 17:02:13 +0000 (20:02 +0300)]
Fix MKL linkage with enabled OpenMP

7 years agoFix error message fisheye CALIB_CHECK_COND
Alexander Duda [Sat, 1 Jul 2017 16:01:21 +0000 (13:31 -0230)]
Fix error message fisheye CALIB_CHECK_COND

The old error message was not giving any hint which input array (image)
led to an ill conditioned matrix. This made it near impossible to
identify poor images in a larger set.

A better approach would be to implement a checker function which gives
each image a rating before the real calibration is performed. This could
also include some image properties like sharpness, etc.

7 years agoIssues found by static analysis (5th round)
Maksim Shabunin [Sat, 1 Jul 2017 15:43:48 +0000 (18:43 +0300)]
Issues found by static analysis (5th round)

7 years agoFix style
Sadika Sumanapala [Sat, 1 Jul 2017 01:29:27 +0000 (06:59 +0530)]
Fix style

7 years agoMerge pull request #9056 from mshabunin:fix-videoio-deps
Alexander Alekhin [Fri, 30 Jun 2017 16:49:42 +0000 (16:49 +0000)]
Merge pull request #9056 from mshabunin:fix-videoio-deps

7 years agocanny: disallow broken inplace arguments
Alexander Alekhin [Fri, 30 Jun 2017 16:32:16 +0000 (19:32 +0300)]
canny: disallow broken inplace arguments

7 years agoRemoved extra dependencies from videoio library
Maksim Shabunin [Fri, 30 Jun 2017 15:21:43 +0000 (18:21 +0300)]
Removed extra dependencies from videoio library

7 years agoMerge pull request #9050 from alalek:dnn_binding_fixes
Alexander Alekhin [Fri, 30 Jun 2017 15:51:34 +0000 (15:51 +0000)]
Merge pull request #9050 from alalek:dnn_binding_fixes

7 years agostatic build workaround
Alexander Alekhin [Fri, 30 Jun 2017 14:57:12 +0000 (17:57 +0300)]
static build workaround

7 years agohow_to_scan_images.markdown: fix grammer mistakes
Frank de Brabander [Fri, 30 Jun 2017 13:47:50 +0000 (15:47 +0200)]
how_to_scan_images.markdown: fix grammer mistakes

Improve the readability of the tutorial.

7 years agoPrevent crash when attempting to create training data without responses.
Rink Springer [Fri, 30 Jun 2017 13:32:40 +0000 (15:32 +0200)]
Prevent crash when attempting to create training data without responses.

This is at least useful when using an SVM one-class linear classifier, so there are valid use cases.

7 years agoa fix for open issue 4772
jqly [Fri, 30 Jun 2017 12:22:16 +0000 (20:22 +0800)]
a fix for open issue 4772

7 years agobinding: fix headers processing
Alexander Alekhin [Fri, 30 Jun 2017 11:49:17 +0000 (14:49 +0300)]
binding: fix headers processing

7 years agohdr_parser: ignore lines with 'CV__' macros
Alexander Alekhin [Thu, 29 Jun 2017 16:40:36 +0000 (19:40 +0300)]
hdr_parser: ignore lines with 'CV__' macros

7 years agoMerge pull request #8936 from terfendail:clipline_fix
Alexander Alekhin [Fri, 30 Jun 2017 10:55:08 +0000 (10:55 +0000)]
Merge pull request #8936 from terfendail:clipline_fix

7 years agocmake: don't add vs_version.rc for static modules (ts)
Alexander Alekhin [Fri, 30 Jun 2017 09:56:57 +0000 (12:56 +0300)]
cmake: don't add vs_version.rc for static modules (ts)

7 years agoMerge pull request #9038 from mshabunin:fix-static-4
Maksim Shabunin [Fri, 30 Jun 2017 10:39:36 +0000 (10:39 +0000)]
Merge pull request #9038 from mshabunin:fix-static-4

7 years agoMerge pull request #9035 from alalek:dnn_fix_halide_tests
Maksim Shabunin [Fri, 30 Jun 2017 10:29:13 +0000 (10:29 +0000)]
Merge pull request #9035 from alalek:dnn_fix_halide_tests

7 years agoMerge pull request #9044 from neilsh-msft:WinRTBuild
Alexander Alekhin [Fri, 30 Jun 2017 10:14:47 +0000 (10:14 +0000)]
Merge pull request #9044 from neilsh-msft:WinRTBuild

7 years agoFixed some issues found by static analysis (4th round)
Maksim Shabunin [Thu, 29 Jun 2017 13:40:22 +0000 (16:40 +0300)]
Fixed some issues found by static analysis (4th round)

7 years agoFix WinRT build breaks in highgui and videoio.
Neil Shipp [Fri, 30 Jun 2017 00:56:09 +0000 (17:56 -0700)]
Fix WinRT build breaks in highgui and videoio.

7 years agoMerge pull request #9033 from alalek:sgbm_disable_perf_in_debug
Alexander Alekhin [Thu, 29 Jun 2017 16:16:54 +0000 (16:16 +0000)]
Merge pull request #9033 from alalek:sgbm_disable_perf_in_debug

7 years agoMerge pull request #9039 from arrybn:disable_caffe_parser_logs
Alexander Alekhin [Thu, 29 Jun 2017 15:50:05 +0000 (15:50 +0000)]
Merge pull request #9039 from arrybn:disable_caffe_parser_logs

7 years agoDisabled logging in caffe parser in release
Aleksandr Rybnikov [Thu, 29 Jun 2017 14:36:48 +0000 (17:36 +0300)]
Disabled logging in caffe parser in release

7 years agodnn: fix compilation of Halide tests
Alexander Alekhin [Thu, 29 Jun 2017 12:42:09 +0000 (15:42 +0300)]
dnn: fix compilation of Halide tests

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 agocalib3d(perf): disable SGBM tests in debug mode
Alexander Alekhin [Thu, 29 Jun 2017 09:49:47 +0000 (12:49 +0300)]
calib3d(perf): disable SGBM tests in debug mode

because they are too long (takes minutes)

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