platform/upstream/opencv.git
6 years agoobjdetect: apply CV_OVERRIDE/CV_FINAL
Alexander Alekhin [Thu, 15 Mar 2018 13:16:57 +0000 (16:16 +0300)]
objdetect: apply CV_OVERRIDE/CV_FINAL

6 years agodnn: apply CV_OVERRIDE/CV_FINAL
Alexander Alekhin [Thu, 15 Mar 2018 13:16:56 +0000 (16:16 +0300)]
dnn: apply CV_OVERRIDE/CV_FINAL

6 years agocalib3d: apply CV_OVERRIDE/CV_FINAL
Alexander Alekhin [Thu, 15 Mar 2018 13:16:55 +0000 (16:16 +0300)]
calib3d: apply CV_OVERRIDE/CV_FINAL

6 years agofeatures2d: apply CV_OVERRIDE/CV_FINAL
Alexander Alekhin [Thu, 15 Mar 2018 13:16:54 +0000 (16:16 +0300)]
features2d: apply CV_OVERRIDE/CV_FINAL

6 years agovideoio: apply CV_OVERRIDE/CV_FINAL
Alexander Alekhin [Thu, 15 Mar 2018 13:16:53 +0000 (16:16 +0300)]
videoio: apply CV_OVERRIDE/CV_FINAL

6 years agoimgcodecs: apply CV_OVERRIDE/CV_FINAL
Alexander Alekhin [Thu, 15 Mar 2018 13:16:52 +0000 (16:16 +0300)]
imgcodecs: apply CV_OVERRIDE/CV_FINAL

6 years agoimgproc: apply CV_OVERRIDE/CV_FINAL
Alexander Alekhin [Thu, 15 Mar 2018 13:16:51 +0000 (16:16 +0300)]
imgproc: apply CV_OVERRIDE/CV_FINAL

6 years agocore: apply CV_OVERRIDE/CV_FINAL
Alexander Alekhin [Thu, 15 Mar 2018 13:16:50 +0000 (16:16 +0300)]
core: apply CV_OVERRIDE/CV_FINAL

6 years agocmake: disable override warnings in 3rdparty code and viz
Alexander Alekhin [Thu, 15 Mar 2018 13:04:21 +0000 (16:04 +0300)]
cmake: disable override warnings in 3rdparty code and viz

6 years agots: apply CV_OVERRIDE/CV_FINAL
Alexander Alekhin [Thu, 15 Mar 2018 13:04:20 +0000 (16:04 +0300)]
ts: apply CV_OVERRIDE/CV_FINAL

- disable "-Wsuggest-override" in tests

6 years agocmake: use SYSTEM include directories
Alexander Alekhin [Thu, 15 Mar 2018 13:04:19 +0000 (16:04 +0300)]
cmake: use SYSTEM include directories

6 years agocore: add CV_OVERRIDE/CV_FINAL macros
Alexander Alekhin [Thu, 15 Mar 2018 13:04:18 +0000 (16:04 +0300)]
core: add CV_OVERRIDE/CV_FINAL macros

6 years agoMerge pull request #11098 from dkurt:dnn_native_inf_engine
Alexander Alekhin [Wed, 28 Mar 2018 14:52:08 +0000 (14:52 +0000)]
Merge pull request #11098 from dkurt:dnn_native_inf_engine

6 years agoUpdate OpenCVDetectInferenceEngine.cmake
Dmitry Kurtaev [Wed, 28 Mar 2018 13:34:37 +0000 (16:34 +0300)]
Update OpenCVDetectInferenceEngine.cmake

6 years agoMerge pull request #11072 from alalek:explicit_autobuffer
Vadim Pisarevsky [Wed, 28 Mar 2018 12:57:25 +0000 (12:57 +0000)]
Merge pull request #11072 from alalek:explicit_autobuffer

6 years agoMerge pull request #11171 from codingforfun:fix_11143
Vadim Pisarevsky [Wed, 28 Mar 2018 12:47:34 +0000 (12:47 +0000)]
Merge pull request #11171 from codingforfun:fix_11143

6 years agoMerge pull request #11137 from alalek:core_fix_mat_ctor
Vadim Pisarevsky [Wed, 28 Mar 2018 12:39:49 +0000 (12:39 +0000)]
Merge pull request #11137 from alalek:core_fix_mat_ctor

6 years agoMerge pull request #11167 from alalek:cmake_compiler_vars
Alexander Alekhin [Wed, 28 Mar 2018 12:38:31 +0000 (12:38 +0000)]
Merge pull request #11167 from alalek:cmake_compiler_vars

6 years agoSolves #11156 (#11160)
LaurentBerger [Wed, 28 Mar 2018 12:35:38 +0000 (14:35 +0200)]
Solves #11156 (#11160)

* Solves #11156

* Check file size for all file format. Disable APPEND if file is empty

* Add test for APPEND mode

6 years agoMerge pull request #11175 from collenjones:hotfix/coreLinkFix
Alexander Alekhin [Wed, 28 Mar 2018 12:21:11 +0000 (12:21 +0000)]
Merge pull request #11175 from collenjones:hotfix/coreLinkFix

6 years agoMerge pull request #11180 from dkurt:fix_dnn_tf_ssd
Alexander Alekhin [Wed, 28 Mar 2018 11:45:51 +0000 (11:45 +0000)]
Merge pull request #11180 from dkurt:fix_dnn_tf_ssd

6 years agoMerge pull request #11179 from tomoaki0705:fixBuildCudaStereo
Alexander Alekhin [Wed, 28 Mar 2018 10:23:21 +0000 (10:23 +0000)]
Merge pull request #11179 from tomoaki0705:fixBuildCudaStereo

6 years agoFix minimal aspect ratio scale for SSDs from TensorFlow
Dmitry Kurtaev [Wed, 28 Mar 2018 09:53:12 +0000 (12:53 +0300)]
Fix minimal aspect ratio scale for SSDs from TensorFlow

6 years agofix build error on Jetson
Tomoaki Teshima [Wed, 28 Mar 2018 09:21:53 +0000 (18:21 +0900)]
fix build error on Jetson

6 years agoFix link to Hershey fonts
Collen Jones [Wed, 28 Mar 2018 03:11:48 +0000 (20:11 -0700)]
Fix link to Hershey fonts

6 years agoMerge pull request #11173 from alalek:issue_11172
Alexander Alekhin [Tue, 27 Mar 2018 15:01:25 +0000 (18:01 +0300)]
Merge pull request #11173 from alalek:issue_11172

6 years agocmake: add module/src include dir in case of enabled precompiled headers
Alexander Alekhin [Tue, 27 Mar 2018 14:38:54 +0000 (17:38 +0300)]
cmake: add module/src include dir in case of enabled precompiled headers

6 years ago#11143 [FIX] Normalize node risk with sample weight sum
codingforfun [Tue, 27 Mar 2018 13:39:36 +0000 (15:39 +0200)]
#11143 [FIX] Normalize node risk with sample weight sum

In case of regression trees, node risk is computed as sum of squared
error. To get a meaningfull value to compare with it needs to be
normalized to the number of samples in the node (or more generally to
the sum of sample weights in this node). Otherwise the sum of squared
error is highly dependend on the number of samples in the node and
comparision with `regressionAccuracy` parameter is not very meaningful.

After normalization `node_risk` means in fact sample variance for all
samples in the node, which makes much more sence and seams to be what
was originaly intended by the code given that node risk is later used as
a split termination criteria by
```
sqrt(node.node_risk) < params.getRegressionAccuracy()
```

6 years agoMerge pull request #11162 from kinchungwong:master
Alexander Alekhin [Tue, 27 Mar 2018 13:27:43 +0000 (13:27 +0000)]
Merge pull request #11162 from kinchungwong:master

6 years agocmake: avoid amending of CMAKE_COMPILER_IS_[GNUCXX|CLANGCXX|CCACHE] vars
Alexander Alekhin [Mon, 26 Mar 2018 11:30:49 +0000 (14:30 +0300)]
cmake: avoid amending of CMAKE_COMPILER_IS_[GNUCXX|CLANGCXX|CCACHE] vars

- Recommended compiler checks:
  - GCC: CV_GCC
  - Clang: CV_CLANG
- fixed problem with CMAKE_CXX_COMPILER_ID=Clang/AppleClang mess on MacOSX
  Details: cmake --help-policy CMP0025
- do not declare Clang as GCC compiler

6 years agoMerge pull request #11089 from terfendail:stereocalibrate_f32
Alexander Alekhin [Tue, 27 Mar 2018 13:08:06 +0000 (13:08 +0000)]
Merge pull request #11089 from terfendail:stereocalibrate_f32

6 years agoMerge pull request #11112 from alalek:cmake_src_include_fix
Alexander Alekhin [Tue, 27 Mar 2018 13:06:48 +0000 (13:06 +0000)]
Merge pull request #11112 from alalek:cmake_src_include_fix

6 years agoMerge pull request #11159 from alalek:samples_avoid_legacy_api
Vadim Pisarevsky [Tue, 27 Mar 2018 10:05:35 +0000 (10:05 +0000)]
Merge pull request #11159 from alalek:samples_avoid_legacy_api

6 years agoMerge pull request #11164 from corleypc:master
Vadim Pisarevsky [Tue, 27 Mar 2018 10:04:20 +0000 (10:04 +0000)]
Merge pull request #11164 from corleypc:master

6 years agoFixed a couple of memory leaks in videoInput::getDevice() when multiple devices are...
corley [Mon, 26 Mar 2018 21:54:48 +0000 (00:54 +0300)]
Fixed a couple of memory leaks in videoInput::getDevice() when multiple devices are present in the system

6 years agoMinor improvement to SSE code in HOGDescriptor::computeGradient, replace emulation...
kinchungwong [Mon, 26 Mar 2018 16:24:03 +0000 (09:24 -0700)]
Minor improvement to SSE code in HOGDescriptor::computeGradient, replace emulation of _mm_mullo_epi32 with constant multiplicand 3 with two _mm_add_epi32. OpenCV issue #11161

6 years agosamples: avoid using of legacy C-like API
Alexander Alekhin [Mon, 26 Mar 2018 10:02:57 +0000 (13:02 +0300)]
samples: avoid using of legacy C-like API

- CV_RGB() macro is moved into opencv2/imgproc.hpp from imgproc_c.h
- samples/cpp/filestorage_base64.cpp is dropped

6 years agoMerge pull request #11151 from AndreiCostinescu:patch-1
Alexander Alekhin [Mon, 26 Mar 2018 10:22:38 +0000 (10:22 +0000)]
Merge pull request #11151 from AndreiCostinescu:patch-1

6 years agoMerge pull request #11155 from nglee:dev_docGpuMatDownloadUpload
Alexander Alekhin [Mon, 26 Mar 2018 10:21:05 +0000 (10:21 +0000)]
Merge pull request #11155 from nglee:dev_docGpuMatDownloadUpload

6 years agoLoad networks from intermediate representation of Intel's Deep learning deployment...
Dmitry Kurtaev [Fri, 16 Mar 2018 16:27:04 +0000 (19:27 +0300)]
Load networks from intermediate representation of Intel's Deep learning deployment toolkit.

6 years agoUpdate GpuMat, GpuMat::download, GpuMat::upload documentation
Namgoo Lee [Mon, 26 Mar 2018 01:58:42 +0000 (10:58 +0900)]
Update GpuMat, GpuMat::download, GpuMat::upload documentation

6 years ago#include <math.h> in cv2.cpp
Andrei Costinescu [Sun, 25 Mar 2018 18:39:29 +0000 (20:39 +0200)]
#include <math.h> in cv2.cpp

My build fails with the error:
"C:/PROGRA~1/MINGW-~1/X86_64~1.0-P/mingw64/lib/gcc/x86_64-w64-mingw32/7.2.0/include/c++/cmath:1136:11: error: '::hypot' has not been declared".
I have tried to fix it by adding "#include <cmath>" before the line "#include <Python.h>" but then the build has failed with the error:
"C:/PROGRA~1/MINGW-~1/X86_64~1.0-P/mingw64/lib/gcc/x86_64-w64-mingw32/7.2.0/include/c++/math.h:91:12:: error: 'std::_hypot' has not been declared".
Adding "#include <math.h>" allowed me to build opencv.

6 years agoMerge pull request #11141 from dkurt:dnn_no_aspect_ratios
Alexander Alekhin [Sat, 24 Mar 2018 20:38:55 +0000 (20:38 +0000)]
Merge pull request #11141 from dkurt:dnn_no_aspect_ratios

6 years agoMerge pull request #11146 from anthonytw:master
Alexander Alekhin [Sat, 24 Mar 2018 06:35:21 +0000 (06:35 +0000)]
Merge pull request #11146 from anthonytw:master

6 years agoSets a higher limit on videoio's AVI container's maximum chunk size, and adds an...
Anthony Wertz [Fri, 23 Mar 2018 16:03:46 +0000 (12:03 -0400)]
Sets a higher limit on videoio's AVI container's maximum chunk size, and adds an explanation of the assertion. Closes #11126

6 years agoMerge pull request #11064 from tomoaki0705:fixCudaStreamAsync
Alexander Alekhin [Fri, 23 Mar 2018 13:04:18 +0000 (13:04 +0000)]
Merge pull request #11064 from tomoaki0705:fixCudaStreamAsync

6 years agoMerge pull request #11113 from tomoaki0705:fixTinkerBoardOpenCL
Alexander Alekhin [Fri, 23 Mar 2018 10:57:59 +0000 (10:57 +0000)]
Merge pull request #11113 from tomoaki0705:fixTinkerBoardOpenCL

6 years agoMerge pull request #11134 from not522:fix-rotation-center
Alexander Alekhin [Fri, 23 Mar 2018 09:37:45 +0000 (09:37 +0000)]
Merge pull request #11134 from not522:fix-rotation-center

6 years agoFix prior box generation in case of squared proposals.
Dmitry Kurtaev [Thu, 22 Mar 2018 10:56:07 +0000 (13:56 +0300)]
Fix prior box generation in case of squared proposals.
Fix batch norm in training phase.

6 years agoUpdate rotated image
Naoto Mizuno [Thu, 22 Mar 2018 12:10:29 +0000 (21:10 +0900)]
Update rotated image

6 years agocore: fix cv::Mat constructor
Alexander Alekhin [Thu, 22 Mar 2018 12:35:54 +0000 (15:35 +0300)]
core: fix cv::Mat constructor

6 years agolet the test OCL_ImgprocWarp/Resize.Mat pass on ARM/Aarch64
Tomoaki Teshima [Thu, 22 Mar 2018 12:35:34 +0000 (21:35 +0900)]
let the test OCL_ImgprocWarp/Resize.Mat pass on ARM/Aarch64
  * disable carotenete when calling resize on ARM/Aarch64
  * loosen eps on Aarch64

6 years agofollow histogram
Tomoaki Teshima [Fri, 16 Mar 2018 07:48:03 +0000 (16:48 +0900)]
follow histogram

6 years agomake the asynchronous call to NPP safe
Tomoaki Teshima [Thu, 15 Mar 2018 09:40:05 +0000 (18:40 +0900)]
make the asynchronous call to NPP safe
  * Stop calling nppSetStream

6 years agoFix center of rotation
Naoto Mizuno [Thu, 22 Mar 2018 07:40:06 +0000 (16:40 +0900)]
Fix center of rotation

6 years agoMerge pull request #11136 from tomoaki0705:fixCalib3dClang
Alexander Alekhin [Thu, 22 Mar 2018 10:24:36 +0000 (10:24 +0000)]
Merge pull request #11136 from tomoaki0705:fixCalib3dClang

6 years agoMerge pull request #11124 from terfendail:minenctriangle_fix
Alexander Alekhin [Thu, 22 Mar 2018 10:23:09 +0000 (10:23 +0000)]
Merge pull request #11124 from terfendail:minenctriangle_fix

6 years agoapply the workaround to correct range
Tomoaki Teshima [Thu, 22 Mar 2018 09:28:47 +0000 (18:28 +0900)]
apply the workaround to correct range

6 years agoUpdated handling of collinear edges while searching for intersection.
Vitaly Tuzov [Tue, 20 Mar 2018 12:39:44 +0000 (15:39 +0300)]
Updated handling of collinear edges while searching for intersection.

6 years agoMerge pull request #11105 from dkurt:issue_11102
Alexander Alekhin [Wed, 21 Mar 2018 09:18:14 +0000 (09:18 +0000)]
Merge pull request #11105 from dkurt:issue_11102

6 years agoMerge pull request #11074 from alalek:android_log_messages
Alexander Alekhin [Tue, 20 Mar 2018 20:40:53 +0000 (20:40 +0000)]
Merge pull request #11074 from alalek:android_log_messages

6 years agoMerge pull request #11110 from nglee:dev_addSyncAfterAsyncCopyTestBufferPool
Alexander Alekhin [Mon, 19 Mar 2018 19:51:36 +0000 (19:51 +0000)]
Merge pull request #11110 from nglee:dev_addSyncAfterAsyncCopyTestBufferPool

6 years agoMerge pull request #11095 from jmartens:patch-2
Alexander Alekhin [Mon, 19 Mar 2018 14:33:34 +0000 (14:33 +0000)]
Merge pull request #11095 from jmartens:patch-2

6 years agocmake: don't add include <module>/src directory to avoid conflicts
Alexander Alekhin [Fri, 16 Mar 2018 13:36:11 +0000 (16:36 +0300)]
cmake: don't add include <module>/src directory to avoid conflicts

during opencv_world builds

6 years agotest_buffer_pool: synchronize after async copy
Namgoo Lee [Mon, 19 Mar 2018 00:30:06 +0000 (09:30 +0900)]
test_buffer_pool: synchronize after async copy

6 years agoMerge pull request #11101 from lamantine:fix_11100
Aleksandr Tischenko [Sun, 18 Mar 2018 12:11:42 +0000 (14:11 +0200)]
Merge pull request #11101 from lamantine:fix_11100

* fixed bug #11100 Integer overflow in kmeans

* fixed integer overflow in other divUp-s in kmeans code
fixed warning about size_t to double conversion

6 years agoMerge pull request #11091 from berak:openpose_sample
Alexander Alekhin [Sun, 18 Mar 2018 09:18:40 +0000 (09:18 +0000)]
Merge pull request #11091 from berak:openpose_sample

6 years agoFix an issue https://github.com/opencv/opencv/issues/11102
Dmitry Kurtaev [Sun, 18 Mar 2018 07:49:12 +0000 (10:49 +0300)]
Fix an issue https://github.com/opencv/opencv/issues/11102

6 years agoMerge pull request #11046 from catree:update_calibration_images
Alexander Alekhin [Fri, 16 Mar 2018 19:33:48 +0000 (19:33 +0000)]
Merge pull request #11046 from catree:update_calibration_images

6 years agoMerge pull request #11069 from berak:fix_samples_beta
Alexander Alekhin [Fri, 16 Mar 2018 19:30:19 +0000 (19:30 +0000)]
Merge pull request #11069 from berak:fix_samples_beta

6 years agoMerge pull request #11078 from atinfinity:pullreq/180315-fixed-openpose-sample
Alexander Alekhin [Fri, 16 Mar 2018 19:29:57 +0000 (19:29 +0000)]
Merge pull request #11078 from atinfinity:pullreq/180315-fixed-openpose-sample

6 years agoUpdate URL to Timing and Profiling in IPython
Jonathan Martens [Fri, 16 Mar 2018 18:37:08 +0000 (19:37 +0100)]
Update URL to Timing and Profiling in IPython

Apparently the blog has been updated and the URL has changed, it is still there though.

6 years agodnn: add an openpose.cpp sample
berak [Fri, 16 Mar 2018 14:06:09 +0000 (15:06 +0100)]
dnn: add an openpose.cpp sample

6 years agoMerge pull request #11081 from alalek:cmake_fix_android_examples_dependencies
Alexander Alekhin [Fri, 16 Mar 2018 16:32:49 +0000 (16:32 +0000)]
Merge pull request #11081 from alalek:cmake_fix_android_examples_dependencies

6 years agoMerge pull request #11083 from take1014:lsd_#9363
yuki takehara [Fri, 16 Mar 2018 16:31:55 +0000 (01:31 +0900)]
Merge pull request #11083 from take1014:lsd_#9363

* Fix #9363

* Renamed the structure and added a new function to the LineSegmentDetectorImpl class as a static member

* Added a new function to the LineSegmentDetectorImpl class as a static member

6 years agoAllow CV_32FC3 objPoints in cv::fisheye::stereoCalibrate
Vitaly Tuzov [Fri, 16 Mar 2018 10:05:40 +0000 (13:05 +0300)]
Allow CV_32FC3 objPoints in cv::fisheye::stereoCalibrate

6 years agoMerge pull request #11073 from geordi:qt-window-pixel-values
Alexander Alekhin [Thu, 15 Mar 2018 14:35:28 +0000 (14:35 +0000)]
Merge pull request #11073 from geordi:qt-window-pixel-values

6 years agoUpdate chessboard pattern image to remove squares overlap. Update also asymmetric...
catree [Fri, 9 Mar 2018 20:25:36 +0000 (21:25 +0100)]
Update chessboard pattern image to remove squares overlap. Update also asymmetric pattern image.

6 years agofix some samples colliding with std::beta
berak [Wed, 14 Mar 2018 04:58:45 +0000 (05:58 +0100)]
fix some samples colliding with std::beta

also add comments explaining the change

6 years agoMerge pull request #11080 from sonnyky:fix/cmake-for-openni
Alexander Alekhin [Thu, 15 Mar 2018 11:18:30 +0000 (11:18 +0000)]
Merge pull request #11080 from sonnyky:fix/cmake-for-openni

6 years agocmake: fix android examples dependencies
Alexander Alekhin [Thu, 15 Mar 2018 11:17:02 +0000 (14:17 +0300)]
cmake: fix android examples dependencies

add_dependencies(${target}) doesn't control regeneration of .apk file,
because "${target}" is dummy target.

6 years agoMerge pull request #10869 from savuor:color_cpp_split
Rostislav Vasilikhin [Thu, 15 Mar 2018 11:10:40 +0000 (14:10 +0300)]
Merge pull request #10869 from savuor:color_cpp_split

color.cpp split (#10869)

* initial split is done

* files renamed (these names are excluded during compilation)

* IPP code moved to corresponding files

* splineBuild, splineInterpolate -> color_lab.cpp

* Lab, Luv: little refactored

* it compiles (didn't check work); Lab OCL code moved to color_lab.cpp

* cvtcolor.cl: Lab/Luv part moved to color_lab.cl

* cvtcolor.cl: color_rgb.cl extracted

* cvtcolor.cl: color_yuv.cl separated

* cvtcolor.cl: color_hsv.cl extracted

* cvtcolor.cl: extracted to color_lab.cl and color_rgb.cl

* helper functions moved to hpp file

* Lab, Luv: moved to color_lab.cpp

* CPU XYZ: to color_lab.cpp

* OCL XYZ: to color_lab.cpp

* warning fixed

* CvtHelper added

* CPU YUV: to color_yuv.cpp, helpers to color.hpp

* CPU HLS/HSV: to color_hsv.cpp

* CPU BGR2BGR: to color_rgb.cpp

* CPU RGB: to color_rgb.cpp

* extra arg removed

* CPU YUV: to color_yuv.cpp

* color code decoded

* OclHelper added, some funcs rewritten

* color_lab.cpp: refactored to use OclHelper

* OCL RGB: to color_rgb.cpp

* OCL HLS/HSV: to color_hsv.cpp

* OCL YUV: to color_yuv.cpp

* OCL YUV planes: to color_yuv.cpp

* OCL: color code reduced

* licence to demosaicing.cpp

* IPP func tables to color_rgb.cpp

* code cleanup

* HAVE_OPENCL ifdefs added

* helpers made more common

* fixed two plane YUV with separate mats

* fixed warning in gcc7.2.0

* precomp header fixed

* color space classification functions fixed

* helpers fixed

* rename: isSRGB -> is_sRGB

6 years agoMerge pull request #11075 from iluxave:master
Alexander Alekhin [Thu, 15 Mar 2018 09:58:04 +0000 (09:58 +0000)]
Merge pull request #11075 from iluxave:master

6 years agoHelp Cmake find OpenNI2 include path
Sonny Kurniawan [Thu, 15 Mar 2018 09:39:07 +0000 (18:39 +0900)]
Help Cmake find OpenNI2 include path

When compiling with OpenNI2 flag active, CMake will not be able to find OpenNI.h due to the environment path not set in OpenCVFindOpenNI2.cmake. This PR rectifies this issue.

6 years agofixed samples/dnn/openpose.py
atinfinity [Wed, 14 Mar 2018 20:17:57 +0000 (05:17 +0900)]
fixed samples/dnn/openpose.py

6 years agoFix crash on exit in opencv_annotation
Ilya A. Volynets-Evenbakh [Wed, 14 Mar 2018 16:40:45 +0000 (09:40 -0700)]
Fix crash on exit in opencv_annotation

destroyWindow was called twice during completion of the
annotation procedure, resulting in a crash, and failure to write
an output file

6 years agoMerge pull request #10940 from dkurt:dnn_tf_graph_optim
Alexander Alekhin [Wed, 14 Mar 2018 14:36:25 +0000 (14:36 +0000)]
Merge pull request #10940 from dkurt:dnn_tf_graph_optim

6 years agoMerge pull request #10979 from dkurt:unite_dnn_samples
Alexander Alekhin [Wed, 14 Mar 2018 14:33:49 +0000 (14:33 +0000)]
Merge pull request #10979 from dkurt:unite_dnn_samples

6 years agocore: write log messages via __android_log_print (logcat) too
Alexander Alekhin [Wed, 14 Mar 2018 12:33:02 +0000 (15:33 +0300)]
core: write log messages via __android_log_print (logcat) too

6 years agoMerge pull request #11065 from vasiliev-vb:BUGFIX_KAZE_orientation
Alexander Alekhin [Wed, 14 Mar 2018 14:15:47 +0000 (14:15 +0000)]
Merge pull request #11065 from vasiliev-vb:BUGFIX_KAZE_orientation

6 years agoMerge pull request #10984 from extrowerk:advanced_haiku_patches
miqlas [Wed, 14 Mar 2018 14:09:10 +0000 (15:09 +0100)]
Merge pull request #10984 from extrowerk:advanced_haiku_patches

* Haiku supporting patches

* Revert uneeded changes

* Whitespace cleanup

6 years agoBetter text contrast of pixel brightness values in Qt window
Jan Gaura [Wed, 14 Mar 2018 12:27:11 +0000 (13:27 +0100)]
Better text contrast of pixel brightness values in Qt window

This offsets text brightness of pixel brightness values
by offsetting it by 127 to the curent pixel value.
The text is now readable even if pixels are black.

6 years agocore: use explicit for cv::AutoBuffer
Alexander Alekhin [Tue, 13 Mar 2018 12:37:09 +0000 (15:37 +0300)]
core: use explicit for cv::AutoBuffer

To avoid compilation of this code:
- buf = 0;

This code can be received after refactoring of 1D cv::Mat to cv::AutoBuffer.
- "cv_mat = 0" calls setTo().
- cv::AutoBuffer calls "allocate(0)" - this is wrong.

6 years agoFixed bug in KAZE features orientation.
vasiliev-vb [Tue, 13 Mar 2018 15:09:36 +0000 (15:09 +0000)]
Fixed bug in KAZE features orientation.

Bug was added in f6ceeaa commit, different angle computation functions have different parameter order.

6 years agoMerge pull request #11057 from tomoaki0705:fixClangComplexCalib3d
Alexander Alekhin [Tue, 13 Mar 2018 13:43:21 +0000 (13:43 +0000)]
Merge pull request #11057 from tomoaki0705:fixClangComplexCalib3d

6 years agoMerge pull request #10923 from Preventis:patch-ios
Ben John [Tue, 13 Mar 2018 13:09:26 +0000 (14:09 +0100)]
Merge pull request #10923 from Preventis:patch-ios

Fixed dynamic build script for iOS (#10923)

* Readded UIDeviceFamily (was removed in beec247)

* Added correct bitcode flag to python build script for iOS

* Missed the bitcodedisabled check

* Corrected the syntax in my proposed changes

6 years agoavoid clang weird behavior in calib3d
Tomoaki Teshima [Tue, 13 Mar 2018 12:51:20 +0000 (21:51 +0900)]
avoid clang weird behavior in calib3d
  * add ifdef to apply on specific situation

6 years agoAdd test for Scalar arguments at CommandLineParser
Dmitry Kurtaev [Mon, 12 Mar 2018 15:42:53 +0000 (18:42 +0300)]
Add test for Scalar arguments at CommandLineParser

6 years agoMerge pull request #11049 from take1014:#10948
yuki takehara [Mon, 12 Mar 2018 18:49:10 +0000 (03:49 +0900)]
Merge pull request #11049 from take1014:#10948

* Fix #10948

* Add test code

* Fixed build error

* Add value zero

* eigen: test cleanup

6 years agoMerge pull request #11035 from shimat:refactoring_decolor
shimat [Mon, 12 Mar 2018 14:22:06 +0000 (23:22 +0900)]
Merge pull request #11035 from shimat:refactoring_decolor

Refactor decolor (#11035)

* decolor: modernize deprecated headers (math.h -> cmath)

* refactor contrast_preserve.cpp

* refactor contrast_preserve.hpp (add static/const)

* refactor contrast_preserve.hpp (join assignment and declaration)

* refactor contrast_preserve.hpp (format)

* refactor test_decolor.cpp (indent)

* refactor contrast_preserve.hpp (const)

* contrast_preserve.hpp : optimize by minMaxLoc

* fix trailing-whitespace

* fix warning C4267 on VC++ x64
(conversion from 'size_t' to 'int', possible loss of data)

* use cvRound instead of round_num

* decrease indentation of test_decolor.cpp

* remove pow() to optimize

* remove redundant Mat initialization