platform/upstream/opencv.git
7 years agoAndroid sample for DNN module
Dmitry Kurtaev [Sat, 26 Aug 2017 18:40:12 +0000 (21:40 +0300)]
Android sample for DNN module

7 years agoMerge pull request #9467 from sovrasov:stereo_calib_fix_td
Alexander Alekhin [Fri, 25 Aug 2017 14:32:57 +0000 (14:32 +0000)]
Merge pull request #9467 from sovrasov:stereo_calib_fix_td

7 years agocalib3d: fix warning from gcc7
Vladislav Sovrasov [Fri, 25 Aug 2017 10:51:43 +0000 (13:51 +0300)]
calib3d: fix warning from gcc7

7 years agoMerge pull request #9441 from wzw-intel:delete_program
Alexander Alekhin [Fri, 25 Aug 2017 12:03:27 +0000 (12:03 +0000)]
Merge pull request #9441 from wzw-intel:delete_program

7 years agoMerge pull request #9445 from adishavit:master
Adi Shavit [Fri, 25 Aug 2017 11:37:50 +0000 (14:37 +0300)]
Merge pull request #9445 from adishavit:master

* Adds cv::resizeWindow() overload taking a single cv::Size argument.

* Replaces copied documentaion with Doxygen @overload command.

7 years agocalib3d: add CALIB_FIX_TANGENT_DIST flag to stereoCalibrate
Vladislav Sovrasov [Fri, 25 Aug 2017 10:05:16 +0000 (13:05 +0300)]
calib3d: add CALIB_FIX_TANGENT_DIST flag to stereoCalibrate

7 years agoocl: Add a function to unload a run-time cached program
Wu Zhiwen [Fri, 25 Aug 2017 00:42:11 +0000 (08:42 +0800)]
ocl: Add a function to unload a run-time cached program

This function is the counterpart of "Context::getProg".
With this function, users have chance to unload a program
from global run-time cached programs, and save resource.

7 years agoMerge pull request #9140 from Cartucho:linter_python
Alexander Alekhin [Thu, 24 Aug 2017 19:49:12 +0000 (19:49 +0000)]
Merge pull request #9140 from Cartucho:linter_python

7 years agoMerge pull request #9139 from Cartucho:improve_match_template_py
Alexander Alekhin [Thu, 24 Aug 2017 19:51:09 +0000 (19:51 +0000)]
Merge pull request #9139 from Cartucho:improve_match_template_py

GSoC - Improving code match_template.py

7 years agoMerge pull request #9460 from Cartucho:pylint_samples_py
Alexander Alekhin [Thu, 24 Aug 2017 19:46:54 +0000 (19:46 +0000)]
Merge pull request #9460 from Cartucho:pylint_samples_py

7 years agoSamples Python:
tribta [Thu, 24 Aug 2017 16:45:14 +0000 (17:45 +0100)]
Samples Python:
* Unused variables
* Bad identation

7 years agoMerge pull request #9448 from alalek:issue_9443
Alexander Alekhin [Thu, 24 Aug 2017 16:05:07 +0000 (16:05 +0000)]
Merge pull request #9448 from alalek:issue_9443

7 years agoMerge pull request #9349 from dkurt:tf_deconv
Alexander Alekhin [Thu, 24 Aug 2017 15:58:38 +0000 (15:58 +0000)]
Merge pull request #9349 from dkurt:tf_deconv

7 years agoMerge pull request #9414 from gadcam:HOGDescriptor-winSigma
Alexander Alekhin [Thu, 24 Aug 2017 15:57:18 +0000 (15:57 +0000)]
Merge pull request #9414 from gadcam:HOGDescriptor-winSigma

7 years agoMerge pull request #9394 from dkurt:fix_halide_wrapper
Alexander Alekhin [Thu, 24 Aug 2017 15:56:54 +0000 (15:56 +0000)]
Merge pull request #9394 from dkurt:fix_halide_wrapper

7 years agoMerge pull request #9252 from jbms:fix/tiff-in-memory
Alexander Alekhin [Thu, 24 Aug 2017 15:33:48 +0000 (15:33 +0000)]
Merge pull request #9252 from jbms:fix/tiff-in-memory

7 years agobuild: eliminate Win32 warnings
Alexander Alekhin [Thu, 24 Aug 2017 13:07:12 +0000 (16:07 +0300)]
build: eliminate Win32 warnings

7 years agocmake: change Pylint integration
Alexander Alekhin [Wed, 23 Aug 2017 16:48:41 +0000 (19:48 +0300)]
cmake: change Pylint integration

7 years agoUsing Pylint Tool to Test the python tutorial codes
tribta [Thu, 29 Jun 2017 11:42:45 +0000 (12:42 +0100)]
Using Pylint Tool to Test the python tutorial codes

* Adding CMake script to check if pylint is installed
* Adding Pylint config file (to choose the tests that are enabled)
* Adding CMake script to samples/python/tutorial_code

Testing: bad-indentation, mixed-indentation, unnecessary-semicolon, unused-variable

7 years agoMerge pull request #9395 from lupustr3:pvlasov/icv2017u3_update
Alexander Alekhin [Thu, 24 Aug 2017 11:48:53 +0000 (11:48 +0000)]
Merge pull request #9395 from lupustr3:pvlasov/icv2017u3_update

7 years agoMerge pull request #9419 from sturkmen72:patch-1
Alexander Alekhin [Thu, 24 Aug 2017 09:49:03 +0000 (09:49 +0000)]
Merge pull request #9419 from sturkmen72:patch-1

7 years agoMerge pull request #9294 from arrybn:layers_perf
Alexander Alekhin [Thu, 24 Aug 2017 09:37:49 +0000 (09:37 +0000)]
Merge pull request #9294 from arrybn:layers_perf

7 years agoMerge pull request #9333 from dkurt:update_mobilenet_sample
Alexander Alekhin [Thu, 24 Aug 2017 09:37:08 +0000 (09:37 +0000)]
Merge pull request #9333 from dkurt:update_mobilenet_sample

7 years agoMerge pull request #9451 from alalek:fix_warning_self_assign
Alexander Alekhin [Thu, 24 Aug 2017 08:46:40 +0000 (08:46 +0000)]
Merge pull request #9451 from alalek:fix_warning_self_assign

7 years agoMerge pull request #9418 from borisfom:cuda9
Boris Fomitchev [Thu, 24 Aug 2017 07:11:44 +0000 (00:11 -0700)]
Merge pull request #9418 from borisfom:cuda9

CUDA9 build fixed, added detection (#9418)

* CUDA9 build fixed, added detection

* Replacing deprecated __shfl_xxx with __shfl_sync, fixing bogus CUDA9 warnings

7 years agoMerge pull request #9449 from ribalda:ocv
Alexander Alekhin [Wed, 23 Aug 2017 19:40:36 +0000 (19:40 +0000)]
Merge pull request #9449 from ribalda:ocv

7 years agoMerge pull request #9450 from alalek:issue_9440
Alexander Alekhin [Wed, 23 Aug 2017 19:40:15 +0000 (19:40 +0000)]
Merge pull request #9450 from alalek:issue_9440

7 years agots: eliminate build warning '-Wself-assign'
Alexander Alekhin [Wed, 23 Aug 2017 16:08:55 +0000 (19:08 +0300)]
ts: eliminate build warning '-Wself-assign'

7 years agocarotene: removed unnecessary 'register' specifier
Alexander Alekhin [Wed, 23 Aug 2017 14:59:31 +0000 (17:59 +0300)]
carotene: removed unnecessary 'register' specifier

7 years agocarotene: don't use __asm__ with aarch64
Alexander Alekhin [Wed, 23 Aug 2017 14:41:23 +0000 (17:41 +0300)]
carotene: don't use __asm__ with aarch64

7 years agoocl: Fix OpenCL library detection in Linux
Ricardo Ribalda Delgado [Wed, 23 Aug 2017 13:45:38 +0000 (15:45 +0200)]
ocl: Fix OpenCL library detection in Linux

OpenCL runtime does not require OpenCL development file (libOpenCL.so),
just the "run" library (so.1).

This patch searches for the run library (so.1) if the dev library (.so)
is not found.

Web search shows that this error has been present since at least 2015
http://answers.opencv.org/question/80532/haveopencl-return-false/

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
7 years agoimgcodesc: fix code problems with integer overflow / address arithmetic / UB
Alexander Alekhin [Wed, 23 Aug 2017 12:15:27 +0000 (15:15 +0300)]
imgcodesc: fix code problems with integer overflow / address arithmetic / UB

7 years agoMerge pull request #9447 from dkurt:qt_windows
Alexander Alekhin [Wed, 23 Aug 2017 14:19:45 +0000 (14:19 +0000)]
Merge pull request #9447 from dkurt:qt_windows

7 years agoAdded 1ms delay to let system decorate Qt windows
Dmitry Kurtaev [Wed, 23 Aug 2017 11:56:54 +0000 (14:56 +0300)]
Added 1ms delay to let system decorate Qt windows

7 years agoMerge pull request #9428 from csukuangfj:fix-commandline-parser
Alexander Alekhin [Wed, 23 Aug 2017 12:48:28 +0000 (12:48 +0000)]
Merge pull request #9428 from csukuangfj:fix-commandline-parser

7 years agoICV2017u3 package update;
Pavel Vlasov [Thu, 17 Aug 2017 11:57:58 +0000 (14:57 +0300)]
ICV2017u3 package update;

- Optimizations set change. Now IPP integrations will provide code for SSE42, AVX2 and AVX512 (SKX) CPUs only. For HW below SSE42 IPP code is disabled.
- Performance regressions fixes for IPP code paths;
- cv::boxFilter integration improvement;
- cv::filter2D integration improvement;

7 years agoAdded function to get timings for layers
Aleksandr Rybnikov [Wed, 2 Aug 2017 14:27:58 +0000 (17:27 +0300)]
Added function to get timings for layers

7 years agofix cv::CommandLineParser.
KUANG Fangjun [Mon, 21 Aug 2017 09:26:22 +0000 (11:26 +0200)]
fix cv::CommandLineParser.

It should handle bool value not only of "true" but also of "TRUE" and "True".

7 years agoUpdate MobileNet object detection sample
Dmitry Kurtaev [Tue, 8 Aug 2017 16:53:07 +0000 (19:53 +0300)]
Update MobileNet object detection sample

7 years agoMerge pull request #9439 from eruffaldi:macos_build_opengl_qt5_interop2
Alexander Alekhin [Wed, 23 Aug 2017 04:13:50 +0000 (04:13 +0000)]
Merge pull request #9439 from eruffaldi:macos_build_opengl_qt5_interop2

7 years agoapple exclusion
Emanuele Ruffaldi [Tue, 22 Aug 2017 21:32:01 +0000 (23:32 +0200)]
apple exclusion

7 years agoMerge pull request #9421 from csukuangfj:fix-doc
Alexander Alekhin [Tue, 22 Aug 2017 20:51:49 +0000 (20:51 +0000)]
Merge pull request #9421 from csukuangfj:fix-doc

7 years agoMerge pull request #9438 from lpea:master
Alexander Alekhin [Tue, 22 Aug 2017 19:25:09 +0000 (19:25 +0000)]
Merge pull request #9438 from lpea:master

7 years agoCMakeLists.txt: fix a typo in a message
Guillaume Jacob [Tue, 22 Aug 2017 18:44:53 +0000 (20:44 +0200)]
CMakeLists.txt: fix a typo in a message

7 years agoMerge pull request #9376 from alalek:imgcodecs_refactoring
Alexander Alekhin [Tue, 22 Aug 2017 16:32:47 +0000 (16:32 +0000)]
Merge pull request #9376 from alalek:imgcodecs_refactoring

7 years agoMerge pull request #9436 from alalek:cmake_drop_install_name_dir
Alexander Alekhin [Tue, 22 Aug 2017 14:10:18 +0000 (14:10 +0000)]
Merge pull request #9436 from alalek:cmake_drop_install_name_dir

7 years agoMerge pull request #9347 from kschwan:fix-docs
Alexander Alekhin [Tue, 22 Aug 2017 13:55:03 +0000 (13:55 +0000)]
Merge pull request #9347 from kschwan:fix-docs

Fix doxygen comment in BFMatcher

7 years agoMerge pull request #9434 from alalek:fix_numpy_warning
Alexander Alekhin [Tue, 22 Aug 2017 13:44:47 +0000 (13:44 +0000)]
Merge pull request #9434 from alalek:fix_numpy_warning

7 years agocmake: drop INSTALL_NAME_DIR
Alexander Alekhin [Tue, 22 Aug 2017 12:26:20 +0000 (15:26 +0300)]
cmake: drop INSTALL_NAME_DIR

7 years agoMerge pull request #9431 from alalek:cmake_compiler_version
Alexander Alekhin [Tue, 22 Aug 2017 12:22:45 +0000 (12:22 +0000)]
Merge pull request #9431 from alalek:cmake_compiler_version

7 years agoMerge pull request #9429 from StevenPuttemans:fix_9404
Alexander Alekhin [Tue, 22 Aug 2017 09:25:29 +0000 (09:25 +0000)]
Merge pull request #9429 from StevenPuttemans:fix_9404

7 years agopython: eliminate -Wundef warning about NPY_INTERNAL_BUILD
Alexander Alekhin [Tue, 22 Aug 2017 08:56:55 +0000 (11:56 +0300)]
python: eliminate -Wundef warning about NPY_INTERNAL_BUILD

numpy 1.13.0+

7 years agoDeconvolution layer from TensorFlow
Dmitry Kurtaev [Fri, 11 Aug 2017 13:23:41 +0000 (16:23 +0300)]
Deconvolution layer from TensorFlow

7 years agocmake: use CMAKE_CXX_COMPILER_VERSION (CMake 2.8.8+)
Alexander Alekhin [Mon, 21 Aug 2017 14:43:56 +0000 (17:43 +0300)]
cmake: use CMAKE_CXX_COMPILER_VERSION (CMake 2.8.8+)

- '-fvisibility' flag was updated
- PVAPI library detection was changed

7 years agoUpdate faq.markdown
Suleyman TURKMEN [Sun, 20 Aug 2017 09:19:11 +0000 (12:19 +0300)]
Update faq.markdown

7 years agofix description of setTrackbarMin
Steven Puttemans [Mon, 21 Aug 2017 10:47:04 +0000 (12:47 +0200)]
fix description of setTrackbarMin

7 years agoMerge pull request #9049 from Cartucho:improve_mask_tutorial_codes
Alexander Alekhin [Mon, 21 Aug 2017 07:14:45 +0000 (07:14 +0000)]
Merge pull request #9049 from Cartucho:improve_mask_tutorial_codes

7 years agoImprove the documentation.
KUANG Fangjun [Sun, 20 Aug 2017 15:21:39 +0000 (17:21 +0200)]
Improve the documentation.

7 years agoMerge pull request #9415 from alalek:cmake_deprecated_policies
Alexander Alekhin [Sat, 19 Aug 2017 18:19:31 +0000 (18:19 +0000)]
Merge pull request #9415 from alalek:cmake_deprecated_policies

7 years agovtk: eliminate 'override' build warning
Alexander Alekhin [Sat, 19 Aug 2017 16:05:32 +0000 (16:05 +0000)]
vtk: eliminate 'override' build warning

7 years agocmake: CMP0026 NEW
Alexander Alekhin [Wed, 16 Aug 2017 22:49:17 +0000 (22:49 +0000)]
cmake: CMP0026 NEW

7 years agocmake: CMP0046 NEW
Alexander Alekhin [Wed, 16 Aug 2017 22:33:27 +0000 (22:33 +0000)]
cmake: CMP0046 NEW

7 years agocmake: CMP0022 NEW
Alexander Alekhin [Wed, 16 Aug 2017 21:23:06 +0000 (21:23 +0000)]
cmake: CMP0022 NEW

7 years agocmake: CMP0020 NEW
Alexander Alekhin [Wed, 16 Aug 2017 21:22:35 +0000 (21:22 +0000)]
cmake: CMP0020 NEW

7 years agoAvoid HOGDescriptor with sigma = 0
Camille Barneaud [Sat, 19 Aug 2017 13:03:16 +0000 (15:03 +0200)]
Avoid HOGDescriptor with sigma = 0

Solve #9307.

7 years agoMerge pull request #9400 from sovrasov:videoio_fix_warn
Alexander Alekhin [Fri, 18 Aug 2017 16:03:50 +0000 (16:03 +0000)]
Merge pull request #9400 from sovrasov:videoio_fix_warn

7 years agovideoio: remove throw lists since they are deprecated in cxx11 (and gcc7 produces...
Vladislav Sovrasov [Fri, 18 Aug 2017 09:07:24 +0000 (12:07 +0300)]
videoio: remove throw lists since they are deprecated in cxx11 (and gcc7 produces a warning)

7 years agoMerge pull request #9397 from alalek:memcpy_null_guard
Alexander Alekhin [Fri, 18 Aug 2017 08:47:17 +0000 (08:47 +0000)]
Merge pull request #9397 from alalek:memcpy_null_guard

7 years agoMerge pull request #9369 from alalek:cpp_refactor_gtk
Alexander Alekhin [Thu, 17 Aug 2017 20:05:56 +0000 (20:05 +0000)]
Merge pull request #9369 from alalek:cpp_refactor_gtk

7 years agoMerge pull request #8847 from Cartucho:java_highgui
Alexander Alekhin [Thu, 17 Aug 2017 20:04:33 +0000 (20:04 +0000)]
Merge pull request #8847 from Cartucho:java_highgui

7 years agoMerge pull request #9210 from whizzzkid/fixing-cuda
Nishant Arora [Thu, 17 Aug 2017 16:32:53 +0000 (10:32 -0600)]
Merge pull request #9210 from whizzzkid/fixing-cuda

Fixing explicitly call download method for cuda::GpuMat object

7 years agocore: fix memcpy with zero size
Alexander Alekhin [Thu, 17 Aug 2017 15:30:31 +0000 (18:30 +0300)]
core: fix memcpy with zero size

7 years agoFix Halide buffer behavior in case of OpenCL device memory allocation
Dmitry Kurtaev [Thu, 17 Aug 2017 09:48:02 +0000 (12:48 +0300)]
Fix Halide buffer behavior in case of OpenCL device memory allocation

7 years agoMerge pull request #9330 from hrnr:akaze_ocl
Jiri Horner [Wed, 16 Aug 2017 16:46:11 +0000 (18:46 +0200)]
Merge pull request #9330 from hrnr:akaze_ocl

[GSOC] Enable OCL for AKAZE (#9330)

* revert e0489cb - reenable OCL for AKAZE

* deal with conversion internally in AKAZE

* pass InputArray directly to AKAZE to allow distiguishing input Mat/UMat. deal with conversion there
* ensure that keypoints orientations are always computed. prevents misuse of internal AKAZE class.

* covert internal AKAZE functions to use InputArray/OutputArray

* make internal functions private in AKAZE

* split OCL and CPU paths in AKAZE

* create 2 separate pyramids, 1 for OCL and 1 for CPU
* template functions that use temporaries to always store them as correct type (UMat/Mat)

* remove variable used only in OCL path

causes unused variable warning

* update AKAZE documentation

* run ocl version only when ocl is enabled

* add tests for OCL path in AKAZE

* relax condition for keypoints angle

7 years agoimgproc(test): add checks for remove() call
Alexander Alekhin [Wed, 16 Aug 2017 10:53:12 +0000 (13:53 +0300)]
imgproc(test): add checks for remove() call

7 years agoimgcodecs: refactoring, improve code quality
Alexander Alekhin [Tue, 15 Aug 2017 22:04:55 +0000 (22:04 +0000)]
imgcodecs: refactoring, improve code quality

7 years agoMerge pull request #9382 from StevenPuttemans:fix_9121
Alexander Alekhin [Wed, 16 Aug 2017 13:56:33 +0000 (13:56 +0000)]
Merge pull request #9382 from StevenPuttemans:fix_9121

7 years agobuild: workaround GCC 7.1.1 compilation issue with sanitize flags
Alexander Alekhin [Tue, 15 Aug 2017 21:45:05 +0000 (21:45 +0000)]
build: workaround GCC 7.1.1 compilation issue with sanitize flags

Version: gcc (GCC) 7.1.1 20170622 (Red Hat 7.1.1-3)
Flags: -fsanitize=address,undefined

7 years agoMerge pull request #9379 from berak:imgproc_hanning
Alexander Alekhin [Wed, 16 Aug 2017 10:28:19 +0000 (10:28 +0000)]
Merge pull request #9379 from berak:imgproc_hanning

7 years agofix_9121
Steven Puttemans [Wed, 16 Aug 2017 09:34:55 +0000 (11:34 +0200)]
fix_9121

7 years agoimgproc:fix winSize in createHanningWindow()
berak [Wed, 16 Aug 2017 06:51:34 +0000 (08:51 +0200)]
imgproc:fix winSize in createHanningWindow()

7 years agoMerge pull request #9366 from martinsey:brisk-detection-parameter-extension
Alexander Alekhin [Tue, 15 Aug 2017 10:48:10 +0000 (10:48 +0000)]
Merge pull request #9366 from martinsey:brisk-detection-parameter-extension

7 years agobrisk add detection threshold for custom sampling pattern
Martin Seyferth [Mon, 14 Aug 2017 07:40:43 +0000 (09:40 +0200)]
brisk add detection threshold for custom sampling pattern

7 years agoMerge pull request #9329 from savuor:softfloat_sincos
Rostislav Vasilikhin [Tue, 15 Aug 2017 09:23:26 +0000 (12:23 +0300)]
Merge pull request #9329 from savuor:softfloat_sincos

SoftFloat: added sin, cos and docs (#9329)

* softfloat: comparison operators made inline, min() max() eps() isSubnormal() added

* softfloat: get/set sign/exp

* softfloat: get/set frac

* softfloat: tests rewritten with new tools

* softfloat: added pi(), sin(), cos()

* softfloat: more comments

* softfloat: updated sincos arg reduction

* softfloat: initial tests for sincos added

* softfloat: test works, code cleanup is pending

* softfloat: sincos argreduce rewritten

* softfloat: sincos refactored and simplified

* softfloat sincos: epsilons calibrated

* softfloat: junk code removed from tests

* softfloat: docs added

* inline comparisons undone; warning fixed

7 years agoMerge pull request #9358 from azatsman:master
Alexander Alekhin [Tue, 15 Aug 2017 09:16:45 +0000 (09:16 +0000)]
Merge pull request #9358 from azatsman:master

7 years agoMerge pull request #9368 from alalek:fix_9361
Alexander Alekhin [Tue, 15 Aug 2017 09:14:40 +0000 (09:14 +0000)]
Merge pull request #9368 from alalek:fix_9361

7 years agohighgui: refactor GTK backend
Alexander Alekhin [Mon, 14 Aug 2017 19:33:00 +0000 (19:33 +0000)]
highgui: refactor GTK backend

- eliminate legacy C code, used fields
- fix mutex synchronization issues
- set trackbar min/max without unnecessary truncation; allow negative values

7 years agoMerge pull request #9367 from StevenPuttemans:fix_doc_9359
Alexander Alekhin [Mon, 14 Aug 2017 15:16:07 +0000 (15:16 +0000)]
Merge pull request #9367 from StevenPuttemans:fix_doc_9359

7 years agocmake: disable HAVE_POSIX_SEMAPHORES on Apple platform
Alexander Alekhin [Mon, 14 Aug 2017 14:19:51 +0000 (17:19 +0300)]
cmake: disable HAVE_POSIX_SEMAPHORES on Apple platform

7 years agofix issue 9359
Steven Puttemans [Mon, 14 Aug 2017 14:16:04 +0000 (16:16 +0200)]
fix issue 9359

7 years agoMerge pull request #9364 from alalek:update_pthread
Alexander Alekhin [Mon, 14 Aug 2017 14:15:23 +0000 (14:15 +0000)]
Merge pull request #9364 from alalek:update_pthread

7 years agoMerge pull request #9317 from sturkmen72:warpPerspective_demo
Alexander Alekhin [Mon, 14 Aug 2017 13:15:48 +0000 (13:15 +0000)]
Merge pull request #9317 from sturkmen72:warpPerspective_demo

7 years agoMerge pull request #9338 from dkurt:fix_ocl
Alexander Alekhin [Mon, 14 Aug 2017 12:56:07 +0000 (12:56 +0000)]
Merge pull request #9338 from dkurt:fix_ocl

7 years agoMerge pull request #9365 from alalek:build_fix_parallel
Alexander Alekhin [Mon, 14 Aug 2017 10:28:53 +0000 (10:28 +0000)]
Merge pull request #9365 from alalek:build_fix_parallel

7 years agocore(build): fix compilation of parallel.cpp (OpenMP configuration)
Alexander Alekhin [Mon, 14 Aug 2017 08:28:21 +0000 (11:28 +0300)]
core(build): fix compilation of parallel.cpp (OpenMP configuration)

7 years agoMerge pull request #9360 from tomoaki0705:suppressCalib3dWarning
Alexander Alekhin [Mon, 14 Aug 2017 08:10:58 +0000 (08:10 +0000)]
Merge pull request #9360 from tomoaki0705:suppressCalib3dWarning

7 years agobuild: HAVE_LIBPTHREAD, HAVE_PTHREAD(S) => HAVE_PTHREAD
Alexander Alekhin [Mon, 14 Aug 2017 07:59:38 +0000 (10:59 +0300)]
build: HAVE_LIBPTHREAD, HAVE_PTHREAD(S) => HAVE_PTHREAD

7 years agosuppress warning message
Tomoaki Teshima [Sun, 13 Aug 2017 23:26:06 +0000 (08:26 +0900)]
suppress warning message

7 years agoChanged NORM_RELATIVE_INF, NORM_RELATIVE_L1 and NORM_RELATIVE_L2 to
Alex Zatsman [Sun, 13 Aug 2017 15:55:35 +0000 (11:55 -0400)]
Changed NORM_RELATIVE_INF, NORM_RELATIVE_L1 and NORM_RELATIVE_L2 to
NORM_RELATIVE | NORM_INF, NORM_RELATIVE | NORM_L1 and NORM_RELATIVE | NORM_L2
respectively in the documentation for cv::norm and cv::NormTypes

7 years agoFix doxy comment for BFMatcher::create()
Kim Lindberg Schwaner [Fri, 11 Aug 2017 12:18:53 +0000 (14:18 +0200)]
Fix doxy comment for BFMatcher::create()

A missing asterisk caused doxygen to not generate documentation for the
BFMatcher::create() method.