platform/upstream/opencv.git
5 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 28 Sep 2018 09:48:51 +0000 (12:48 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

5 years agoMerge pull request #12657 from alalek:docs_repair_cuda_section
Alexander Alekhin [Fri, 28 Sep 2018 09:45:49 +0000 (09:45 +0000)]
Merge pull request #12657 from alalek:docs_repair_cuda_section

5 years agoMerge pull request #12660 from alalek:flann_drop_useless_mutex
Alexander Alekhin [Thu, 27 Sep 2018 19:46:59 +0000 (19:46 +0000)]
Merge pull request #12660 from alalek:flann_drop_useless_mutex

5 years agoMerge pull request #12637 from savuor:fix/instr_ipp_ocl
Rostislav Vasilikhin [Thu, 27 Sep 2018 19:39:06 +0000 (22:39 +0300)]
Merge pull request #12637 from savuor:fix/instr_ipp_ocl

Fixes for instrumentation of IPP and OCL (#12637)

* fixed warning about re-declaring variable when both IPP and instrumentation are enabled

* fixed segfault when no funName provided

* compilation fixed when both OCL and instrumentation are enabled

5 years agoMerge pull request #12671 from alalek:fix_build_warnings_3.4
Alexander Alekhin [Thu, 27 Sep 2018 16:23:05 +0000 (16:23 +0000)]
Merge pull request #12671 from alalek:fix_build_warnings_3.4

5 years agoMerge pull request #12568 from sturkmen72:patch-3
Alexander Alekhin [Thu, 27 Sep 2018 13:42:44 +0000 (13:42 +0000)]
Merge pull request #12568 from sturkmen72:patch-3

5 years agofix build warnings
Alexander Alekhin [Thu, 27 Sep 2018 13:31:31 +0000 (16:31 +0300)]
fix build warnings

5 years agoMerge pull request #12650 from alalek:dnn_ocl4dnn_verification_test
Alexander Alekhin [Thu, 27 Sep 2018 09:54:23 +0000 (12:54 +0300)]
Merge pull request #12650 from alalek:dnn_ocl4dnn_verification_test

* dnn(ocl4dnn): update kernel checks

* dnn: workaround for IDLF kernels on Intel iGPU

* dnn(test): remove "skip" check for unstable cases

5 years agoMerge pull request #12608 from dmatveev:gapi
Dmitry Matveev [Wed, 26 Sep 2018 18:50:39 +0000 (21:50 +0300)]
Merge pull request #12608 from dmatveev:gapi

* G-API Initial code upload

* Update G-API code base to Sep-24-2018

* The majority of OpenCV buildbot problems was addressed

* Update G-API code base to 24-Sep-18 EOD

* G-API code base update 25-Sep-2018

* Linux warnings should be resolved
* Documentation build should become green
* Number of Windows warnings should be reduced

* Update G-API code base to 25-Sep-18 EOD

* ARMv7 build issue should be resolved
* ADE is bumped to latest version and should fix Clang builds for macOS/iOS
* Remaining Windows warnings should be resolved
* New Linux32 / ARMv7 warnings should be resolved

* G-API code base update 25-Sep-2018-EOD2

* Final Windows warnings should be resolved now

* G-API code base update 26-Sep-2018

* Fixed issues with precompiled headers in module and its tests

5 years agoflann: drop useless mutex
Alexander Alekhin [Wed, 26 Sep 2018 16:37:44 +0000 (19:37 +0300)]
flann: drop useless mutex

5 years agoMerge pull request #12655 from alalek:fix_printf_format_warning
Alexander Alekhin [Wed, 26 Sep 2018 16:21:07 +0000 (16:21 +0000)]
Merge pull request #12655 from alalek:fix_printf_format_warning

5 years agoMerge pull request #12647 from alalek:cmake_js_cleanup
Alexander Alekhin [Wed, 26 Sep 2018 15:53:02 +0000 (18:53 +0300)]
Merge pull request #12647 from alalek:cmake_js_cleanup

* cmake: js cleanup

- avoid unnecessary 2 messages for other platforms
- drop MODULE_NAME variable

* js: cleanup build_js.py

5 years agoMerge pull request #12548 from alalek:videoio_backend_name
Vadim Pisarevsky [Wed, 26 Sep 2018 15:19:55 +0000 (15:19 +0000)]
Merge pull request #12548 from alalek:videoio_backend_name

5 years agoMerge pull request #12565 from dkurt:dnn_non_intel_gpu
Dmitry Kurtaev [Wed, 26 Sep 2018 13:27:00 +0000 (16:27 +0300)]
Merge pull request #12565 from dkurt:dnn_non_intel_gpu

* Remove isIntel check from deep learning layers

* Remove fp16->fp32 fallbacks where it's not necessary

* Fix Kernel::run to prevent localsize > globalsize

5 years agoFix #12542 (#12603)
Dmitry Kurtaev [Wed, 26 Sep 2018 13:08:51 +0000 (16:08 +0300)]
Fix #12542 (#12603)

* Fix #12542

* Remove ignore of non-virtual-dtor error

5 years agoM_PI changed to CV_PI (#12645)
Menghui Xie [Wed, 26 Sep 2018 13:05:02 +0000 (21:05 +0800)]
M_PI changed to CV_PI (#12645)

* M_PI changed to CV_PI

* M_PI changed to CV_PI

* M_PI changed to CV_PI

5 years agodocs: fix CUDA docs section
Alexander Alekhin [Wed, 26 Sep 2018 12:36:55 +0000 (15:36 +0300)]
docs: fix CUDA docs section

5 years agodnn: fix printf format warning
Alexander Alekhin [Wed, 26 Sep 2018 11:04:49 +0000 (14:04 +0300)]
dnn: fix printf format warning

5 years agoMerge pull request #12644 from dkurt:dnn_out_layers_names
Alexander Alekhin [Tue, 25 Sep 2018 16:12:59 +0000 (16:12 +0000)]
Merge pull request #12644 from dkurt:dnn_out_layers_names

5 years agoadd Net::getUnconnectedOutLayersNames method
Dmitry Kurtaev [Tue, 25 Sep 2018 15:10:45 +0000 (18:10 +0300)]
add Net::getUnconnectedOutLayersNames method

5 years agoMerge pull request #12599 from mshabunin:printf
Alexander Alekhin [Tue, 25 Sep 2018 14:44:21 +0000 (14:44 +0000)]
Merge pull request #12599 from mshabunin:printf

5 years agoMerge pull request #12615 from D-Alex:master
Alexander Duda [Tue, 25 Sep 2018 14:06:46 +0000 (16:06 +0200)]
Merge pull request #12615 from D-Alex:master

findChessboardCornersSB: speed improvements (#12615)

* chessboard: fix do not modify const image

* chessboard: speed up scale space using parallel_for

* chessboard: small improvements

* chessboard: speed up board growing using parallel_for

* chessboard: add flags for tuning detection

* chessboard: fix compiler warnings

* chessborad: change flag name to CALIB_CB_EXHAUSTIVE

This also fixes a typo

* chessboard: fix const ref + remove to_string

5 years agoMerge pull request #12639 from tomoaki0705:fixFp16CudaFailure
Alexander Alekhin [Tue, 25 Sep 2018 13:19:51 +0000 (13:19 +0000)]
Merge pull request #12639 from tomoaki0705:fixFp16CudaFailure

5 years agoMerge pull request #12591 from sturkmen72:patch-6
Alexander Alekhin [Tue, 25 Sep 2018 10:05:15 +0000 (10:05 +0000)]
Merge pull request #12591 from sturkmen72:patch-6

5 years agofix CvFp16Test failure
Tomoaki Teshima [Tue, 25 Sep 2018 06:00:37 +0000 (15:00 +0900)]
fix CvFp16Test failure

5 years agoMerge pull request #12632 from mshabunin:move-opengl-sample
Alexander Alekhin [Mon, 24 Sep 2018 17:53:11 +0000 (17:53 +0000)]
Merge pull request #12632 from mshabunin:move-opengl-sample

5 years agoMerge pull request #12629 from cv3d:fix/opengl
Alexander Alekhin [Mon, 24 Sep 2018 11:32:07 +0000 (11:32 +0000)]
Merge pull request #12629 from cv3d:fix/opengl

5 years agoMoved OpenGL sample to opengl folder
Maksim Shabunin [Mon, 24 Sep 2018 10:09:18 +0000 (13:09 +0300)]
Moved OpenGL sample to opengl folder

5 years agoOpenGL: avoid losing precision in double-to-float conversion
Hamdi Sahloul [Mon, 24 Sep 2018 08:27:03 +0000 (17:27 +0900)]
OpenGL: avoid losing precision in double-to-float conversion

5 years agoMerge pull request #12622 from cv3d:fix/js_property
Alexander Alekhin [Mon, 24 Sep 2018 09:36:51 +0000 (09:36 +0000)]
Merge pull request #12622 from cv3d:fix/js_property

5 years agoFixed several incorrect printf format specifiers
Maksim Shabunin [Wed, 19 Sep 2018 12:49:59 +0000 (15:49 +0300)]
Fixed several incorrect printf format specifiers

5 years agocore: fix printf warnings by using c++11 format
Pavel Rojtberg [Mon, 6 Aug 2018 15:16:21 +0000 (17:16 +0200)]
core: fix printf warnings by using c++11 format

5 years agocore: enable printf format warnings for cv::format
Pavel Rojtberg [Sun, 5 Aug 2018 23:23:19 +0000 (01:23 +0200)]
core: enable printf format warnings for cv::format

5 years agoJS: Support enum properties
Hamdi Sahloul [Sun, 23 Sep 2018 14:36:42 +0000 (23:36 +0900)]
JS: Support enum properties

5 years agoMerge pull request #12621 from cv3d:fix/opengl
Alexander Alekhin [Sun, 23 Sep 2018 20:00:53 +0000 (20:00 +0000)]
Merge pull request #12621 from cv3d:fix/opengl

5 years agofix a bug in OpenGL
Hamdi Sahloul [Sun, 23 Sep 2018 14:07:28 +0000 (23:07 +0900)]
fix a bug in OpenGL

5 years agoMerge pull request #12614 from alalek:winpack_samples_python_launcher_update
Alexander Alekhin [Sun, 23 Sep 2018 13:37:36 +0000 (13:37 +0000)]
Merge pull request #12614 from alalek:winpack_samples_python_launcher_update

5 years agoMerge pull request #12612 from alalek:winpack_samples_python_launcher_update
Alexander Alekhin [Sat, 22 Sep 2018 20:44:45 +0000 (20:44 +0000)]
Merge pull request #12612 from alalek:winpack_samples_python_launcher_update

5 years agosamples: update winpack python samples launcher
Alexander Alekhin [Sat, 22 Sep 2018 17:15:40 +0000 (17:15 +0000)]
samples: update winpack python samples launcher

- accepts script parameter (allows drag & drop from 'explorer')
- use script dir instead of current dir (can launch samples from 'samples/dnn')
- added 'pause' to show error messages (about missing numpy) instead of instant closing

5 years agoMerge pull request #12592 from alalek:dnn_test_at_least_one
Alexander Alekhin [Fri, 21 Sep 2018 16:49:51 +0000 (16:49 +0000)]
Merge pull request #12592 from alalek:dnn_test_at_least_one

5 years agoMerge pull request #12310 from cv3d:chunks/enum_interface
Hamdi Sahloul [Fri, 21 Sep 2018 15:12:35 +0000 (00:12 +0900)]
Merge pull request #12310 from cv3d:chunks/enum_interface

* Cleanup macros and enable expansion of `__VA_ARGS__` for Visual Studio

* Macros for enum-arguments backwards compatibility

* Convert struct Param to enum struct

* Enabled ParamType.type for enum types

* Enabled `cv.read` and `cv.write` for enum types

* Rename unnamed enum to AAKAZE.DescriptorType

* Rename unnamed enum to AccessFlag

* Rename unnamed enum to AgastFeatureDetector.DetectorType

* Convert struct DrawMatchesFlags to enum struct

* Rename unnamed enum to FastFeatureDetector.DetectorType

* Rename unnamed enum to Formatter.FormatType

* Rename unnamed enum to HOGDescriptor.HistogramNormType

* Rename unnamed enum to DescriptorMatcher.MatcherType

* Rename unnamed enum to KAZE.DiffusivityType

* Rename unnamed enum to ORB.ScoreType

* Rename unnamed enum to UMatData.MemoryFlag

* Rename unnamed enum to _InputArray.KindFlag

* Rename unnamed enum to _OutputArray.DepthMask

* Convert normType enums to static const NormTypes

* Avoid conflicts with ElemType

* Rename unnamed enum to DescriptorStorageFormat

5 years agoMerge pull request #12601 from cv3d:fix/js
Hamdi Sahloul [Fri, 21 Sep 2018 15:11:46 +0000 (00:11 +0900)]
Merge pull request #12601 from cv3d:fix/js

* JS: Support enum types in constructors

* JS: Avoid unary expression on enum-based consts

5 years agoMerge pull request #12598 from cv3d:cmake/js
Alexander Alekhin [Fri, 21 Sep 2018 14:59:27 +0000 (14:59 +0000)]
Merge pull request #12598 from cv3d:cmake/js

5 years agoJS: Provides meaningful message in case of compile issues
Hamdi Sahloul [Thu, 20 Sep 2018 11:56:21 +0000 (20:56 +0900)]
JS: Provides meaningful message in case of compile issues

5 years agoJS: Improves Emscripten detection
Hamdi Sahloul [Thu, 20 Sep 2018 11:55:45 +0000 (20:55 +0900)]
JS: Improves Emscripten detection

5 years agoUpdate hog.cpp
Suleyman TURKMEN [Wed, 19 Sep 2018 08:52:12 +0000 (11:52 +0300)]
Update hog.cpp

5 years agoMerge tag '4.0.0-alpha'
Alexander Alekhin [Wed, 19 Sep 2018 20:47:17 +0000 (20:47 +0000)]
Merge tag '4.0.0-alpha'

5 years agorelease: OpenCV 4.0.0-alpha (version++)
Alexander Alekhin [Tue, 18 Sep 2018 18:10:51 +0000 (18:10 +0000)]
release: OpenCV 4.0.0-alpha (version++)

5 years agoMerge pull request #12585 from alalek:move_cuda_modules
Alexander Alekhin [Wed, 19 Sep 2018 16:30:02 +0000 (19:30 +0300)]
Merge pull request #12585 from alalek:move_cuda_modules

cuda: move CUDA modules to opencv_contrib: https://github.com/opencv/opencv_contrib/pull/1781

5 years agocuda: move CUDA modules to opencv_contrib
Alexander Alekhin [Tue, 18 Sep 2018 16:38:12 +0000 (16:38 +0000)]
cuda: move CUDA modules to opencv_contrib

OpenCV 4.0+

5 years agoMerge pull request #12401 from alalek:opencv_install_paths
Alexander Alekhin [Wed, 19 Sep 2018 15:49:47 +0000 (15:49 +0000)]
Merge pull request #12401 from alalek:opencv_install_paths

5 years agoMerge pull request #12589 from xoox:fix-stddev-request
Alexander Alekhin [Wed, 19 Sep 2018 15:07:57 +0000 (15:07 +0000)]
Merge pull request #12589 from xoox:fix-stddev-request

5 years agocmake: update install paths (Linux)
Alexander Alekhin [Mon, 3 Sep 2018 22:40:16 +0000 (22:40 +0000)]
cmake: update install paths (Linux)

5 years agoMerge pull request #12586 from Slyce-Inc:bug-xcode10-compile
Alexander Alekhin [Wed, 19 Sep 2018 10:58:50 +0000 (10:58 +0000)]
Merge pull request #12586 from Slyce-Inc:bug-xcode10-compile

5 years agodnn(test): test at least CPU code path
Alexander Alekhin [Wed, 19 Sep 2018 10:56:59 +0000 (13:56 +0300)]
dnn(test): test at least CPU code path

5 years agoMerge pull request #12570 from alalek:drop_usrtype1
Alexander Alekhin [Wed, 19 Sep 2018 10:55:26 +0000 (13:55 +0300)]
Merge pull request #12570 from alalek:drop_usrtype1

* core: drop usage of CV_USRTYPE1 in OpenCV

avoid OpenCV crashes due size change CV_ELEM_SIZE(CV_USRTYPE1): 8 -> 2

* ! fix persistence internal types

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

5 years agoMerge pull request #12587 from alalek:ts_update_valgrind_test_filter
Alexander Alekhin [Wed, 19 Sep 2018 07:37:20 +0000 (07:37 +0000)]
Merge pull request #12587 from alalek:ts_update_valgrind_test_filter

5 years agoFix failure to request stddev of non-intrinsics
Wenfeng CAI [Wed, 19 Sep 2018 04:27:07 +0000 (12:27 +0800)]
Fix failure to request stddev of non-intrinsics

Before this fix, the code would fail if only standard deviations of
extrinsic parameters are requested. While standard deviations matrix
should be computed if any set of standard deviations is requested. A
variable is added to represent this case.

5 years agots: update valgrind test filter
Alexander Alekhin [Wed, 19 Sep 2018 00:21:39 +0000 (00:21 +0000)]
ts: update valgrind test filter

- DNN: avoid very large models
- build filter per module
- fixed longTestFilter

5 years agobuild: fix Xcode 10 build problems
Andrew Mroczkowski [Tue, 18 Sep 2018 19:42:03 +0000 (15:42 -0400)]
build: fix Xcode 10 build problems

Updating the base SDK from 6.0 to 8.0 where applicable

5 years agovideoio: CAP_PROP_BACKEND property interface
Alexander Alekhin [Tue, 18 Sep 2018 16:25:01 +0000 (16:25 +0000)]
videoio: CAP_PROP_BACKEND property interface

5 years agovideoio(test): add "camera" tests
Alexander Alekhin [Sat, 15 Sep 2018 20:55:18 +0000 (20:55 +0000)]
videoio(test): add "camera" tests

- disabled due specific requirements (camera, OpenNI camera, etc)
- designed for manual validation

5 years agovideoio: added '.getBackendName()' method
Alexander Alekhin [Sat, 15 Sep 2018 20:54:03 +0000 (20:54 +0000)]
videoio: added '.getBackendName()' method

5 years agoMerge pull request #12579 from dkurt:dnn_reset_myriad_device
Alexander Alekhin [Tue, 18 Sep 2018 16:14:38 +0000 (16:14 +0000)]
Merge pull request #12579 from dkurt:dnn_reset_myriad_device

5 years agoMerge pull request #12577 from dkurt:dnn_tf_scripts
Alexander Alekhin [Tue, 18 Sep 2018 16:13:59 +0000 (16:13 +0000)]
Merge pull request #12577 from dkurt:dnn_tf_scripts

5 years agoMerge pull request #12572 from alalek:ffmpeg_update_master
Alexander Alekhin [Tue, 18 Sep 2018 16:12:10 +0000 (16:12 +0000)]
Merge pull request #12572 from alalek:ffmpeg_update_master

5 years agoMerge pull request #12574 from alalek:fixes_master
Alexander Alekhin [Tue, 18 Sep 2018 11:16:24 +0000 (11:16 +0000)]
Merge pull request #12574 from alalek:fixes_master

5 years agoEnable Myriad device for OpenVINO models test
Dmitry Kurtaev [Tue, 18 Sep 2018 08:21:08 +0000 (11:21 +0300)]
Enable Myriad device for OpenVINO models test

5 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 18 Sep 2018 09:49:52 +0000 (12:49 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

5 years agoMerge pull request #12573 from alalek:fixes_3.4
Alexander Alekhin [Tue, 18 Sep 2018 09:47:22 +0000 (09:47 +0000)]
Merge pull request #12573 from alalek:fixes_3.4

5 years ago3.4: fixes
Alexander Alekhin [Mon, 17 Sep 2018 22:13:01 +0000 (22:13 +0000)]
3.4: fixes

5 years agots: flush stdout/stderr before and after test code run
Alexander Alekhin [Tue, 18 Sep 2018 08:01:52 +0000 (08:01 +0000)]
ts: flush stdout/stderr before and after test code run

5 years agovideoio(test): dump file size information
Alexander Alekhin [Tue, 18 Sep 2018 07:58:52 +0000 (07:58 +0000)]
videoio(test): dump file size information

5 years agoImport tensorflow to create text graphs if import cv is failed
Dmitry Kurtaev [Tue, 18 Sep 2018 06:04:28 +0000 (09:04 +0300)]
Import tensorflow to create text graphs if import cv is failed

5 years agoUpdate seamless_cloning.cpp
Suleyman TURKMEN [Mon, 17 Sep 2018 17:39:29 +0000 (20:39 +0300)]
Update seamless_cloning.cpp

5 years agocalib3d: fix build warnings
Alexander Alekhin [Mon, 17 Sep 2018 22:16:31 +0000 (22:16 +0000)]
calib3d: fix build warnings

5 years agoffmpeg: update 4.0 (master)
Alexander Alekhin [Mon, 17 Sep 2018 21:36:52 +0000 (21:36 +0000)]
ffmpeg: update 4.0 (master)

- ffmpeg 4.0.2
- openh264 1.8.0

5 years agoMerge pull request #12510 from take1014:doc_hough
Alexander Alekhin [Mon, 17 Sep 2018 18:39:12 +0000 (21:39 +0300)]
Merge pull request #12510 from take1014:doc_hough

5 years agoMerge pull request #12528 from dkurt:dnn_py_tests
Alexander Alekhin [Mon, 17 Sep 2018 18:34:42 +0000 (18:34 +0000)]
Merge pull request #12528 from dkurt:dnn_py_tests

5 years agoMerge pull request #12559 from dkurt:dnn_remove_usrtype1
Alexander Alekhin [Mon, 17 Sep 2018 18:13:29 +0000 (18:13 +0000)]
Merge pull request #12559 from dkurt:dnn_remove_usrtype1

5 years agoMerge pull request #12563 from cv3d:bug/cuda_msseg
Alexander Alekhin [Mon, 17 Sep 2018 18:09:11 +0000 (18:09 +0000)]
Merge pull request #12563 from cv3d:bug/cuda_msseg

5 years agoMerge pull request #12519 from l-bat:l-bat/onnx_parser
Lubov Batanina [Mon, 17 Sep 2018 17:26:17 +0000 (20:26 +0300)]
Merge pull request #12519 from l-bat:l-bat/onnx_parser

Support asymmetric padding in pooling layer (#12519)

* Add Inception_V1 support in ONNX

* Add asymmetric padding in OpenCL and Inference engine

* Refactoring

5 years agoMerge pull request #12503 from nikhedonia:12500-move-gcgraph
Gaetano Checinski [Mon, 17 Sep 2018 17:13:47 +0000 (18:13 +0100)]
Merge pull request #12503 from nikhedonia:12500-move-gcgraph

* feat: move gcgraph to detail

* chore: puts gcgraph cv::detail namespace

5 years agoUse TorchType enum
Dmitry Kurtaev [Mon, 17 Sep 2018 14:28:26 +0000 (17:28 +0300)]
Use TorchType enum

5 years agoSupport GpuMat in copyTo() functions
Hamdi Sahloul [Mon, 17 Sep 2018 14:31:54 +0000 (23:31 +0900)]
Support GpuMat in copyTo() functions

5 years agoAdd python tests for dnn module
Dmitry Kurtaev [Thu, 13 Sep 2018 13:31:31 +0000 (16:31 +0300)]
Add python tests for dnn module

5 years agoMerge pull request #12531 from VladKarpushin:tutorial-using-anisotropic-image-segment...
Alexander Alekhin [Mon, 17 Sep 2018 12:06:46 +0000 (12:06 +0000)]
Merge pull request #12531 from VladKarpushin:tutorial-using-anisotropic-image-segmentation

5 years agoMerge pull request #12364 from dkurt:dnn_change_blob_from_image
Vadim Pisarevsky [Mon, 17 Sep 2018 12:04:41 +0000 (12:04 +0000)]
Merge pull request #12364 from dkurt:dnn_change_blob_from_image

5 years agocmake: move Matlab scripts to opencv_contrib (#12541)
Alexander Alekhin [Mon, 17 Sep 2018 11:55:42 +0000 (14:55 +0300)]
cmake: move Matlab scripts to opencv_contrib (#12541)

* matlab: move to opencv_contrib

* cmake: preserve variables scope for processing modules

- use macro instead of function to avoid scope resets

5 years agoReplace CV_USRTYPE1 for int64 to CV_32SC2 in Torch importer
Dmitry Kurtaev [Mon, 17 Sep 2018 09:31:09 +0000 (12:31 +0300)]
Replace CV_USRTYPE1 for int64 to CV_32SC2 in Torch importer

5 years agoMerge pull request #12529 from gkaneto:master
Alexander Alekhin [Sat, 15 Sep 2018 19:52:37 +0000 (22:52 +0300)]
Merge pull request #12529 from gkaneto:master

Minor changes in docs (Python Tutorials)

5 years agoUpdate py_basic_ops.markdown
gkaneto [Fri, 14 Sep 2018 01:17:12 +0000 (22:17 -0300)]
Update py_basic_ops.markdown

Correcting indentation of border type flags

5 years agoUpdate py_trackbar.markdown
gkaneto [Thu, 13 Sep 2018 21:02:50 +0000 (18:02 -0300)]
Update py_trackbar.markdown

For some mysterious (for me) reason, two lines of the code appears in my browser (Chrome) in the same line.
I've add an "enter" (just pressed enter), but don't know if it's the best solution.

5 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

5 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

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

5 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

5 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

5 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