platform/upstream/opencv.git
5 years agocompletely new C++ persistence implementation (#13011)
Vadim Pisarevsky [Thu, 1 Nov 2018 21:27:06 +0000 (00:27 +0300)]
completely new C++ persistence implementation (#13011)

* integrated the new C++ persistence; removed old persistence; most of OpenCV compiles fine! the tests have not been run yet

* fixed multiple bugs in the new C++ persistence

* fixed raw size of the parsed empty sequences

* [temporarily] excluded obsolete applications traincascade and createsamples from build

* fixed several compiler warnings and multiple test failures

* undo changes in cocoa window rendering (that was fixed in another PR)

* fixed more compile warnings and the remaining test failures (hopefully)

* trying to fix the last little warning

5 years agoMerge pull request #13007 from dkurt:fix_12970
Alexander Alekhin [Thu, 1 Nov 2018 11:30:37 +0000 (11:30 +0000)]
Merge pull request #13007 from dkurt:fix_12970

5 years agoFix https://github.com/opencv/opencv/issues/12970
Dmitry Kurtaev [Thu, 1 Nov 2018 08:22:28 +0000 (11:22 +0300)]
Fix https://github.com/opencv/opencv/issues/12970

5 years agoMerge pull request #12889 from alalek:drop_untested_flann_hdf5_header
Alexander Alekhin [Wed, 31 Oct 2018 15:11:32 +0000 (15:11 +0000)]
Merge pull request #12889 from alalek:drop_untested_flann_hdf5_header

5 years agoMerge pull request #12988 from LaurentBerger:test_copyto_py
Alexander Alekhin [Wed, 31 Oct 2018 14:23:08 +0000 (14:23 +0000)]
Merge pull request #12988 from LaurentBerger:test_copyto_py

5 years agoMerge pull request #12951 from catree:easy_fixes_const_viz
Alexander Alekhin [Tue, 30 Oct 2018 18:55:21 +0000 (18:55 +0000)]
Merge pull request #12951 from catree:easy_fixes_const_viz

5 years agoMerge pull request #12990 from rgarnov:gapi_fluid_reshape_support
Ruslan Garnov [Tue, 30 Oct 2018 18:12:36 +0000 (21:12 +0300)]
Merge pull request #12990 from rgarnov:gapi_fluid_reshape_support

G-API: Introduce new `reshape()` API (#12990)

* Moved initFluidUnits, initLineConsumption, calcLatency, calcSkew to separate functions

* Added Fluid::View::allocate method (moved allocation logic from constructor)

* Changed util::zip to util::indexed, utilized collectInputMeta in GFluidExecutable constructor

* Added makeReshape method to FluidExecutable

* Removed m_outputRoi from GFluidExecutable

* Added reshape feature

* Added switch of resize mapper if agent ratio was changed

* Added more TODOs and renamed a function

* G-API reshape(): add missing `override` specifiers

Fix warnings on all platforms

5 years agoMerge pull request #12949 from AsyaPronina:missed_multiply_operator_for_GMAT
AsyaPronina [Tue, 30 Oct 2018 18:10:47 +0000 (21:10 +0300)]
Merge pull request #12949 from AsyaPronina:missed_multiply_operator_for_GMAT

Made scale parameter optional for mul kernel wrapper (#12949)

* Added missed operator*(GMat, GMat). Made scale parameter optional for mul kernel.

* Fixed perf test for mul(GMat, GMat) kernel

* Removed operator*(GMat, GMat) as not needed

5 years agoAdd python test for copyto with mask
LaurentBerger [Tue, 30 Oct 2018 09:34:54 +0000 (10:34 +0100)]
Add python test for copyto with mask

5 years agoMerge pull request #12703 from wzw-intel:vkcom
WuZhiwen [Mon, 29 Oct 2018 14:51:26 +0000 (14:51 +0000)]
Merge pull request #12703 from wzw-intel:vkcom

* dnn: Add a Vulkan based backend

This commit adds a new backend "DNN_BACKEND_VKCOM" and a
new target "DNN_TARGET_VULKAN". VKCOM means vulkan based
computation library.

This backend uses Vulkan API and SPIR-V shaders to do
the inference computation for layers. The layer types
that implemented in DNN_BACKEND_VKCOM include:
Conv, Concat, ReLU, LRN, PriorBox, Softmax, MaxPooling,
AvePooling, Permute

This is just a beginning work for Vulkan in OpenCV DNN,
more layer types will be supported and performance
tuning is on the way.

Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/vulkan: Add FindVulkan.cmake to detect Vulkan SDK

In order to build dnn with Vulkan support, need installing
Vulkan SDK and setting environment variable "VULKAN_SDK" and
add "-DWITH_VULKAN=ON" to cmake command.

You can download Vulkan SDK from:
https://vulkan.lunarg.com/sdk/home#linux

For how to install, see
https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html
https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html
https://vulkan.lunarg.com/doc/sdk/latest/mac/getting_started.html
respectively for linux, windows and mac.

To run the vulkan backend, also need installing mesa driver.
On Ubuntu, use this command 'sudo apt-get install mesa-vulkan-drivers'

To test, use command '$BUILD_DIR/bin/opencv_test_dnn --gtest_filter=*VkCom*'

Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/Vulkan: dynamically load Vulkan runtime

No compile-time dependency on Vulkan library.
If Vulkan runtime is unavailable, fallback to CPU path.

Use environment "OPENCL_VULKAN_RUNTIME" to specify path to your
own vulkan runtime library.

Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/Vulkan: Add a python script to compile GLSL shaders to SPIR-V shaders

The SPIR-V shaders are in format of text-based 32-bit hexadecimal
numbers, and inserted into .cpp files as unsigned int32 array.

* dnn/Vulkan: Put Vulkan headers into 3rdparty directory and some other fixes

Vulkan header files are copied from
https://github.com/KhronosGroup/Vulkan-Docs/tree/master/include/vulkan
to 3rdparty/include

Fix the Copyright declaration issue.

Refine OpenCVDetectVulkan.cmake

* dnn/Vulkan: Add vulkan backend tests into existing ones.

Also fixed some test failures.

- Don't use bool variable as uniform for shader
- Fix dispathed group number beyond max issue
- Bypass "group > 1" convolution. This should be support in future.

* dnn/Vulkan: Fix multiple initialization in one thread.

5 years agoMerge pull request #12944 from dbudniko:dbudniko/tests_thresholds
Dmitry Budnikov [Mon, 29 Oct 2018 14:34:20 +0000 (17:34 +0300)]
Merge pull request #12944 from dbudniko:dbudniko/tests_thresholds

* added threshold to g-api imgproc tests

* trailing spaces remove

* try to fix warnings

* fix license header

* fix random numbers issue

* fix Sobel test

* license headers + precompiled headers included

5 years agoMake cast() function const. Make parameters of addLight() const.
catree [Thu, 25 Oct 2018 18:05:01 +0000 (20:05 +0200)]
Make cast() function const. Make parameters of addLight() const.

5 years agoMerge pull request #12978 from xoox:fix-collectCalibrationData-signature
Alexander Alekhin [Mon, 29 Oct 2018 12:23:39 +0000 (12:23 +0000)]
Merge pull request #12978 from xoox:fix-collectCalibrationData-signature

5 years agoMerge pull request #12980 from LaurentBerger:copyToPy
Vadim Pisarevsky [Mon, 29 Oct 2018 11:22:20 +0000 (11:22 +0000)]
Merge pull request #12980 from LaurentBerger:copyToPy

5 years agoadd python copyto with mask (https://github.com/opencv/opencv/issues/10225)
LaurentBerger [Sat, 27 Oct 2018 18:57:02 +0000 (20:57 +0200)]
add python copyto with mask (https://github.com/opencv/opencv/issues/10225)

5 years agoFix signature of static collectCalibrationData()
Wenfeng CAI [Mon, 29 Oct 2018 02:19:02 +0000 (10:19 +0800)]
Fix signature of static collectCalibrationData()

This is a fix to the signature of static function
collectCalibrationData() and clean-up for #12772. Since fallback scheme
in calibration method selection is not used anymore. As an input
parameter, iFixedPoint should be passed by value according to the OpenCV
coding style guide.

5 years agoMerge pull request #12947 from AsyaPronina:sobel_renaming
AsyaPronina [Sat, 27 Oct 2018 16:54:32 +0000 (19:54 +0300)]
Merge pull request #12947 from AsyaPronina:sobel_renaming

* Renamed Sobel operator GAPI kernel to match with OpenCV naming rules

* Fixed perf tests

* Small refactoring to check CI issue

* Refactored alignment for kernel wrappers in imgproc.hpp

5 years agoMerge pull request #12952 from seanm:fix12933
Alexander Alekhin [Fri, 26 Oct 2018 18:27:27 +0000 (18:27 +0000)]
Merge pull request #12952 from seanm:fix12933

5 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 26 Oct 2018 14:56:28 +0000 (17:56 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

5 years agoMerge pull request #12960 from alalek:workaround_ipp_sse42_meanstddev
Alexander Alekhin [Fri, 26 Oct 2018 14:50:49 +0000 (14:50 +0000)]
Merge pull request #12960 from alalek:workaround_ipp_sse42_meanstddev

5 years agocore(ipp): disable SSE4.2 meanStdDev() optimization for CV_32F
Alexander Alekhin [Fri, 26 Oct 2018 11:57:20 +0000 (14:57 +0300)]
core(ipp): disable SSE4.2 meanStdDev() optimization for CV_32F

5 years agoFixed #12933: added cast to silence clang -Wcomma warning
Sean McBride [Thu, 25 Oct 2018 17:27:17 +0000 (13:27 -0400)]
Fixed #12933: added cast to silence clang -Wcomma warning

5 years agoMerge pull request #12138 from wanghanmin:wanghanmin-patch-videoio_crossbarsetting-1
wanghanmin [Thu, 25 Oct 2018 16:41:37 +0000 (00:41 +0800)]
Merge pull request #12138 from wanghanmin:wanghanmin-patch-videoio_crossbarsetting-1

* Update videoio.hpp

add VideoCapturePropertie for clossbar input pin setting

* Update cap_dshow.cpp

For some kind of capture card, such as "avermedia cv710 " , it use SerialDigital as input pin and so it can not work.
Here added new PhysicalConnectorType enumeration: PhysConn_Video_YRYBY and PhysConn_Video_SerialDigital to support it.
And also provide new property parameter CAP_CROSSBAR_INPIN_TYPE to set the crossbar input pin type which will be used in videoInput::start(int deviceID, videoDevice *VD):
" if(VD->useCrossbar)
    {
        DebugPrintOut("SETUP: Checking crossbar\n");
        routeCrossbar(&VD->pCaptureGraph, &VD->pVideoInputFilter, VD->connection, CAPTURE_MODE);

    }
"

And at last ,fixed one issue for function setSizeAndSubtype, added code
pVih->rcSource.top = pVih->rcSource.left = pVih->rcTarget.top =pVih->rcTarget.left=0;
pVih->rcSource.right = pVih->rcTarget.right= attemptWidth;
pVih->rcSource.bottom = pVih->rcTarget.bottom = attemptHeight;

without these code , rcSource and rcTarget will keeping use default resolution and cause fail in hr = VD->streamConf->SetFormat(VD->pAmMediaType) and cannot find suitable MediaType.

Tested with python3 and mfc (Avermedia cv710)
Python3 code:
import cv2
print("test cv")
cap=cv2.VideoCapture(0)
cap.set(5,60)
cap.set(3,1920)
cap.set(4,1080)
cap.set(31,6)

ret,img=cap.read()
cv2.namedWindow("cap",cv2.WINDOW_NORMAL)
cv2.resizeWindow("cap",960,640);
while True:
    ret,img=cap.read()
    if ret==False:
        continue
    cv2.imshow("cap",img)
    if cv2.waitKey(1) & 0xFF == ord('q'):
        break
cap.release()

cv2.destroyAllWindows()

MFC code:
void CcvtestDlg::OnBnClickedButton1()
{
VideoCapture cap(0);
cap.set(CAP_PROP_FRAME_WIDTH, 1920);
cap.set(CAP_PROP_FRAME_HEIGHT, 1080);

cap.set(CAP_CROSSBAR_INPIN_TYPE , 6);
Mat img;
namedWindow("test", WINDOW_NORMAL);
resizeWindow("test", 960, 640);
while (1)
{
if (cap.read(img))
{
imshow("test", img);
if ('q' ==waitKey(1))
break;
}
}
destroyAllWindows();
cap.release();
}

* Update cap_dshow.cpp

* Update videoio.hpp

move enum value of CAP_CROSSBAR_INPIN_TYPE to the end of list

* Update videoio.hpp

* Update cap_dshow.cpp

removed trailing whitespace

* Update test_camera.cpp

Add test for capture device using PhysConn_Video_SerialDigital as crossbar input pin

* Update test_camera.cpp

Correction of misunderstanding about how to add test case.

5 years agoMerge pull request #12772 from xoox:calib-release-object
Wenfeng CAI [Thu, 25 Oct 2018 16:38:55 +0000 (00:38 +0800)]
Merge pull request #12772 from xoox:calib-release-object

More accurate pinhole camera calibration with imperfect planar target (#12772)
43 commits:

* Add derivatives with respect to object points

Add an output parameter to calculate derivatives of image points with
respect to 3D coordinates of object points. The output jacobian matrix
is a 2Nx3N matrix where N is the number of points.

This commit introduces incompatibility to old function signature.

* Set zero for dpdo matrix before using

dpdo is a sparse matrix with only non-zero value close to major
diagonal. Set it to zero because only elements near major diagonal are
computed.

* Add jacobian columns to projectPoints()

The output jacobian matrix of derivatives with respect to coordinates of
3D object points are added. This might break callers who assume the
columns of jacobian matrix.

* Adapt test code to updated project functions

The test cases for projectPoints() and cvProjectPoints2() are updated to
fit new function signatures.

* Add accuracy test code for dpdo

* Add badarg test for dpdo

* Add new enum item for new calibration method

CALIB_RELEASE_OBJECT is used to whether to release 3D coordinates of
object points. The method was proposed in: K. H. Strobl and G. Hirzinger.
"More Accurate Pinhole Camera Calibration with Imperfect Planar Target".
In Proceedings of the IEEE International Conference on Computer Vision
(ICCV 2011), 1st IEEE Workshop on Challenges and Opportunities in Robot
Perception, Barcelona, Spain, pp. 1068-1075, November 2011.

* Add releasing object method into internal function

It's a simple extension of the standard calibration scheme. We choose to
fix the first and last object point and a user-selected fixed point.

* Add interfaces for extended calibration method

* Refine document for calibrateCamera()

When releasing object points, only the z coordinates of the
objectPoints[0].back is fixed.

* Add link to strobl2011iccv paper

* Improve documentation for calibrateCamera()

* Add implementations of wrapping calibrateCamera()

* Add checking for params of new calibration method

If input parameters are not qualified, then fall back to standard
calibration method.

* Add camera calibration method of releasing object

The current implementation is equal to or better than
https://github.com/xoox/calibrel

* Update doc for CALIB_RELEASE_OBJECT

CALIB_USE_QR or CALIB_USE_LU could be used for faster calibration with
potentially less precise and less stable in some rare cases.

* Add RELEASE_OBJECT calibration to tutorial code

To select the calibration method of releasing object points, a command
line parameter `-d=<number>` should be provided.

* Update tutorial doc for camera_calibration

If the method of releasing object points is merged into OpenCV. It will
be expected to be firstly released in 4.1, I think.

* Reduce epsilon for cornerSubPix()

Epsilon of 0.1 is a bigger one. Preciser corner positions are required
with calibration method of releasing object.

* Refine camera calibration tutorial

The hypothesis coordinates are used to indicate which distance must be
measured between two specified object points.

* Update sample calibration code method selection

Similar to camera_calibration tutorial application, a command line
argument `-dt=<number>` is used to select the calibration method.

* Add guard to flags of cvCalibrateCamera2()

cvCalibrateCamera2() doesn't accept CALIB_RELEASE_OBJECT unless overload
interface is added in the future.

* Simplify fallback when iFixedPoint is out of range

* Refactor projectPoints() to keep compatibilities

* Fix arg string "Bad rvecs header"

* Read calibration flags from test data files

Instead of being hard coded into source file, the calibration flags will
be read from test data files.
opencv_extra/testdata/cv/cameracalibration/calib?.dat must be sync with
the test code.

* Add new C interface of cvCalibrateCamera4()

With this new added C interface, the extended calibration method with
CALIB_RELEASE_OBJECT can be called by C API.

* Add regression test of extended calibration method

It has been tested with new added test data in xoox:calib-release-object
branch of opencv_extra.

* Fix assertion in test_cameracalibration.cpp

The total number of refined 3D object coordinates is checked.

* Add checker for iFixedPoint in cvCalibrateCamera4

If iFixedPoint is out of rational range, fall back to standard method.

* Fix documentation for overloaded calibrateCamera()

* Remove calibration flag of CALIB_RELEASE_OBJECT

The method selection is based on the range of the index of fixed point.
For minus values, standard calibration method will be chosen.  Values in
a rational range will make the object-releasing calibration method
selected.

* Use new interfaces instead of function overload

Existing interfaces are preserved and new interfaces are added. Since
most part of the code base are shared, calibrateCamera() is now a
wrapper function of calibrateCameraRO().

* Fix exported name of calibrateCameraRO()

* Update documentation for calibrateCameraRO()

The circumstances where this method is mostly helpful are described.

* Add note on the rigidity of the calibration target

* Update documentation for calibrateCameraRO()

It is clarified that iFixedPoint is used as a switch to select
calibration method. If input data are not qualified, exceptions will be
thrown instead of fallback scheme.

* Clarify iFixedPoint as switch and remove fallback

iFixedPoint is now used as a switch for calibration method selection. No
fallback scheme is utilized anymore. If the input data are not
qualified, exceptions will be thrown.

* Add badarg test for object-releasing method

* Fix document format of sample list

List items of same level should be indented the same way. Otherwise they
will be formatted as nested lists by Doxygen.

* Add brief intro for objectPoints and imagePoints

* Sync tutorial to sample calibration code

* Update tutorial compatibility version to 4.0

5 years agoMerge pull request #12905 from tomoaki0705:fixQrcodePeakyFailure
Alexander Alekhin [Thu, 25 Oct 2018 16:24:56 +0000 (16:24 +0000)]
Merge pull request #12905 from tomoaki0705:fixQrcodePeakyFailure

5 years agoMerge pull request #12937 from mshabunin:fix-static-4
Alexander Alekhin [Thu, 25 Oct 2018 15:15:15 +0000 (15:15 +0000)]
Merge pull request #12937 from mshabunin:fix-static-4

5 years agoMerge pull request #12935 from alalek:python_so_warning
Alexander Alekhin [Thu, 25 Oct 2018 15:11:44 +0000 (15:11 +0000)]
Merge pull request #12935 from alalek:python_so_warning

5 years agoMerge pull request #12804 from alalek:editorconfig
Alexander Alekhin [Thu, 25 Oct 2018 14:17:42 +0000 (14:17 +0000)]
Merge pull request #12804 from alalek:editorconfig

5 years agoMerge pull request #12854 from allnes:detect_qr_code
Alexander Alekhin [Thu, 25 Oct 2018 14:16:55 +0000 (14:16 +0000)]
Merge pull request #12854 from allnes:detect_qr_code

5 years agoMerge pull request #12930 from aliyasineser:3.4
Alexander Alekhin [Thu, 25 Oct 2018 14:12:16 +0000 (17:12 +0300)]
Merge pull request #12930 from aliyasineser:3.4

Update depth map for python-opencv

5 years agoMerge pull request #12927 from alalek:docs_filter_gapi_exports
Alexander Alekhin [Thu, 25 Oct 2018 11:53:06 +0000 (11:53 +0000)]
Merge pull request #12927 from alalek:docs_filter_gapi_exports

5 years agoMerge pull request #12925 from alalek:fix_cmake_conditions
Alexander Alekhin [Thu, 25 Oct 2018 11:52:39 +0000 (11:52 +0000)]
Merge pull request #12925 from alalek:fix_cmake_conditions

5 years agoMerge pull request #12934 from alalek:issue_12932
Alexander Alekhin [Thu, 25 Oct 2018 11:28:12 +0000 (11:28 +0000)]
Merge pull request #12934 from alalek:issue_12932

5 years agocore: move compiler defines from base.hpp into cvdef.h
Alexander Alekhin [Thu, 25 Oct 2018 03:02:01 +0000 (03:02 +0000)]
core: move compiler defines from base.hpp into cvdef.h

5 years agoMerge pull request #12928 from alalek:fix_typo_3.4
Alexander Alekhin [Thu, 25 Oct 2018 11:04:59 +0000 (11:04 +0000)]
Merge pull request #12928 from alalek:fix_typo_3.4

5 years agoFixed several issues found by static analysis
Maksim Shabunin [Tue, 23 Oct 2018 12:06:33 +0000 (15:06 +0300)]
Fixed several issues found by static analysis

5 years agopython: eliminate DeprecationWarning: SO -> EXT_SUFFIX
Alexander Alekhin [Thu, 25 Oct 2018 03:47:59 +0000 (03:47 +0000)]
python: eliminate DeprecationWarning: SO -> EXT_SUFFIX

- https://python.readthedocs.io/en/stable/whatsnew/3.4.html
- The `sysconfig` key `SO` is deprecated, it has been replaced by `EXT_SUFFIX`

5 years agocore: move compiler defines from base.hpp into cvdef.h
Alexander Alekhin [Thu, 25 Oct 2018 03:02:01 +0000 (03:02 +0000)]
core: move compiler defines from base.hpp into cvdef.h

5 years agoMerge pull request #12868 from VladKarpushin:tutorial-using-periodic-noise-removing...
Alexander Alekhin [Wed, 24 Oct 2018 20:24:50 +0000 (20:24 +0000)]
Merge pull request #12868 from VladKarpushin:tutorial-using-periodic-noise-removing-filter

5 years agoUpdate depth map for pytho-opencv
Ali Yasin Eser [Wed, 24 Oct 2018 17:29:27 +0000 (19:29 +0200)]
Update depth map for pytho-opencv

5 years agoAdded perf tests with sanity check
Alexander Nesterov [Tue, 16 Oct 2018 12:27:37 +0000 (12:27 +0000)]
Added perf tests with sanity check

5 years agoMerge pull request #12888 from alalek:cmake_fix_objdetect
Alexander Alekhin [Wed, 24 Oct 2018 16:22:26 +0000 (16:22 +0000)]
Merge pull request #12888 from alalek:cmake_fix_objdetect

5 years agovideoio: fix typo
Alexander Alekhin [Wed, 24 Oct 2018 16:12:35 +0000 (19:12 +0300)]
videoio: fix typo

5 years agoMerge pull request #12894 from alalek:c_api_drop_samples
Alexander Alekhin [Wed, 24 Oct 2018 15:40:03 +0000 (15:40 +0000)]
Merge pull request #12894 from alalek:c_api_drop_samples

5 years agoMerge pull request #12922 from alalek:fix_merge_12787
Alexander Alekhin [Wed, 24 Oct 2018 15:15:13 +0000 (15:15 +0000)]
Merge pull request #12922 from alalek:fix_merge_12787

5 years agodocs: hide GAPI_EXPORTS from documentation
Alexander Alekhin [Wed, 24 Oct 2018 15:05:21 +0000 (18:05 +0300)]
docs: hide GAPI_EXPORTS from documentation

5 years agoMerge pull request #12881 from huangqinjin:orb
Alexander Alekhin [Wed, 24 Oct 2018 13:28:57 +0000 (13:28 +0000)]
Merge pull request #12881 from huangqinjin:orb

5 years agoMerge pull request #12887 from alalek:fix_cmake_conditions
Alexander Alekhin [Wed, 24 Oct 2018 13:17:54 +0000 (13:17 +0000)]
Merge pull request #12887 from alalek:fix_cmake_conditions

5 years agoMerge pull request #12914 from seiko2plus:issue12830
Alexander Alekhin [Wed, 24 Oct 2018 13:15:23 +0000 (13:15 +0000)]
Merge pull request #12914 from seiko2plus:issue12830

5 years agoMerge pull request #12921 from alalek:ios_xcode10
Alexander Alekhin [Wed, 24 Oct 2018 13:06:27 +0000 (13:06 +0000)]
Merge pull request #12921 from alalek:ios_xcode10

5 years agoMerge pull request #12909 from alalek:cmake_fix_baseline_detect_flags
Alexander Alekhin [Wed, 24 Oct 2018 13:05:14 +0000 (13:05 +0000)]
Merge pull request #12909 from alalek:cmake_fix_baseline_detect_flags

5 years agoMerge pull request #12919 from berak:fix_dnn_sample_common
Alexander Alekhin [Wed, 24 Oct 2018 13:03:37 +0000 (13:03 +0000)]
Merge pull request #12919 from berak:fix_dnn_sample_common

5 years agoMerge pull request #12877 from maver1:3.4
maver1 [Wed, 24 Oct 2018 12:02:53 +0000 (15:02 +0300)]
Merge pull request #12877 from maver1:3.4

* Updated ICV packages and IPP integration

* core(test): minMaxIdx IPP regression test

* core(ipp): workaround minMaxIdx problem

* core(ipp): workaround meanStdDev() CV_32FC3 buffer overrun

* Returned semicolon after CV_INSTRUMENT_REGION_IPP()

5 years agocore: fix merge from 3.4
Alexander Alekhin [Wed, 24 Oct 2018 11:45:45 +0000 (14:45 +0300)]
core: fix merge from 3.4

`CV_ErrorNoReturn` should not be used in OpenCV

5 years agodnn/samples: handle not set env vars gracefully
berak [Wed, 24 Oct 2018 10:37:01 +0000 (12:37 +0200)]
dnn/samples: handle not set env vars gracefully

5 years agoMerge pull request #12713 from antonioborondo:depthwise_convolution
Alexander Alekhin [Wed, 24 Oct 2018 09:17:56 +0000 (09:17 +0000)]
Merge pull request #12713 from antonioborondo:depthwise_convolution

5 years agoRecognize ConvolutionDepthwise as Convolution
Antonio Borondo [Tue, 23 Oct 2018 19:17:22 +0000 (20:17 +0100)]
Recognize ConvolutionDepthwise as Convolution

5 years agocore:vsx change behavior of v_round to rounding to nearest even
Sayed Adel [Wed, 24 Oct 2018 04:33:08 +0000 (04:33 +0000)]
core:vsx change behavior of v_round to rounding to nearest even

5 years agoMerge pull request #12857 from dmatveev:hld
Dmitry Matveev [Wed, 24 Oct 2018 04:47:56 +0000 (07:47 +0300)]
Merge pull request #12857 from dmatveev:hld

* G-API Documentation: first submission

This PR introduces a number of new OpenCV documentation chapters for
Graph API module.

In particular, the following topics are covered:
- Introduction & background information;
- High-level design overview;
- Kernel API;
- Pipeline example.

All changes are done in Markdown files, no headers, etc modified.

Doxygen references for main API classes will be added later.

Also, a tutorial will be introduced soon (in the common Tutorials place)

* G-API Documentation - fix warnings & trailing whitespaces

* G-API Documentation: address review issues

* G-API Documentation: export code snippets to compileable files

* gapi: move documentation samples

5 years agoios: update build script
Alexander Alekhin [Wed, 24 Oct 2018 04:37:31 +0000 (04:37 +0000)]
ios: update build script

- IPHONEOS_DEPLOYMENT_TARGET=8.0 by default (minimal for XCode 10)

5 years agocmake: don't change baseline compiler flags in 'detection' mode
Alexander Alekhin [Wed, 24 Oct 2018 03:54:31 +0000 (03:54 +0000)]
cmake: don't change baseline compiler flags in 'detection' mode

5 years agoobjdetect: fix test failure of QR code on Aarch64
Tomoaki Teshima [Wed, 24 Oct 2018 00:35:02 +0000 (09:35 +0900)]
objdetect: fix test failure of QR code on Aarch64
  * use boundingRect instead of manual loop

5 years agorewrote the line segment intersection function to make the static analyzer happy...
Vadim Pisarevsky [Tue, 23 Oct 2018 14:09:23 +0000 (17:09 +0300)]
rewrote the line segment intersection function to make the static analyzer happy (#12902)

* rewrote the line segment intersection function to make the static analyzer happy

* fixed bug with improper "no intersection" detection in some of corner cases

* fixed bug with improper "no intersection" detection in some of corner cases

5 years agodrop C-API sample code
Alexander Alekhin [Mon, 22 Oct 2018 17:22:11 +0000 (17:22 +0000)]
drop C-API sample code

5 years agoORB: compute default norm by wta_k
huangqinjin [Sat, 20 Oct 2018 13:43:39 +0000 (21:43 +0800)]
ORB: compute default norm by wta_k

5 years agoflann: drop untested hdf5.h
Alexander Alekhin [Sun, 21 Oct 2018 15:16:52 +0000 (15:16 +0000)]
flann: drop untested hdf5.h

5 years agocmake: fix objdetect QR decoder link_libraries
Mansoo Kim [Sun, 21 Oct 2018 15:13:43 +0000 (15:13 +0000)]
cmake: fix objdetect QR decoder link_libraries

5 years agocmake: fix variable expand in CMake conditions
Alexander Alekhin [Sun, 21 Oct 2018 15:02:40 +0000 (15:02 +0000)]
cmake: fix variable expand in CMake conditions

5 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 20 Oct 2018 11:37:54 +0000 (11:37 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

5 years agoMerge pull request #12871 from UnderscoreAsterisk:document-Distance
Apoorv Goel [Sat, 20 Oct 2018 08:15:13 +0000 (13:45 +0530)]
Merge pull request #12871 from UnderscoreAsterisk:document-Distance

* Document distance functors in dist.h

* Add spec for Distance

* Generate appropriate links for symbols

5 years agoMerge pull request #12875 from dkurt:dnn_enet_accuracy
Alexander Alekhin [Fri, 19 Oct 2018 15:33:48 +0000 (15:33 +0000)]
Merge pull request #12875 from dkurt:dnn_enet_accuracy

5 years agoMerge pull request #12870 from dmatveev:gapi_fluid_basic_hetero_support
Dmitry Matveev [Fri, 19 Oct 2018 15:32:48 +0000 (18:32 +0300)]
Merge pull request #12870 from dmatveev:gapi_fluid_basic_hetero_support

* G-API Fluid basic heterogeneity support: initial upload

* G-API Fluid heterogeneity: address some coding style issues

* G-API Fluid heterogeneity: fix compiler warnings

* G-API Fluid heterogeneity: fix warnings on Windows & ARMv7

* G-API Fluid heterogeneity: finally fix Windows warnings

* G-API Fluid heterogeneity: fix dangling reference problem

5 years agoFix ENet test
Dmitry Kurtaev [Fri, 19 Oct 2018 14:43:26 +0000 (17:43 +0300)]
Fix ENet test

5 years agoMerge pull request #12867 from UnderscoreAsterisk:document-radiusSearch
Alexander Alekhin [Thu, 18 Oct 2018 07:52:49 +0000 (07:52 +0000)]
Merge pull request #12867 from UnderscoreAsterisk:document-radiusSearch

5 years agoMerge pull request #12832 from kmansoo:fix-compile-errors-on-nvcc10
Alexander Alekhin [Thu, 18 Oct 2018 07:51:47 +0000 (07:51 +0000)]
Merge pull request #12832 from kmansoo:fix-compile-errors-on-nvcc10

5 years agodoc: add new tutorial periodic noise removing filter
Karpushin Vladislav [Thu, 18 Oct 2018 04:41:59 +0000 (11:41 +0700)]
doc: add new tutorial periodic noise removing filter

5 years agoAdd documentation for radiusSearch
Apoorv [Wed, 17 Oct 2018 22:39:16 +0000 (04:09 +0530)]
Add documentation for radiusSearch

5 years agocuda: fix build with CUDA 10.x
Mansoo Kim [Wed, 17 Oct 2018 17:35:40 +0000 (17:35 +0000)]
cuda: fix build with CUDA 10.x

5 years agoMerge pull request #12852 from nangchoo:bugfix/increase_magic_threshold_for_perf_test
Alexander Alekhin [Wed, 17 Oct 2018 17:31:19 +0000 (17:31 +0000)]
Merge pull request #12852 from nangchoo:bugfix/increase_magic_threshold_for_perf_test

5 years agoMerge pull request #12844 from jasjuang:3.4
Alexander Alekhin [Wed, 17 Oct 2018 17:31:00 +0000 (17:31 +0000)]
Merge pull request #12844 from jasjuang:3.4

5 years agoMerge pull request #12864 from dkurt:dnn_ie_get_batch_size
Alexander Alekhin [Wed, 17 Oct 2018 14:02:25 +0000 (14:02 +0000)]
Merge pull request #12864 from dkurt:dnn_ie_get_batch_size

5 years agoMerge pull request #12863 from alalek:disable_wshadow_gcc_4.x
Alexander Alekhin [Wed, 17 Oct 2018 13:59:13 +0000 (13:59 +0000)]
Merge pull request #12863 from alalek:disable_wshadow_gcc_4.x

5 years agoImplement getBatchSize for Intel's Inference Engine networks
Dmitry Kurtaev [Wed, 17 Oct 2018 11:02:37 +0000 (14:02 +0300)]
Implement getBatchSize for Intel's Inference Engine networks

5 years agoMerge pull request #12838 from dmatveev:gapi_fluid_resize_lpi
Alexander Alekhin [Wed, 17 Oct 2018 09:22:28 +0000 (09:22 +0000)]
Merge pull request #12838 from dmatveev:gapi_fluid_resize_lpi

5 years agobuild: eliminate warnings
Alexander Alekhin [Wed, 17 Oct 2018 08:41:18 +0000 (08:41 +0000)]
build: eliminate warnings

5 years agoMerge pull request #12860 from janisozaur:include-guards
Alexander Alekhin [Wed, 17 Oct 2018 08:20:31 +0000 (08:20 +0000)]
Merge pull request #12860 from janisozaur:include-guards

5 years agoMerge pull request #12859 from janisozaur:empty-block
Alexander Alekhin [Wed, 17 Oct 2018 08:20:08 +0000 (08:20 +0000)]
Merge pull request #12859 from janisozaur:empty-block

5 years agoMerge pull request #12858 from janisozaur:catch-by-ref
Alexander Alekhin [Wed, 17 Oct 2018 08:19:11 +0000 (08:19 +0000)]
Merge pull request #12858 from janisozaur:catch-by-ref

5 years agoFix clashing include guards
Michał Janiszewski [Tue, 16 Oct 2018 19:15:54 +0000 (21:15 +0200)]
Fix clashing include guards

Relevant guards can be found in
https://github.com/opencv/opencv/blob/ef5579dc8667e5eb5e149acc4af898421eed99da/modules/features2d/src/kaze/AKAZEConfig.h#L8
and
https://github.com/opencv/opencv/blob/ef5579dc8667e5eb5e149acc4af898421eed99da/modules/ml/include/opencv2/ml.hpp#L44

5 years agoRemove unused empty block
Michał Janiszewski [Tue, 16 Oct 2018 19:13:23 +0000 (21:13 +0200)]
Remove unused empty block

5 years agoCatch exceptions by const-reference
Michał Janiszewski [Tue, 16 Oct 2018 19:09:26 +0000 (21:09 +0200)]
Catch exceptions by const-reference

Exceptions caught by value incur needless cost in C++, most of them can
be caught by const-reference, especially as nearly none are actually
used. This could allow compiler generate a slightly more efficient code.

5 years agoIncreased the acceptable error margin for perf testing
Paul Shin [Tue, 16 Oct 2018 03:03:39 +0000 (20:03 -0700)]
Increased the acceptable error margin for perf testing

- This is to accommodate the variabiilty in floating-point operations in new platforms/compilers
- Specifically due to the error margin found in NVIDIA Jetson TX2

5 years agoMerge tag '4.0.0-beta'
Alexander Alekhin [Mon, 15 Oct 2018 20:33:41 +0000 (20:33 +0000)]
Merge tag '4.0.0-beta'

5 years agorelease: OpenCV 4.0.0-beta (version++)
Alexander Alekhin [Mon, 15 Oct 2018 20:31:53 +0000 (20:31 +0000)]
release: OpenCV 4.0.0-beta (version++)

5 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 15 Oct 2018 20:15:42 +0000 (20:15 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

5 years agoMerge pull request #12848 from alalek:issue_12337
Alexander Alekhin [Mon, 15 Oct 2018 20:09:36 +0000 (20:09 +0000)]
Merge pull request #12848 from alalek:issue_12337

5 years agoMerge pull request #12845 from alalek:workaround_12824
Alexander Alekhin [Mon, 15 Oct 2018 20:09:06 +0000 (20:09 +0000)]
Merge pull request #12845 from alalek:workaround_12824

5 years agoMerge pull request #12846 from alalek:issue_12834
Alexander Alekhin [Mon, 15 Oct 2018 19:19:46 +0000 (19:19 +0000)]
Merge pull request #12846 from alalek:issue_12834

5 years agoMerge pull request #12843 from alalek:fix_qrdecode_input_validation
Alexander Alekhin [Mon, 15 Oct 2018 19:18:58 +0000 (19:18 +0000)]
Merge pull request #12843 from alalek:fix_qrdecode_input_validation

5 years agoMerge pull request #12829 from tomoaki0705:fixTestVideoOpenCLPyrLK
Alexander Alekhin [Mon, 15 Oct 2018 19:18:24 +0000 (19:18 +0000)]
Merge pull request #12829 from tomoaki0705:fixTestVideoOpenCLPyrLK