platform/upstream/opencv.git
6 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 14 Sep 2018 21:52:21 +0000 (00:52 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

6 years agoMerge pull request #12512 from sturkmen72:patch-1
Alexander Alekhin [Fri, 14 Sep 2018 17:27:14 +0000 (17:27 +0000)]
Merge pull request #12512 from sturkmen72:patch-1

6 years agoUpdate seamless_cloning.cpp
Suleyman TURKMEN [Wed, 12 Sep 2018 14:34:32 +0000 (17:34 +0300)]
Update seamless_cloning.cpp

6 years agoMerge pull request #12527 from terfendail:mean_wintr
Alexander Alekhin [Fri, 14 Sep 2018 16:34:29 +0000 (16:34 +0000)]
Merge pull request #12527 from terfendail:mean_wintr

6 years agoMerge pull request #12535 from terfendail:testparser_update
Alexander Alekhin [Fri, 14 Sep 2018 16:32:24 +0000 (16:32 +0000)]
Merge pull request #12535 from terfendail:testparser_update

6 years agoMerge pull request #12526 from terfendail:avx2_resize_fix
Alexander Alekhin [Fri, 14 Sep 2018 15:57:47 +0000 (15:57 +0000)]
Merge pull request #12526 from terfendail:avx2_resize_fix

6 years agomeanStdDev() implementation updated to use wide universal intrinsics
Vitaly Tuzov [Fri, 7 Sep 2018 17:33:43 +0000 (20:33 +0300)]
meanStdDev() implementation updated to use wide universal intrinsics

6 years agotestlog_parser updated to handle output of latest GTest as well
Vitaly Tuzov [Fri, 14 Sep 2018 14:29:06 +0000 (17:29 +0300)]
testlog_parser updated to handle output of latest GTest as well

6 years agoMerge pull request #12530 from cv3d:lint/instrument_semicolon
Alexander Alekhin [Fri, 14 Sep 2018 08:57:31 +0000 (08:57 +0000)]
Merge pull request #12530 from cv3d:lint/instrument_semicolon

6 years agoAdd semicolons after `CV_INSTRUMENT` macros
Hamdi Sahloul [Thu, 13 Sep 2018 21:35:26 +0000 (06:35 +0900)]
Add semicolons after `CV_INSTRUMENT` macros

6 years agoMerge pull request #12403 from dkurt:dnn_replace_darknet_reorg
Alexander Alekhin [Thu, 13 Sep 2018 20:58:10 +0000 (20:58 +0000)]
Merge pull request #12403 from dkurt:dnn_replace_darknet_reorg

6 years agoMerge pull request #12524 from alalek:fix_dnn_skx_dlie
Alexander Alekhin [Thu, 13 Sep 2018 20:56:31 +0000 (20:56 +0000)]
Merge pull request #12524 from alalek:fix_dnn_skx_dlie

6 years agoMerge pull request #12523 from takotakot:12455_rotatedrect_constructor
Takuho NAKANO [Thu, 13 Sep 2018 19:26:05 +0000 (04:26 +0900)]
Merge pull request #12523 from takotakot:12455_rotatedrect_constructor

* Fix perpendicular decision of RotatedRect::RotatedRect

Error estimation is based on #12455.

* Fix abs to std::fabs and atan to std::atan

6 years agodnn(test): run DL IE tests on Intel OpenCL devices only
Alexander Alekhin [Thu, 13 Sep 2018 14:23:04 +0000 (14:23 +0000)]
dnn(test): run DL IE tests on Intel OpenCL devices only

6 years agoFixed bit-exact resize SIMD implementation for AVX2 baseline
Vitaly Tuzov [Thu, 13 Sep 2018 15:20:27 +0000 (18:20 +0300)]
Fixed bit-exact resize SIMD implementation for AVX2 baseline

6 years agoMerge pull request #12502 from alalek:fix_dnn_tests_32bit
Alexander Alekhin [Thu, 13 Sep 2018 14:20:42 +0000 (14:20 +0000)]
Merge pull request #12502 from alalek:fix_dnn_tests_32bit

6 years agoMerge pull request #12504 from kraj:3.4
Alexander Alekhin [Thu, 13 Sep 2018 14:19:25 +0000 (14:19 +0000)]
Merge pull request #12504 from kraj:3.4

6 years agoMerge pull request #12522 from mshabunin:remove-va-msdk-34
Alexander Alekhin [Thu, 13 Sep 2018 14:15:59 +0000 (14:15 +0000)]
Merge pull request #12522 from mshabunin:remove-va-msdk-34

6 years agoMerge pull request #12515 from hmaarrfk:fix_bayer2rgba_blue_channel
Alexander Alekhin [Thu, 13 Sep 2018 12:53:08 +0000 (12:53 +0000)]
Merge pull request #12515 from hmaarrfk:fix_bayer2rgba_blue_channel

6 years agoMerge pull request #12410 from terfendail:sum_wintr
Alexander Alekhin [Thu, 13 Sep 2018 12:49:56 +0000 (15:49 +0300)]
Merge pull request #12410 from terfendail:sum_wintr

6 years agoMerge pull request #12147 from D-Alex:master
Alexander Duda [Thu, 13 Sep 2018 12:43:04 +0000 (14:43 +0200)]
Merge pull request #12147 from D-Alex:master

* add new chessboard detector

The chessboar detector is based on the paper.
Accurate Detection and Localization of Checkerboard Corners for
Calibration Alexander Duda, Udo Frese
British Machine Vision Conference, o.A., 2018.

It utilizes point symmetry of checkerboard corners in combination with a
localized Radon transform approximated by box filters to achieve high
performance even on large images. Here, tests have shown that the
ability to localize checkerboard corners is close to the theoretical
limit of 1/100 of a pixel while being considerably less sensitive
to image noise than standard methods.

* chessboard: add reference to bibtex file

* chessboard: add dependency to opencv_flann

* fix: test chesscorners. It is valid to return an empty list

In case no chessboard was detected it should be valid for the detector
to return an empty list.

For simplifcation, it should be allowed to return any number of corners
if they are flagged as not found.

* fix: opencv.bib remove empty lines

* fix: doc findChessboardCorners replace cvSize with cv::Size

* chessboard tests: factor out logic selecting detector

* chessboard: add unit test for findChessboardCorners2

This is includes a new chessboard generator which supports subpix
corners with high accuracy by wrapping an optimal chessboard using
wrapPerspective.

* fix: chessboard unit test - overwrite of default parameter flag of findCirclesGrid

* chessboard: remove trailing whitespace

* chessboard: fix debug drawing

* chessboard: fix some issues during code review

* chessboard: normalize asymmetric chessboard

* chessboard: fix float double warning

* remove trailing whitespace

* chessboards: fix compiler warnings

* chessboards: fix compiler warnings

* checkerboard: some performance improvements

* chessboard: remove NULL macros for language bindinges from internal headers

* chessboard: shorten license terms

* chessboard: remove unused internal method

* chessboard: set helper functions to static

* chessboard: fix normalizePoints1D using unshifted points

* chessboard: remove wrongly copied text

* chessboard: use CV_CheckTypeEQ macro

* chessboard: comment all NaN checks

* chessboard: use consistent color conversion

* chessboard: use CheckChannelEQ macro

* chessboard: assume gray color image for internal methods

* chessboard: use std::swap

* chessboard: use Mat.dataend

* chessboard: fix compiler warnings

* chessboard: replace some checks witch CV_CHECK macro

* chessboard: fix comparison function for partial sort

* chessboard: small cleanup

* chessboard: use short license header

* chessboard: rename findChessboard2 to findChessboardSB

* chessboard: fix type in unit test

6 years agoRemoved unnecessary build-time MediaSDK detection
Maksim Shabunin [Thu, 13 Sep 2018 09:46:06 +0000 (12:46 +0300)]
Removed unnecessary build-time MediaSDK detection

6 years agoCheck for clang before using -isystem
Khem Raj [Wed, 12 Sep 2018 01:18:33 +0000 (18:18 -0700)]
Check for clang before using -isystem

When cross compiling with clang, the internal C++ headers are not found
when adding sysroot to -isystem, that is redundant anyway because it
will look for headers insider --sysroot path with same quality as it
would do with -isystem otherwise

Fixes errors like

FAILED: 3rdparty/openexr/CMakeFiles/IlmImf.dir/Iex/IexBaseExc.cpp.o
....
In file included from
TOPDIR/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/opencv/3.4.3+gitAUTOINC+b38c50b3d0_1f6d6f0626_bdb7bb85f3_34e4206aef_fccf7cd6a4-r0/git/3rdparty/openexr/Iex/IexBaseExc.cpp:43:
In file included from
TOPDIR/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/opencv/3.4.3+gitAUTOINC+b38c50b3d0_1f6d6f0626_bdb7bb85f3_34e4206aef_fccf7cd6a4-r0/git/3rdparty/openexr/Iex/IexBaseExc.h:48:
In file included from
TOPDIR/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/opencv/3.4.3+gitAUTOINC+b38c50b3d0_1f6d6f0626_bdb7bb85f3_34e4206aef_fccf7cd6a4-r0/recipe-sysroot/usr/lib//arm-bec-linux-musleabi/8.2.0/../../../include/c++/8.2.0/string:52:
In file included from
TOPDIR/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/opencv/3.4.3+gitAUTOINC+b38c50b3d0_1f6d6f0626_bdb7bb85f3_34e4206aef_fccf7cd6a4-r0/recipe-sysroot/usr/lib//arm-bec-linux-musleabi/8.2.0/../../../include/c++/8.2.0/bits/basic_string.h:6391:
In file included from
TOPDIR/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/opencv/3.4.3+gitAUTOINC+b38c50b3d0_1f6d6f0626_bdb7bb85f3_34e4206aef_fccf7cd6a4-r0/recipe-sysroot/usr/lib//arm-bec-linux-musleabi/8.2.0/../../../include/c++/8.2.0/ext/string_conversions.h:41:
TOPDIR/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/opencv/3.4.3+gitAUTOINC+b38c50b3d0_1f6d6f0626_bdb7bb85f3_34e4206aef_fccf7cd6a4-r0/recipe-sysroot/usr/lib//arm-bec-linux-musleabi/8.2.0/../../../include/c++/8.2.0/cstdlib:75:15:
fatal error: 'stdlib.h' file not found
              ^~~~~~~~~~
1 error generated.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
6 years agoMerge pull request #12511 from GeorgeMironov:rename-tf-namespace
Alexander Alekhin [Wed, 12 Sep 2018 20:13:43 +0000 (20:13 +0000)]
Merge pull request #12511 from GeorgeMironov:rename-tf-namespace

6 years agoFix BayerXX2RGBA when blue is on the first line.
Mark Harfouche [Wed, 12 Sep 2018 18:47:00 +0000 (14:47 -0400)]
Fix BayerXX2RGBA when blue is on the first line.

6 years agoMerge pull request #12509 from alalek:fix_cv_ptr_default_deleter
Alexander Alekhin [Wed, 12 Sep 2018 18:45:00 +0000 (18:45 +0000)]
Merge pull request #12509 from alalek:fix_cv_ptr_default_deleter

6 years agodnn(tensorflow): re-generate files using protoc
Alexander Alekhin [Wed, 12 Sep 2018 18:33:45 +0000 (21:33 +0300)]
dnn(tensorflow): re-generate files using protoc

6 years agoRename tensorflow namespace
George Mironov [Wed, 12 Sep 2018 12:08:56 +0000 (15:08 +0300)]
Rename tensorflow namespace

6 years agoMerge pull request #12501 from alalek:fix_qt_build
Alexander Alekhin [Wed, 12 Sep 2018 17:14:23 +0000 (17:14 +0000)]
Merge pull request #12501 from alalek:fix_qt_build

6 years agoMerge pull request #12507 from cv3d:fix_warnings
Alexander Alekhin [Wed, 12 Sep 2018 17:12:46 +0000 (17:12 +0000)]
Merge pull request #12507 from cv3d:fix_warnings

6 years agoReplace Darknet's Reorg to permute layer
Dmitry Kurtaev [Tue, 4 Sep 2018 07:55:54 +0000 (10:55 +0300)]
Replace Darknet's Reorg to permute layer

6 years agodnn(test): fix failures of 32-bit builders
Alexander Alekhin [Tue, 11 Sep 2018 20:27:14 +0000 (20:27 +0000)]
dnn(test): fix failures of 32-bit builders

6 years agocore: change cv::Ptr DefaultDeleter
Alexander Alekhin [Wed, 12 Sep 2018 09:52:50 +0000 (09:52 +0000)]
core: change cv::Ptr DefaultDeleter

6 years agoMerge pull request #12497 from tomoaki0705:removeRawSSE
Vadim Pisarevsky [Wed, 12 Sep 2018 11:59:43 +0000 (11:59 +0000)]
Merge pull request #12497 from tomoaki0705:removeRawSSE

6 years agoMerge pull request #12204 from allnes:detect_qr_code
Vadim Pisarevsky [Wed, 12 Sep 2018 11:55:44 +0000 (11:55 +0000)]
Merge pull request #12204 from allnes:detect_qr_code

6 years agoMSVC: Slience external/meaningless warnings
Hamdi Sahloul [Wed, 12 Sep 2018 04:23:36 +0000 (13:23 +0900)]
MSVC: Slience external/meaningless warnings

6 years agoMerge pull request #12249 from kopytjuk:feature/region-layer-batch-mode
Marat K [Wed, 12 Sep 2018 10:29:43 +0000 (12:29 +0200)]
Merge pull request #12249 from kopytjuk:feature/region-layer-batch-mode

Feature/region layer batch mode (#12249)

* Add batch mode for Darknet networks.

Swap variables in test_darknet.

Adapt reorg layer to batch mode.

Adapt region layer.

Add OpenCL implementation.

Remove trailing whitespace.

Bugifx reorg opencl implementation.

Fix bug in OpenCL reorg.

Fix modulo bug.

Fix bug.

Reorg openCL.

Restore reorg layer opencl code.

OpenCl fix.

Work on openCL reorg.

Remove whitespace.

Fix openCL region layer implementation.

Fix bug.

Fix softmax region opencl bug.

Fix opencl bug.

Fix openCL bug.

Update aff_trans.cpp

When the fullAffine parameter is set to false, the estimateRigidTransform function maybe return empty, then the _localAffineEstimate function will be called, but the bug in it will result in incorrect results.

core(libva): support YV12 too

Added to CPU path only.
OpenCL code path still expects NV12 only (according to Intel OpenCL extension)

cmake: allow to specify own libva paths

via CMake:
- `-DVA_LIBRARIES=/opt/intel/mediasdk/lib64/libva.so.2\;/opt/intel/mediasdk/lib64/libva-drm.so.2`

android: NDK17 support

tested with NDK 17b (17.1.4828580)

Enable more deep learning tests using Intel's Inference Engine backend

ts: don't pass NULL for std::string() constructor

openvino: use 2018R3 defines

experimental version++

OpenCV version++

OpenCV 3.4.3

OpenCV version '-openvino'

openvino: use 2018R3 defines

Fixed windows build with InferenceEngine

dnn: fix variance setting bug for PriorBoxLayer

- The size of second channel should be size[2] of output tensor,
- The Scalar should be {variance[0], variance[0], variance[0], variance[0]}
  for _variance.size() == 1 case.

Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Fix lifetime of networks which are loaded from Model Optimizer IRs

Adds a small note describing BUILD_opencv_world (#12332)

* Added a mall note describing BUILD_opencv_world cmake option to the Installation in Windows tutorial.

* Made slight changes in BUILD_opencv_world documentation.

* Update windows_install.markdown

improved grammar

Update opengl_interop.cpp

resolves #12307

java: fix LIST_GET macro

fix typo

Added option to fail on missing testdata

Fixed that object_detection.py does not work in python3.

cleanup: IPP Async (IPP_A)

except header file with conversion routines (will be removed in OpenCV 4.0)

imgcodecs: add null pointer check

Include preprocessing nodes to object detection TensorFlow networks (#12211)

* Include preprocessing nodes to object detection TensorFlow networks

* Enable more fusion

* faster_rcnn_resnet50_coco_2018_01_28 test

countNonZero function reworked to use wide universal intrinsics instead of SSE2 intrinsics

resolve #5788

imgcodecs(webp): multiple fixes

- don't reallocate passed 'img' (test fixed - must use IMREAD_UNCHANGED / IMREAD_ANYCOLOR)
- avoid memory DDOS
- avoid reading of whole file during header processing
- avoid data access after allocated buffer during header processing (missing checks)
- use WebPFree() to free allocated buffers (libwebp >= 0.5.0)
- drop unused & undefined `.close()` method
- added checks for channels >= 5 in encoder

ml: fix adjusting K in KNearest (#12358)

dnn(perf): fix and merge Convolution tests

- OpenCL tests didn't run any OpenCL kernels
- use real configuration from existed models (the first 100 cases)
- batch size = 1

dnn(test): use dnnBackendsAndTargets() param generator

Bit-exact resize reworked to use wide intrinsics (#12038)

* Bit-exact resize reworked to use wide intrinsics

* Reworked bit-exact resize row data loading

* Added bit-exact resize row data loaders for SIMD256 and SIMD512

* Fixed type punned pointer dereferencing warning

* Reworked loading of source data for SIMD256 and SIMD512 bit-exact resize

Bit-exact GaussianBlur reworked to use wide intrinsics (#12073)

* Bit-exact GaussianBlur reworked to use wide intrinsics

* Added v_mul_hi universal intrinsic

* Removed custom SSE2 branch from bit-exact GaussianBlur

* Removed loop unrolling for gaussianBlur horizontal smoothing

doc: fix English gramma in tutorial out-of-focus-deblur filter (#12214)

* doc: fix English gramma in tutorial out-of-focus-deblur filter

* Update out_of_focus_deblur_filter.markdown

slightly modified one sentence

doc: add new tutorial motion deblur filter (#12215)

* doc: add new tutorial motion deblur filter

* Update motion_deblur_filter.markdown

a few minor changes

Replace Slice layer to Crop in Faster-RCNN networks from Caffe

js: use generated list of OpenCV headers

- replaces hand-written list

imgcodecs(webp): use safe cast to size_t on Win32

* Put Version status back to -dev.

follow the common codestyle

Exclude some target engines.

Refactor formulas.

Refactor code.

* Remove unused variable.

* Remove inference engine check for yolov2.

* Alter darknet batch tests to test with two different images.

* Add yolov3 second image GT.

* Fix bug.

* Fix bug.

* Add second test.

* Remove comment.

* Add NMS on network level.

* Add helper files to dev.

* syntax fix.

* Fix OD sample.

Fix sample dnn object detection.

Fix NMS boxes bug.

remove trailing whitespace.

Remove debug function.

Change thresholds for opencl tests.

* Adapt score diff and iou diff.

* Alter iouDiffs.

* Add debug messages.

* Adapt iouDiff.

* Fix tests

6 years agoMerge pull request #12206 from jsxyhelu/3.4
jsxyhelu [Tue, 11 Sep 2018 20:58:01 +0000 (04:58 +0800)]
Merge pull request #12206 from jsxyhelu/3.4

find innercircle of contour by using pointPolygonTest: (#12206)

6 years agohighgui: fix QT build
Alexander Alekhin [Tue, 11 Sep 2018 20:30:36 +0000 (20:30 +0000)]
highgui: fix QT build

6 years agoMerge pull request #12494 from DEEPIR:3.4
Alexander Alekhin [Tue, 11 Sep 2018 19:38:00 +0000 (19:38 +0000)]
Merge pull request #12494 from DEEPIR:3.4

6 years agoMerge pull request #12486 from cv3d:fix_cpp11
Hamdi Sahloul [Tue, 11 Sep 2018 19:35:03 +0000 (04:35 +0900)]
Merge pull request #12486 from cv3d:fix_cpp11

Support MSVC 2013 (#12486)

* Added CV_CONSTEXPR macro

* Utilize CV_NOEXCEPT and CV_CONSTEXPR

* Provides some Ptr<> logical operators

6 years agoMerge pull request #12479 from sturkmen72:patch-2
Alexander Alekhin [Tue, 11 Sep 2018 19:33:50 +0000 (19:33 +0000)]
Merge pull request #12479 from sturkmen72:patch-2

6 years agoMerge pull request #12478 from alalek:fix_python_converters
Alexander Alekhin [Tue, 11 Sep 2018 19:33:11 +0000 (19:33 +0000)]
Merge pull request #12478 from alalek:fix_python_converters

6 years agoMerge pull request #12477 from alalek:drop_legacy_headers
Alexander Alekhin [Tue, 11 Sep 2018 19:31:16 +0000 (19:31 +0000)]
Merge pull request #12477 from alalek:drop_legacy_headers

6 years agoremove raw SSE2 implementation
Tomoaki Teshima [Tue, 11 Sep 2018 12:28:18 +0000 (21:28 +0900)]
remove raw SSE2 implementation

6 years agoOptimiaztion search template lines and added sample
Alexander Nesterov [Tue, 7 Aug 2018 14:37:51 +0000 (11:37 -0300)]
Optimiaztion search template lines and added sample

6 years agofix uninitialized read errors reported by CUDA-INITCHECK
cyy [Tue, 11 Sep 2018 06:47:39 +0000 (14:47 +0800)]
fix uninitialized read errors reported by CUDA-INITCHECK

6 years agoMerge pull request #12482 from GeorgeMironov:protobuf-cmake-fix
Alexander Alekhin [Tue, 11 Sep 2018 06:35:47 +0000 (06:35 +0000)]
Merge pull request #12482 from GeorgeMironov:protobuf-cmake-fix

6 years agoMerge pull request #12483 from terfendail:meanstddev_multichan
Alexander Alekhin [Mon, 10 Sep 2018 19:27:50 +0000 (19:27 +0000)]
Merge pull request #12483 from terfendail:meanstddev_multichan

6 years agoMerge pull request #12071 from l-bat/l-bat:onnx_parser
Lubov Batanina [Mon, 10 Sep 2018 18:07:51 +0000 (21:07 +0300)]
Merge pull request #12071 from l-bat/l-bat:onnx_parser

* Add Squeezenet support in ONNX

* Add AlexNet support in ONNX

* Add Googlenet support in ONNX

* Add CaffeNet and RCNN support in ONNX

* Add VGG16 and VGG16 with batch normalization support in ONNX

* Add RCNN, ZFNet, ResNet18v1 and ResNet50v1 support in ONNX

* Add ResNet101_DUC_HDC

* Add Tiny Yolov2

* Add CNN_MNIST, MobileNetv2 and LResNet100 support in ONNX

* Add ONNX models for emotion recognition

* Add DenseNet121 support in ONNX

* Add Inception v1 support in ONNX

* Refactoring

* Fix tests

* Fix tests

* Skip unstable test

* Modify Reshape operation

6 years agosum() implementation updated to use wide universal intrinsics
Vitaly Tuzov [Tue, 4 Sep 2018 13:37:39 +0000 (16:37 +0300)]
sum() implementation updated to use wide universal intrinsics

6 years agoFixed meanStdDev() implementation for the case input matrix has more than 4 channels
Vitaly Tuzov [Mon, 10 Sep 2018 17:05:45 +0000 (20:05 +0300)]
Fixed meanStdDev() implementation for the case input matrix has more than 4 channels

6 years agoMerge pull request #12467 from alalek:core_use_shared_ptr
Vadim Pisarevsky [Mon, 10 Sep 2018 13:59:14 +0000 (13:59 +0000)]
Merge pull request #12467 from alalek:core_use_shared_ptr

6 years agoadded basic support for CV_16F (the new datatype etc.) (#12463)
Vadim Pisarevsky [Mon, 10 Sep 2018 13:56:29 +0000 (16:56 +0300)]
added basic support for CV_16F (the new datatype etc.) (#12463)

* added basic support for CV_16F (the new datatype etc.). CV_USRTYPE1 is now equal to CV_16F, which may break some [rarely used] functionality. We'll see

* fixed just introduced bug in norm; reverted errorneous changes in Torch importer (need to find a better solution)

* addressed some issues found during the PR review

* restored the patch to fix some perf test failures

6 years agoUpdate hog.cpp
Suleyman TURKMEN [Mon, 10 Sep 2018 01:02:27 +0000 (04:02 +0300)]
Update hog.cpp

6 years agoFix include paths when building with external protobuf
George Mironov [Mon, 10 Sep 2018 13:09:45 +0000 (16:09 +0300)]
Fix include paths when building with external protobuf

6 years agopython: fix "unsigned int" / "size_t" overloading conflict
Alexander Alekhin [Sat, 8 Sep 2018 07:33:23 +0000 (07:33 +0000)]
python: fix "unsigned int" / "size_t" overloading conflict

6 years agoMerge pull request #12054 from alalek:debug_bindings
Alexander Alekhin [Mon, 10 Sep 2018 10:44:32 +0000 (10:44 +0000)]
Merge pull request #12054 from alalek:debug_bindings

6 years agodrop legacy headers
Alexander Alekhin [Sun, 9 Sep 2018 21:46:46 +0000 (21:46 +0000)]
drop legacy headers

6 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sun, 9 Sep 2018 21:04:29 +0000 (00:04 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

6 years agoMerge pull request #12475 from sturkmen72:patch-1
Alexander Alekhin [Sun, 9 Sep 2018 20:16:47 +0000 (20:16 +0000)]
Merge pull request #12475 from sturkmen72:patch-1

6 years agoMerge pull request #12473 from cv3d:cmake/python_detection
Alexander Alekhin [Sun, 9 Sep 2018 20:16:28 +0000 (20:16 +0000)]
Merge pull request #12473 from cv3d:cmake/python_detection

6 years agoCMAKE: Improve python detection
Hamdi Sahloul [Sun, 9 Sep 2018 04:47:03 +0000 (13:47 +0900)]
CMAKE: Improve python detection

6 years agoavoid `Ptr<> == NULL` checks
Alexander Alekhin [Sat, 8 Sep 2018 16:49:11 +0000 (16:49 +0000)]
avoid `Ptr<> == NULL` checks

6 years agocore(test): update cv::Ptr tests
Alexander Alekhin [Fri, 7 Sep 2018 22:16:53 +0000 (22:16 +0000)]
core(test): update cv::Ptr tests

6 years agocore: replace cv::Ptr implementation => std::shared_ptr
Alexander Alekhin [Thu, 6 Sep 2018 23:05:40 +0000 (23:05 +0000)]
core: replace cv::Ptr implementation => std::shared_ptr

6 years agoUpdate window.cpp
Suleyman TURKMEN [Sun, 9 Sep 2018 14:49:09 +0000 (17:49 +0300)]
Update window.cpp

6 years agoMerge pull request #12449 from Nuzhny007:master
Sergey Nuzhny [Sat, 8 Sep 2018 20:20:14 +0000 (23:20 +0300)]
Merge pull request #12449 from Nuzhny007:master

* Fixed compilation error WITH_OPENMP under Windows

* Move up OpenMP condition

6 years agobindings: add debug helpers for args conversions
Alexander Alekhin [Tue, 24 Jul 2018 18:31:40 +0000 (18:31 +0000)]
bindings: add debug helpers for args conversions

6 years agoMerge pull request #12465 from hmaarrfk:fix_bayer2rgba
Alexander Alekhin [Sat, 8 Sep 2018 11:44:04 +0000 (11:44 +0000)]
Merge pull request #12465 from hmaarrfk:fix_bayer2rgba

6 years agoMerge pull request #12469 from cv3d:fix/js/python3_msvc
Alexander Alekhin [Sat, 8 Sep 2018 11:42:11 +0000 (11:42 +0000)]
Merge pull request #12469 from cv3d:fix/js/python3_msvc

6 years agoopencv_js: Support Python3 and MSVC
Hamdi Sahloul [Sat, 8 Sep 2018 06:49:39 +0000 (15:49 +0900)]
opencv_js: Support Python3 and MSVC

6 years agoopencv_js: fix a bug in handling enums using the new parser
Hamdi Sahloul [Sat, 8 Sep 2018 09:23:22 +0000 (18:23 +0900)]
opencv_js: fix a bug in handling enums using the new parser

6 years agoMerge pull request #12464 from alalek:fix_contrib_1754
Alexander Alekhin [Fri, 7 Sep 2018 20:03:41 +0000 (20:03 +0000)]
Merge pull request #12464 from alalek:fix_contrib_1754

6 years agoOutput RGBA images when bayer_xx2YYYA is called
Mark Harfouche [Fri, 7 Sep 2018 19:57:55 +0000 (15:57 -0400)]
Output RGBA images when bayer_xx2YYYA is called

6 years agoMerge pull request #12462 from alalek:issue_12453
Alexander Alekhin [Fri, 7 Sep 2018 16:55:01 +0000 (16:55 +0000)]
Merge pull request #12462 from alalek:issue_12453

6 years agofeatures2d(test): extract common extract/invariance test code
Alexander Alekhin [Fri, 7 Sep 2018 13:31:01 +0000 (16:31 +0300)]
features2d(test): extract common extract/invariance test code

to share with opencv_contrib/xfeatures2d

6 years agoMerge pull request #12458 from DEEPIR:3.4
cyy [Fri, 7 Sep 2018 15:43:47 +0000 (23:43 +0800)]
Merge pull request #12458 from DEEPIR:3.4

* may be an typo fix

* remove identical branch,may be paste error

* add parentheses around macro parameter

* simplify if condition

* check malloc fail

* change the condition of branch removed by commit 3041502861318c85d901e8c08226ff67898c77ed

6 years agovideo(perf): drop unreliable sanity checks
Alexander Alekhin [Fri, 7 Sep 2018 10:42:09 +0000 (13:42 +0300)]
video(perf): drop unreliable sanity checks

6 years agoMerge pull request #12460 from cv3d:lint_unused
Alexander Alekhin [Fri, 7 Sep 2018 13:03:44 +0000 (13:03 +0000)]
Merge pull request #12460 from cv3d:lint_unused

6 years agoUtilize CV_UNUSED macro
Hamdi Sahloul [Fri, 7 Sep 2018 11:33:52 +0000 (20:33 +0900)]
Utilize CV_UNUSED macro

6 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 7 Sep 2018 09:40:27 +0000 (12:40 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

6 years agoMerge pull request #12459 from alalek:fix_cuda_build
Alexander Alekhin [Fri, 7 Sep 2018 09:27:31 +0000 (09:27 +0000)]
Merge pull request #12459 from alalek:fix_cuda_build

6 years agoMerge pull request #12452 from seiko2plus:issue12427
Alexander Alekhin [Fri, 7 Sep 2018 07:32:15 +0000 (07:32 +0000)]
Merge pull request #12452 from seiko2plus:issue12427

6 years agocuda: fix build (legacy C-API usage)
Alexander Alekhin [Fri, 7 Sep 2018 07:26:17 +0000 (07:26 +0000)]
cuda: fix build (legacy C-API usage)

6 years agoMerge pull request #12446 from alalek:imgproc_grabcut_numeric_issues
Alexander Alekhin [Thu, 6 Sep 2018 20:18:45 +0000 (20:18 +0000)]
Merge pull request #12446 from alalek:imgproc_grabcut_numeric_issues

6 years agoMerge pull request #12443 from DEEPIR:master
cyy [Thu, 6 Sep 2018 20:09:39 +0000 (04:09 +0800)]
Merge pull request #12443 from DEEPIR:master

* simplify condition

* dims must > 0 or latter sz[dims-1] will underflow

6 years agoMerge pull request #11630 from alalek:c_api_eliminate_constructors
Alexander Alekhin [Thu, 6 Sep 2018 20:07:16 +0000 (20:07 +0000)]
Merge pull request #11630 from alalek:c_api_eliminate_constructors

6 years agopython:ppc64 Add missing support for PyLongObject
Sayed Adel [Thu, 6 Sep 2018 20:04:05 +0000 (20:04 +0000)]
python:ppc64 Add missing support for PyLongObject

6 years agoMerge pull request #12411 from vpisarev:wide_convert
Vadim Pisarevsky [Thu, 6 Sep 2018 16:36:59 +0000 (19:36 +0300)]
Merge pull request #12411 from vpisarev:wide_convert

* rewrote Mat::convertTo() and convertScaleAbs() to wide universal intrinsics; added always-available and SIMD-optimized FP16<=>FP32 conversion

* fixed compile warnings

* fix some more compile errors

* slightly relaxed accuracy threshold for int->float conversion (since we now do it using single-precision arithmetics, not double-precision)

* fixed compile errors on iOS, Android and in the baseline C++ version (intrin_cpp.hpp)

* trying to fix ARM-neon builds

* trying to fix ARM-neon builds

* trying to fix ARM-neon builds

* trying to fix ARM-neon builds

6 years agoMerge pull request #12437 from vpisarev:avx2_fixes
Vadim Pisarevsky [Thu, 6 Sep 2018 15:56:55 +0000 (18:56 +0300)]
Merge pull request #12437 from vpisarev:avx2_fixes

* trying to fix the custom AVX2 builder test failures (false alarms)

* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests

* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests

* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests

* seemingly disabled false alarm warning in surf.cpp; increased tolerance thresholds in the tests for SolvePnP and in DNN/ENet

6 years agoimgproc: grabcut numeric stability
Alexander Alekhin [Thu, 6 Sep 2018 14:05:54 +0000 (17:05 +0300)]
imgproc: grabcut numeric stability

6 years agodon't use constructors for C API structures
Alexander Alekhin [Thu, 6 Sep 2018 11:34:16 +0000 (14:34 +0300)]
don't use constructors for C API structures

6 years agocore: remove constructors from C API structures
Alexander Alekhin [Wed, 30 May 2018 13:59:52 +0000 (16:59 +0300)]
core: remove constructors from C API structures

POD structures can't have constructors.

6 years agoMerge pull request #12440 from woodychow:fix_normL2Sqr_speed_regression_3.4
Alexander Alekhin [Thu, 6 Sep 2018 10:33:33 +0000 (10:33 +0000)]
Merge pull request #12440 from woodychow:fix_normL2Sqr_speed_regression_3.4

6 years agoMerge pull request #12279 from savuor:cvtcolor_bgr2gray_8u_15bits
Rostislav Vasilikhin [Thu, 6 Sep 2018 10:28:24 +0000 (13:28 +0300)]
Merge pull request #12279 from savuor:cvtcolor_bgr2gray_8u_15bits

* bgr2gray 8u fixed to be in conformance with IPP code

* coefficients fixed so their sum is 32768

* java test for CascadeDetect fixed: equalizeHist added

6 years agoMerge pull request #12264 from dkurt:dnn_remove_forward_method
Dmitry Kurtaev [Thu, 6 Sep 2018 10:26:47 +0000 (13:26 +0300)]
Merge pull request #12264 from dkurt:dnn_remove_forward_method

* Remove a forward method in dnn::Layer

* Add a test

* Fix tests

* Mark multiple dnn::Layer::finalize methods as deprecated

* Replace back dnn's inputBlobs to vector of pointers

* Remove Layer::forward_fallback from CV_OCL_RUN scopes

6 years agoReplace naive normL2Sqr with hal::normL2Sqr_ for better performance
woody.chow [Thu, 6 Sep 2018 08:43:07 +0000 (17:43 +0900)]
Replace naive normL2Sqr with hal::normL2Sqr_ for better performance

6 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 5 Sep 2018 16:52:16 +0000 (19:52 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

6 years agoMerge pull request #12434 from alalek:pr12414_rebased
Alexander Alekhin [Wed, 5 Sep 2018 16:46:36 +0000 (16:46 +0000)]
Merge pull request #12434 from alalek:pr12414_rebased