mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 09:25:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,692 Commits 6 Branches 128 Tags 3.4 GiB
11b020b9f9
Commit Graph

26692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Alekhin
11b020b9f9 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-06-10 19:05:28 +00:00
Alexander Alekhin
878af7ada8
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
 2019-06-10 20:04:23 +03:00
Alexander Alekhin
987061d800 Merge pull request #14771 from mshabunin:fix-world-build 2019-06-10 12:02:39 +00:00
Maksim Shabunin
f99f58d99f Allow setting IS_PART_OF_WORLD in command line, fix videoio plugin linking 2019-06-10 14:13:54 +03:00
atalaman
1aefa6779f Merge pull request #14513 from TolyaTalamanov:at/color-convert-kernels 
G-API: Implement color-convert kernels (#14513)

* Implement color-convert kernels

* Fix rgb2yuv422 reference version

* Fix comments to review

* Restore NV12toBGR in imgproc.hpp

* Add accuracy tests

* Fix doxygen

* Fix ref version yuv422

* Fix warnings

* Fix typos

* Fix simd version yuv422

* Fix warnings

* Fix compile error

* Fix warning

* Remove comment
 2019-06-10 14:09:30 +03:00
Alexander Alekhin
d2f9cfcf81 Merge pull request #14760 from ChipKerchner:3.4 2019-06-09 17:43:02 +00:00
Alexander Alekhin
52644f067e Merge pull request #14764 from alalek:core_intrin_drop_hasSIMD_checks 2019-06-09 17:11:45 +00:00
Alexander Alekhin
417ac94456 Merge pull request #14767 from alalek:imgcodecs_test_exr 2019-06-08 22:44:37 +00:00
Alexander Alekhin
02bfd20760 imgcodecs(test): add OpenEXR I/O test 2019-06-08 21:30:26 +00:00
Alexander Alekhin
6d916c5bb4 Merge pull request #14440 from alalek:async_array 2019-06-08 20:57:15 +00:00
Alexander Alekhin
1e9ad5476d core(intrin): drop hasSIMD128 checks 
- use compile-time checks instead (`#if CV_SIMD128`)
- runtime checks are useless
 2019-06-08 19:20:20 +00:00
Lubov Batanina
5e80191d27 Merge pull request #14697 from l-bat:Slice_ONNX 
* Support Slice layer in ONNX importer

* Add IE support

* Fix ONNX importer

* Fix Slice
 2019-06-08 16:52:40 +03:00
Chip Kerchner Chip.Kerchner@ibm.com
058367f34c Rewrite code in BGR2Gray functions so that auto vectorizer does a better job. 2019-06-07 11:48:05 -05:00
Alexander Alekhin
ddcf388270 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-06-07 19:02:55 +03:00
Alexander Alekhin
254f88f805 Merge pull request #14759 from alalek:java_gen_unicode 2019-06-07 16:02:12 +00:00
Alexander Alekhin
60fb1fde75 java: wrap StringIO() to support unicode strings 2019-06-07 17:05:58 +03:00
Alexander Alekhin
00367289bd Merge pull request #14754 from allnes:java_qr_code 2019-06-07 12:49:25 +00:00
Alexander Nesterov
a9769b9202 Remove check and added binding tests 2019-06-07 14:53:40 +00:00
Alexander Alekhin
6d62be55b3 Merge pull request #14756 from mshabunin:fix-avx512-detection 2019-06-07 12:35:39 +00:00
Alexander Alekhin
002925466b Merge pull request #14717 from alalek:core_visibility_handling 2019-06-07 11:49:30 +00:00
Alexander Alekhin
8fae361768 Merge pull request #14750 from alalek:sample_fix_encoding 2019-06-07 11:12:28 +00:00
Maksim Shabunin
65919ed839 AVX 512 detection: workaround for older GCC 2019-06-07 13:58:09 +03:00
Alexander Alekhin
cdee3d33b4 Merge pull request #14752 from SchultzC:3.4 2019-06-07 10:44:39 +00:00
Alexander Alekhin
f5ca9d3fe1 python: visibility 2019-06-07 07:23:15 +00:00
Alexander Alekhin
4a8fd71a2e core: fix visibility handling 2019-06-07 07:23:15 +00:00
SchultzC
1e6e18ff05
Changed to integer division 2019-06-06 14:50:45 -07:00
Alexander Alekhin
5c05b7bc01 Merge pull request #14749 from alalek:fix_android_javadoc 2019-06-06 21:07:23 +00:00
Alexander Alekhin
a51d46cbf9 samples: skip findFile() in encoding mode 2019-06-06 20:42:55 +00:00
Alexander Alekhin
c6deba6003 android: fix javadoc 2019-06-06 20:22:42 +00:00
Alexander Alekhin
08019732e2 Merge pull request #14729 from arnaudbrejeon:bug_fix_14722 2019-06-06 19:44:06 +00:00
Alexander Alekhin
aab9ef4290 Merge pull request #14667 from asashour:javadoc 2019-06-06 10:57:39 +00:00
utibenkei
03382d29cc Merge pull request #14693 from utibenkei:fix_java_simpleblobdetector 
* java: fix java SimpleBlobDetector

* add SIMPLEBLOBFeatureDetectorTest

* add package org.opencv.test.features2d;

* fix SIMPLEBLOBFeatureDetectorTest
 2019-06-06 13:05:41 +03:00
SchultzC
3833d86f0f Merge pull request #14733 from SchultzC:3.4 
* cast positional arguments to int

* Changed to integer division based

* removed white space

* removed white space
 2019-06-06 13:02:45 +03:00
Alexander Alekhin
94ec0e9b74 Merge pull request #14724 from asashour:typos 2019-06-06 10:01:03 +00:00
arnaudbrejeon
e8e020ffb7 Add test 2019-06-05 09:15:18 -07:00
arnaudbrejeon
e9b8571afc Fix bug 2019-06-05 09:15:04 -07:00
Alexander Alekhin
f3de2b4be7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-06-05 19:11:52 +03:00
Alexander Alekhin
51631b90af Merge pull request #14726 from alalek:backport_14716 2019-06-05 15:54:46 +00:00
Alexander Alekhin
a2445c44cb imgcodecs: sanitize PAM decoding 
backporting of commit: 76fca0e755
 2019-06-05 18:12:43 +03:00
Ahmed Ashour
5c56b8ce92 java: generated code to have javadoc 2019-06-05 12:44:03 +02:00
Ahmed Ashour
1aca1d582e Fix some typos 2019-06-05 12:24:13 +02:00
Lubov Batanina
3efd2df87f Merge pull request #14682 from l-bat:axpy_layer 
* Add Axpy layer

* Fix test

* fix caffe importer
 2019-06-05 00:18:06 +03:00
Ted Steiner
f1fb002682 Merge pull request #14678 from tedsteiner:qnx 
Fix build issue on QNX platform (#14678)

* QNX compatibility

* core: unify gettimeofday() usage
 2019-06-04 19:45:21 +03:00
Alexander Alekhin
d5a0d6783a Merge pull request #14710 from bommo1:bommo1-14265 2019-06-04 16:44:42 +00:00
Alexander Alekhin
5fde16ba90 Merge pull request #14712 from SchultzC:master 2019-06-04 16:43:45 +00:00
rasmus25
394bc91e07 Merge pull request #14718 from rasmus25:3.4 
* Revert the bad parts of b085158d59 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
 2019-06-04 18:43:42 +03:00
SchultzC
edb3337ead Remove divide by 1000 
because t = (time.time() - t) will return seconds,  dividing by 1000 to obtain seconds will be incorrect.
 2019-06-04 08:17:37 -07:00
Alexander Alekhin
fa96507fe7 Merge pull request #14719 from alalek:update_protobuf_3.5.2 2019-06-04 13:10:17 +00:00
Alexey Smirnov
e329c84d5e Merge pull request #14684 from smirnov-alexey:as/convert2_test_extension 
G-API: Add parameters alpha and beta in tests on ConvertTo kernel (#14684)

* Add parameters alpha and beta in tests on ConvertTo kernel

* Change tolerance function

* Reduce number of test cases
 2019-06-04 15:54:09 +03:00
Alexander Alekhin
1febb12942 3rdparty: apply protobuf v3.5.1..v3.5.2 patch 
https://github.com/protocolbuffers/protobuf/compare/v3.5.1..v3.5.2
 2019-06-04 12:57:34 +03:00