platform/upstream/opencv.git
4 years agoMerge pull request #15338 from rayonnant14:my_detect_and_decode_3.4
Polina Smolnikova [Sun, 26 Jan 2020 19:18:42 +0000 (22:18 +0300)]
Merge pull request #15338 from rayonnant14:my_detect_and_decode_3.4

QR-Code detector : multiple detection

* change in qr-codes detection

* change in qr-codes detection

* change in test

* change in test

* add multiple detection

* multiple detection

* multiple detect

* add parallel implementation

* add functional for performance tests

* change in test

* add perftest

* returned implementation for 1 qr-code, added support for vector<Mat> and vector<vector<Point2f>> in MultipleDetectAndDecode

* deleted all lambda expressions

* changing in triangle sort

* fixed warnings

* fixed errors

* add java and python tests

* change in java tests

* change in java and python tests

* change in perf test

* change in qrcode.cpp

* add spaces

* change in qrcode.cpp

* change in qrcode.cpp

* change in qrcode.cpp

* change in java tests

* change in java tests

* solved problems

* solved problems

* change in java and python tests

* change in python tests

* change in python tests

* change in python tests

* change in methods name

* deleted sample qrcode_multi, change in qrcode.cpp

* change in perf tests

* change in objdetect.hpp

* deleted code duplication in sample qrcode.cpp

* returned spaces

* added spaces

* deleted draw function

* change in qrcode.cpp

* change in qrcode.cpp

* deleted all draw functions

* objdetect(QR): extractVerticalLines

* objdetect(QR): whitespaces

* objdetect(QR): simplify operations, avoid duplicated code

* change in interface, additional checks in java and python tests, added new key in sample for saving original image from camera

* fix warnings and errors in python test

* fix

* write in file with space key

* solved error with empty mat check in python test

* correct path to test image

* deleted spaces

* solved error with check empty mat in python tests

* added check of empty vector of points

* samples: rework qrcode.cpp

* objdetect(QR): fix API, input parameters must be first

* objdetect(QR): test/fix points layout

4 years agoMerge pull request #16434 from alalek:fix_build_i386
Alexander Alekhin [Sun, 26 Jan 2020 07:21:59 +0000 (07:21 +0000)]
Merge pull request #16434 from alalek:fix_build_i386

4 years agoMerge pull request #16413 from l-bat:ngraph_deconv
Alexander Alekhin [Sun, 26 Jan 2020 07:19:58 +0000 (07:19 +0000)]
Merge pull request #16413 from l-bat:ngraph_deconv

4 years agoMerge pull request #16190 from pletessier:videocapture_skip_frames
Pierre Letessier [Sun, 26 Jan 2020 07:19:09 +0000 (08:19 +0100)]
Merge pull request #16190 from pletessier:videocapture_skip_frames

Videocapture skip frames

* enable skipping frames

* update videoio_skip test

4 years agocore(build): fix i386 compilation
Alexander Alekhin [Sun, 26 Jan 2020 00:00:25 +0000 (00:00 +0000)]
core(build): fix i386 compilation

4 years agoMerge pull request #16418 from l-bat:ngraph_logsoftmax
Alexander Alekhin [Fri, 24 Jan 2020 21:46:28 +0000 (21:46 +0000)]
Merge pull request #16418 from l-bat:ngraph_logsoftmax

4 years agoMerge pull request #16170 from themechanicalcoder:tutorial_1
Alexander Alekhin [Fri, 24 Jan 2020 21:26:18 +0000 (21:26 +0000)]
Merge pull request #16170 from themechanicalcoder:tutorial_1

4 years agoMerge pull request #16374 from alalek:imgproc_dispatch_sumpixels
Alexander Alekhin [Fri, 24 Jan 2020 21:21:48 +0000 (21:21 +0000)]
Merge pull request #16374 from alalek:imgproc_dispatch_sumpixels

4 years agoMerge pull request #16375 from ChipKerchner:vectorizeMultTranspose
Chip Kerchner [Fri, 24 Jan 2020 15:00:49 +0000 (10:00 -0500)]
Merge pull request #16375 from ChipKerchner:vectorizeMultTranspose

* Reduce LLC loads, stores and multiplies on MulTransposed - 8% faster on VSX

* Add is_same method so c++11 is not required

* Remove trailing whitespaces.

* Change is_same to DataType depth check

4 years agoMerge pull request #16414 from alalek:samples_fix_async
Alexander Alekhin [Fri, 24 Jan 2020 14:57:24 +0000 (14:57 +0000)]
Merge pull request #16414 from alalek:samples_fix_async

4 years agoMerge pull request #16356 from alalek:dnn_ie_prevent_plugins_unloading
Alexander Alekhin [Fri, 24 Jan 2020 12:07:05 +0000 (12:07 +0000)]
Merge pull request #16356 from alalek:dnn_ie_prevent_plugins_unloading

4 years agosamples(dnn): avoid 'async' keyword (Python 3.7+)
Alexander Alekhin [Thu, 23 Jan 2020 15:43:36 +0000 (18:43 +0300)]
samples(dnn): avoid 'async' keyword (Python 3.7+)

4 years agoSupport logSoftMax
Liubov Batanina [Thu, 23 Jan 2020 12:32:16 +0000 (15:32 +0300)]
Support logSoftMax

4 years agoMerge pull request #16405 from ganesh-k13:bugfix/solvepnp-crash
Ganesh Kathiresan [Thu, 23 Jan 2020 12:23:03 +0000 (17:53 +0530)]
Merge pull request #16405 from ganesh-k13:bugfix/solvepnp-crash

Added type check for solvePnPGeneric | Issue: #16049

* Added type check

* Added checks before type fix

* Tests for 16049

* calib3d: update solvePnP regression check (16049)

4 years agoExtend nGraph Deconvolution layer support
Liubov Batanina [Thu, 23 Jan 2020 12:10:42 +0000 (15:10 +0300)]
Extend nGraph Deconvolution layer support

4 years agoAdded tutorial for text skewness correction in C++ and Python.
Gourav Roy [Mon, 16 Dec 2019 05:42:32 +0000 (11:12 +0530)]
Added tutorial for text skewness correction in C++ and Python.

4 years agoMerge pull request #16396 from miguelps:android_modules
Alexander Alekhin [Wed, 22 Jan 2020 19:59:10 +0000 (19:59 +0000)]
Merge pull request #16396 from miguelps:android_modules

4 years agodnn: prevent unloading of InferenceEngine plugins
Alexander Alekhin [Wed, 15 Jan 2020 12:54:18 +0000 (15:54 +0300)]
dnn: prevent unloading of InferenceEngine plugins

4 years agofeat(android): add support for android modules selection
Miguel Pari Soto [Wed, 22 Jan 2020 14:48:33 +0000 (11:48 -0300)]
feat(android): add support for android modules selection

4 years agoMerge pull request #16408 from alalek:dnn_test_tolerance_myriad
Alexander Alekhin [Wed, 22 Jan 2020 13:56:15 +0000 (13:56 +0000)]
Merge pull request #16408 from alalek:dnn_test_tolerance_myriad

4 years agoMerge pull request #16146 from pmur:reg_16137x2
Alexander Alekhin [Wed, 22 Jan 2020 13:53:51 +0000 (13:53 +0000)]
Merge pull request #16146 from pmur:reg_16137x2

4 years agodnn(test): adjust test tolerance for MYRIAD
Alexander Alekhin [Wed, 22 Jan 2020 11:42:52 +0000 (14:42 +0300)]
dnn(test): adjust test tolerance for MYRIAD

4 years agoMerge pull request #16358 from ashishkrshrivastava:opencv-2
Alexander Alekhin [Wed, 22 Jan 2020 09:57:41 +0000 (09:57 +0000)]
Merge pull request #16358 from ashishkrshrivastava:opencv-2

4 years agoMerge pull request #16400 from alalek:issue_7001
Alexander Alekhin [Tue, 21 Jan 2020 19:16:39 +0000 (19:16 +0000)]
Merge pull request #16400 from alalek:issue_7001

4 years agocmake: apply '-Wl,--as-needed' linker option
Alexander Alekhin [Tue, 21 Jan 2020 14:19:30 +0000 (17:19 +0300)]
cmake: apply '-Wl,--as-needed' linker option

4 years agoMerge pull request #16391 from l-bat:ngraph_lrn
Alexander Alekhin [Tue, 21 Jan 2020 10:08:54 +0000 (10:08 +0000)]
Merge pull request #16391 from l-bat:ngraph_lrn

4 years agoSupport lrn with SPATIAL_NRM
Liubov Batanina [Mon, 20 Jan 2020 14:07:35 +0000 (17:07 +0300)]
Support lrn with SPATIAL_NRM

4 years agoMerge pull request #16389 from alalek:core_fix_msa_build
Alexander Alekhin [Mon, 20 Jan 2020 16:31:38 +0000 (16:31 +0000)]
Merge pull request #16389 from alalek:core_fix_msa_build

4 years agocore(SIMD): fix MSA build - add v_reduce_min/max for u8/s8
Alexander Alekhin [Mon, 20 Jan 2020 12:08:51 +0000 (15:08 +0300)]
core(SIMD): fix MSA build - add v_reduce_min/max for u8/s8

4 years agoMerge pull request #16309 from ganesh-k13:bugfix/imdecode-resize
Ganesh Kathiresan [Mon, 20 Jan 2020 11:00:45 +0000 (16:30 +0530)]
Merge pull request #16309 from ganesh-k13:bugfix/imdecode-resize

* Added flag handlers for imread and imdecode | Issue 16203

Undo imread change

Added Imread resize tests

Added imdecode flags check

Added imdecode tests for resize

Removed trailing whitespace

Removed IMREAD_IGNORE_ORIENTATION check

Added else condition

Removed IMREAD_IGNORE_ORIENTATION check in decode

Added HAVE_JPEG guards

Added static_cast for Win32

Added resize for non jpegs

Added tests for non jpeg resize case

Fixed resize value in assert

Changed tests to Value-Parameterized Tests

Changed tests to Value-Parameterized Tests | handled >> in cpp

Changed tests to Value-Parameterized Tests | removed trailing whitespace

* imgcodecs: update test

4 years agoMerge pull request #16385 from alalek:ts_update_optional_message
Alexander Alekhin [Mon, 20 Jan 2020 10:54:40 +0000 (10:54 +0000)]
Merge pull request #16385 from alalek:ts_update_optional_message

4 years agoMerge pull request #16378 from alalek:dnn_getMemoryShapes_error_dump_blobs
Alexander Alekhin [Mon, 20 Jan 2020 10:49:17 +0000 (10:49 +0000)]
Merge pull request #16378 from alalek:dnn_getMemoryShapes_error_dump_blobs

4 years agoMerge pull request #16377 from alalek:fix_16373
Alexander Alekhin [Mon, 20 Jan 2020 10:48:21 +0000 (10:48 +0000)]
Merge pull request #16377 from alalek:fix_16373

4 years agoConvolutional padding parsing modified
ashishiva3@gmail.com [Wed, 15 Jan 2020 13:31:01 +0000 (19:01 +0530)]
Convolutional padding parsing modified

4 years agots: move message about misused 'optional' under the configuration parameter
Alexander Alekhin [Sun, 19 Jan 2020 16:09:40 +0000 (16:09 +0000)]
ts: move message about misused 'optional' under the configuration parameter

4 years agoMerge pull request #15929 from sturkmen72:patch-3
Alexander Alekhin [Sun, 19 Jan 2020 12:45:28 +0000 (12:45 +0000)]
Merge pull request #15929 from sturkmen72:patch-3

4 years agoMerge pull request #16372 from alalek:backport_16350
Alexander Alekhin [Sat, 18 Jan 2020 17:57:46 +0000 (17:57 +0000)]
Merge pull request #16372 from alalek:backport_16350

4 years agoMerge pull request #15488 from ChipKerchner:vectorizeMinMax2
Chip Kerchner [Fri, 17 Jan 2020 16:37:35 +0000 (11:37 -0500)]
Merge pull request #15488 from ChipKerchner:vectorizeMinMax2

Vectorize minMaxIdx functions

* Updated documentation and intrinsic tests for v_reduce

* Add other files back in from the forced push

* Prevent an constant overflow with v_reduce for int8 type

* Another alternative to fix constant overflow warning.

* Fix another compiler warning.

* Update comments and change comparison form to be consistent with other vectorized loops.

* Change return type of v_reduce_min & max for v_uint8 and v_uint16 to be same as lane type.

* Cast v_reduce functions to int to avoid overflow. Reduce number of parameters in MINMAXIDX_REDUCE macro.

* Restore cast type for v_reduce_min & max to LaneType

4 years agoMerge pull request #16273 from JulienMaille:wrapper_available_target
Julien [Fri, 17 Jan 2020 16:24:37 +0000 (17:24 +0100)]
Merge pull request #16273 from JulienMaille:wrapper_available_target

* add a wrapper for getAvailableTargets

* add java wrapper on Target enum

4 years agodnn(onnx): handle unaligned access in ONNX importer
Alexander Alekhin [Fri, 17 Jan 2020 13:38:58 +0000 (16:38 +0300)]
dnn(onnx): handle unaligned access in ONNX importer

4 years agoimgproc: dispatch sumpixels (integral)
Alexander Alekhin [Fri, 17 Jan 2020 13:54:08 +0000 (16:54 +0300)]
imgproc: dispatch sumpixels (integral)

4 years agoimgproc: rename sumpixels.avx512_skx.{cpp,hpp}
Alexander Alekhin [Fri, 17 Jan 2020 13:49:46 +0000 (16:49 +0300)]
imgproc: rename sumpixels.avx512_skx.{cpp,hpp}

4 years agofix lint errors and warnings ins Android samples
Hannes Achleitner [Wed, 15 Jan 2020 05:29:49 +0000 (06:29 +0100)]
fix lint errors and warnings ins Android samples

backporting of commit 4057e81b7649d8d814908157478456c6889271cd

4 years agoMerge pull request #16367 from dkurt:dnn_ie_ngraph_mvn
Alexander Alekhin [Fri, 17 Jan 2020 09:12:36 +0000 (09:12 +0000)]
Merge pull request #16367 from dkurt:dnn_ie_ngraph_mvn

4 years agoMerge pull request #16369 from kraj:gcc10
Alexander Alekhin [Fri, 17 Jan 2020 08:58:19 +0000 (08:58 +0000)]
Merge pull request #16369 from kraj:gcc10

4 years agoMerge pull request #16294 from h6197627:master
Alexander Alekhin [Fri, 17 Jan 2020 08:53:09 +0000 (08:53 +0000)]
Merge pull request #16294 from h6197627:master

4 years agocmake: fix Linux system OpenEXR detection
h6197627 [Mon, 6 Jan 2020 13:52:40 +0000 (15:52 +0200)]
cmake: fix Linux system OpenEXR detection

4 years agocarotene: Replace ipcp-unit-growth with ipa-cp-unit-growth on gcc >= 10
Khem Raj [Thu, 16 Jan 2020 16:52:00 +0000 (08:52 -0800)]
carotene: Replace ipcp-unit-growth with ipa-cp-unit-growth on gcc >= 10

gcc 10+ has renamed this option, therefore check for gcc version before
deciding which name to use for opt parameter

Signed-off-by: Khem Raj <raj.khem@gmail.com>
4 years agoMerge pull request #16325 from alalek:core_simd_neon_fix_alignment_lut
Alexander Alekhin [Thu, 16 Jan 2020 15:18:56 +0000 (15:18 +0000)]
Merge pull request #16325 from alalek:core_simd_neon_fix_alignment_lut

4 years agoMVN support through nGraph
Dmitry Kurtaev [Thu, 16 Jan 2020 15:04:10 +0000 (18:04 +0300)]
MVN support through nGraph

4 years agoimgproc(dispatch): keep history of sumpixels.cpp
Alexander Alekhin [Thu, 16 Jan 2020 12:09:10 +0000 (15:09 +0300)]
imgproc(dispatch): keep history of sumpixels.cpp

4 years agoimgproc: copy sumpixels.dispatch.cpp
Alexander Alekhin [Thu, 16 Jan 2020 12:07:48 +0000 (15:07 +0300)]
imgproc: copy sumpixels.dispatch.cpp

4 years agoimgproc: copy sumpixels.simd.hpp
Alexander Alekhin [Thu, 16 Jan 2020 12:06:34 +0000 (15:06 +0300)]
imgproc: copy sumpixels.simd.hpp

4 years agodnn: dump layer's blobs on getMemoryShapes() error
Alexander Alekhin [Thu, 16 Jan 2020 11:31:43 +0000 (14:31 +0300)]
dnn: dump layer's blobs on getMemoryShapes() error

4 years agoMerge pull request #16357 from dkurt:dnn_ie_reset_myriad
Alexander Alekhin [Wed, 15 Jan 2020 17:03:09 +0000 (17:03 +0000)]
Merge pull request #16357 from dkurt:dnn_ie_reset_myriad

4 years agoDifferent way to reset Myriad device
Dmitry Kurtaev [Wed, 15 Jan 2020 13:22:00 +0000 (16:22 +0300)]
Different way to reset Myriad device

4 years agoMerge pull request #16354 from dkurt:dnn_ie_custom_cpu_layers
Alexander Alekhin [Wed, 15 Jan 2020 15:33:18 +0000 (15:33 +0000)]
Merge pull request #16354 from dkurt:dnn_ie_custom_cpu_layers

4 years agoMerge pull request #16353 from dkurt:uninitialized_value
Alexander Alekhin [Wed, 15 Jan 2020 14:49:45 +0000 (14:49 +0000)]
Merge pull request #16353 from dkurt:uninitialized_value

4 years agoWrap custom OpenCV layers to try-catch
Dmitry Kurtaev [Wed, 15 Jan 2020 12:10:17 +0000 (15:10 +0300)]
Wrap custom OpenCV layers to try-catch

4 years agoFix uninitialized value
Dmitry Kurtaev [Wed, 15 Jan 2020 09:58:12 +0000 (12:58 +0300)]
Fix uninitialized value

4 years agoMerge pull request #16291 from dkurt:dnn_onnx_graph_simplifier
Alexander Alekhin [Tue, 14 Jan 2020 12:45:59 +0000 (12:45 +0000)]
Merge pull request #16291 from dkurt:dnn_onnx_graph_simplifier

4 years agoMerge pull request #16199 from sajarindider:computeGradientX
Alexander Alekhin [Tue, 14 Jan 2020 12:42:28 +0000 (12:42 +0000)]
Merge pull request #16199 from sajarindider:computeGradientX

4 years agoMerge pull request #16344 from l-bat:ngraph_normalize
Alexander Alekhin [Tue, 14 Jan 2020 11:55:37 +0000 (11:55 +0000)]
Merge pull request #16344 from l-bat:ngraph_normalize

4 years agoFixed small inefficiency in seamless clone init
sajarindider [Thu, 19 Dec 2019 05:46:46 +0000 (00:46 -0500)]
Fixed small inefficiency in seamless clone init

4 years agoEnable acrossSpatial normalizeL2 on Myriad
Liubov Batanina [Tue, 14 Jan 2020 09:51:19 +0000 (12:51 +0300)]
Enable acrossSpatial normalizeL2 on Myriad

4 years agoONNX graphs simplifier
Dmitry Kurtaev [Mon, 6 Jan 2020 11:03:05 +0000 (14:03 +0300)]
ONNX graphs simplifier

4 years agoMerge pull request #16232 from dkurt:dnn_ie_ngraph_fix_myriad_tests
Alexander Alekhin [Mon, 13 Jan 2020 16:59:45 +0000 (16:59 +0000)]
Merge pull request #16232 from dkurt:dnn_ie_ngraph_fix_myriad_tests

4 years agoMerge pull request #15915 from VadimLevin:dev/norm_fix
Vadim Levin [Mon, 13 Jan 2020 15:11:34 +0000 (18:11 +0300)]
Merge pull request #15915 from VadimLevin:dev/norm_fix

Fix implicit conversion from array to scalar in python bindings

* Fix wrong conversion behavior for primitive types

  - Introduce ArgTypeInfo namedtuple instead of plain tuple.
    If strict conversion parameter for type is set to true, it is
    handled like object argument in PyArg_ParseTupleAndKeywords and
    converted to concrete type with the appropriate pyopencv_to function
    call.
  - Remove deadcode and unused variables.
  - Fix implicit conversion from numpy array with 1 element to scalar
  - Fix narrowing conversion to size_t type.

* Fix wrong conversion behavior for primitive types

  - Introduce ArgTypeInfo namedtuple instead of plain tuple.
    If strict conversion parameter for type is set to true, it is
    handled like object argument in PyArg_ParseTupleAndKeywords and
    converted to concrete type with the appropriate pyopencv_to function
    call.
  - Remove deadcode and unused variables.
  - Fix implicit conversion from numpy array with 1 element to scalar
  - Fix narrowing conversion to size_t type.·
  - Enable tests with wrong conversion behavior
  - Restrict passing None as value
  - Restrict bool to integer/floating types conversion

* Add PyIntType support for Python 2

* Remove possible narrowing conversion of size_t

* Bindings conversion update

  - Remove unused macro
  - Add better conversion for types to numpy types descriptors
  - Add argument name to fail messages
  - NoneType treated as a valid argument. Better handling will be added
    as a standalone patch

* Add descriptor specialization for size_t

* Add check for signed to unsigned integer conversion safety

  - If signed integer is positive it can be safely converted
    to unsigned
  - Add check for plain python 2 objects
  - Add check for numpy scalars
  - Add simple type_traits implementation for better code style

* Resolve type "overflow" false negative in safe casting check

 - Move type_traits to separate header

* Add copyright message to type_traits.hpp

* Limit conversion scope for integral numpy types

  - Made canBeSafelyCasted specialized only for size_t, so
    type_traits header became unused and was removed.
  - Added clarification about descriptor pointer

4 years agoDisable some tests for Myriad target of nGraph
Dmitry Kurtaev [Tue, 24 Dec 2019 10:34:33 +0000 (13:34 +0300)]
Disable some tests for Myriad target of nGraph

Add lightweight IE hardware targets checks

nGraph: Concat with paddings

Enable more nGraph tests

Restore FP32->FP16 for GPU plugin of IE

try to fix buildbot

Use lightweight IE targets check only starts from R4

4 years agoMerge pull request #16335 from berak:fix_ml_python_digits_samples_3.4
Alexander Alekhin [Mon, 13 Jan 2020 12:16:40 +0000 (12:16 +0000)]
Merge pull request #16335 from berak:fix_ml_python_digits_samples_3.4

4 years agoml/python: fix digits samples(3.4)
berak [Mon, 13 Jan 2020 11:26:28 +0000 (12:26 +0100)]
ml/python: fix digits samples(3.4)

4 years agoMerge pull request #16276 from themechanicalcoder:video-tutorial
Gourav Roy [Sun, 12 Jan 2020 08:34:59 +0000 (14:04 +0530)]
Merge pull request #16276 from themechanicalcoder:video-tutorial

* Added java code for meanshift and optical_flow

* added java code for module video

* added appropriate spaces in codes

* converted absolute path to command line arguments

* added spaces at appropriate places

4 years agoMerge pull request #14666 from ihsan314:file_io_xml_yml
ihsan314 [Sun, 12 Jan 2020 08:32:12 +0000 (00:32 -0800)]
Merge pull request #14666 from ihsan314:file_io_xml_yml

Python code examples for file IO in xml and yml format

* Initial "Pythonization" of file_input_output.cpp

* Moved file_input_output.py to correct location

* Nearly done Pythonizing file_input_output.cpp

* Python equivalent of file_input_output.py created

* Started Pythonizing camera_calibration.cpp

* Completed Python tutorial/sample code for file_input_output

* Resolved whitespace issues

* Removed tabs in file_input_output.cpp

* Patched import order and wrapped code in main function

* Changed string to docstring format in help file

* Updated link to Python example code

4 years agocore(simd): fix NEON alignmnet issue
Alexander Alekhin [Sat, 11 Jan 2020 18:39:50 +0000 (18:39 +0000)]
core(simd): fix NEON alignmnet issue

4 years agoMerge pull request #16270 from dkurt:dnn_sort_tf_text_graphs
Alexander Alekhin [Sat, 11 Jan 2020 17:39:13 +0000 (17:39 +0000)]
Merge pull request #16270 from dkurt:dnn_sort_tf_text_graphs

4 years agoMerge pull request #16236 from alalek:fix_core_simd_emulator
Alexander Alekhin [Fri, 10 Jan 2020 18:31:02 +0000 (21:31 +0300)]
Merge pull request #16236 from alalek:fix_core_simd_emulator

* core: fix intrin_cpp, allow to build modules with SIMD emulator

* core(arithm): fix v_zero initialization

* core(simd): 'strict' types for binary/bitwise operations

* features2d: avoid aligned load issue in GCC 5.4 with emulated SIMD

* core(simd): alignment checks in SIMD emulator

4 years agoMerge pull request #16240 from olramde:olramde
olramde [Fri, 10 Jan 2020 13:18:31 +0000 (22:18 +0900)]
Merge pull request #16240 from olramde:olramde

* Changed plus operator to os.path.join()

* Remove '/' from PATH

4 years agoMerge pull request #16300 from Palmitoxico:cmake-cmp0077
Alexander Alekhin [Wed, 8 Jan 2020 21:52:30 +0000 (21:52 +0000)]
Merge pull request #16300 from Palmitoxico:cmake-cmp0077

4 years agoEnable cmake CMP0077 policy
Augusto Fraga Giachero [Tue, 7 Jan 2020 11:36:35 +0000 (08:36 -0300)]
Enable cmake CMP0077 policy

When building OpenCV as a sub-project using cmake's add_subdirectory()
the OpenCV's build options would be overwritten to its default
state. With cmake 3.13+ the CMP0077 policy, option() honors previous
definitions via set().

4 years agoMerge pull request #16289 from Nuzhny007:3.4
Alexander Alekhin [Tue, 7 Jan 2020 22:13:39 +0000 (22:13 +0000)]
Merge pull request #16289 from Nuzhny007:3.4

4 years agoFixed compilation on windows with openvx
Nuzhny007 [Mon, 6 Jan 2020 03:32:56 +0000 (06:32 +0300)]
Fixed compilation on windows with openvx

4 years agoMerge pull request #16265 from JanuszL:fix_bgr
Alexander Alekhin [Sun, 5 Jan 2020 12:01:03 +0000 (12:01 +0000)]
Merge pull request #16265 from JanuszL:fix_bgr

4 years agoFix swapped channels in BGR* conversion utility function
Janusz Lisiecki [Fri, 20 Dec 2019 16:54:37 +0000 (17:54 +0100)]
Fix swapped channels in BGR* conversion utility function

- some of `icvCvt_BGR*` functions have R with B channels
  swapped what leads to the wrong conversion
- renames misleading `rgb` variable name to `bgr`
- swap back the conversion coefficients, `cB` should be the first

Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
4 years agoimgproc(resize): improve 8u3 HResize vector exit calc
Paul E. Murphy [Thu, 12 Dec 2019 16:33:08 +0000 (10:33 -0600)]
imgproc(resize): improve 8u3 HResize vector exit calc

Actually, we can do this in constant time. xofs always
contains same or increasing offset values. We can instead
find the most extreme value used and never attempt to load it.

Similarly, we can note for all dx >= 0 and dx < (dwidth - cn)
where xofs[dx] + cn < xofs[dwidth-cn] implies dx < (dwidth - cn).

Thus, we can use this to control our loop termination optimally.

This fixes #16137 with little or no performance impact. I have
also added a debug check as a sanity check.

4 years agoMerge pull request #16238 from alalek:imgproc_resize_fix_types
Alexander Alekhin [Fri, 3 Jan 2020 16:30:28 +0000 (16:30 +0000)]
Merge pull request #16238 from alalek:imgproc_resize_fix_types

4 years agocopyright: 2020
Alexander Alekhin [Thu, 2 Jan 2020 11:58:20 +0000 (11:58 +0000)]
copyright: 2020

4 years agoMerge pull request #16249 from alalek:check_size
Alexander Alekhin [Tue, 31 Dec 2019 10:09:00 +0000 (10:09 +0000)]
Merge pull request #16249 from alalek:check_size

4 years agoSort text TensorFlow graphs
Dmitry Kurtaev [Tue, 31 Dec 2019 08:43:32 +0000 (11:43 +0300)]
Sort text TensorFlow graphs

4 years agoMerge pull request #16263 from dkurt:dnn_tf_addv2
Alexander Alekhin [Mon, 30 Dec 2019 22:56:11 +0000 (22:56 +0000)]
Merge pull request #16263 from dkurt:dnn_tf_addv2

4 years agoMerge pull request #16258 from jed-frey:patch/python38-clock
Alexander Alekhin [Mon, 30 Dec 2019 17:34:23 +0000 (17:34 +0000)]
Merge pull request #16258 from jed-frey:patch/python38-clock

4 years agoAddV2 from TensorFlow
Dmitry Kurtaev [Mon, 30 Dec 2019 17:06:58 +0000 (20:06 +0300)]
AddV2 from TensorFlow

4 years agoRemoved deprecated 'clock' import.
Jed [Sun, 29 Dec 2019 23:50:17 +0000 (18:50 -0500)]
Removed deprecated 'clock' import.

4 years agoMerge pull request #16251 from pwuertz:rtrees_set_rng
Alexander Alekhin [Sun, 29 Dec 2019 22:30:39 +0000 (22:30 +0000)]
Merge pull request #16251 from pwuertz:rtrees_set_rng

4 years agoUse global RNG for training RTrees.
Peter Würtz [Sat, 28 Dec 2019 12:34:08 +0000 (13:34 +0100)]
Use global RNG for training RTrees.

4 years agocore(check): add Size_<int>
Alexander Alekhin [Sat, 28 Dec 2019 13:18:12 +0000 (13:18 +0000)]
core(check): add Size_<int>

4 years agoMerge pull request #16237 from alalek:eliminate_build_warnings
Alexander Alekhin [Fri, 27 Dec 2019 19:38:25 +0000 (19:38 +0000)]
Merge pull request #16237 from alalek:eliminate_build_warnings

4 years agoMerge pull request #16247 from alalek:backport_16241
Alexander Alekhin [Fri, 27 Dec 2019 16:20:52 +0000 (16:20 +0000)]
Merge pull request #16247 from alalek:backport_16241

4 years agoMerge pull request #16242 from catree:add_Rodrigues_input_shape_check
Alexander Alekhin [Fri, 27 Dec 2019 13:12:03 +0000 (13:12 +0000)]
Merge pull request #16242 from catree:add_Rodrigues_input_shape_check

4 years agoFix spelling typos
Brian Wignall [Thu, 26 Dec 2019 11:45:03 +0000 (06:45 -0500)]
Fix spelling typos

backport commit 659ffaddb4aa2cd1ae94603e514711dfe171a971

4 years agoMerge pull request #16243 from collinbrake:grammar_fixes_9
Alexander Alekhin [Fri, 27 Dec 2019 11:13:08 +0000 (11:13 +0000)]
Merge pull request #16243 from collinbrake:grammar_fixes_9