platform/upstream/opencv.git
5 years agoMerge pull request #13252 from take1014:filter2d_13179
Alexander Alekhin [Wed, 26 Jun 2019 13:34:09 +0000 (13:34 +0000)]
Merge pull request #13252 from take1014:filter2d_13179

5 years agoMerge pull request #14869 from alalek:samples_msvs2019_support
Alexander Alekhin [Tue, 25 Jun 2019 22:07:02 +0000 (22:07 +0000)]
Merge pull request #14869 from alalek:samples_msvs2019_support

5 years agoMerge pull request #14814 from alalek:dnn_skip_test_tags
Alexander Alekhin [Tue, 25 Jun 2019 22:00:25 +0000 (22:00 +0000)]
Merge pull request #14814 from alalek:dnn_skip_test_tags

5 years agoMerge pull request #14849 from thangktran:thangktran/feature/fillPoly_and_fillConvexP...
Alexander Alekhin [Tue, 25 Jun 2019 15:01:12 +0000 (15:01 +0000)]
Merge pull request #14849 from thangktran:thangktran/feature/fillPoly_and_fillConvexPoly_js_binding

5 years agoMerge pull request #14875 from Legoless:master
Alexander Alekhin [Tue, 25 Jun 2019 10:53:49 +0000 (10:53 +0000)]
Merge pull request #14875 from Legoless:master

5 years ago[#14873] Fix code signing issue in Try Compile script
Dal Rupnik [Mon, 24 Jun 2019 12:42:03 +0000 (14:42 +0200)]
[#14873] Fix code signing issue in Try Compile script

5 years agoMerge pull request #14876 from dkurt:fix_js_face_recognition_v2
Alexander Alekhin [Mon, 24 Jun 2019 18:29:05 +0000 (18:29 +0000)]
Merge pull request #14876 from dkurt:fix_js_face_recognition_v2

5 years agoFix face recognition JS sample
Dmitry Kurtaev [Mon, 24 Jun 2019 13:41:37 +0000 (16:41 +0300)]
Fix face recognition JS sample

5 years agoMerge pull request #14845 from vonchenplus:ocv_mirrorpad
Feng Chen [Mon, 24 Jun 2019 09:27:42 +0000 (17:27 +0800)]
Merge pull request #14845 from vonchenplus:ocv_mirrorpad

* tensorflow support mirror pad

* revert macro define

* revert macro define

* reduce code duplication

* revert macro define

5 years agodnn(test): replace SkipTestException with tags
Alexander Alekhin [Sat, 15 Jun 2019 12:17:25 +0000 (12:17 +0000)]
dnn(test): replace SkipTestException with tags

5 years agoMerge pull request #14847 from alalek:dnn_fix_test_data_searching
Alexander Alekhin [Sun, 23 Jun 2019 12:42:26 +0000 (12:42 +0000)]
Merge pull request #14847 from alalek:dnn_fix_test_data_searching

5 years agoMerge pull request #14305 from cameron-martin:calib3d-js
Alexander Alekhin [Sat, 22 Jun 2019 16:43:40 +0000 (16:43 +0000)]
Merge pull request #14305 from cameron-martin:calib3d-js

5 years agosamples: support MSVS 2019 compiler
Alexander Alekhin [Sat, 22 Jun 2019 16:24:21 +0000 (16:24 +0000)]
samples: support MSVS 2019 compiler

requires CMake 3.14+

5 years agoMerge pull request #14864 from dkurt:fix_js_face_recognition
Alexander Alekhin [Sat, 22 Jun 2019 07:15:02 +0000 (07:15 +0000)]
Merge pull request #14864 from dkurt:fix_js_face_recognition

5 years agoMerge pull request #14833 from l-bat:ocv_eltwise3d
Lubov Batanina [Sat, 22 Jun 2019 07:13:28 +0000 (10:13 +0300)]
Merge pull request #14833 from l-bat:ocv_eltwise3d

* Support Eltwise3d

* Refactoring

* Fix test

5 years agoFix face recognition sample for JS
Dmitry Kurtaev [Sat, 22 Jun 2019 04:53:52 +0000 (21:53 -0700)]
Fix face recognition sample for JS

5 years agoMerge pull request #14855 from alalek:update_version_3.4.7-pre
Alexander Alekhin [Fri, 21 Jun 2019 14:26:40 +0000 (17:26 +0300)]
Merge pull request #14855 from alalek:update_version_3.4.7-pre

5 years agopre: OpenCV 3.4.7 (version++)
Alexander Alekhin [Fri, 21 Jun 2019 11:25:06 +0000 (14:25 +0300)]
pre: OpenCV 3.4.7 (version++)

5 years agoexperimental version++
Alexander Alekhin [Fri, 21 Jun 2019 11:22:01 +0000 (14:22 +0300)]
experimental version++

5 years agoMerge pull request #14848 from alalek:build_warnings_avx512
Alexander Alekhin [Fri, 21 Jun 2019 13:53:52 +0000 (13:53 +0000)]
Merge pull request #14848 from alalek:build_warnings_avx512

5 years agoMerge pull request #14834 from alalek:videoio_gstreamer_issues
Alexander Alekhin [Fri, 21 Jun 2019 13:38:34 +0000 (13:38 +0000)]
Merge pull request #14834 from alalek:videoio_gstreamer_issues

5 years agoMerge pull request #14836 from alalek:static_analysis_issues_3.4
Alexander Alekhin [Fri, 21 Jun 2019 10:26:09 +0000 (10:26 +0000)]
Merge pull request #14836 from alalek:static_analysis_issues_3.4

5 years agojs: Add findHomography js bindings.
Cameron Martin [Thu, 11 Apr 2019 23:13:12 +0000 (00:13 +0100)]
js: Add findHomography js bindings.

Removed constants from legacy C api and switched out header with shorter version.

Removed blank line that was failing CI.

5 years agoMerge pull request #14737 from Wenzhao-Xiang:master
Alexander Alekhin [Thu, 20 Jun 2019 19:01:32 +0000 (19:01 +0000)]
Merge pull request #14737 from Wenzhao-Xiang:master

5 years agojs: added fillPoly() and fillConvexPoly()
Thang Tran [Thu, 20 Jun 2019 17:56:23 +0000 (19:56 +0200)]
js: added fillPoly() and fillConvexPoly()

5 years agocore: eliminate AVX512 build warnings
Alexander Alekhin [Thu, 20 Jun 2019 16:28:53 +0000 (19:28 +0300)]
core: eliminate AVX512 build warnings

from MSVS2017 and GCC8 -O1 mode

5 years agotest: fix usage of findDataFile()
Alexander Alekhin [Thu, 20 Jun 2019 13:43:28 +0000 (16:43 +0300)]
test: fix usage of findDataFile()

misused 'optional' mode

5 years agovideoio: refactor GStreamer backend
Alexander Alekhin [Mon, 17 Jun 2019 16:33:02 +0000 (19:33 +0300)]
videoio: refactor GStreamer backend

- exception safe smart pointers, fixed many memory leaks
- fixed errors handling
- fixed strings handling
- fixed file existence check
- fixed toFraction() implementation
- add 'drop=true' for v4l2 input
- avoid overriding custom pipelines sink's 'max-buffers' value
- updated valgrind supression rules
- added support for GStreamer native leaks tracking (via gst_deinit() call)
- repaired capturing through GStreamer0.10 (fixed CV_8UC1)

5 years agovideoio(test): avoid raw ptr in ffmpeg tests
Alexander Alekhin [Tue, 18 Jun 2019 14:25:43 +0000 (17:25 +0300)]
videoio(test): avoid raw ptr in ffmpeg tests

causes leaks if FFmpeg is disabled through OPENCV_VIDEOIO_PRIORITY_FFMPEG=0

5 years agocore: backport toLowerCase()/toUpperCase()
Alexander Alekhin [Tue, 18 Jun 2019 12:35:16 +0000 (15:35 +0300)]
core: backport toLowerCase()/toUpperCase()

5 years agovideoio(test): add extra videoio tests
Alexander Alekhin [Mon, 17 Jun 2019 20:47:41 +0000 (20:47 +0000)]
videoio(test): add extra videoio tests

5 years agostatic analysis issues
Alexander Alekhin [Wed, 19 Jun 2019 16:04:51 +0000 (19:04 +0300)]
static analysis issues

5 years agoMerge pull request #14816 from gal0is:gal0is-branch
Alexander Alekhin [Mon, 17 Jun 2019 13:54:53 +0000 (13:54 +0000)]
Merge pull request #14816 from gal0is:gal0is-branch

5 years agoSolve the import issue in Python2.
gal0is [Sat, 15 Jun 2019 15:51:13 +0000 (23:51 +0800)]
Solve the import issue in Python2.

5 years agoMerge pull request #14815 from alalek:valgrind_suppress_openexr_threadpool
Alexander Alekhin [Sat, 15 Jun 2019 16:18:57 +0000 (16:18 +0000)]
Merge pull request #14815 from alalek:valgrind_suppress_openexr_threadpool

5 years agovalgrind: suppress OpenEXR ThreadPool
Alexander Alekhin [Sat, 15 Jun 2019 14:38:37 +0000 (14:38 +0000)]
valgrind: suppress OpenEXR ThreadPool

5 years agoMerge pull request #14808 from alalek:issue_14807
Alexander Alekhin [Fri, 14 Jun 2019 22:44:43 +0000 (22:44 +0000)]
Merge pull request #14808 from alalek:issue_14807

5 years agoMerge pull request #14800 from FanaticsKang:add_undistortPoint_test
Kang Yifei [Fri, 14 Jun 2019 19:57:21 +0000 (03:57 +0800)]
Merge pull request #14800 from FanaticsKang:add_undistortPoint_test

Test request by #14583 (#14800)

* add test to show the undistort bug

* move test to calib3d

5 years agoMerge pull request #14583 from FanaticsKang:fix_undistortPoint_bug
Alexander Alekhin [Fri, 14 Jun 2019 18:30:25 +0000 (18:30 +0000)]
Merge pull request #14583 from FanaticsKang:fix_undistortPoint_bug

5 years agoMerge pull request #14747 from dkurt:fix_14683
Alexander Alekhin [Fri, 14 Jun 2019 16:41:55 +0000 (16:41 +0000)]
Merge pull request #14747 from dkurt:fix_14683

5 years agocmake: typo in hook name
Alexander Alekhin [Fri, 14 Jun 2019 16:07:54 +0000 (19:07 +0300)]
cmake: typo in hook name

5 years agofix the bug, when k[4] is negative, icdist may be negative at the edge of image.
Kang [Sun, 19 May 2019 07:14:20 +0000 (15:14 +0800)]
fix the bug, when k[4] is negative, icdist may be negative at the edge of image.

5 years agodnn: fix MVN layer (issue 14683)
Dmitry Kurtaev [Thu, 6 Jun 2019 16:08:45 +0000 (19:08 +0300)]
dnn: fix MVN layer (issue 14683)

5 years agoMerge pull request #14792 from dkurt:dnn_ie_min_version_r5
Dmitry Kurtaev [Fri, 14 Jun 2019 15:17:02 +0000 (18:17 +0300)]
Merge pull request #14792 from dkurt:dnn_ie_min_version_r5

* Remove Inference Engine 2018R3 and 2018R4

* Fix 2018R5

5 years agoMerge pull request #14794 from terfendail:wui512_interleavenames
Alexander Alekhin [Fri, 14 Jun 2019 14:20:34 +0000 (14:20 +0000)]
Merge pull request #14794 from terfendail:wui512_interleavenames

5 years agoMerge pull request #14790 from alalek:update_ffmpeg_3.4
Alexander Alekhin [Fri, 14 Jun 2019 13:40:59 +0000 (13:40 +0000)]
Merge pull request #14790 from alalek:update_ffmpeg_3.4

5 years agoRename parameters in AVX512 implementation of v_load_deinterleave and v_store_interleave
Vitaly Tuzov [Thu, 13 Jun 2019 13:46:22 +0000 (16:46 +0300)]
Rename parameters in AVX512 implementation of v_load_deinterleave and v_store_interleave

5 years agoMerge pull request #14673 from janstarzy:hidden-vis-with-java7
Alexander Alekhin [Thu, 13 Jun 2019 17:59:39 +0000 (17:59 +0000)]
Merge pull request #14673 from janstarzy:hidden-vis-with-java7

5 years agomake -fvisibility=hidden work with java 1.7
Jan Starzynski [Wed, 29 May 2019 14:27:21 +0000 (16:27 +0200)]
make -fvisibility=hidden work with java 1.7

5 years agoopencv.js: fix the loading issue of opencv.js(WASM) in face recognition
wenzhao [Thu, 13 Jun 2019 03:26:27 +0000 (11:26 +0800)]
opencv.js: fix the loading issue of opencv.js(WASM) in face recognition

5 years agoffmpeg: update 3.4.6
Alexander Alekhin [Wed, 12 Jun 2019 16:54:47 +0000 (16:54 +0000)]
ffmpeg: update 3.4.6

libvpx: 1.8.0

5 years agoMerge pull request #14784 from alalek:backport_14779
Alexander Alekhin [Tue, 11 Jun 2019 20:36:15 +0000 (20:36 +0000)]
Merge pull request #14784 from alalek:backport_14779

5 years agoMerge pull request #14783 from alalek:backport_14777
Alexander Alekhin [Tue, 11 Jun 2019 20:12:01 +0000 (20:12 +0000)]
Merge pull request #14783 from alalek:backport_14777

5 years agoMerge pull request #14743 from terfendail:wui512_fixvswarn
Vitaly Tuzov [Tue, 11 Jun 2019 20:07:39 +0000 (23:07 +0300)]
Merge pull request #14743 from terfendail:wui512_fixvswarn

Fix for MSVS2019 build warnings (#14743)

* AVX512 arch support for MSVS

* Fix for MSVS2019 build warnings: updated integral() AVX512 implementation

* Fix for MSVS2019 build warnings: reworked v_rotate_right AVX512 implementation

* fix indentation

5 years agocore: avoid function type cast, make happy UBSAN
Alexander Alekhin [Tue, 11 Jun 2019 07:06:29 +0000 (07:06 +0000)]
core: avoid function type cast, make happy UBSAN

backporting of commit: d3d13c41c4fefd5708decd20d9d59b01a2530648

5 years agoimgcodecs(tiff): add more checks
Alexander Alekhin [Mon, 10 Jun 2019 19:50:54 +0000 (19:50 +0000)]
imgcodecs(tiff): add more checks

backporting of commit: f6230ae0198ed66597c5a7a91279fb20c8a78ca4

5 years agoMerge pull request #14736 from mshabunin:minimal-python-3
Alexander Alekhin [Tue, 11 Jun 2019 13:01:05 +0000 (13:01 +0000)]
Merge pull request #14736 from mshabunin:minimal-python-3

5 years agoLimited API support for Python3
Maksim Shabunin [Thu, 21 Mar 2019 07:45:02 +0000 (10:45 +0300)]
Limited API support for Python3

5 years agoMerge pull request #14725 from alalek:update_openexr_2.3.0
Alexander Alekhin [Mon, 10 Jun 2019 17:04:23 +0000 (20:04 +0300)]
Merge pull request #14725 from alalek:update_openexr_2.3.0

3rdparty: update OpenEXR 2.3.0 (#14725)

* openexr 2.2.1

* openexr 2.3.0

* openexr: build fixes

* openexr: build dwa tables on-demand

5 years agoMerge pull request #14760 from ChipKerchner:3.4
Alexander Alekhin [Sun, 9 Jun 2019 17:43:02 +0000 (17:43 +0000)]
Merge pull request #14760 from ChipKerchner:3.4

5 years agoMerge pull request #14764 from alalek:core_intrin_drop_hasSIMD_checks
Alexander Alekhin [Sun, 9 Jun 2019 17:11:45 +0000 (17:11 +0000)]
Merge pull request #14764 from alalek:core_intrin_drop_hasSIMD_checks

5 years agoMerge pull request #14767 from alalek:imgcodecs_test_exr
Alexander Alekhin [Sat, 8 Jun 2019 22:44:37 +0000 (22:44 +0000)]
Merge pull request #14767 from alalek:imgcodecs_test_exr

5 years agoimgcodecs(test): add OpenEXR I/O test
Alexander Alekhin [Sat, 8 Jun 2019 14:43:01 +0000 (14:43 +0000)]
imgcodecs(test): add OpenEXR I/O test

5 years agoMerge pull request #14440 from alalek:async_array
Alexander Alekhin [Sat, 8 Jun 2019 20:57:15 +0000 (20:57 +0000)]
Merge pull request #14440 from alalek:async_array

5 years agocore(intrin): drop hasSIMD128 checks
Alexander Alekhin [Sat, 8 Jun 2019 19:14:35 +0000 (19:14 +0000)]
core(intrin): drop hasSIMD128 checks

- use compile-time checks instead (`#if CV_SIMD128`)
- runtime checks are useless

5 years agoMerge pull request #14697 from l-bat:Slice_ONNX
Lubov Batanina [Sat, 8 Jun 2019 13:52:40 +0000 (16:52 +0300)]
Merge pull request #14697 from l-bat:Slice_ONNX

* Support Slice layer in ONNX importer

* Add IE support

* Fix ONNX importer

* Fix Slice

5 years agoRewrite code in BGR2Gray functions so that auto vectorizer does a better job.
Chip Kerchner Chip.Kerchner@ibm.com [Fri, 7 Jun 2019 16:48:05 +0000 (11:48 -0500)]
Rewrite code in BGR2Gray functions so that auto vectorizer does a better job.

5 years agoMerge pull request #14759 from alalek:java_gen_unicode
Alexander Alekhin [Fri, 7 Jun 2019 16:02:11 +0000 (16:02 +0000)]
Merge pull request #14759 from alalek:java_gen_unicode

5 years agojava: wrap StringIO() to support unicode strings
Alexander Alekhin [Fri, 7 Jun 2019 13:30:16 +0000 (16:30 +0300)]
java: wrap StringIO() to support unicode strings

5 years agoMerge pull request #14754 from allnes:java_qr_code
Alexander Alekhin [Fri, 7 Jun 2019 12:49:25 +0000 (12:49 +0000)]
Merge pull request #14754 from allnes:java_qr_code

5 years agoRemove check and added binding tests
Alexander Nesterov [Fri, 7 Jun 2019 10:56:55 +0000 (10:56 +0000)]
Remove check and added binding tests

5 years agoMerge pull request #14756 from mshabunin:fix-avx512-detection
Alexander Alekhin [Fri, 7 Jun 2019 12:35:38 +0000 (12:35 +0000)]
Merge pull request #14756 from mshabunin:fix-avx512-detection

5 years agoMerge pull request #14717 from alalek:core_visibility_handling
Alexander Alekhin [Fri, 7 Jun 2019 11:49:30 +0000 (11:49 +0000)]
Merge pull request #14717 from alalek:core_visibility_handling

5 years agoMerge pull request #14750 from alalek:sample_fix_encoding
Alexander Alekhin [Fri, 7 Jun 2019 11:12:28 +0000 (11:12 +0000)]
Merge pull request #14750 from alalek:sample_fix_encoding

5 years agoAVX 512 detection: workaround for older GCC
Maksim Shabunin [Thu, 6 Jun 2019 13:59:17 +0000 (16:59 +0300)]
AVX 512 detection: workaround for older GCC

5 years agoMerge pull request #14752 from SchultzC:3.4
Alexander Alekhin [Fri, 7 Jun 2019 10:44:39 +0000 (10:44 +0000)]
Merge pull request #14752 from SchultzC:3.4

5 years agopython: visibility
Alexander Alekhin [Tue, 4 Jun 2019 14:40:24 +0000 (17:40 +0300)]
python: visibility

5 years agocore: fix visibility handling
Alexander Alekhin [Mon, 3 Jun 2019 20:14:52 +0000 (20:14 +0000)]
core: fix visibility handling

5 years agoChanged to integer division
SchultzC [Thu, 6 Jun 2019 21:50:45 +0000 (14:50 -0700)]
Changed to integer division

5 years agoMerge pull request #14749 from alalek:fix_android_javadoc
Alexander Alekhin [Thu, 6 Jun 2019 21:07:23 +0000 (21:07 +0000)]
Merge pull request #14749 from alalek:fix_android_javadoc

5 years agosamples: skip findFile() in encoding mode
Alexander Alekhin [Thu, 6 Jun 2019 20:42:55 +0000 (20:42 +0000)]
samples: skip findFile() in encoding mode

5 years agoandroid: fix javadoc
Alexander Alekhin [Thu, 6 Jun 2019 19:55:17 +0000 (19:55 +0000)]
android: fix javadoc

5 years agoMerge pull request #14729 from arnaudbrejeon:bug_fix_14722
Alexander Alekhin [Thu, 6 Jun 2019 19:44:06 +0000 (19:44 +0000)]
Merge pull request #14729 from arnaudbrejeon:bug_fix_14722

5 years agoMerge pull request #14667 from asashour:javadoc
Alexander Alekhin [Thu, 6 Jun 2019 10:57:39 +0000 (10:57 +0000)]
Merge pull request #14667 from asashour:javadoc

5 years agoMerge pull request #14693 from utibenkei:fix_java_simpleblobdetector
utibenkei [Thu, 6 Jun 2019 10:05:41 +0000 (19:05 +0900)]
Merge pull request #14693 from utibenkei:fix_java_simpleblobdetector

* java: fix java SimpleBlobDetector

* add SIMPLEBLOBFeatureDetectorTest

* add package org.opencv.test.features2d;

* fix SIMPLEBLOBFeatureDetectorTest

5 years agoMerge pull request #14733 from SchultzC:3.4
SchultzC [Thu, 6 Jun 2019 10:02:45 +0000 (03:02 -0700)]
Merge pull request #14733 from SchultzC:3.4

* cast positional arguments to int

* Changed to integer division based

* removed white space

* removed white space

5 years agoMerge pull request #14724 from asashour:typos
Alexander Alekhin [Thu, 6 Jun 2019 10:01:03 +0000 (10:01 +0000)]
Merge pull request #14724 from asashour:typos

5 years agoAdd test
arnaudbrejeon [Wed, 5 Jun 2019 16:15:18 +0000 (09:15 -0700)]
Add test

5 years agoFix bug
arnaudbrejeon [Wed, 5 Jun 2019 16:15:04 +0000 (09:15 -0700)]
Fix bug

5 years agoMerge pull request #14726 from alalek:backport_14716
Alexander Alekhin [Wed, 5 Jun 2019 15:54:45 +0000 (15:54 +0000)]
Merge pull request #14726 from alalek:backport_14716

5 years agoimgcodecs: sanitize PAM decoding
Alexander Alekhin [Fri, 31 May 2019 20:52:20 +0000 (20:52 +0000)]
imgcodecs: sanitize PAM decoding

backporting of commit: 76fca0e755c961a17b890d0b7834eed774b46241

5 years agojava: generated code to have javadoc
Ahmed Ashour [Wed, 5 Jun 2019 10:44:03 +0000 (12:44 +0200)]
java: generated code to have javadoc

5 years agoFix some typos
Ahmed Ashour [Wed, 5 Jun 2019 10:24:13 +0000 (12:24 +0200)]
Fix some typos

5 years agoMerge pull request #14682 from l-bat:axpy_layer
Lubov Batanina [Tue, 4 Jun 2019 21:18:06 +0000 (00:18 +0300)]
Merge pull request #14682 from l-bat:axpy_layer

* Add Axpy layer

* Fix test

* fix caffe importer

5 years agoMerge pull request #14678 from tedsteiner:qnx
Ted Steiner [Tue, 4 Jun 2019 16:45:21 +0000 (12:45 -0400)]
Merge pull request #14678 from tedsteiner:qnx

Fix build issue on QNX platform (#14678)

* QNX compatibility

* core: unify gettimeofday() usage

5 years agoMerge pull request #14710 from bommo1:bommo1-14265
Alexander Alekhin [Tue, 4 Jun 2019 16:44:42 +0000 (16:44 +0000)]
Merge pull request #14710 from bommo1:bommo1-14265

5 years agoMerge pull request #14712 from SchultzC:master
Alexander Alekhin [Tue, 4 Jun 2019 16:43:45 +0000 (16:43 +0000)]
Merge pull request #14712 from SchultzC:master

5 years agoMerge pull request #14718 from rasmus25:3.4
rasmus25 [Tue, 4 Jun 2019 15:43:42 +0000 (18:43 +0300)]
Merge pull request #14718 from rasmus25:3.4

* Revert the bad parts of b085158d5999fdced91094405f8753e9275092f6 to fix https://github.com/opencv/opencv/issues/11131
but preserve the good parts to keep https://github.com/opencv/opencv/issues/10791 fixed

* calib3d: add regression test for stereoCalibrate to fix https://github.com/opencv/opencv/issues/11131

5 years agoRemove divide by 1000
SchultzC [Tue, 4 Jun 2019 01:18:40 +0000 (18:18 -0700)]
Remove divide by 1000

because t = (time.time() - t) will return seconds,  dividing by 1000 to obtain seconds will be incorrect.

5 years agoMerge pull request #14719 from alalek:update_protobuf_3.5.2
Alexander Alekhin [Tue, 4 Jun 2019 13:10:17 +0000 (13:10 +0000)]
Merge pull request #14719 from alalek:update_protobuf_3.5.2