Giles Payne
af9ee90091
Merge pull request #17818 from komakai:documentation-improvements
...
Documentation fixes/improvements
* Documentation fixes/improvements
* Remove HASH_UTILS defines
2020-07-15 18:42:05 +00:00
Pinaev Danil
cb2e276bff
Merge pull request #17741 from aDanPin:dp/add_dinamic_graph_feature
...
[G-API] Allow building graphs with a dynamic number of inputs and outputs
* Add dinamic graph feature and tests
* Remove unnecessary file
* Review response
* Add implementation of operator += for GRunArgs
And test for that case
* Tests refactoring
* Add doxygen
Review response
* Fix docs
* A small documentation fix
* Review response
* Add tests for more entities
* Add typed tests
* Another typed tests
* Doc fix
* Documentation fix
* Build fix
* Commit for rebuild
* The last one
2020-07-15 18:37:08 +00:00
Alexander Alekhin
cd0f0384ef
Merge pull request #17788 from YashasSamaga:cuda4dnn-nice-build
2020-07-15 12:25:23 +00:00
Dmitry Kurtaev
cc584760d3
Fix TensorFlow->ONNX imports
2020-07-15 14:36:13 +03:00
Anton Potapov
111cdd7a32
GAPI: fix warnings in own::Mat default generated constructors/assign op
2020-07-15 10:49:05 +03:00
Anton Potapov
89a17b4232
GAPI: GAPI_LOG_DEBUG facility
2020-07-15 01:31:25 +03:00
Dmitry Matveev
f0c411d8b5
Merge pull request #17502 from dmatveev:dm/infer2
...
* G-API: Introduce a new gapi::infer2 overload + gaze estimation sample
* G-API/infer2: Introduced static type checking for infer2
- Also added extra tests on the type check routine
* G-API/infer2: Addressed self-review comments in the sample app
- Also fix build on Linux;
* G-API/infer2: Remove incorrect SetLayout(HWC) + dead code
- Also fixed comments in the backend
* G-API/infer2: Continue with self-review
- Fix warnings/compile errors in gaze estimation
- Dropped the use of RTTI (VectorRef::holds()) from the giebackend
- Replaced it with a trait-based enums for GArray<T> and std::vector<T>
- The enums and traits are temporary and need to be unified with
the S11N when it comes
* G-API/infer2: Final self-review items
- Refactored ROIList test to cover 70% for infer<> and infer2<>;
- Fixed the model data discovery routine to be compatible with new
OpenVINO;
- Hopefully fixed the final issues (warnings) with the sample.
* G-API/infer2: address review problems
- Fixed typo in comments;
- Fixed public (Doxygen) comment on GArray<GMat> input case for infer2;
- Made model lookup more flexible to allow new & old OMZ dir layouts.
* G-API/infer2: Change the model paths again
* G-API/infer2: Change the lookup path for test data
* G-API/infer2: use randu instead of imread. CI war is over
2020-07-14 11:06:49 +03:00
Alexander Alekhin
e5e767abc1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-07-13 19:54:49 +00:00
Dmitry Budnikov
521aac9665
Merge pull request #17694 from dbudniko:dbudniko/serialization_args2
...
G-API args serialization
* args serialization
* GRunArgP draft
* UMat added
* bind added
* DmitryM's review addressed. Code clean up required.
* fix android build
* bind test added
* more comments addressed
* try to fix Mac build
* clean up
* header-based generic implementation (GRunArg)
* clang again
* one more attempt for clang
* more clean up
* More Dmitry's comments addressed.
* monostate removed
* Top level functions and some other comments addressed.
* fix warnings
* disable warning
2020-07-13 19:24:46 +00:00
Alexander Alekhin
d41b20b268
Merge pull request #17830 from alalek:fix_17815
2020-07-13 18:52:34 +00:00
Alexander Alekhin
36da867caf
features2d: v_fma => v_muladd for integers
2020-07-13 17:31:08 +00:00
Alexander Alekhin
c5f540e3d7
Merge pull request #17806 from alalek:dnn_ie_num_threads_windows
2020-07-13 17:12:31 +00:00
YashasSamaga
1949056423
improved diagnostics for build issues
2020-07-13 21:09:38 +05:30
pemmanuelviel
c90e824342
Merge pull request #17639 from pemmanuelviel:pev--binary-kmeans
...
Pev binary kmeans
* Ongoing work transposing kmeans clustering method for bitfields: the computeClustering method
Ongoing work transposing kmeans clustering method for bitfields: interface computeBitfieldClustering
Fix genericity of computeNodeStatistics
Ongoing work transposing kmeans clustering method for bitfields: adapt computeNodeStatistics()
Ongoing work transposing kmeans clustering method for bitfields: adapt findNN() method
Ongoing work transposing kmeans clustering method for bitfields: allow kmeans with Hamming distance
Ongoing work transposing kmeans clustering method for bitfields: adapt distances code
Ongoing work transposing kmeans clustering method for bitfields: adapt load/save code
Ongoing work transposing kmeans clustering method for bitfields: adapt kmeans hierarchicalClustring()
PivotType -> CentersType Renaming
Fix type casting for ARM SIMD implementation of Hamming
Fix warnings with Win32 compilation
Fix warnings with Win64 compilation
Fix wrong parenthesis position on rounding
* Ensure proper rounding when CentersType is integral
2020-07-13 12:59:10 +00:00
jasonKercher
749bd80091
Merge pull request #17770 from jasonKercher:3.4_triggered
...
3.4 Allow first capture to return false
* fix first capture timeout
* fix first capture timeout
2020-07-13 12:29:54 +00:00
Alexander Alekhin
1c0b70bbd2
Merge pull request #17822 from alalek:issue_17792
2020-07-13 11:08:33 +00:00
Alexander Alekhin
e54040d540
core: use lazy on-demand initialization for param_traceEnable
2020-07-12 11:53:46 +00:00
Alexander Alekhin
0b454486cf
Merge pull request #17783 from dmatveev:dm/pmc_script
2020-07-11 19:11:03 +00:00
Alexander Alekhin
b96e9a4a4a
Merge pull request #17800 from Yosshi999:gsoc_sift-universal-intrinsic
2020-07-11 19:09:21 +00:00
YashasSamaga
ead1dcf308
error if cuda4dnn depends are not resolved
2020-07-11 21:37:51 +05:30
Alexander Alekhin
e18df87a15
Merge pull request #17635 from jsxyhelu:3.4
2020-07-10 15:11:53 +00:00
Alexander Alekhin
5cb8619eca
dnn(ie): enable KEY_CPU_THREADS_NUM for Windows
2020-07-10 14:29:21 +00:00
jsxyhelu
476094ad5a
Use“ moms” replace "contourArea"
...
double area = moms.m00;
is same as
double area = contourArea(contours[contourIdx]);
Not to mention
"moms" already calculated here,"contourArea" should not apply
2020-07-10 11:05:24 +00:00
Yosshi999
0df8fb70b4
use bufferarea for allocating buffer
2020-07-09 16:50:20 +00:00
YashasSamaga
37e2afb8f6
fix concat fusion for cuda4dnn
2020-07-09 19:40:44 +05:30
Maksim Shabunin
4dd9a36a3c
Added test for checkMasks with UMat train descs
2020-07-09 16:22:19 +03:00
Maksim Shabunin
41678fe3d3
Fixed checkMasks in DescriptorMatcher with train descs in UMats
2020-07-09 16:05:20 +03:00
Yashas Samaga B L
d0e6d2438c
Merge pull request #17363 from YashasSamaga:cuda4dnn-eltwise-fusion2
...
cuda4dnn(conv): fuse eltwise with convolutions
* fuse eltwise with convolutions
* manually rebase to avoid bad git merge
2020-07-09 16:02:21 +03:00
Dmitry Matveev
a724dc99e8
G-API: Change the default FD model in the privacy-masking-camera
2020-07-09 14:09:59 +03:00
Alexander Alekhin
44d473fba0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-07-08 21:03:43 +00:00
Alexander Alekhin
5bc6b6fc26
Merge pull request #17737 from pemmanuelviel:pev--fix-trees-descent
2020-07-08 20:59:29 +00:00
Alexander Alekhin
8931c68b20
Merge pull request #17707 from Yosshi999:gsoc_sift-universal-intrinsic
2020-07-08 20:33:40 +00:00
Alexander Alekhin
988bc804bf
Merge pull request #17748 from YashasSamaga:cuda4dnn-data-parallel
2020-07-08 20:20:19 +00:00
Alexander Alekhin
f78f908c09
Merge pull request #17674 from alalek:issue_16214
2020-07-08 20:01:35 +00:00
Dmitry Matveev
27f1ab5a70
Added a script to measure & report privacy masking camera performance in different configurations
2020-07-08 19:19:37 +03:00
Alexander Alekhin
762a5c8334
imgproc: align GaussianBlur/sepFilter2D OpenCL with CPU version
2020-07-08 15:13:48 +00:00
Alexander Alekhin
2fed41dfa5
imgproc(test): test bitExact cases in OCL/sepFilter2D
2020-07-08 10:14:56 +00:00
Alexander Alekhin
8bf1b9a422
cmake(cuda): repair ccbin, re-implement execute_process() cache
...
- preventive fix for arch "11.0" (CUDA_ARCH_BIN_OR_PTX_10 bug)
- new var: OPENCV_CUDA_DETECTION_NVCC_FLAGS
- new var: OPENCV_CMAKE_CUDA_DEBUG
2020-07-08 07:34:17 +00:00
Alexander Alekhin
e0f9eac521
cmake: backport CUDA scripts
2020-07-08 07:33:54 +00:00
Alexander Alekhin
950a916952
Merge pull request #17752 from YashasSamaga:generalize-concat-fusion-3.4
2020-07-07 10:36:02 +00:00
Alexander Alekhin
524a2fffe9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-07-06 23:05:04 +00:00
Alexander Alekhin
3f13339071
Merge pull request #17728 from sturkmen72:patch-4
2020-07-06 23:01:27 +00:00
Alexander Alekhin
eb6678ebef
Merge pull request #17699 from alalek:build_core_cuda
...
* core(cuda): fix build
- MSVS 19.25.28612.0
- CUDA release 11.0, V11.0.167
* cmake(cuda): backport workaround for CUDA 11
* cmake(cuda): call CUDA_BUILD_CLEAN_TARGET() on finalize
* cmake(cuda): use CMAKE_SUPPRESS_REGENERATION with MSVS
2020-07-06 22:58:17 +00:00
Alexander Alekhin
6781ca7d55
Merge pull request #17685 from YashasSamaga:cuda4dnn-cudnn8-support
2020-07-06 22:48:07 +00:00
Alexander Alekhin
d62e0a3695
Merge pull request #17743 from alalek:test_17666
2020-07-06 22:36:35 +00:00
Alexander Alekhin
dcb7fd8520
Merge pull request #17766 from alalek:backport_17756
2020-07-06 21:50:24 +00:00
Alexander Alekhin
d5713c657b
dnn(slice): disable buggy OCV/OCL implementation
2020-07-06 21:36:19 +00:00
Alexander Alekhin
99c4b76a6d
dnn(test): add YOLOv4-tiny tests
2020-07-06 21:36:19 +00:00
Alexander Alekhin
0970ef57bd
Merge pull request #17754 from YashasSamaga:cuda4dnn-slice-concat-copy-reduction
2020-07-06 20:00:52 +00:00
Alexander Alekhin
f98c97f796
Merge pull request #17758 from tomoaki0705:fixGapiOpenclTestError
2020-07-06 19:57:54 +00:00
Ilya Churaev
d69a7a3bbf
Fixed header paths for some nGraph ops
...
* Added dependency on IE version
backport of commit: 992c908b56
2020-07-06 19:51:57 +00:00
Maksim Shabunin
e8129429e9
imgcodecs: fix test build with disabled JPEG and PNG libs
2020-07-06 14:52:52 +03:00
Tomoaki Teshima
46d3637609
avoid kernel compile error on Arm SBCs
2020-07-06 18:27:19 +09:00
Ilya Churaev
992c908b56
Merge pull request #17756 from ilyachur:feature/ichuraev/fix_ngraph_headers
...
* Fixed header paths for some nGraph ops
* Added dependency on IE version
2020-07-06 08:11:59 +00:00
Suleyman TURKMEN
2566d13100
Update documentation of imwrite()
2020-07-06 11:02:50 +03:00
YashasSamaga
cbdaa93e54
reduce slice, concat to copy; enable more concat fusions
2020-07-05 20:52:35 +05:30
Alexander Alekhin
deaf1dd458
Merge pull request #17724 from pemmanuelviel:pev--fix-mix-of-types
2020-07-04 17:16:57 +00:00
pemmanuelviel
65f87b114b
Merge pull request #17722 from pemmanuelviel:pev--replace-asserts
...
* Clean: replace C style asserts by CV_Assert and CV_DbgAssert
* Try fixing warning on Windows compilation
* Another way trying to fix warnings on Win
* Fixing warnings with some compilers:
Some compilers warn on systematic exit preventing to execute the code that follows.
This is why assert(0) that exits only in debug was working, but not CV_Assert or CV_Error
that exit both in release and debug, even if with different behavior.
In addition, other compilers complain when return 0 is removed from getKey(),
even if before we have a statement leading to systematic exit.
* Disable "unreachable code" warnings for Win compilers so we can use proper CV_Error
2020-07-04 20:15:44 +03:00
Alexander Alekhin
8f5b453a96
Merge pull request #17719 from pemmanuelviel:pev--fix-computeNodeStatistics-genericity
2020-07-04 17:14:35 +00:00
YashasSamaga
b7eec216e9
generalize axis for concat fusion
2020-07-04 18:57:28 +05:30
YashasSamaga
4988e131fd
transfer output blobs in background
2020-07-04 12:55:12 +05:30
kadi soheib
17c430da88
Updated comment.
2020-07-04 06:37:59 +03:00
kadi soheib
96a501c08b
Adding comment from source code to documentation.
2020-07-04 06:37:58 +03:00
Christoph
657c8d1c65
Merge pull request #17454 from creinders:master
...
fix instable fisheye undistortPoints
* remove artefacts when (un)distorting fisheye images with large distortion coefficient values
* fix fisheye undistortion when theta is close to zero
* add fisheye image undistort and distort test
* Fixed type conversion warnings
* fixed trailing whitespace
2020-07-03 22:59:19 +00:00
Liubov Batanina
65dbbf712d
Merge pull request #17733 from l-bat:tiny_yolov4
...
* Supported yolov4-tiny
* Added comments
2020-07-03 18:07:08 +00:00
Alexander Alekhin
49497d8e7c
Merge pull request #17725 from pemmanuelviel:pev--precompute-divisor
2020-07-03 11:24:11 +00:00
Pierre-Emmanuel Viel
728684840c
Fix trees parsing behavior in hierarchical_clustering_index:
...
Before, when maxCheck was reached in the first descent of a tree, time was still wasted parsing
the next trees till their best leaves whose points were not used at all.
2020-07-03 01:19:10 +02:00
Alexander Alekhin
73f7d091f8
Merge pull request #17721 from pemmanuelviel:pev--fix-hist-intersect-arguments
2020-07-02 11:54:28 +00:00
Ken Shirriff
00e1bc49c8
Merge pull request #17708 from shirriff:patch-1
...
Clarify component statistics documentation
* Change ConnectedComponentsTypes documentation
Change from "algorithm output formats" to "statistics" because it specifies types of statistics, not formats.
* Documentation: clarify component statistics
Explain that ConnectedComponentTypes selects a statistic.
2020-07-02 13:58:53 +03:00
Pierre-Emmanuel Viel
6a045fd678
Fix arguments list in loadindex for histogram intersection
2020-07-01 18:59:45 +02:00
Pierre-Emmanuel Viel
327f92cc46
Precompute the divisor to ensure that no kind of compiler would process it on the fly at each call.
2020-07-01 18:52:05 +02:00
Pierre-Emmanuel Viel
482cacd420
Mix of 32 and 64bits vector types prevents vectorisation for distance computation.
...
Argument "a" is of type ElementType* that is either int* or float*, while b was double*.
Mixing types prevents the possibility to use SSE or AVX instructions.
On implementation without SIMD instructions, this doesn't show any impact on performance.
2020-07-01 18:27:07 +02:00
Pierre-Emmanuel Viel
93a6be836c
Remove duplicate line
2020-07-01 18:15:01 +02:00
Pierre-Emmanuel Viel
ef7185ce43
Fix genericity of computeNodeStatistics that couldn't compute stats properly on sub-nodes
2020-07-01 12:14:15 +02:00
YashasSamaga
62a63021c7
add cuDNN 8 support
2020-06-30 21:51:23 +05:30
Pierre-Emmanuel Viel
33fab84473
Type consistency for all xxxIndexParams integer arguments as well as with miniflann's LshIndexParams
2020-06-30 10:33:07 +02:00
Yosshi999
920c180052
use universal SIMD intrinsics for SIFT
2020-06-30 06:44:12 +00:00
Alexander Alekhin
a711e2aa41
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-29 21:19:09 +00:00
Alexander Alekhin
a84afb6334
Merge pull request #17640 from pemmanuelviel:pev--fix-lsh-bad-any-cast
2020-06-29 20:53:34 +00:00
Alexander Alekhin
ab4065fa1c
Merge pull request #17696 from dbudniko:dbudniko/g_api_fix_min_max
2020-06-29 19:54:41 +00:00
Alexander Alekhin
ee73b0bd08
Merge pull request #17695 from alalek:issue_17677
2020-06-29 19:15:24 +00:00
Dmitry Budnikov
31bee49371
min max fix for standalone
2020-06-29 20:57:44 +03:00
Alexander Alekhin
48ef6df842
cmake(gapi): fix opencv_world build for winpack
2020-06-29 17:46:39 +00:00
Pierre-Emmanuel Viel
cdac7c7bec
Add test checking we don't throw when creating GenericIndex with LshIndexParams()
2020-06-28 19:51:04 +00:00
Pierre-Emmanuel Viel
fe09c79f4b
Fix the 'cvflann::anyimpl::bad_any_cast' error using Lsh
2020-06-28 19:51:04 +00:00
cyy
206c843f36
Merge pull request #17499 from cyyever:fix_CUDA11
...
Fix cuda11
* use cudnn_version.h to detect version when it is available
* remove nppi from CUDA11
* use ocv_list_filterout
* dnn(cuda): temporary disable CUDNN 8.0
2020-06-27 20:34:44 +00:00
Alexander Alekhin
cabad90d6c
Merge pull request #17636 from okamotoR:3.4
2020-06-27 20:17:16 +00:00
Alexander Alekhin
4e6a108bda
Merge pull request #17665 from komakai:fix-ios-dynamic-build
2020-06-27 20:12:08 +00:00
Alexander Alekhin
6dba1733f0
Merge pull request #17567 from dev-tronifier:new_branch
2020-06-27 20:08:37 +00:00
pemmanuelviel
daa88c6b9e
Merge pull request #17642 from pemmanuelviel:pev--fixes-and-clean
...
* Clean: make the use of the indices array length consistent
Either we don't want this method to be used in the future for any other node
than the root node, and so we replace indices_length by size_ and remove it as
argument, or we want to be able to use it potentially for other nodes, and
so using size_ instead of indices_length would have lead to a bug.
* Fix: b was not an address
* Fix: transpose the Flann repo commit "Fixes in accum_dist methods" from Adil Ibragimov
Avoids trying to compute log(ratio) with ratio = 0
* Fix: transpose the Flann repo commit "result_set bugfix" from Jack Rae
* Fix Jack Rae commit as the initial i - 1 index was decremented before entering the loop body
* Clean: transpose the Flann repo commit "Updated comments in lsh_index" from Richard McPherson
* Fix: Transpose the Flann repo commit "Fixing unreachable code in lsh_table.h" from hypevr
* Fix warning the same way it was done in flann standalone repo
* Change the return value in case of unsupported type
2020-06-26 22:34:52 +00:00
dev-tronifier
9b727fa1f3
Increased portability of CV_Func
2020-06-26 19:45:58 +00:00
Dmitry Budnikov
7566921364
Merge pull request #17020 from dbudniko:dbudniko/serialization_backend
...
G-API Serialization routines
* Serialization backend in tests, initial version
* S11N/00: A Great Rename
- "Serialization" is too long and too error-prone to type,
so now it is renamed to "s11n" everywhere;
- Same applies to "SRLZ";
- Tests also renamed to start with 'S11N.*' (easier to run);
- Also updated copyright years in new files to 2020.
* S11N/01: Some basic interface segregation
- Moved some details (low-level functions) out of serialization.hpp;
- Introduced I::IStream and I::OStream interfaces;
- Implemented those via the existing [De]SerializationStream classes;
- Moved all operators to use interfaces instead of classes;
- Moved the htonl/ntohl handling out of operators (to the classes).
The implementation didn't change much, it is a subject to the further
refactoring
* S11N/02: Basic operator reorg, basic tests, vector support
- Reorganized operators on atomic types to follow >>/<< model
(put them closer in the code for the respective types);
- Introduce more operators for basic (scalar) types;
- Drop all vector s11n overloads -- replace with a generic
(template-based) one;
- Introduced a new test suite where low-level s11n functionality
is tested (for the basic types).
* S11N/03: Operators reorganization
- Sorted the Opaque types enum by complexity;
- Reorganized the existing operators for basic types, also ordered by
complexity;
- Organized operators in three groups (Basics, OpenCV, G-API);
- Added a generic serialization for variant<>;
- Reimplemented some of the existing operators (for OpenCV and G-API
data structures);
- Introduced new operators for cv::gimpl data types. These operators
(and so, the data structures) are not yet used in the graph
dump/reconstruction routine, it will be done as a next step.
* S11N/04: The Great Clean-up
- Drop the duplicates of GModel data structures from the
serialization, serialize the GModel data structures themselve
instead (hand-written code replaced with operators).
- Also removed usuned code for printing, etc.
* S11N/05: Internal API Clean-up
- Minimize the serialization API to just Streams and Operators;
- Refactor and fix the graph serialization (deconstruction and
reconstruction) routines, fix data addressing problems there;
- Move the serialization.[ch]pp files to the core G-API library
* S11N/06: Top-level API introduction
- !!!This is likely the most invasive commit in the series!!!
- Introduced a top-level API to serialize and deserialize a GComputation
- Extended the compiler to support both forms of a GComputation:
an expession based and a deserialized one. This has led to changes in
the cv::GComputation::Priv and in its dependent components (even the
transformation tests);
- Had to extend the kernel API (GKernel) with extra information on
operations (mainly `outMeta`) which was only available for expression
based graphs. Now the `outMeta` can be taken from kernels too (and for
the deserialized graphs it is the only way);
- Revisited the internal serialization API, had to expose previously
hidden entities (like `GSerialized`);
- Extended the serialized graph info with new details (object counter,
protocol). Added unordered_map generic serialization for that;
- Reworked the very first pipeline test to be "proper"; GREEN now, the rest
is to be reworked in the next iteration.
* S11N/07: Tests reworked
- Moved the sample pipeline tests w/serialization to
test the public API (`cv::gapi::serialize`, then
followed by `cv::gapi::deserialize<>`). All GREEN.
- As a consequence, dropped the "Serialization" test
backend as no longer necessary.
* S11N/08: Final touches
- Exposed the C++ native data types at Streams level;
- Switched the ByteMemoryIn/OutStreams to store data in `char`
internally (2x less memory for sample pipelines);
- Fixed and refactored Mat dumping to the stream;
- Renamed S11N pipeline tests to their new meaning.
* linux build fix
* fix RcDesc and int uint warnings
* more Linux build fix
* white space and virtual android error fix (attempt)
* more warnings to be fixed
* android warnings fix attempt
* one more attempt for android build fix
* android warnings one more fix
* return back override
* avoid size_t
* static deserialize
* and how do you like this, elon? anonymous namespace to fix android warning.
* static inline
* trying to fix standalone build
* mat dims fix
* fix mat r/w for standalone
Co-authored-by: Dmitry Matveev <dmitry.matveev@intel.com>
2020-06-26 19:41:29 +00:00
Alexander Alekhin
e45d74c8f9
Merge pull request #17638 from pemmanuelviel:pev--avoid-branching-in-loop
2020-06-26 19:22:20 +00:00
Alexander Alekhin
923009b5ff
Merge pull request #17663 from alalek:backport_17658
2020-06-26 17:41:53 +00:00
Giles Payne
59ba33658a
Dynamic build for Objective-C/Swift wrapper
2020-06-26 08:26:05 +09:00
Yosshi999
4064d4c7eb
Merge pull request #17618 from Yosshi999:gsoc_sift-better-test
...
Added/Fixed testcases for SIFT
* merge perf_sift into conventional perf tests
* Fix disabled SIFT scale invariance tests
allows trainIdx duplication in matching scaled keypoints
2020-06-25 11:34:31 +00:00
Ilya Lavrenov
e58ce89b10
Conditional compilation for IR v7 support
...
backported commit 86905754e4
2020-06-25 10:05:14 +00:00
Alexander Alekhin
085bd5f55f
Merge pull request #17658 from ilya-lavrenov:get-layer-by-name
2020-06-25 09:42:59 +00:00
Alexander Alekhin
6259ba1bfd
Merge pull request #17641 from pemmanuelviel:pev--fix-middleSplit-for-kdtree-single
2020-06-25 09:12:40 +00:00
Ilya Lavrenov
86905754e4
Conditional compilation for IR v7 support
2020-06-25 11:32:10 +03:00
Anastasiya
eff259b047
Enable state initialization params via compile_args
2020-06-25 00:43:12 +03:00
Alexander Alekhin
4f03f70968
Merge pull request #17605 from TolyaTalamanov:at/fix-plaidml-kernels-function
2020-06-24 09:44:51 +00:00
Alexander Alekhin
c81d785ada
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-23 19:15:47 +00:00
Alexander Alekhin
6fb46bb34b
Merge pull request #17621 from YashasSamaga:cuda4dnn-mish-half
2020-06-23 18:44:50 +00:00
Alexander Alekhin
2e165053ef
Merge pull request #17624 from dkurt:dnn_optimize_mish
2020-06-23 18:43:51 +00:00
Pierre-Emmanuel Viel
06b4292534
Fix: error in the dimension used for computeMinMax
...
Instead of using the current dimension for which we just got a big span,
we were computing Min and Max for the previous dimension stored in cutfeat
(and using 0 instead of the dimension indice for the very first dimension
with "span > (1-eps)max_span")
2020-06-23 15:47:27 +02:00
Pierre-Emmanuel Viel
29f883feee
Optim: test that could be done once has been extracted from the loop
2020-06-23 15:43:38 +02:00
okamotoR
0e69cddda2
add if block for indexed color images
2020-06-23 21:36:47 +09:00
Dmitry Kurtaev
3bdd7bfbea
Remove deprecated Inference Engine CPU extensions
2020-06-23 14:33:22 +03:00
Ilya Lavrenov
ad5e70f94e
Conditional compilation for network reader
...
origibal commit: 63e92cccf2
2020-06-23 14:15:52 +03:00
Dmitry Kurtaev
8e3f5fb209
Remove deprecated Inference Engine CPU extensions
2020-06-23 10:10:29 +03:00
Pierre-Emmanuel Viel
05fbd1e5bc
DNA mode: add the distance computations
2020-06-22 22:53:05 +02:00
Dmitry Kurtaev
1491934d17
Optimize Mish for CPU backend
2020-06-22 23:27:47 +03:00
YashasSamaga
6573b9ace0
use fp32 mish for fp16 mish
2020-06-22 19:09:36 +05:30
Alexander Alekhin
ee5ff71d55
Merge pull request #17616 from ilya-lavrenov:network-reader
2020-06-22 12:10:34 +00:00
Alexander Alekhin
6e5f0a2a58
Merge pull request #17576 from philippefoubert:branch_ximea
2020-06-22 11:36:40 +00:00
Alexander Alekhin
99bc35a883
core(logger): complete initialization of logger structures
...
- for using of logging functions from global destructors
2020-06-22 09:27:26 +00:00
Ilya Lavrenov
63e92cccf2
Conditional compilation for network reader
2020-06-22 11:45:56 +03:00
Anatoliy Talamanov
a74ed58893
Add implementation in case plaidml isn't found
2020-06-22 00:46:41 +03:00
Philippe FOUBERT
0eb7060205
Fix the detection of the XIMEA library (since its location may be different when the version of the ximea software is updated)
2020-06-20 16:47:18 +02:00
Liubov Batanina
85c0c8c7ed
Disabling dafault NMS in yolo layer
2020-06-19 14:34:13 +03:00
Alexander Alekhin
e3d502310f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-19 07:33:50 +00:00
Tomoaki Teshima
77fa1a20bf
fix build on Jetson TX1 and TX2
...
* enable_if_t is a c++14 feature
2020-06-19 07:56:37 +09:00
Alexander Alekhin
a7cdc42140
Merge pull request #17581 from tomoaki0705:fixCudaAsync
2020-06-18 20:54:28 +00:00
Alexander Alekhin
a8aa9d5ecb
Merge pull request #17578 from Bleach665:fix_win_eigen_build
2020-06-18 20:52:33 +00:00
Philippe FOUBERT
d25293b721
Fix the build of imgproc using MinGW (variables with the same name as symbols defined in MinGW headers)
2020-06-18 20:13:34 +00:00
Tomoaki Teshima
c07af090f5
fix build error on Jetson TX1 and TX2
...
* enable_if_t and is_base_of is c++14 feature
* override is c++11 feature
2020-06-18 21:25:15 +09:00
Yuriy Obukh
456e88a8a4
fix VS Windows build with eigen. https://github.com/opencv/opencv/issues/17548
2020-06-18 14:31:11 +03:00
Alexander Alekhin
42a4c3fba6
Merge pull request #17568 from alalek:cleanup_17527
2020-06-18 07:38:16 +00:00
Alexander Alekhin
d01cbe9320
cudacodec(build): fix detection in CMake, cleanup duplicate includes
2020-06-17 09:09:40 +00:00
Yashas Samaga B L
9ba5581d17
Merge pull request #17534 from YashasSamaga:cuda4dnn-remove-unused-funcs
...
cuda4dnn: reduce CUDA version requirements to at least CUDA 9.2
* remove half2 specializations
* do not remove atomicAdd for half in CUDA 10 and below
* remove fp16.hpp
2020-06-17 09:07:52 +00:00
Alexander Alekhin
619462b029
Merge pull request #17564 from l-bat:fix_yolov4
2020-06-17 08:45:56 +00:00
Alexander Alekhin
6fdddd53a1
Merge pull request #17555 from komakai:objc-fix-sift
2020-06-17 07:58:35 +00:00
Liubov Batanina
d93b6be3cc
Changed StridedSlice to VariadicSplit in Region layer
2020-06-17 10:02:53 +03:00
Alexander Alekhin
9755ab160d
Merge pull request #17556 from nglee:dev_optFlowTVL1Async
2020-06-16 20:06:56 +00:00
Pinaev Danil
57f5700e18
Merge pull request #16772 from aDanPin:dp/performance_render_tests
...
Added g-api render performance tests
* Add render performance tests for BGROCV
* Add render NV12 performance tests
* Review response
* Review response
* Review response
* Review response
* Review response
* Review response
* Just a small fix
* Final review response I hope)
* Review response
* Review response
* Review response
* Review response
* Review response
* Review response
2020-06-16 19:48:09 +00:00
Namgoo Lee
2043e06102
cuda optflow tvl1 : async safety
...
also modify cuda canny to use createTextureObjectPitch2D, etc.
2020-06-17 01:04:22 +09:00
Giles Payne
177fbc7bbb
Cleanup unneeded raw pointer handling code
2020-06-16 08:15:27 +09:00
Alexander Alekhin
c7dcdc0e88
Merge pull request #17557 from alalek:backport_17554
2020-06-15 19:26:11 +00:00
Alexander Alekhin
eb67dc9f50
Merge pull request #17533 from alalek:fix_dumpInputArray_nd_case
2020-06-15 18:38:19 +00:00
Ilya Lavrenov
676b818d6a
Removed plugin dispatcher
...
backport of commit 74113737f3
2020-06-15 18:03:14 +00:00
Namgoo Lee
411ce04f54
CUDA_OptFlow/OpticalFlowDual_TVL1 Asynchronous test
2020-06-16 01:43:51 +09:00
Giles Payne
13962b8533
Use cv::Ptr instead of raw pointers
2020-06-15 23:20:45 +09:00
Giles Payne
04bee3f9b7
Fix testFitEllipse test
2020-06-15 23:16:22 +09:00
Ilya Lavrenov
74113737f3
Removed plugin dispatcher
2020-06-15 16:02:52 +03:00
Alexander Alekhin
c244b456f0
Merge pull request #17540 from YashasSamaga:cuda4dnn-update-mish
2020-06-14 11:08:53 +00:00
Alexander Alekhin
d321a34f7c
Merge pull request #17527 from tomoaki0705:detectCuvidHeader
2020-06-14 11:08:16 +00:00
YashasSamaga
87ab4ee567
improve mish performance and accuracy
2020-06-13 16:53:27 +05:30
Alexander Alekhin
0cbaaba4b1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-12 22:20:50 +00:00
Alexander Alekhin
1644af841b
Merge pull request #17536 from ilya-lavrenov:remove-error-listener
2020-06-12 22:18:04 +00:00
Ilya Lavrenov
9697e3ac24
Removed error lisneter usage
2020-06-12 20:29:11 +00:00
Alexander Alekhin
d2a9efd039
dnn: use OpenVINO 2020.3 defines
2020-06-12 20:24:08 +00:00
Alexander Alekhin
442999dcdb
core: fix handling of ND-arrays in dumpInputArray() helpers
2020-06-12 10:23:32 +00:00
Tomoaki Teshima
d4af89781b
fix corner case of libnvcuvid
...
* detect header automatically and not based on version number
2020-06-11 23:06:18 +09:00
YashasSamaga
265acccd56
allow multiple inputs to resize, fix tests
2020-06-11 19:31:48 +05:30
Maksim Shabunin
7a187e9b5e
QRDetectMulti: refactored checkPoints method
2020-06-10 13:48:24 +03:00
Maksim Shabunin
9096b1c768
dnn/NGraph: added nullptr checks
2020-06-10 13:48:24 +03:00
Rasmus
781fbde449
Merge pull request #17368 from themightyoarfish:cv2eigen-doc
...
* Add documentation about usage of cv2eigen functions in eigen.hpp
* Fixed Doxygen syntax.
Co-authored-by: Alexander Smorkalov <smorkalov.a.m@gmail.com>
2020-06-10 07:53:18 +00:00
Alexander Alekhin
55ca0fcc27
Merge pull request #17492 from cyyever:fix_data_race
2020-06-10 07:01:04 +00:00
Maksim Shabunin
579d74d35b
QRDetectMulti: refactored checkPoints method
2020-06-09 11:10:47 +03:00
Maksim Shabunin
7ce518106b
dnn/NGraph: added nullptr checks
2020-06-09 11:10:36 +03:00
cyy
171cba4947
use C++11 static variables as memory barrier
2020-06-09 15:49:31 +08:00
Alexander Alekhin
5f3012fc9a
pre: OpenCV 4.4.0 (version++)
2020-06-09 02:27:13 +00:00
Alexander Alekhin
a43e3bebe6
pre: OpenCV 3.4.11 (version++)
2020-06-08 18:46:27 +00:00
Giles Payne
02385472b6
Merge pull request #17165 from komakai:objc-binding
...
Objc binding
* Initial work on Objective-C wrapper
* Objective-C generator script; update manually generated wrappers
* Add Mat tests
* Core Tests
* Imgproc wrapper generation and tests
* Fixes for Imgcodecs wrapper
* Miscellaneous fixes. Swift build support
* Objective-C wrapper build/install
* Add Swift wrappers for videoio/objdetect/feature2d
* Framework build;iOS support
* Fix toArray functions;Use enum types whenever possible
* Use enum types where possible;prepare test build
* Update test
* Add test runner scripts for iOS and macOS
* Add test scripts and samples
* Build fixes
* Fix build (cmake 3.17.x compatibility)
* Fix warnings
* Fix enum name conflicting handling
* Add support for document generation with Jazzy
* Swift/Native fast accessor functions
* Add Objective-C wrapper for calib3d, dnn, ml, photo and video modules
* Remove IntOut/FloatOut/DoubleOut classes
* Fix iOS default test platform value
* Fix samples
* Revert default framework name to opencv2
* Add converter util functions
* Fix failing test
* Fix whitespace
* Add handling for deprecated methods;fix warnings;define __OPENCV_BUILD
* Suppress cmake warnings
* Reduce severity of "jazzy not found" log message
* Fix incorrect #include of compatibility header in ios.h
* Use explicit returns in subscript/get implementation
* Reduce minimum required cmake version to 3.15 for Objective-C/Swift binding
2020-06-08 18:32:53 +00:00
Alexander Alekhin
89a6937c00
videoio: fix plugins build
2020-06-08 09:17:13 +00:00
Alexander Alekhin
434014b05e
Merge pull request #17471 from asmorkalov:as/video_capability_check
2020-06-05 19:54:41 +00:00
Alexander Alekhin
7d30e19b3e
Merge pull request #17350 from AsyaPronina:gapi_ocv_stateful_kernel
...
Enable stateful kernels in G-API OCV Backend
2020-06-05 00:51:22 +03:00
AsyaPronina
b083c20eb2
Enable stateful kernels in G-API OCV Backend
2020-06-04 22:14:42 +03:00
Alexander Alekhin
7722a2b8a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-04 17:58:34 +00:00
Fernando Martin
cb0f74ab9f
Merge pull request #17473 from f3rm4rf3r:fixingFourCCDocBrokenLink
...
* - Fixing broken URL to mp4ra website
* - Fixing broken URL to mp4ra website (in C videoio API)
2020-06-04 17:07:54 +00:00
Alexander Alekhin
08d1c54364
Merge pull request #17469 from l-bat:fix_virtual_try_on
2020-06-04 10:32:30 +00:00
Alexander Smorkalov
a17d1843fb
Skip some GAPI tests if VideoCapture is not capable to playback video.
2020-06-04 09:59:09 +03:00
Liubov Batanina
5ffc5bca7c
Fixed virtual try on sample
2020-06-04 09:41:24 +03:00
Maksim Shabunin
59608907b8
Added countNonZero test for big arrays and disable IPP for some cases
2020-06-03 18:58:41 +03:00
Alexander Alekhin
e454c4891e
Merge pull request #17369 from themightyoarfish:doc-essential-matrix-different-cameras
2020-06-03 12:55:55 +00:00
Alexander Alekhin
3ed243abde
Merge pull request #17430 from alalek:issue_17257
2020-06-02 12:42:04 +00:00
Alexander Alekhin
d60524ecfa
Merge pull request #17447 from alalek:dnn_ie_extract_layers
2020-06-02 12:40:06 +00:00
Rasmus Diederichsen
345e071b24
Add instructions for how to use findEssentialMat() when camera matrices are different
2020-06-02 12:19:49 +03:00
Alexander Alekhin
be1a121d0d
dnn(ie): fix layers extraction
2020-06-01 21:57:39 +00:00
Alexander Alekhin
f68654a204
Merge pull request #17438 from alalek:fix_eigen_builds
2020-06-01 18:02:07 +00:00
Vadim Pisarevsky
8abb312c20
Merge pull request #17417 from vpisarev:fix_fitellipse
...
* improved fitEllipse and fitEllipseDirect accuracy in singular or close-to-singular cases (see issue #9923 )
* scale points using double precision
* added normalization to fitEllipseAMS as well; fixed Java test case by raising the tolerance (it's unclear what is the correct result in this case).
* improved point perturbation a bit. make the code a little bit more clear
* trying to fix Java fitEllipseTest by slightly raising the tolerance threshold
* synchronized C++ version of Java's fitEllipse test
* removed trailing whitespaces
2020-06-01 18:01:20 +00:00
Vadim Pisarevsky
5489735258
Merge pull request #17436 from vpisarev:fix_python_io
...
* fixed #17044
1. fixed Python part of the tutorial about using OpenCV XML-YAML-JSON I/O functionality from C++ and Python.
2. added startWriteStruct() and endWriteStruct() methods to FileStorage
3. modifed FileStorage::write() methods to make them work well inside sequences, not only mappings.
* try to fix the doc builder
* added Python regression test for FileStorage I/O API ([TODO] iterating through long sequences can be very slow)
* fixed yaml testing
2020-06-01 11:33:09 +00:00
Alexander Alekhin
8de176988d
Merge pull request #17439 from alalek:fix_dnn_test_required_file
2020-05-31 19:51:56 +00:00
Alexander Alekhin
79c5d07abe
dnn(test): file 'dnn/efficientdet-d0.pb' is optional
2020-05-31 16:18:37 +00:00
Alexander Alekhin
74020a084b
core: fix builds with eigen helper header
2020-05-31 15:41:42 +00:00
Alexander Alekhin
e6c9e2fa50
Merge pull request #17420 from nosajthenitram:fix_cascadedetect_convert_bug_for_old_cascade
2020-05-30 17:34:20 +00:00
Meng Wang
ab2c59b80e
Merge pull request #17403 from wangmengHB:master
...
Fix Test Case: in latest version, window.cv is a promise instance that makes most test case failed.
* Fix Browser Test Case: In latest version, window.cv is a promise instance
In latest version of opencv.js, window.cv is promise instance.
So that most of the test cases is run failed.
This commit is to fix browser test case.
* Add comment for backward compatible
Add comments for backward compatible
2020-05-30 17:33:17 +00:00
Jason Martin
a5209c4882
Fixed cascadedetect convert from old cascade to new
2020-05-30 11:45:24 -05:00
Alexander Alekhin
f1dd5e49c5
videoio(ffmpeg): fix handling of AVERROR_EOF
...
decoder should be properly flushed after that
2020-05-29 19:52:26 +00:00
Alexander Alekhin
c6b60e219d
Merge pull request #17428 from asmorkalov:as/java_smart_constructors
2020-05-29 18:38:34 +00:00
Alexander Alekhin
740f6628ec
Merge pull request #17419 from YourButterfly:fix_divide_zero_in_darknet_3_4
2020-05-29 17:32:48 +00:00
Alexander Smorkalov
821fac187c
Generate constructor with smart pointer, if it's expected.
2020-05-29 16:40:19 +03:00
YourButterfly
f7daa9e4f5
chk divide 0
2020-05-29 09:54:46 +08:00
Alexander Alekhin
c3e8a82c9c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-28 23:53:54 +00:00
Liubov Batanina
d3aaf2d3a3
Merge pull request #17371 from l-bat:nms_model
...
* Fix NMS bug in DetectionModel
* Fixed comments
* Refactoring
2020-05-28 22:54:19 +00:00
Alexander Alekhin
e58e545584
Merge pull request #17392 from alalek:dnn_test_yolov4
2020-05-28 22:52:21 +00:00
Alexander Alekhin
319db07b6b
Merge pull request #17384 from dkurt:efficientdet
2020-05-28 22:48:52 +00:00
Vadim Pisarevsky
80037dc6de
fixed fillPoly, the overloaded variant with InputArrayOfArrays parameter (single or multiple polygons)
2020-05-28 21:36:28 +03:00
Dmitry Kurtaev
d9bada9867
dnn: EfficientDet
2020-05-28 17:23:42 +03:00
Alexander Alekhin
6b89154afd
dnn(test): add YOLOv4 tests
2020-05-28 13:27:40 +00:00
Maksim Shabunin
2d11edd103
videoio/MSMF: fixed audio stream handling
2020-05-27 17:57:18 +03:00
Alexander Alekhin
515a06cedf
Merge pull request #17359 from YashasSamaga:cuda4dnn-fix-default-stream-wrappers
2020-05-27 11:28:09 +00:00
Alexander Alekhin
7d9e1be588
Merge pull request #17388 from alalek:dnn_update_network_dump
2020-05-27 07:55:32 +00:00
Liubov Batanina
ba3cf47600
Merge pull request #17386 from l-bat:tf_clamp_subgraph
...
* Added ClipByValue subgraph
* Return const nodes
2020-05-26 19:01:47 +00:00
Liubov Batanina
b236f10792
Switch ngraph::op::v1::Multiply to v0
2020-05-26 16:59:50 +03:00
Alexander Alekhin
f0bef94a03
dnn: update network dump code, include ngraph serialization
2020-05-26 12:49:22 +00:00
Egor Pugin
1bec7ca540
Merge pull request #17352 from egorpugin:patch-2
...
* Fix integer overflow in parseOption().
Previous code does not work for values like 100000MB.
* Fix warning during 32-bit build on inactive code path.
* fix build without C++11
2020-05-25 20:25:18 +00:00
Alexander Alekhin
29bbbaa0a7
Merge pull request #17376 from alalek:dnn_fix_build
2020-05-25 19:59:58 +00:00
shijiayuan
4e97c69792
Merge pull request #17275 from shijiayuan:fixbug
...
* fix bug for CHECK issue
* remove chack for bpp
* add test for tif file
* add test for tiff file
* change the test name
* use proper bpp value, use clear test names
2020-05-25 18:49:37 +00:00
Alexander Alekhin
88d8a48b09
Merge pull request #17374 from alalek:dnn_fix_build
2020-05-25 18:46:15 +00:00
Alexander Alekhin
73aa5f567b
dnn: *_DENORMALS_ZERO_MODE is defined for SSE3
2020-05-25 17:55:36 +00:00
Anton Potapov
be9f3826d7
GAPI: fix uninitialized variables in Fluid
2020-05-25 11:59:28 +03:00
Michal W. Tarnowski
7f453ade73
Merge pull request #17361 from mwtarnowski:fix-documentation-gapi-imgproc-blur
...
* fix documentation for cv::gapi::blur
* remove dst parameter and move ksize parameter to its correct position
2020-05-24 22:48:44 +00:00
Michal W. Tarnowski
5393185add
Merge pull request #17360 from mwtarnowski:fix-documentation-imgproc-blur
...
* fix documentation for cv::blur
* correct the position of ksize parameter
2020-05-24 22:46:41 +00:00
YashasSamaga
b3a261c7ce
set stream at the site of creation
2020-05-24 19:01:17 +05:30
Josh Bradley
9fef09fe89
Merge pull request #17320 from jgbradley1:add-eigen-tensor-conversions
...
* add eigen tensor conversion functions
* add eigen tensor conversion tests
* add support for column major order
* update eigen tensor tests
* fix coding style and add conditional compilation
* fix conditional compilation checks
* remove whitespace
* rearrange functions for easier reading
* reformat function documentation and add tensormap unit test
* cleanup documentation of unit test
* remove condition duplication
* check Eigen major version, not minor version
* restrict to Eigen v3.3.0+
* add documentation note and add type checking to cv2eigen_tensormap()
2020-05-23 18:25:01 +00:00
Alexander Alekhin
6b0fff72d9
Merge pull request #17349 from YashasSamaga:cuda4dnn-general-fixes
2020-05-23 18:18:55 +00:00
Alexander Alekhin
21e28adb87
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-22 19:50:14 +00:00
Alexander Alekhin
a9b030591b
Merge pull request #17295 from dkurt:dnn_fusion_ftz
2020-05-22 18:49:43 +00:00
YashasSamaga
57ca10636c
do not create redundant handles
2020-05-22 19:52:20 +05:30
Alexander Alekhin
d4a9c731ff
Merge pull request #17345 from alalek:build_fix_mac_warnings
2020-05-22 10:50:41 +00:00
Alexander Alekhin
98611adeb9
build: fix warnings about TARGET_OS_MACCATALYST
2020-05-21 20:41:47 +00:00
Alexander Alekhin
e96a58f091
Merge pull request #17191 from anton-potapov:gapi_variant_converting_ctor_assign_op_reworked
2020-05-21 12:59:31 +00:00
Anton Potapov
e02318d384
GAPI: utils - variant converting ctor and assignment op. reworked
...
- reworked variant::operator(T&&) and varaint::variant(T&&) to be more
concise and signature accurate with C++17 specification
- restricted cv::detail::OpaqueRef::OpaqueRef(T&&) to not substitute
copy/move ctors
- moved common additions to C++11 version of std <type_traits> to
separte header
2020-05-20 14:34:55 +03:00
Liubov Batanina
d991c22090
Merge pull request #16575 from l-bat:flownet2
...
Support FlowNet2 model
* Support DataAugmentation layer
* Fix warnings
* Fix comments
* Support Correlation layer
* TEST
* Support Correlation layer
* Supported Accum and FlowWarp layers
* Supported ChannelNorm layer
* Supported Resample with inputs.size() > 1
* Fixed comments
* Refactoring
* Added tests
* Add resample test
* Added asserts in resize layer
* Updated DataAugmentation layer
* Update convolution layer
* Refactoring
* Fix data augmentation layer
* Fix caffe importer
* Fix resize
* Switch to Mat ptr
* Remove useless resize type
* Used ResizeLayer in Accum
* Split ChannelNormLayer
* Delete duplicate assert
* Add sample
* Fix sample
* Added colormap
2020-05-19 12:29:50 +00:00
Alexander Alekhin
9039284d96
Merge pull request #17317 from Yosshi999:prevent-build-failure-without-flann
2020-05-19 08:30:54 +00:00
Alexander Alekhin
593af7287b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-18 17:50:16 +00:00
Alexander Alekhin
322960f795
Merge pull request #17297 from dkurt:dnn_yolov3_ocl
2020-05-18 17:47:16 +00:00
Dmitry Kurtaev
b5035ce991
Increase test threshold for YOLOv3 on OCL FP16
2020-05-18 19:06:15 +03:00
Yosshi999
c0f435349a
ignore tests dependent on flann when flann module is absent
2020-05-18 15:30:32 +00:00
Alexander Alekhin
0e1c7eda39
Merge pull request #17092 from alalek:imgproc_ipp_parallel_gaussuanBlur
2020-05-18 11:51:59 +00:00
Alexander Alekhin
a3b109eca0
imgproc: enable GaussianBlur IPP parallel processing
2020-05-17 11:40:34 +00:00
Alexander Alekhin
a1b09a3734
imgproc(perf): add GaussianBlur cases for SIFT
2020-05-17 10:15:31 +00:00
Chris Ballinger
d81ac52ce2
Remove linking against AssetsLibrary framework
2020-05-16 12:47:50 -07:00
Chris Ballinger
220df8252d
Add target conditionals for Mac Catalyst
2020-05-16 12:47:50 -07:00
Dmitry Kurtaev
68d59a2913
Flush to zero Convolution denormal weights
2020-05-15 23:44:34 +03:00
Alexander Alekhin
5ecf5f106a
Merge pull request #17296 from mshabunin:fix-vulkan-build
2020-05-15 16:51:29 +00:00
jumostedu
5b095dfcb6
Merge pull request #15214 from jumostedu:matchtemplmask
...
* imgproc: templmatch: Add support for mask for all methods
Add support for masked template matching. Fix/scrub old implementation
for masked matching, as it did partly not even really do a meaningful
masking, and only supported limited template matching methods.
Add documentation including formulas for masked matching.
* imgproc: test: Add tests for masked template matching
Test accuracy by comparing to naive implementation for one point.
Test compatibility/correctness by comparing results without mask and
with all ones mask.
All tests are done for all methods, all supported depths, and for 1 and
3 channels.
* imgproc: test: templmatch: Add test for crossCorr
Add a test for the crossCorr function in templmatch.cpp. crossCorr() had
to be added to exported functions to be testable.
This test can maybe help to identify the problem with template matching
on MacOSX.
* fix: Fixed wrong evaluations of the MatExpr on Clang
* fix: removed crossCorr from public interface.
If it should be exported, it should be done as separate PR.
Co-authored-by: Vadim Levin <vadim.levin@xperience.ai>
2020-05-14 22:46:25 +00:00
Maksim Shabunin
7c41b54e3d
Fixed build with latest Vulkan headers
2020-05-14 23:20:28 +03:00
Ganesh Kathiresan
cddd7f10d5
Merge pull request #17224 from ganesh-k13:bugfix/calib3d/17201
...
* Fixed indexing in prefilter
* Initialised prefilter
* Initialised prefilter with value initialisation
* Added TC to trigger different Mem Allocs in BufferBM
* Optimize cases with only needed conditions
2020-05-14 16:30:01 +00:00
Nicolas Roduit
400a781ebf
Prefer addall instead of iteration for performance
2020-05-14 11:42:24 +03:00
Alexander Alekhin
c8689d9d0a
Merge pull request #17288 from dkurt:dnn_tf_resize_down
2020-05-14 07:08:41 +00:00
Alexander Alekhin
ea0d1424d8
Merge pull request #17287 from tomoaki0705:fixAkazeTestFailureMali
2020-05-14 06:59:28 +00:00
Alexander Alekhin
bcf96d637e
Merge pull request #17284 from dkurt:dnn_bn_fusion
2020-05-14 06:57:36 +00:00
Alexander Alekhin
486de65067
Merge pull request #17268 from anton-potapov:deownification_fix
2020-05-14 06:55:08 +00:00
Dmitry Kurtaev
b4a6aa335d
TensorFlow bilinear resize downscale
2020-05-13 23:59:20 +03:00
Tomoaki Teshima
35245cb76e
fix test failure on Mali T760 and Mali T628
2020-05-14 05:44:14 +09:00
Dmitry Kurtaev
df305e83fa
Fix BatchNorm reinitialization after fusion
2020-05-13 22:15:36 +03:00
Alexander Alekhin
b2464e3379
Merge pull request #17270 from l-bat:ngraph_missed_data
2020-05-13 08:27:04 +00:00
Alexander Alekhin
06bff34a6b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-12 19:24:28 +00:00
Alexander Alekhin
6856cc7253
Merge pull request #17228 from mshabunin:mfx-surface-pool-34
2020-05-12 19:00:49 +00:00
Alexander Alekhin
508bd3f55d
Merge pull request #17260 from jsxyhelu:add_deepgreen_colormap
2020-05-12 18:58:54 +00:00
Alexander Alekhin
8b51e2df8b
Merge pull request #17211 from alalek:sift_dispatch
2020-05-12 18:53:35 +00:00
Alexander Alekhin
bd1b252de9
Merge pull request #17196 from alalek:core_matexpr_fix_warning
2020-05-12 18:50:58 +00:00
Maksim Shabunin
f30931848e
CAP_MFX: surface pool with timeout, more parameters
2020-05-12 18:43:04 +03:00
Liubov Batanina
b27ae9c63b
Switch v1::Multiply to v0::Multiply
2020-05-12 16:05:03 +03:00
Liubov Batanina
79f8b7fd73
Merge pull request #17233 from l-bat:onnx_bn
...
* Added ONNX BatchNorm subgraph
* Move removing constant inputs to addConstantNodesForInitializers
* Added initializers to ONNXGraphWrapper
2020-05-12 15:33:57 +03:00
jsxyhelu
48e9e651a4
add DeepGreen colormap
2020-05-12 15:24:32 +03:00
Anton Potapov
7386d8523b
G-API: "deownification" corrections
...
- moved "standalone" aliases of cv types to "opencv_includes.hpp" to
keep responsibility principle aplied
- introduced correct aliasing for "descr_of(Mat)" function for
standalone case
- added missing include in `gapi/own/mat.hpp`
2020-05-12 14:28:32 +03:00
Alexander Alekhin
1bf353b876
Merge pull request #17230 from asmorkalov:as/issue_17171
2020-05-12 10:53:23 +00:00
Alexander Alekhin
713577b257
Merge pull request #17258 from YashasSamaga:cuda4dnn-hotfix-slice-pr17231-pr17222
2020-05-11 19:25:50 +00:00
YashasSamaga
45a6386e45
port pr17222 changes to CUDA backend
2020-05-11 11:01:01 +05:30
YashasSamaga
3c35b563d7
add scale_x_y parameter to region
2020-05-10 16:53:28 +05:30
Alexander Alekhin
066259b656
Merge pull request #17118 from l-bat/concat_3d
...
Added NDHWC Concat support for TensorFlow
* Supported TF concat 3d
* Skip myriad
* Fix test
2020-05-09 22:24:06 +03:00
Yashas Samaga B L
d981d04c76
Merge pull request #17200 from YashasSamaga:cuda4dnn-general-opt1
...
cuda4dnn: optimizations for swish, mish, sigmoid, region, resize based ops, transpose, identity-conv fusion
* bunch of optimizations
* more accurate implementation for mish
2020-05-09 17:20:30 +00:00
Alexander Alekhin
666be238d8
Merge pull request #17229 from smirnov-alexey:as/fix_fluid_resize
2020-05-08 18:59:41 +00:00
Alexander Alekhin
64f5471b2a
Merge pull request #17208 from hn-88:3.4
2020-05-08 18:31:11 +00:00
Alexander Smorkalov
7c17695be4
Added Java and C++ regression test for estimateNewCameraMatrixForUndistortRectify.
2020-05-08 13:04:25 +03:00
Smirnov Alexey
3e3d4ad797
Fix fluid resize operating with zero output size
2020-05-07 12:24:57 +03:00
Alexander Alekhin
09799402f9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-06 19:53:51 +00:00
Dmitry Kurtaev
8b13b85c5e
dnn: Slice with variable input shapes
2020-05-05 13:35:17 +03:00
Alexander Alekhin
1f9713195b
features2d(sift): enable runtime dispatching
2020-05-03 11:59:27 +00:00
hn-88
ea04f9d12e
to make OpenCV compile on mingw32
...
added #define NO_DSHOW_STRSAFE
2020-05-03 11:19:04 +05:30
Alexander Alekhin
74e4cfd1da
core(MatExpr): fix warning in case of e.s == (0, 0, 0, 0)
2020-05-01 07:29:57 +00:00
Alexander Alekhin
27ee6501eb
Merge pull request #17188 from asmorkalov:as/fisheye_test
2020-04-30 13:55:31 +00:00
Liubov Batanina
a5696da9ec
Merge pull request #17185 from l-bat:yolo_v4
...
* Support Yolov4
* Skip Mish on OpenVINO 2020.2
* Revert Mish
* Refactoring
2020-04-30 16:53:44 +03:00
Alexander Alekhin
0b439bcd08
Merge pull request #17190 from alalek:dnn_test_win32_skip_list
2020-04-29 20:53:54 +00:00
Alexander Alekhin
b805115c1a
dnn(test): update skip tests on Win32 configuration
2020-04-29 20:02:13 +00:00
Alexander Smorkalov
c41fb45da3
Restored test disabled during 3.0-alpha preparation.
2020-04-29 17:08:51 +03:00
QIU Xiaochen
cdfa58dde0
Merge pull request #17180 from PetWorm:3.4
...
* fix Scharr nomination
2020-04-29 09:55:59 +00:00
Alexander Alekhin
c722625f28
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-28 16:53:19 +00:00
Alexander Alekhin
6630eac813
Merge pull request #17173 from tomoaki0705:fixOclHogDetect
2020-04-28 16:36:14 +00:00
Tomoaki Teshima
63f5f93063
fix test failure on ODROID-N2
2020-04-28 21:46:31 +09:00
Alexander Alekhin
1d30a524fa
Merge pull request #17145 from asmorkalov:as/riscv
2020-04-28 10:41:41 +00:00
Vadim Levin
7f90f04df2
Merge pull request #16766 from VadimLevin:dev/vlevin/video_writer_params_constructor
...
* feature: Extend VideoWriter to accept vector of parameters
- Add additional constructor and `open` method for `VideoWriter`
those accept a vector of parameters
- Move actual implementation of the `VideoWriter::open` to general method
which accepts vector of parameters
- Propagate parsed parameters map up to actual video backend construction
* fix: Change VideoWriter constructor description to suppress doc warning
* refactor: Rollback newlines changes
* feature: Changed VideoWriter parameters workflow
* feature: Log unused parameters in VideoWriter open
* doc: Fix VideoWriter `isColor` parameter description
* fix: int to bool VC++ conversion warning
* doc: Remove information about `isColor` flag usage.
2020-04-28 08:38:39 +00:00
Dmitry Kurtaev
25ec4ce6f1
PReLU from Tensorflow
2020-04-28 00:01:21 +03:00
Alexander Alekhin
c05ac8729e
features2d: keep history of simd.cpp
2020-04-27 18:19:14 +00:00
Alexander Alekhin
9926a93a78
features2d: copy sift.dispatch.cpp
2020-04-27 18:18:16 +00:00
Alexander Alekhin
7093752cb5
features2d: copy sift.simd.hpp
2020-04-27 18:17:15 +00:00
Alexander Alekhin
0daf055fe6
Merge pull request #17159 from pauljurczak:patch-3
2020-04-27 12:43:32 +00:00
Alexander Alekhin
3f38edfd61
Merge pull request #17161 from alalek:cmake_protobuf_fix
2020-04-27 12:24:37 +00:00
Alexander Smorkalov
7228d2a824
Added initial version of cmake toolchain for RISC-V architecture.
2020-04-27 12:42:38 +03:00
Alexander Alekhin
9181ecfc7b
cmake: fix protobuf handling
2020-04-27 02:11:19 +00:00
Liubov Batanina
4bf94cb5d1
Fix test
2020-04-26 20:42:11 +03:00
Paul Jurczak
599a3026d1
Added to Camera constructor parameter description
2020-04-26 00:17:39 -06:00
Alexander Alekhin
288fa70ed9
dnn(protobuf): backport AllowUnknownField(), SetRecursionLimit()
...
- limit recursion in SkipField*() calls
2020-04-25 20:45:43 +00:00
Alexander Alekhin
152e6476d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-24 19:02:39 +00:00
Alexander Alekhin
8d05dab32c
Merge pull request #17119 from alalek:move_sift
2020-04-24 18:15:15 +00:00
Alexander Alekhin
3c14a8c507
Merge pull request #17149 from alalek:core_simd_suppress_coverity
2020-04-24 17:46:54 +00:00
Alexander Alekhin
ab3b1e9922
Merge pull request #17108 from HowardsPlayPen:patch-1
2020-04-24 17:25:31 +00:00
Alexander Alekhin
cd7db168e0
core(SIMD): suppress coverity UNINIT_CTOR on SIMD vectors
2020-04-24 16:36:35 +00:00
HowardsPlayPen
cbcdbde29d
Update videocapture_basic.cpp
...
I believe you are using the wrong version of open() on line 28 - adding deviceID + appId together. It's better to use the new version of .open() taking two integers as parameter.
2020-04-24 11:42:45 +03:00
YashasSamaga
aff2c7c43c
handle redundant slice in SliceOp
2020-04-24 12:54:17 +05:30
Alexander Alekhin
2df978b8e7
Merge pull request #17134 from alalek:dnn_ie_avoid_conversion_to_legacy
2020-04-23 22:39:45 +00:00
Alexander Alekhin
10808ccbb4
Merge pull request #17129 from alalek:dnn_myriad_tests
2020-04-23 19:41:15 +00:00
Alexander Alekhin
f756923271
dnn(ie): avoid conversion to legacy CNNNetworkImpl
2020-04-23 19:11:33 +00:00
Maxim Pashchenkov
51a42c0647
Merge pull request #17088 from mpashchenkov:mp/ocv-gapi-kernel-laplacian
...
G-API: Laplacian and bilateralFilter standard kernels
* Added Laplacian kernel and tests
* Added: Laplacian kernel, Bilateral kernel (CPU, GPU); Performance and accuracy tests for this kernels
* Changed tolerance for GPU test
* boner
* Some changes with alignment; Tests's parameters are the same as for OCV
* Cut tests
* Compressed tests
* Minor changes (rsrt bb)
* Returned types
2020-04-23 17:47:55 +00:00
Alexander Alekhin
189fc43765
Merge pull request #17082 from OrestChura:oc/buildPyramid
2020-04-23 12:07:27 +00:00
Alexander Alekhin
a327418767
features2d(sift): move SIFT tests / headers / build fixes
2020-04-23 08:45:22 +00:00
Alexander Alekhin
a1641f938e
Merge pull request #17133 from alalek:build_fix_gapi_ie
2020-04-22 23:06:14 +00:00
Alexander Alekhin
351fb8c058
gapi: fix build, update IE handling, add OPENCV_GAPI_INF_ENGINE
2020-04-22 21:47:45 +00:00
Alexander Alekhin
83c4378d5d
dnn(test): skip failed NGRAPH/MYRIAD tests
2020-04-22 15:00:23 +00:00
Alexander Alekhin
561421f748
Merge pull request #17122 from mshabunin:videoio-win-dbg-plugins
2020-04-22 11:42:33 +00:00
Maksim Shabunin
9415560250
videoio: load debug versions of plug-ins in debug builds
2020-04-22 13:35:06 +03:00
Alexander Alekhin
511d0fe198
Merge pull request #17120 from ganesh-k13:bugfix/documentation/16987
2020-04-22 09:08:02 +00:00
Liubov Batanina
1c1762d3f6
Skip myriad
2020-04-22 09:52:20 +03:00
ashishiva3@gmail.com
e0ac0cfbe2
add fused batchNorm Upsample
2020-04-22 08:24:17 +05:30
Alexander Alekhin
bfcc136dc7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-21 21:32:51 +00:00
Alexander Alekhin
775d031366
Merge pull request #17123 from ganesh-k13:bugfix/documentation/3.4/16987
2020-04-21 21:03:36 +00:00
Alexander Alekhin
1a17f402a4
Merge pull request #17030 from ashishkrshrivastava:onnximporter
2020-04-21 21:02:41 +00:00
Polina Smolnikova
40973bea31
Merge pull request #16961 from rayonnant14:objdetect_different_return_value_issue
...
QRDetectMulti : different return value bug fix
* QRDetectMulti : bug fix
* added tests
* changed test image due to large size of previous test image
2020-04-21 20:44:50 +00:00
Maxim Pashchenkov
94e36d8c8d
Merge pull request #16995 from mpashchenkov:mp/ocv-gapi-standalone-mat
...
G-API: Mat's "deownification"
* deowned Mat
* boner
* Removed canDescribe test for own::Mat
* Removed STANDALONE flag for apply() and operator()
* Removed: desc_tests for own::Mat, descr_of for own::Mat.
* Returned: tests, cv::gapi::own::descr_of; fixed alignment; Removed own::Mat's headers
* Removed unused header own/mat.hpp from gbackend.hpp
2020-04-21 20:22:01 +00:00
Ganesh Kathiresan
4ee6852a1e
Formula Fixes for master branch
...
Foumula fix 6
Foumula fix 7
2020-04-21 19:31:52 +05:30
Ganesh Kathiresan
0be2c7018b
Formula Fixes for 3.4 branch
...
Foumula fix 1
Foumula fix 2
Foumula fix 3
Foumula fix 4
Foumula fix 5
Foumula fix 8
2020-04-21 19:23:23 +05:30
Liubov Batanina
aa08900ac8
Supported TF concat 3d
2020-04-21 15:15:22 +03:00
OrestChura
05d5c284f6
gapi: buildOpticalFlowPyramid() interface, CPUkernel and CPUtests implementation
...
- kernel added to a cv::gapi::video namespace
- tests to check a kernels (based on cv::video tests for cv::buildOpticalFlowPyramid())
- tests for a combined G-API-pipeline (buildOpticalFlowPyramid() -> calcOpticalFlowPyrLK())
- tests for internal purposes added
- custom function for comparison in tests implemented
2020-04-21 14:36:42 +03:00
AshihsKrShrivastava
d37180a2c4
modification for upsample node fused from unfused Resize subgraph
2020-04-21 15:03:00 +05:30
Liubov Batanina
8badf7f354
Merge pull request #17112 from l-bat:ie_region
...
* Support nGraph Region
* Support region since OpenVINO 2020.2
* Skip myriad
2020-04-21 09:26:58 +00:00
Alexander Alekhin
150bd3aee6
Merge pull request #17106 from pauljurczak:patch-3
2020-04-20 18:00:01 +00:00
Alexander Alekhin
f19d0ae41d
Merge pull request #17109 from alalek:cmake_videoio_plugins_all
2020-04-20 17:24:18 +00:00
Paul Jurczak
a748eba42e
Added descriptions of randu and randn
2020-04-20 07:13:37 +00:00
Alexander Alekhin
10d2bcc8a2
videoio(msmf): fix build warning
...
- warning C4800: 'int': forcing value to bool 'true' or 'false'
2020-04-19 19:47:32 +00:00
Alexander Alekhin
7ce1bd5d88
cmake: handle VIDEOIO_PLUGIN_LIST=all
2020-04-19 19:29:07 +00:00
Alexander Alekhin
935420217c
Merge pull request #17102 from dkurt:dnn_ie_flexible_inputs
2020-04-19 18:06:09 +00:00
Alexander Alekhin
acf1be547d
Merge pull request #17046 from alalek:core_inputarray_matexpr_cleanup
2020-04-18 21:41:59 +00:00
Dmitry Kurtaev
908bf935f7
Flexible inputs for OpenVINO IR models
2020-04-18 20:00:22 +03:00
Alexander Alekhin
e59e978fcd
Merge pull request #17096 from spectralio:java-cmake-fix
2020-04-17 21:24:41 +00:00
Alexander Alekhin
fbaae7ac37
Merge pull request #17041 from alalek:core_simd_vector_ctors
2020-04-17 21:22:08 +00:00
Alexander Alekhin
dcf7eb972e
core(SIMD): align behavior of vector constructors
...
- setzero() calls are dropped due low-level API nature
- initialization is mandatory if necessary (not an output of other calls)
2020-04-17 14:34:34 +00:00
spectralio
1cce9db710
fix missing underscore
2020-04-17 13:08:32 +02:00
Alexander Alekhin
e92f1eaa3d
Merge pull request #17071 from mshabunin:tickmeter-fps
2020-04-17 08:56:29 +00:00
Maksim Shabunin
f84cae833a
TickMeter: added FPS and AvgTime, improved docs, reformatted
2020-04-16 21:33:29 +03:00
Alexander Alekhin
2cef100303
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-16 18:28:27 +00:00
Alexander Alekhin
ed58b5489f
[move sift.cpp] sift: avoid inplace calls of GaussianBlur
...
- should unlock IPP optimizations
original commit: ce7c8f2646
2020-04-16 17:58:45 +00:00
Alexander Alekhin
ef5fa498d4
[move sift.cpp] sift: perf tests and trace regions
...
original commit: a15e105db1
2020-04-16 17:58:45 +00:00
Alexander Alekhin
78e4fbd2d7
Merge pull request #17091 from tomoaki0705:fixHOGDetectorFailure
2020-04-16 16:34:45 +00:00
Tomoaki Teshima
96075ce0c9
avoid test failure on Arm platform
2020-04-17 00:59:15 +09:00
Alexander Alekhin
c007228d0f
Merge pull request #17075 from alalek:dnn_updates_from_openvino_2020.2
2020-04-16 12:19:58 +00:00
Alexander Alekhin
dca9b4283b
Merge pull request #17080 from dkurt:dnn_ngraph_future
2020-04-16 11:19:08 +00:00
Alexander Alekhin
dcec3150f0
Merge pull request #17084 from tomoaki0705:fixQRInputCheck
2020-04-16 09:44:08 +00:00
Dmitry Kurtaev
5e5385a814
Remove NodeVector for nGraph
2020-04-16 11:13:49 +03:00
Tomoaki Teshima
c2e484a465
fix wrong condition check
2020-04-16 08:24:14 +09:00
Paul Jurczak
f64d807863
Added to description of WCube constructor
...
`WCube` constructor reorders `min_point`, `max_point` parameters when necessary. I added this info to the description.
2020-04-15 16:06:14 -06:00
Alexander Alekhin
8c77f35fce
Merge pull request #17079 from tomoaki0705:fixCUDABgSgmMOG
2020-04-15 18:30:09 +00:00
Tomoaki Teshima
f39784c584
fix test failure on Jetson TX2
2020-04-15 23:25:12 +09:00
Alexander Alekhin
98e38b2a41
Merge pull request #17017 from VadimLevin:dev/vlevin/header-parser-explicit-support
2020-04-15 12:53:42 +00:00
Vadim Levin
1d8c73cf6c
feature: Added explicit
support to header parser
...
- It is safe to remove `explicit` keyword for constructors with 1
argument, because it is C++ specific keyword and does not affect any of
the generated binding.
2020-04-15 14:25:39 +03:00
Alexander Alekhin
ef68cc3d5f
dnn: use OpenVINO 2020.2 defines
...
original commit: 45263d7642
2020-04-15 11:14:43 +00:00
Vadim Levin
18550b4601
test: Added tests for VideoCapture constructors in java
2020-04-15 14:12:31 +03:00
Alexander Alekhin
8ff0399432
Merge pull request #17048 from anton-potapov:ap/variant_get_if
2020-04-14 19:06:01 +00:00
Alexander Alekhin
c8f1948d58
core: drop EXPR handing code in InputArray
2020-04-14 18:02:19 +00:00
Alexander Alekhin
f6de25b6cb
Merge pull request #17060 from dkurt:dnn_align_ie_pool
2020-04-14 15:15:44 +00:00
Anton Potapov
dd2c7c5140
GAPI: utils - variant::get_if
...
adding one more missing function to local version of std::variant
2020-04-14 15:12:31 +03:00
Ilya Lavrenov
91b0100287
Fixed compilation when NN builder is not built
2020-04-14 15:05:01 +03:00
Dmitry Kurtaev
870a775d7d
Align DLIE and nGraph average pooling layers
2020-04-14 13:54:54 +03:00
Alexander Alekhin
ca9756f6a1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-13 20:00:12 +00:00
Alexander Alekhin
675342ecd9
Merge pull request #17025 from tomoaki0705:fixTestFailureCUDABruteForceNonLocalMeans
2020-04-13 18:17:50 +00:00
Alexander Alekhin
245b2fec34
Merge pull request #16925 from dkurt:dnn_ssd.pytorch
2020-04-13 13:12:12 +00:00
Alexander Alekhin
49a75079f2
Merge pull request #17047 from alalek:fix_permissions
2020-04-13 12:34:08 +00:00
Dmitry Kurtaev
d3f9ad1145
Enable ONNX SSD from https://github.com/amdegroot/ssd.pytorch
2020-04-13 15:12:27 +03:00
Alexander Alekhin
46615ffc4a
Merge pull request #16985 from ashishkrshrivastava:padfusion
2020-04-13 11:26:13 +00:00
Pierre Chatelier
f351653589
Merge pull request #13869 from chacha21:LineVirtualIterator
...
* LineVirtualIterator
Proposal of LineVirtualIterator, an alternative to "LineIterator not attached to any mat".
This is basically the same implementation, replacing the address difference by a single "offset" variable. elemsize becomes irrelevant and considered to be 1. "step" is thus equal to size.width since no stride is expected.
* Update drawing.cpp
fixed warning
* improvement of LineVirtualIterator
instead of being too conservative, the new implementation gets rid of "offset/step" and only keeps a "Point currentPos" up to date.
left_to_right is renamed to forceLeftToRight as suggested (even for the old LineIterator)
assert() replaced by CV_Assert() (even for the old LineIterator)
* fixed implementation
+fixed last commit so that LineVirtualIterator gives at least the same results as LineIterator
+added a new constructor that does not require any Size, so that no clipping is done and iteration occurs from pt1 to pt2. This is done by adding a spatial offset to pt1 and pt2 so that the same implementation is used, the size being in that case the spatial size between pt1 and pt2
* Update imgproc.hpp
fixed warnings
* Update drawing.cpp
fixed whitespace
* Update drawing.cpp
trailing whitespace
* Update imgproc.hpp
+added a new constructor that takes a Rect rather than a Size. It computes the line pt1->pt2 that clips that rect.
Yet again, this is still based on the same implementation, thanks to the Size and the currentPosOffset that can artifically consider the origin of the rect at (0,0)
* revert changes
revert changes on original LineIterator implementation, that will be superseded by the new LineVirtualIterator anyway
* added test of LineVirtualIterator
* More tests
* refactoring
Use C++11 chained constructors
Improved code style
* improve test
Added offset as random test data.
* fixed order of initialization
* merged LineIterator and VirtualLineIterator
* merged LineIterator & VirtualLineIterator
* merged LineIterator & VirtualLineIterator
* merged LineIterator & VirtualLineIterator
* made LineIterator::operator ++() more efficient
added one perfectly predictable check; in theory, since ptmode is set in the end of the constructor in the header file, the compiler can figure out that it's always true/false and eliminate the check from the inline `LineIterator::operator++()` completely
* optimized Line() function
in the most common case (CV_8UC3) eliminated the check from the loop
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
2020-04-13 06:59:31 +00:00
Alexander Alekhin
f0ffc52435
fix files permissions
2020-04-13 04:29:55 +00:00
Tomoaki Teshima
1eb63cfc42
fix test failure on Jetson TX1/TX2/Nano
2020-04-12 23:58:53 +09:00
tpoisonooo
b11a3a0820
Update grfmt_pxm.cpp
...
remove comment in .ppm
2020-04-11 17:41:51 +03:00
AshihsKrShrivastava
bef6b6282c
ReflecitonPad2d and ZeroPad2d Subgraph fusion added
2020-04-11 07:14:05 +05:30
Alexander Alekhin
9c58a7cb1e
Merge pull request #16653 from alalek:core_inputarray_matexpr
2020-04-10 16:57:17 +00:00
Alexander Alekhin
0556450801
Merge pull request #17000 from rgarnov:async_islands
2020-04-10 12:23:53 +00:00
Alexander Alekhin
d7abb641ca
core(test): add InputArray(MatExpr) fetch test
2020-04-10 11:35:42 +00:00
Tomoaki Teshima
4e75f31c55
fix test failure on Jetson Nano/TX1/TX2
2020-04-10 06:15:16 +09:00
Alexander Alekhin
1537a5f253
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-09 19:19:20 +00:00
Ruslan Garnov
ce772b346c
Fixed standalone build, added cv::gapi::proto::ptr test
2020-04-09 17:19:11 +03:00
shimat
39d3bbb601
fix error at #include <window_winrt_bridge.hpp>
2020-04-09 09:54:13 +09:00
Dmitry Matveev
b1f42a6506
Implement asynchronous execution for islands
2020-04-08 20:48:23 +03:00
Dmitry Matveev
cb5921b375
Introduced a newStreamSignal() callback for Island Executables
2020-04-08 20:48:23 +03:00
Alexander Alekhin
016f9ab16e
Merge pull request #16788 from OrestChura:oc/optFlowPyrLK
...
G-API: gapi::calcOpticalFlowPyrLK() Implementation
2020-04-08 20:23:20 +03:00
Alexander Alekhin
499e20da4f
Merge pull request #17018 from anton-potapov:ap/fix_control_may_reach_end_of_non_void_function_warning
2020-04-08 16:46:34 +00:00
OrestChura
d50c21e571
gapi: Full calcOpticalFlowPyrLK implementation (2 overloads) and tests
...
- opencv_gapi module is linked with opencv_video module (optional dependency)
- kernels added to a new cv::gapi::video namespace and a brand new files created to provide gapi_video environment
- there are 2 different kernels as G-API should provide GMat AND GArray<GMat> implementation: cv::calcOptFlowPyrLK doesn't calculate pyramids if vector<Mat> is given so just the cast GMat -> GArray<GMat> wouldn't represent all the cv:: functionality
- tests to check both kernels (based on cv::video tests for cv::calcOpticalFlowPyrLK())
- tests for internal purposes added
- vectors<T> comparison in tests implemented
- new (and old too) common test structures refactored to avoid code copypasting
- "modules/gapi/test/common/gapi_video_tests_common.hpp" created to share some code snippets between perf and acc tests and avoid code copypasting
2020-04-08 18:11:55 +03:00
Anton Potapov
676d1dfd5b
GAPI: Fix [-Wreturn-type] warning on standalone mac build
...
- added [[noreturn]] to standalone version of GAPI_Assert
2020-04-08 17:13:33 +03:00
Alexander Alekhin
06bf845783
Merge pull request #16979 from dkurt:dnn_fused_resize_conv
2020-04-08 13:29:51 +00:00
Alexander Alekhin
acede976e4
Merge pull request #17009 from mshabunin:msmf-plugin
2020-04-08 13:28:26 +00:00
Maksim Shabunin
90e7c29c46
videoio: set plugin output dir on windows to bin
2020-04-08 15:22:50 +03:00
Maksim Shabunin
ca6a11e4d2
videoio: added plug-in support to MSMF backend
2020-04-08 15:22:50 +03:00
Alexander Alekhin
b8579f12be
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-08 10:19:09 +00:00
Dmitry Kurtaev
21ed892489
Fix Elu import from ONNX
2020-04-08 12:09:45 +03:00
GFleishman
31ec9b2aa7
Merge pull request #16614 from GFleishman:estimateTranslation3D
...
added estimateTranslation3D to calib3d/ptsetreg
* added estimateTranslation3D; follows API and implementation structure for estimateAffine3D, but only allows for translation
* void variables in null function to suppress compiler warnings
* added test for estimateTranslation3D
* changed to Matx13d datatype for translation vector in ptsetreg and test; used short license in test
* removed iostream include
* calib3d: code cleanup
2020-04-07 19:58:25 +00:00
Alexander Alekhin
0c2a43923c
Merge pull request #17007 from mshabunin:fix-openjpeg-vs
2020-04-07 19:55:37 +00:00
Alexander Alekhin
63320aba6c
Merge pull request #16999 from rgarnov:exports_for_gisland_executable
2020-04-07 19:55:01 +00:00
Orest Chura
2fe9c87433
Merge pull request #16717 from OrestChura:oc/goodFeatures
...
- cv::gapi::goodFeaturesToTrack() kernel is implemented
- tests (for exact check with cv::goodFeaturesToTrack() and for internal cases) are implemented
- a custom comparison function for vectors and a custom test fixture implemented
- some posiible issues as wrong/inexact sorting of two compared vectors are
not taken into account
- initializations of an input Mat using a picture from opencv_extra implemented (function from gapi_streaming_test used)
2020-04-07 15:53:24 +00:00
Alexander Alekhin
adf54d41d5
Merge pull request #16905 from dkurt:dnn_tf2_keras
2020-04-07 14:59:42 +00:00
Alexander Alekhin
ab4dbff150
Merge pull request #15907 from rgarnov:rg/unique_ptr_for_priv_in_fluid
2020-04-07 14:51:14 +00:00
Liubov Batanina
734771418e
Merge pull request #16840 from l-bat:matmul_inputs
...
* Supported FullyConnected layer with two inputs
* Skipped test
* Fix conditions
* Added OpenCL support
* Supported ReduceMean3D
* Supported Expand layer
* Fix warning
* Added Normalize subgraph
* refactoring
* Used addLayer
* Fix check
* Used addLayer
* Skip failed test
* Added normalize1 subgraph
* Fix comments
2020-04-07 14:12:18 +00:00
Maksim Shabunin
01a85736e6
OpenJPEG: fixed compilation and warnings with VS
2020-04-07 16:03:17 +03:00
Alexander Alekhin
60c382d8f1
Merge pull request #17005 from tomoaki0705:fixHoughKernelLocal
2020-04-07 10:05:44 +00:00
Tomoaki Teshima
3371e679ce
fix OpenCL spec violation
2020-04-07 14:34:55 +09:00
Nikita Shulga
b8cf5d8d5f
Enable Otsu thresholding for CV_16UC1 images
2020-04-06 21:19:07 -07:00
Dmitry Matveev
43df944eb4
Added GAPI_EXPORTS to GIslandExecutable since now it needs to be exported
2020-04-06 23:42:52 +03:00
Alexander Alekhin
ce5626db45
Merge pull request #16878 from dkurt:fix_16877
2020-04-06 18:14:35 +00:00
Alexander Alekhin
763a1d7392
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-06 15:57:43 +00:00
Alexander Alekhin
1377b9b736
Merge pull request #16970 from l-bat:fix_enet
2020-04-06 15:57:08 +00:00
Alexander Alekhin
5db3092a1f
Merge pull request #16952 from anton-potapov:kw_fixes
2020-04-06 15:55:33 +00:00
Ruslan Garnov
be1615b1c3
Merge pull request #16964 from rgarnov:rg/opaque_for_streaming_exec
...
* Added GOpaque support to GStreamingExecutor
* Added inter-island GOpaque support to GExecutor
2020-04-06 15:53:54 +00:00
Alexander Alekhin
936428cb3b
core(MatExpr) fetch result before InputArray wrap
...
- avoid multiple expression evaluations
- avoid issues with reduced support of InputArray::EXPR
2020-04-06 15:28:32 +00:00
Maxim Pashchenkov
ca9fd66744
Merge pull request #16886 from mpashchenkov:mp/ocv-gapi-add-disable
...
G-API: DISABLED_ in tests instead #if 0
* Removed if 0, replaced with DISABLED_
* boner
* Added tests for fluid
* -1 instead 0.0
* Added GMatDesc's tests for own::Mat
* IMGPROC_FLUID CORE_FLUID
* Added use_only, disabled tests without kernels
2020-04-06 15:21:08 +00:00
Alexander Alekhin
bdc95d2c66
Merge pull request #16911 from anton-potapov:ap/variant_move_issue
2020-04-06 15:19:32 +00:00
Adam Fowles
8334932a26
Merge pull request #16992 from afowles:fix-forEach-segfault
...
* Fixed divide by zero error in forEach
* Dedicated assertion for !empty
2020-04-06 14:49:02 +00:00
Alexander Alekhin
a10385543b
Merge pull request #16963 from rgarnov:rg/gframe
2020-04-06 14:35:52 +00:00
Alexander Alekhin
99d29c9d39
Merge pull request #16982 from tomoaki0705:houghLinesOCL
2020-04-06 14:35:14 +00:00
Liubov Batanina
a448d3a6aa
Fix ENet test with OpenVINO 2020.2
2020-04-06 17:29:43 +03:00
Alexander Alekhin
e80adc0bc6
Merge pull request #16965 from rgarnov:in_out_island_interface
2020-04-06 14:06:40 +00:00
Dmitry Matveev
1b5730a799
Introduce a new abstraction layer over island input/output data
...
- Port GExecutor to this new interface
2020-04-06 12:24:19 +03:00
Tomoaki Teshima
07c3aae315
let the test pass on Mali G52 (ODROID-N2)
2020-04-05 01:39:47 +09:00
Dmitry Kurtaev
b36eba7fab
Support FusedResizeAndPadConv2D from TensorFlow
2020-04-04 16:02:17 +03:00
Dmitry Kurtaev
8574a757f9
Case sensitive dnn layers types
2020-04-04 15:03:56 +03:00
Alexander Alekhin
01dcfb0825
Merge tag '4.3.0'
2020-04-03 11:50:53 +00:00
Alexander Alekhin
01b2c5a77c
release: OpenCV 4.3.0
2020-04-03 11:45:28 +00:00
Alexander Alekhin
0812207db7
Merge tag '3.4.10'
2020-04-03 11:24:31 +00:00
Ruslan Garnov
c8776e6ebd
Added GFrame
2020-04-03 01:21:51 +03:00
Alexander Alekhin
cf2a3c8e74
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-02 21:52:32 +00:00
Alexander Alekhin
1cc1e6fa56
release: OpenCV 3.4.10
2020-04-02 19:59:58 +00:00
Maxim Pashchenkov
277f0d270f
Merge pull request #16745 from Volskig:mp/ocv-gapi-standalone-size
...
G-API: Unification of own:: structures with cv:: (Size, Point, Rect)
* deowned Size Rect Point
* Deownded Size Rect Point
* With Scalar
2020-04-02 18:19:45 +00:00
Alexander Alekhin
388a7ce86e
Merge pull request #16956 from alalek:ocl_control_buffer_mapping
2020-04-02 17:56:50 +00:00
Alexander Alekhin
54063c40de
core(ocl): options to control buffer access flags
...
- control using of clEnqueueMapBuffer or clEnqueueReadBuffer[Rect]
- added benchmarks with OpenCL buffer access use cases
2020-04-02 11:11:06 +00:00
Maksim Shabunin
585593e9fc
videoio: fixed MSMF writer fps handling
2020-04-02 12:52:38 +03:00
Alexander Alekhin
f15e885baf
Merge pull request #16950 from alalek:fix_16945
2020-04-02 09:26:09 +00:00
Alexander Alekhin
9109cb1ec6
Merge pull request #16948 from alalek:warning_16739
2020-04-02 09:25:47 +00:00
Anton Potapov
3ffed0bf6e
GAPI - KW fixes
...
- remove unreachable code in GIsland::producer()
2020-04-02 12:05:34 +03:00
Alexander Alekhin
dc9ee53ff5
stitching: fix range check in DpSeamFinder::computeCosts
2020-04-02 03:51:17 +00:00
Maxim Pashchenkov
557ac3dbaf
Merge pull request #16805 from Volskig:mp/ocv-gapi-standalone-scalar
...
G-API: Unification of own:: Scalar with cv:: Scalar
* cvdefs.hpp
* Small changes
* Deowned Scalar. Does't work
* Something
* Removed to_ocv for Scalar
* Clear code
* Deleted whitespaces
* Added include<..own/scalar.hpp in cvdefs.hpp.
* Long string split on two now
* Comment about scalar
* Comment about crutch
* Removed second varible in scalar_wrapper
* Changed wrapper for scalar, alignment
* Alignment
* Whitespaces
* Removed scalar_wrapper
2020-04-01 18:40:38 +00:00
Alexander Alekhin
09134ac881
core: emit warning ONCE on ambiguous MatExpr processing
2020-04-01 18:34:20 +00:00
Maksim Shabunin
433c5199fd
videoio: fixed conversion in MSMF backend
2020-04-01 14:40:11 +03:00
Alexander Alekhin
396f43d674
Merge pull request #16938 from alalek:winpack_samples_update
2020-04-01 01:46:13 +03:00
Alexander Alekhin
3c5fec6746
build: updates for winpack dldt
2020-03-31 22:18:21 +00:00
Alexander Alekhin
e12b1c2209
build: updates for winpack dldt
2020-03-31 20:29:11 +00:00
Alexander Alekhin
f6b2b49e4a
Merge pull request #16932 from alalek:imgproc_resize_nn_cleanup
2020-03-30 15:38:40 +00:00
Alexander Alekhin
e1322cf503
Merge pull request #16928 from alalek:fix_15075
2020-03-30 13:07:35 +00:00
Alexander Alekhin
61c4cfd896
imgproc(resize): drop unused 'pix_size4'
2020-03-29 02:41:50 +00:00
Alexander Alekhin
be17f532e1
imgproc(resize): fix resizeNNInvoker handling of generic pixel size
2020-03-29 02:41:41 +00:00
Alexander Alekhin
6d85fa3fd2
imgcodecs(test): rework common I/O test, added grayscale mode
2020-03-27 21:34:51 +00:00
Alexander Alekhin
95a07ca11c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-27 16:49:59 +00:00
Alexander Alekhin
222a48577f
Merge pull request #16919 from alalek:backport_16860
2020-03-27 16:44:05 +00:00
Alexander Alekhin
353273579b
Merge pull request #16918 from alalek:build_warnings_3.4
2020-03-27 16:43:23 +00:00
Alexander Alekhin
72c5ac37de
Merge pull request #16915 from alalek:build_warnings
2020-03-27 16:42:53 +00:00
Alexander Alekhin
1eba7f60c2
Merge pull request #16913 from alalek:gapi_simd_initialization
2020-03-27 16:42:14 +00:00
Moritz Fischer-Gundlach
2740901378
-calib3d updates documentation
...
backporting commit 99436bb8cf
2020-03-27 16:02:29 +00:00
Alexander Alekhin
0c00d082cf
Merge pull request #16860 from FischerGundlach:rework_docu
2020-03-27 16:00:48 +00:00
Alexander Alekhin
e661ad2a67
eliminate build warnings
2020-03-27 11:39:07 +00:00
Anton Potapov
faceb05775
G-API utils - make variant converting constructor and assignment
...
operator properly forward it's argument
2020-03-27 14:30:16 +03:00
cyy
bdc29cccb6
fix freebsd build
2020-03-27 18:12:10 +08:00
StefanBruens
8d78400052
Merge pull request #16494 from StefanBruens:jpeg2000_openjpeg_port
...
Jpeg2000 OpenJPEG port
* OpenJPEG based JPEG2000 decoder implementation
Currently, the following input color spaces and depth conversions are
supported:
- 8 bit -> 8 bit
- 16 bit -> 16 bit (IMREAD_UNCHANGED, IMREAD_ANYDEPTH)
- RGB(a) -> BGR
- RGBA -> BGRA (IMREAD_UNCHANGED)
- Y(a) -> Y(a) (IMREAD_ANYCOLOR, IMREAD_GRAY, IMREAD_UNCHANGED))
- YCC -> Y (IMREAD_GRAY)
* Check for OpenJPEG availability
This enables OpenJPEG based JPEG2000 imread support by default, which
can be disabled by -DWITH_OPENJPEG=OFF. In case OpenJPEG is enabled
and found, any checks for Jasper are skipped.
* Implement precision downscaling for precision > 8 without IMREAD_UNCHANGED
With IMREAD_UNCHANGED, values are kept from the input image, without it
components are downscaled to CV_8U range.
* Enable Jpeg2K tests when OpenJPEG is available
* Add support for some more color conversions
Support IMREAD_GRAY when input color space is RGB or unspecified.
Support YUV input color space for BGR output.
* fix: problems with unmanaged memory
* fix: CMake warning - HAVE_OPENJPEG is undefined
Removed trailing whitespaces
* fix: CMake find_package OpenJPEG add minimal version
* Basic JPEG2K encoder
Images with depth CV_8U and CV_16U are supported, with 1 to 4 channels.
* feature: Improved code for OpenJPEG2000 encoder/decoder
- Removed code duplication
- Added error handlers
- Extracted functions
* feature: Update conversion openjpeg array from/to Mat
* feature: Extend ChannelsIterator to fulfill RandomAccessIterator named requirements
- Removed channels split in copyFromMatImpl. With ChannelsIterator no allocations are performed.
- Split whole loop into 2 parts in copyToMat -> where std::copy and std::transforms are called.
* fix: Applied review comments.
- Changed `nullptr` in CV_LOG* functions to `NULL`
- Added `falls through` comment in decoder color space `switch`
- Added warning about unsupported parameters for the encoder
* feature: Added decode from in-memory buffers.
Co-authored-by: Vadim Levin <vadim.levin@xperience.ai>
2020-03-27 07:18:58 +00:00
Alexander Alekhin
b4b4d21212
eliminate build warnings
2020-03-26 19:18:09 +00:00
Alexander Alekhin
99502e99cc
gapi(simd): initialize accumulator values
2020-03-26 16:48:21 +00:00
Moritz Fischer-Gundlach
99436bb8cf
-calib3d updates documentation
2020-03-26 15:22:39 +01:00
Dmitry Kurtaev
7e4b2057f2
Import TF2.0 network from Keras
2020-03-25 15:34:28 +03:00
Anatoliy Talamanov
c303aaa94d
Merge pull request #16841 from TolyaTalamanov:at/warp-perspective
...
G-API: Implement WarpPerspective
* Implement WarpPerspective kernel
* Fix comment to review
2020-03-25 11:23:32 +00:00
Alexander Alekhin
c920b45fb8
core(persistence): fix resource leaks - force closing files
...
backporting commit 673eb2b006
2020-03-25 10:49:16 +00:00
Alexander Alekhin
b0563ce368
Merge pull request #16895 from alalek:fix_16823
2020-03-24 16:15:15 +03:00
Alexander Alekhin
673eb2b006
core(persistence): fix resource leaks - force closing files
2020-03-24 11:38:09 +00:00
Alexander Alekhin
ef395c3866
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-24 11:12:11 +00:00
Anatoliy Talamanov
4d3d6230c5
Merge pull request #16803 from TolyaTalamanov:at/yuv-to-gray
...
* Implement NV12toGray
* Snapshot
* Implement NV12toGray as compound kernel
* Update gapi_imgproc_tests_inl.hpp
* Remove YUV2Gray from public API
2020-03-24 10:51:18 +00:00
Maksim Shabunin
0aac17d9f7
calib3d: check input values in dls
2020-03-24 12:22:26 +03:00
Alexander Alekhin
ea34b2fefb
Merge pull request #16888 from YashasSamaga:cuda4dnn-redundant-act-fusion-check
2020-03-24 08:41:11 +00:00
Alexander Alekhin
978666c816
Merge pull request #16849 from anton-potapov:ap/variant__assignment_operator_compile_error
2020-03-23 22:04:48 +00:00
Alexander Alekhin
0b4c101e8a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-23 16:54:35 +00:00
Alexander Alekhin
2d63861c09
Merge pull request #16885 from mshabunin:fix-msvc-warn
2020-03-23 16:23:37 +00:00
Alexander Alekhin
e8c7d61752
Merge pull request #16817 from dkurt:dnn_onnx_lstm
2020-03-23 16:22:17 +00:00
YashasSamaga
4e8cd4629c
fix CUDNN_STATUS_NOT_SUPPORTED, remove redundant fusion checks
2020-03-23 19:47:00 +05:30
Dmitry Kurtaev
467c3ef0ac
Add checks for LSTM initial h and c
2020-03-23 16:28:55 +03:00
Maksim Shabunin
2f665ec589
calib3d: fixed VS2019 warning C4756
2020-03-23 14:46:21 +03:00
Alexander Alekhin
39b64fc7d7
Merge pull request #16864 from alalek:issue_16857
2020-03-22 23:15:57 +03:00
Alexander Alekhin
4dfa798e75
Merge pull request #16868 from YashasSamaga:cuda4dnn-scale-fix_and_improvements
2020-03-22 20:15:11 +00:00
YashasSamaga
2aeb32d2d1
fix segfaults, support bias in untrainable mode, support batches in untrainable mode
2020-03-22 22:18:52 +05:30
Dmitry Kurtaev
8433620295
Bidirectional LSTM
2020-03-22 00:56:48 +03:00
Alexander Alekhin
760e9e0943
Merge pull request #16859 from dmatveev:dm/gapi_android
2020-03-21 17:06:01 +00:00
Alexander Alekhin
d7e839b8c5
objdetect(QR): avoid bug with empty input
2020-03-21 01:35:30 +00:00
Alexander Alekhin
2fb1d9d02e
doc: fix misused "see also" doxygen command
2020-03-21 00:25:49 +00:00
Alexander Alekhin
4cdb4652cf
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-20 21:41:15 +00:00
Alexander Alekhin
0fb4f2cc9c
imgproc: add src.empty() checks in filter operations
2020-03-20 21:04:29 +00:00
Dmitry Matveev
020be63df5
Try to enable G-API build on Android
2020-03-20 17:20:01 +03:00
Alexander Alekhin
377dd04224
core: fix .begin()/.end() of empty Mat
2020-03-20 14:08:45 +00:00
Anton Potapov
31d624f9a8
G-API utils - fix compilation error in variant::operator=
2020-03-20 14:46:13 +03:00
Alexander Alekhin
dbb30134bc
Merge pull request #16835 from YashasSamaga:cuda4dnn-hotfix-memory-lock
2020-03-19 16:50:39 +00:00
Alexander Alekhin
847190b5b8
Merge pull request #16828 from paroj:nmspy
2020-03-19 16:43:43 +00:00
Anatoliy Talamanov
8fe9674301
Merge pull request #16768 from TolyaTalamanov:at/add-warp-affine
...
G-API: Implement WarpAffine
* Add WarpAffine
* Ban BORDER_TRANSPARENT
* Fix doc
2020-03-19 12:12:09 +00:00
Pavel Rojtberg
66cf55ea1f
dnn: expose only float variant of NMSBoxes for bindings
...
the float variant was always shadowed by the int version as
Rect2d is implicitly convertible to Rect.
This swaps things which is fine, as the vector of boxes was always
copied and the computation was done in double.
2020-03-19 12:36:35 +01:00
Alexander Alekhin
4b47c7dbd2
cmake(python): handle PYTHON3_LIMITED_API
...
- python-3.x => python-3
- config-3.x.py => config-3.py
2020-03-18 23:10:06 +00:00
Pratik Raj
2160f9b20e
Merge pull request #16733 from Rajpratik71:master
...
Some debian package manager tweaks
2020-03-18 15:19:55 +00:00
Dmitry Kurtaev
11d565ca62
Fix LSTM from ONNX with batch==1
2020-03-18 00:00:24 +03:00
Dmitry Kurtaev
8d69dbdf49
LSTM from ONNX works
2020-03-17 22:05:57 +03:00
Dmitry Kurtaev
14da5ec311
LSTM scalar
2020-03-17 22:01:49 +03:00
Alexander Alekhin
25ab141b93
Merge pull request #16836 from alalek:stitching_avoid_nonfree_by_default
2020-03-17 16:29:44 +00:00
Liubov Batanina
718d7e4b04
Merge pull request #16715 from l-bat:slice_onnx
...
* Support Slice layer with multiple inputs
* Add test
* Supported Resize from PyTorch
* Rewrite test
* Remove Cast layer (supported in #16735 )
* Support ConstantOfShape
* Fix tests
* Fix coments
* Remove useless condition
* Fixed failed tests
2020-03-17 17:31:01 +03:00
Alexander Alekhin
ca68fac4b2
stitching: don't use nonfree by default
2020-03-17 15:09:23 +03:00
YashasSamaga
034a43e7f7
release and relock on wrapper resize
2020-03-17 16:08:04 +05:30
Alexander Alekhin
ca23c0e630
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-17 13:23:33 +03:00
Alexander Alekhin
1d7bfcc958
Merge pull request #16827 from alalek:update_buffer_area
2020-03-17 10:12:47 +00:00
Alexander Alekhin
01ea055d79
Merge pull request #16825 from mshabunin:fix-qrcode-tests
2020-03-16 18:52:15 +00:00
Alexander Alekhin
77d1c20fb7
core(buffer_area): handle 'OPENCV_ENABLE_MEMORY_SANITIZER=ON' case
2020-03-16 19:34:08 +03:00
Maksim Shabunin
05d4975619
objdetect: fix QRCode tests with disabled QUIRC
2020-03-16 19:20:34 +03:00
Maksim Shabunin
d4d95bd70d
Fixs several problems found by static analysis
2020-03-16 19:15:26 +03:00
Maksim Shabunin
7e7bb3027c
Fixs several problems found by static analysis
2020-03-16 19:03:24 +03:00
Alexander Alekhin
8f49b820db
Merge pull request #16820 from dkurt:fix_16811
2020-03-16 15:04:49 +00:00
RAJKIRAN NATARAJAN
3b2e409fa7
Merge pull request #16779 from saskatchewancatch:issue-16777
...
* Fixes issue 16777.
* core: update Concurrency getNumThreads()
2020-03-16 17:12:29 +03:00
Dmitry Kurtaev
7f0d90a525
Fix memory leak in Python custom dnn layers
2020-03-16 16:54:55 +03:00
Alexander Alekhin
71ec112093
Merge pull request #16786 from alalek:issue_16398
2020-03-15 19:49:50 +00:00
Sayed Adel
9ea62bfddb
core:vsx reimplement v_broadcast_element()
...
There's no need to use `vec_perm()` instead of `vec_splat()`,
since instruction `vperm` is quite heavy compared to `vsplt[b,h,w]`.
2020-03-14 22:54:22 +02:00
Alexander Alekhin
00925ad795
Merge pull request #16809 from alalek:dnn_ie_separate_core_instances
2020-03-14 13:47:50 +00:00
Alexander Alekhin
683910f579
Merge pull request #16760 from dkurt:dnn_mobilenet_v3
2020-03-14 13:38:06 +00:00
Liubov Batanina
2645ee90ca
Merge pull request #16735 from l-bat:flatten_const_onnx
...
* Supported Flatten for constant nodes
* Added default axis
* Refactoring
* Refactoring
* Added cast layer
* Fix comments
* Add Cast for layers
2020-03-14 11:05:49 +00:00
Alexander Alekhin
9b64eadcb6
dnn(ie): separate IECore for different devices
...
- HETERO plugin doesn't switch well between devices
2020-03-13 18:49:28 +03:00
Anton Potapov
3af63fe052
GAPI - KW fixes
...
- avoid overflow in own::Mat::total() and according tests, part 2
2020-03-13 12:46:18 +03:00
Alexander Alekhin
a1230ad0a0
Merge pull request #16796 from anton-potapov:kw_fixes_own_mat_total_overflow
2020-03-12 13:05:52 +00:00
Alexander Alekhin
448a5452d0
Merge pull request #16793 from anton-potapov:kw_fixes_bitwise_op_on_bools
2020-03-12 12:10:32 +00:00
Alexander Alekhin
4cebef9090
Merge pull request #16792 from alalek:fixup_merge_dnn
2020-03-12 12:04:47 +00:00
Alexander Alekhin
7080c783d1
cmake: fix missing project() warning in Python standalone builds
2020-03-12 14:29:31 +03:00
Anton Potapov
d3b68b059b
GAPI - KW fixes
...
- avoid overflow in own::Mat::total() and according tests
2020-03-12 13:29:54 +03:00
Alexander Alekhin
7d1c42afe1
dnn: fix merge mistake in scale_layer.cpp
2020-03-12 13:07:33 +03:00
Alexander Duda
d594e72586
fix: estimateChessboardSharpness triggers out of range test
...
Problem is that iter1 += tcols, iter2 += tcols are called without check.
row < trows - 1 check is processed after increment in "for" statements.
2020-03-11 22:04:54 +01:00
Alexander Alekhin
4e56c1326f
core: adjust type of allocator_stats counter, allow to disable
2020-03-11 20:12:29 +03:00
Anton Potapov
3ba6b41961
GAPI - KW fixes
...
- replaced bitwise &= on bools, with explicit && to make KW happy
2020-03-11 18:16:56 +03:00
Alexander Alekhin
c1a8fb72b7
Merge pull request #16498 from etrulls:3.4.9-maxIters
2020-03-11 12:35:33 +00:00
Alexander Alekhin
850414a501
Merge pull request #16771 from alalek:update_version_4.3.0-pre
2020-03-11 10:24:56 +00:00
Alexander Alekhin
a560ebf09d
Merge pull request #16782 from anton-potapov:kw_fixes
2020-03-11 10:08:55 +00:00
Anton Potapov
72fedbe096
GAPI - KW fixes
...
- replace "unsafe" memcpy with "safe" :) std::copy_n to make KW happy
2020-03-11 11:23:15 +03:00
Alexander Alekhin
d00e58cdb0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-10 22:49:51 +00:00
Alexander Alekhin
9f82b74788
Merge pull request #16774 from alalek:core_update_cpus_detection
2020-03-10 22:39:30 +00:00
Alexander Alekhin
612746b4e5
Merge pull request #16744 from alalek:fix_mat_aug_operators_use_after_free
2020-03-10 22:02:47 +00:00
Alexander Alekhin
83e1d79403
core: update CPUs detection
...
- cache value, evaluate once
- better support for MINGW
- anything in 'cv' namespace
- test: dump number of active threads
2020-03-10 21:29:08 +00:00
Alexander Alekhin
4966186e10
Merge pull request #16770 from alalek:update_version_3.4.10-pre
2020-03-10 18:34:39 +00:00
Alexander Alekhin
510a8520c7
Merge pull request #16746 from alalek:dnn_switch_ie_backend_ngraph
2020-03-10 13:52:33 +00:00
Vadim Levin
09fe66e87f
Merge pull request #16713 from VadimLevin:dev/vlevin/ffmpeg_video_capture_bitrate
...
* feature: Add video capture bitrate read-only property for FFMPEG backend
* test: For WIN32 property should be either expected or 0.
Added `IsOneOf` helper function, enabled only for _WIN32.
2020-03-10 16:44:22 +03:00
Alexander Alekhin
3c85745e22
pre: OpenCV 4.3.0 (version++)
2020-03-10 15:00:03 +03:00
Alexander Alekhin
b7ecaceda8
pre: OpenCV 3.4.10 (version++)
...
- Android Manager version is not increased (stuck on 3.49)
2020-03-10 14:53:43 +03:00
Maxim Pashchenkov
3befdb4ae8
Merge pull request #16604 from Volskig:mp/ocv-gapi-zero-height-mat
...
G-API: Zero-height mat is cause of crash
* Added check for zero-height Mat case
* Refactoring, added validate_input_arg func
* No bool function now
2020-03-10 14:44:16 +03:00
Alexander Alekhin
db95aec4a7
dnn(ie): switch to nGraph backend by default
2020-03-10 14:33:22 +03:00
Yashas Samaga B L
490908f0ff
Merge pull request #16436 from YashasSamaga:feature-enetb0-yolo
...
dnn(darknet-importer): add grouped convolutions, sigmoid, swish, scale_channels
* update darknet importer to support enetb0-yolo
* remove dropout (pr16438) and fix formatting
* add test for scale_channels
* disable batch testing for scale channels
* do not set LayerParams::name
* merge all activations into setActivation
2020-03-10 12:45:19 +03:00
Alexander Alekhin
27b71d6368
Merge pull request #16625 from D-Alex:findChessboard
2020-03-09 22:21:29 +00:00
Alexander Alekhin
9b3be01b83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-09 20:27:34 +00:00
NesQl
0bcdf7d03e
Merge pull request #16724 from liqi-c:3.4-tengine
...
* Add Tengine support .
* Modify printf to CV_LOG_WARNING
* a few minor fixes in the code
* Renew Tengine version
* Add header file for CV_LOG_WARNING
* Add #ifdef HAVE_TENGINE in tengine_graph_convolution.cpp
* remove trailing whitespace
* Remove trailing whitespace
* Modify for compile problem
* Modify some code style error
* remove whitespace
* Move some code style problem
* test
* add ios limit and build problem
* Modified as alalek suggested
* Add cmake 2.8 support
* modify cmake 3.5.1 problem
* test and set BUILD_ANDROID_PROJECTS OFF
* remove some compile error
* remove some extra code in tengine
* close test.
* Test again
* disable android.
* delete ndk version judgement
* Remove setenv() call . and add License information
* Set tengine default OFF. Close test .
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
2020-03-09 14:59:23 +00:00
Alexander Duda
44560c3e50
calib3d: add estimateChessboardSharpness
...
Image sharpness, as well as brightness, are a critical parameter for
accuracte camera calibration. For accessing these parameters for
filtering out problematic calibraiton images, this method calculates
edge profiles by traveling from black to white chessboard cell centers.
Based on this, the number of pixels is calculated required to transit
from black to white. This width of the transition area is a good
indication of how sharp the chessboard is imaged and should be below
~3.0 pixels.
Based on this also motion blur can be detectd by comparing sharpness in
vertical and horizontal direction. All unsharp images should be excluded
from calibration as they will corrupt the calibration result. The same
is true for overexposued images due to a none-linear sensor response.
This can be detected by looking at the average cell brightness of the
detected chessboard.
2020-03-09 08:58:18 +01:00
Dmitry Kurtaev
b927ce18b2
Support for MobileNetV3-SSD from TensorFlow
2020-03-08 21:09:21 +03:00
Alexander Alekhin
969cc3dd95
Merge pull request #16743 from alalek:ts_dump_exception_content
2020-03-07 19:07:18 +00:00
Alexander Alekhin
198b5096aa
Merge pull request #16754 from alalek:issue_16752
...
* core(test): FP16 norm test
* core: norm()-FP16 disable OpenCL
* core(norm): fix 16f32f local buffer size
2020-03-07 19:06:47 +00:00
Eduard Trulls
7e637c134f
Expose maxIters in findFundamentalMat
...
Lets the user choose the maximum number of iterations the robust
estimator runs for, similary to findHomography. This can significantly
improve performance (at a computational cost).
2020-03-07 18:03:44 +03:00
Alexander Alekhin
619180dffd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-06 20:41:30 +00:00
Alexander Alekhin
6d113bd03f
Merge pull request #16751 from alalek:core_coverity_issues
2020-03-06 19:07:21 +00:00
Alexander Alekhin
a76c72acdd
Merge pull request #16738 from dkurt:onnx_broadcast
2020-03-06 19:04:43 +00:00
Alexander Alekhin
e9655cf646
Merge pull request #16697 from alalek:imgcodecs_jpeg_drop_unnecessary_code
2020-03-06 19:03:43 +00:00
Alexander Alekhin
34530da66e
core: fix coverity issues
2020-03-06 18:12:45 +00:00
Alexander Alekhin
6271192a32
Merge pull request #16694 from alalek:dnn_disable_nn_builder_api
2020-03-06 13:18:41 +00:00
Alexander Alekhin
3a2f40ac6f
core: don't allow reallocation in add/div/sub/bitwise aug operators
2020-03-06 13:00:40 +00:00
Alexander Alekhin
094a5b0cba
Merge pull request #16719 from alalek:dnn_disable_nn_builder_api_3.4
2020-03-06 12:26:48 +00:00
Alexander Alekhin
a55cc07548
ts(gtest): dump exception message from EXPECT_NO_THROW()
2020-03-06 12:08:43 +00:00
Manoj Gupta
880d2afb67
Fix building with ToT libc++
...
ToT libc++ (LLVM) no longer includes <sstream>
as part of <complex> which breaks building opencv.
Include <sstream> header explcitly to fix this.
2020-03-05 17:10:43 -08:00
Dmitry Kurtaev
9e332dc5fb
Broadcasting from ONNX
2020-03-06 00:58:59 +03:00
Alexander Alekhin
a694e5074f
Merge pull request #16723 from jansol:master
2020-03-05 12:25:20 +00:00
Alexander Alekhin
90a4d67e8d
Merge pull request #16513 from pwuertz:cuda_py_interop
2020-03-05 11:56:07 +00:00
Alexander Alekhin
23bc89d6fc
Merge pull request #16577 from Volskig:mp/ocv-gapi-work
2020-03-05 10:58:51 +00:00
Alexander Alekhin
73ddc091a2
Merge pull request #16693 from Volskig:mp/ocv-gapi-add-include
2020-03-05 10:53:23 +00:00
Maxim Pashchenkov
bce9837604
Added assert for create Mat with negative dims, added tets for this case
2020-03-05 11:52:10 +03:00
Maxim Pashchenkov
f3a50224f2
Rm imgproc from render.cpp
2020-03-05 11:41:36 +03:00
Alexander Alekhin
d4a17da7b2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-04 20:49:09 +00:00
Alexander Alekhin
4f288a1e28
Merge pull request #16704 from alalek:core_log_once_log_if
...
* core(logger): add CV_LOG_ONCE_xxx() CV_LOG_IF_xxx() macros
* core(logger): keep tests disabled
2020-03-04 20:42:41 +00:00
Alexander Alekhin
fd09413566
Merge pull request #16731 from alalek:issue_16708
...
* imgproc(integral): avoid OOB access
* imgproc(test): fix integral perf check
- FP32 computation is not accurate
* imgproc(integral): tune loop limits
2020-03-04 19:28:04 +00:00
Jan Solanti
ad16c243ca
core(ocl): Don't query image formats when none exist
...
clGetSupportedImageFormats returns CL_INVALID_VALUE if called with
num_entries 0 and a non-NULL image_formats pointer so let's not do that.
2020-03-04 14:15:33 +02:00
Alexander Alekhin
da6ad1c640
Merge pull request #15765 from zachlowry:patch-1
...
Use argument value for 'mat' in call to format for vector_mat and vector_mat_template
2020-03-04 11:42:31 +03:00
Liubov Batanina
9ed1332355
Merge pull request #16722 from l-bat:reshape_opset_11
...
* Supported Div op for constants
* Added Mul test
2020-03-04 11:27:10 +03:00
Vadim Levin
90ec651bd7
test: Add test to verify correct mat substitution into the template in header parser
2020-03-04 08:14:19 +03:00
Zach Lowry
0aa5391c4b
Use argument value for 'mat' in call to format for vector_mat and vector_mat_template
...
The hard-coded string value "Mat" was used in the two format strings for vector_mat and vector_mat_template, preventing UMat arguments to functions that have these types from working correctly. as noted in #12231 .
2020-03-04 08:14:11 +03:00
Alexander Alekhin
57cf120118
Merge pull request #16709 from ashishkrshrivastava:cvonnx
2020-03-03 20:23:10 +00:00
ashishiva3@gmail.com
e18d5e94c7
Gather-Cast, Mul-Cast fusion
2020-03-03 21:08:28 +05:30
Maksim Shabunin
219ef95dd8
MSMF: fixed issue with camera format selection
2020-03-03 13:17:32 +03:00
Anton Potapov
8ed89bae84
KW: G-API tests - fixes for uninitialized variables
2020-03-03 11:37:40 +03:00
Alexander Alekhin
124bf8339f
dnn(IE): use HAVE_DNN_IE_NN_BUILDER_2019 for NN Builder API code
...
- CMake option: OPENCV_DNN_IE_NN_BUILDER_2019
2020-03-03 08:07:54 +00:00
Alexander Alekhin
29d214474f
dnn(IE): use HAVE_DNN_IE_NN_BUILDER_2019 for NN Builder API code
...
- CMake option: OPENCV_DNN_IE_NN_BUILDER_2019
2020-03-03 07:45:09 +00:00
Alexander Alekhin
4d0f13544d
Merge pull request #16700 from alalek:fix_core_matexpr_size_gemm
...
core: fix MatExpr::size() for gemm()
* core(test): MatExpr::size() test for gemm()
* core: fix MatExpr::size() for gemm()
2020-03-02 17:13:02 +03:00
Liubov Batanina
b1b78aedd2
Skipped ResizeUnfused test on Builder API
2020-03-02 15:45:29 +03:00
Alexander Alekhin
599a595c6f
Merge pull request #16573 from ashishkrshrivastava:opencvonnx
2020-02-29 21:20:40 +03:00
ashishiva3@gmail.com
8559237d4e
ONNX: upsample subgraph fusion added
2020-02-29 15:24:06 +05:30
Yashas Samaga B L
8808aaccff
Merge pull request #16658 from YashasSamaga:cuda4dnn-refactor-activations
...
cuda4dnn(activations, eltwise, scale_shift): refactor to reduce code duplication
* refactor activations
* refactor eltwise kernels
* move all functors to functors.hpp
* remove bias1 and scale1 kernels
2020-02-29 11:46:14 +03:00
Alexander Alekhin
333a767be4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-28 18:34:37 +00:00
Peter Würtz
5012fc5d23
Merge pull request #16684 from pwuertz:ignore_clang_mat_inl
...
* Ignore clang warnings for deprecated enum+enum operations in mat.inl.hpp
* build: added customization macros, cmake flags for OpenCV build
2020-02-28 21:21:03 +03:00
firebladed
f00607c8ac
Merge pull request #16626 from firebladed:firebladed-v4l2_pix_fmt_y12
...
V4L2: Add V4L2_PIX_FMT_Y12 (12 bit grey) support
2020-02-28 21:17:30 +03:00
Chip Kerchner
8c24af66bd
Merge pull request #16556 from ChipKerchner:vectorizeIntegralSumPixels
...
* Vectorize calculating integral for line for single and multiple channels
* Single vector processing for 4-channels - 25-30% faster
* Single vector processing for 4-channels - 25-30% faster
* Fixed AVX512 code for 4 channels
* Disable 3 channel 8UC1 to 32S for SSE2 and SSE3 (slower). Use new version of 8UC1 to 64F for AVX512.
2020-02-28 19:34:06 +03:00
Alexander Alekhin
7ffab23a53
Merge pull request #16535 from jshiwam:exifbugfix
2020-02-28 16:31:59 +00:00
Alexander Alekhin
4a39b12a78
imgcodecs(jpeg): drop unnecessary code
...
- standard huffman tables are handled by modern libjpeg-turbo
2020-02-28 18:55:14 +03:00
Alexander Alekhin
1bc607e8d8
Merge pull request #16677 from Bleach665:Qt_imshow_clipbrd
2020-02-28 14:41:07 +00:00
jshiwam
1f48940a93
bug fix to Inconsistent comment for EXIF issue id #15706 stream added final
...
removed all the changes occured while trying to resolve conflicts
2020-02-28 15:01:17 +05:30
Yuriy Obukh
edcc762f7a
add "Copy to clipboard functional" to imshow wnd with Qt
2020-02-28 00:03:38 +02:00
Alexander Alekhin
db5f1c3554
Merge pull request #16688 from alalek:issue_16679
2020-02-27 20:55:49 +00:00
Alexander Alekhin
9c4b1d0a51
Merge pull request #16685 from YashasSamaga:cuda4dnn-fix-tests-pr16595
2020-02-27 20:42:45 +00:00
YashasSamaga
98b5fb4b9f
disable MaskRCNN test for CUDA_FP16
2020-02-28 15:44:37 +05:30
Alexander Alekhin
e93c51762b
gapi(test): fix check
2020-02-27 19:43:06 +00:00
Alexander Alekhin
b16c1096d1
Merge pull request #16682 from alalek:dnn_test_keypoints_face_myriad
2020-02-27 19:04:28 +00:00
Alexander Alekhin
cc0066d38d
dnn(test): adjust check tolerance in Keypoints_face
2020-02-27 19:44:51 +03:00
Dmitry Kurtaev
5bbe116f89
Track Hetero execution for nGraph networks using ngraph::Function
2020-02-27 17:45:28 +03:00
Rajkiran Natarajan
b17e9c614b
Fix annoying compiler warning.
2020-02-26 22:59:02 -08:00
Alexander Alekhin
45d073f889
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-26 20:09:03 +03:00
Alexander Alekhin
af9ded89d0
core: fix build getNumberOfCPUs for JavaScript
2020-02-26 18:54:23 +03:00
Alexander Alekhin
c13a62ce10
Merge pull request #16638 from mshabunin:use-safe-buffers
2020-02-26 14:54:57 +00:00
Dmitry Kurtaev
d8dea7896b
Merge pull request #16628 from dkurt:dnn_ngraph_custom_layers
...
* Custom layers with nGraph
* nGraph: multiple outputs from nodes
2020-02-26 17:51:18 +03:00
Ganesh Kathiresan
09df7810d1
Merge pull request #16457 from ganesh-k13:bugfix/getCPUCount-fix
...
* Fixed getCPUCount
Minor new line changes
Android fix | efficient linux checks
Android fix 2
Fixed cpu logic for non linux platforms
Android fix 3
Android fix 4
* No v1 case handle | Refactor long lines
* Refined Cgroups logic | Combine Android and Linux
* Fixed directives
* Added support for --cpus | Fixed minor bug in Andriod | Change file read logic
* Added macro checks for apple errors
* Fixed macro to include android
* Addressed review comments
* Fixed android macro
* Refined return values
* Fixed apple warning
* Addressed review comments
* Fixed whitespace
* Android Fix try 1
* Android Fix try 2
* Android Fix try 3
* Removed unwanted endif
* Android Fix try 4
* Android Fix try 5
* Macro Restructure
* core: updates to CPUs detection (minor)
2020-02-26 17:48:50 +03:00
Alexander Alekhin
95aa6d7307
Merge pull request #16657 from alalek:issue_16655_master
2020-02-26 14:36:08 +00:00
Alexander Alekhin
2617c9aa64
Merge pull request #16673 from alalek:exclude_contrib_modules_4.x
2020-02-26 14:03:52 +00:00
Alexander Alekhin
f48c84eaee
Merge pull request #16656 from alalek:issue_16655
2020-02-26 12:47:46 +00:00
Alexander Alekhin
84bb67e49b
exclude opencv_contrib modules
2020-02-26 15:12:45 +03:00
Alexander Alekhin
f2d3edec80
gapi(test): ban and get rid of countNonZero() checks
2020-02-26 14:19:19 +03:00
Peter Würtz
53c0189ed7
Allow access to CUDA memory and stream pointers for interoperability.
2020-02-26 11:11:03 +01:00
Maksim Shabunin
bf96d8239d
Use BufferArea in more places
2020-02-26 11:45:19 +03:00
Alexander Alekhin
a5d0c7b02c
Merge pull request #16650 from ashishkrshrivastava:cvdarknet
2020-02-25 12:57:11 +00:00
Alexander Alekhin
c2f5f5a202
dnn(test): configure filtering for 32-bit systems (part 2)
2020-02-24 18:18:33 +00:00
YashasSamaga
5e082ab852
resize tensor on reuse if required
2020-02-24 10:45:59 +05:30
Alexander Alekhin
fce6e7248e
Merge pull request #16629 from alalek:dnn_test_32bit
2020-02-23 17:09:31 +00:00
Alexander Alekhin
d54d01ca46
core(MatExpr): fix .type() bug
2020-02-23 17:05:05 +00:00
ashishiva3@gmail.com
2b96a485e7
Darknet_io: Parsing for cost layer added
2020-02-23 21:06:48 +05:30
Alexander Alekhin
8eafddf211
Merge pull request #16647 from YashasSamaga:cuda4dnn-hotfix-i16568
2020-02-22 22:21:56 +00:00
Alexander Alekhin
1540ae340f
dnn(test): configure filtering for 32-bit systems
2020-02-22 17:35:26 +00:00
YashasSamaga
c23ab37355
fix weights rank assertion in InnerProductOp
2020-02-22 16:59:09 +05:30
Alexander Alekhin
01048e5603
Merge pull request #16616 from alalek:dnn_fix_input_shape
...
* dnn: fix processing of input shapes
- importer: avoid using of .setInput() => .setInputShape()
- setInput: shape limitation check (partial)
* dnn(test): test .setInput() in readNet()
2020-02-21 22:39:54 +03:00
Alexander Alekhin
102ef39a27
Merge pull request #16225 from berak:dnn_pose_estimation
...
dnn: small fix in pose estimation model
2020-02-21 22:37:23 +03:00
Alexander Alekhin
966c2191cb
Merge pull request #13928 from catree:add_matx_div_operations
2020-02-21 22:35:03 +03:00
Vadim Pisarevsky
8f3867756c
Merge pull request #16594 from vpisarev:hull_ordering_fix
...
fixed the ordering of contour convex hull points
* partially fixed the issue #4539
* fixed warnings and test failures
* fixed integer overflow (issue #14521 )
* added comment to force buildbot to re-run
* extended the test for the issue 4539. Check the expected behaviour on the original contour as well
* added comment; fixed typo, renamed another variable for a little better clarity
* added yet another part to the test for issue #4539 , where we run convexHull and convexityDetects on the original contour, without any manipulations. the rest of the test stays the same
2020-02-21 18:18:24 +03:00
Alexander Alekhin
a0f5eb282c
Merge pull request #16635 from mshabunin:fix-avx512-cvt
2020-02-21 13:15:40 +00:00
Vadim Pisarevsky
07b475062f
Merge pull request #16608 from vpisarev:fix_mac_ocl_tests
...
* fixed several problems when running tests on Mac:
* OCL_pyrUp
* OCL_flip
* some basic UMat tests
* histogram badarg test (out of range access)
* retained the storepix fix in ocl_flip only for 16U/16S datatype, where the OpenCL compiler on Mac generates incorrect code
* moved deletion of ACCESS_FAST flag to non-SVM branch (where SVM is shared virtual memory (in OpenCL 2.x), not support vector machine)
* force OpenCL to use read/write for GPU<=>CPU memory transfers on machines with discrete video only on Macs. On Windows/Linux the drivers are seemingly smart enough to implement map/unmap properly (and maybe more efficiently than explicit read/write)
2020-02-21 16:13:41 +03:00
Alexander Duda
a41cbbdc99
findChessboardCornersSB: performance + support for full FOV boards with markers
...
Changes:
* UMat for blur + rotate resulting in a speedup of around 2X on an i7
* support for boards larger than specified allowing to cover full FOV
* support for markers moving the origin into the center of the board
* increase detection accuracy
The main change is for supporting boards that are larger than the FOV of
the camera and have their origin in the board center. This allows
building OEM calibration targets similar to the one from intel real
sense utilizing corner points as close as possible to the image border.
2020-02-21 14:01:47 +01:00
Maksim Shabunin
8b2c499be6
intrin: fixed int64->double conversion for AVX-512
2020-02-21 15:20:00 +03:00
Alexander Smorkalov
c87b99e82b
Added test for new MatX division.
2020-02-21 10:08:55 +03:00
Alexander Alekhin
96b26dc8f4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-20 19:47:27 +03:00
berak
4fdf4d380c
dnn: small fix in pose estimation model
2020-02-20 17:08:55 +01:00
Alexander Alekhin
30331eef4b
Merge pull request #16595 from dkurt:dnn_ie_mask_rcnn
2020-02-20 12:50:27 +00:00
Yashas Samaga B L
1f695c4532
Merge pull request #16161 from YashasSamaga:cuda4dnn-concat-fusion
...
cuda4dnn(concat): write outputs from previous layers directly into concat's output
* eliminate concat by directly writing to its output buffer
* fix concat fusion not happening sometimes
* use a whitelist instead of a blacklist
2020-02-20 15:43:05 +03:00
Dmitry Kurtaev
f3eef792eb
Enable Mask R-CNN with Inference Engine. Full coverage with nGraph
2020-02-20 10:13:40 +03:00
cyy
450b96510e
fixes #16500
2020-02-20 11:10:12 +08:00
Alexander Alekhin
4b0d3316f6
Merge pull request #16617 from alalek:dnn_fix_caffe_importer
2020-02-19 10:57:27 +00:00
Alexander Alekhin
7ac7aca33b
dnn(caffe): fix net.input_dim handling in Caffe importer
2020-02-19 07:37:27 +00:00
Alexander Alekhin
6713063a8d
Merge pull request #16612 from rabbull:master
2020-02-18 19:31:38 +00:00
Karl Liu
331a96c670
transplant 8p's normalization to 7p
...
use const instead of constexpr
2020-02-18 23:39:52 +08:00
Alexander Alekhin
1602a38fa9
Merge pull request #16572 from alalek:dnn_test_dldt_ir_v10
...
* dnn(test): test DLDT IRv10 model, drop old models
* dnn(test): don't expect bitexact results in DLDT IR tests
2020-02-18 17:57:46 +03:00
Dmitry Matveev
dae1fc8889
Merge pull request #16555 from dmatveev:dm/ocv_blog_sample
...
* G-API/Samples: Added a simple "privacy masking camera" sample
The main idea is to host this code for an opencv.org blog post only
* G-API/Samples: Modified privacy masking camera code to look better for the post
* G-API/Samples: fix Windows (MSVC) support in Privacy Masking Camera
* G-API/Samples: Addressed the majority of review comments in PMC
* G-API/Samples: Use TickMeter to measure time + more info in cmd options
* G-API/Samples: fix yet another Windows warning in PMC
* G-API/Samples: Fix wording in PMC cmd arg parameters
* Fix wording, again
* G-API/Samples: Fix PMC cmd-line arguments, again
2020-02-18 15:11:44 +03:00
Anatoliy Talamanov
a6ef9b4584
Merge pull request #16213 from TolyaTalamanov:at/lambdas-for-kernels
...
G-API: Using functors as kernel implementation
* Implement ability to create kernel impls from functors
* Clean up
* Replace make_ocv_functor to ocv_kernel
* Clean up
* Replace GCPUFunctor -> GOCVFunctor
* Move GOCVFunctor to cv::gapi::cpu namespace
* Implement override for rvalue and lvalue cases
* Fix comments to review
* Remove GAPI_EXPORT for template functions
* Fix indentation
2020-02-17 23:29:55 +03:00
Liubov Batanina
e970eccbf1
Merge pull request #16472 from l-bat:cp_vton
...
Add CP-VTON sample
* Support resize from PyTorch
* Add CP-VTON sample
* Fix downsampling
* Fix test
* Add model links
* Add default args
* Speed up resize
* Fix TOM link
* Add default args
* Fix comments
* Set aspect ratio for input
* Update links
* Check files exist
2020-02-17 22:29:37 +03:00
Alexander Alekhin
5ad9e5f9bc
Merge pull request #16600 from alalek:revert_16497
2020-02-17 13:17:35 +00:00
Alexander Alekhin
3a546aa380
imgproc: revert resize changes from PR 16497
2020-02-17 15:23:59 +03:00
Vadim Pisarevsky
d67a6c1be4
Merge pull request #16588 from vpisarev:fix_macos_move_window
...
fixed cv::moveWindow() on mac
* fixed cv::moveWindow() on mac (issue #16343 ). Thanks to cwreynolds and saskatchewancatch for the help!
* fixed warnings about _x0 and _y0
* fixed warnings about _x0 and _y0
2020-02-17 14:54:36 +03:00
keeper121
d84360e7f3
Merge pull request #16497 from keeper121:master
...
* Fix NN resize with dimentions > 4
* add test check for nn resize with channels > 4
* Change types from float to double
* Del unnecessary test file. Move nn test to test_imgwarp. Add 5 channels test only.
2020-02-16 19:33:25 +03:00
atinfinity
f81fdd58da
Merge pull request #16445 from atinfinity:fixed-typo
...
* fixed typo
* add compatibility code to handle migration
2020-02-16 19:16:33 +03:00
Gagandeep Singh
a6f3a21256
Merge pull request #16424 from czgdp1807:issue-16370
...
* fixed Split layer in ONNXImporter
* added test for fix of split layer
* fixed tests for Split layer
* applied reviews
* updated tests
* fixed paths in tests
2020-02-15 14:12:20 +03:00
Alexander Alekhin
f3237fdc6e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-14 19:54:59 +03:00
Vadim Pisarevsky
cc259e49f6
Merge pull request #16561 from vpisarev:better_hough_circles
...
* improved version of HoughCircles (HOUGH_GRADIENT_ALT method)
* trying to fix build problems on Windows
* fixed typo
* * fixed warnings on Windows
* make use of param2. make it minCos2 (minimal value of squared cosine between the gradient at the pixel edge and the vector connecting it with circle center). with minCos2=0.85 we can detect some more eyes :)
* * added description of HOUGH_GRADIENT_ALT
* cleaned up the implementation; added comments, replaced built-in numeic constants with symbolic constants
* rewrote circle_popcount() to use built-in popcount() if possible
* modified some of HoughCircles tests to use method parameter instead of the built-in loop
* fixed warnings on Windows
2020-02-14 19:16:41 +03:00
Dmitry Kurtaev
9a4cafa319
Resolve #14566
2020-02-14 00:21:38 +03:00
Alexander Alekhin
0a91261c7f
dnn: turn off visibility workaround for OpenVINO 2020.1
2020-02-12 17:22:44 +03:00
Alexander Alekhin
d81a0da3e0
dnn: use OpenVINO 2020.1 defines
2020-02-12 17:21:08 +03:00
Alexander Alekhin
2a6637afdf
Merge pull request #16516 from alalek:dnn_dump_network
2020-02-11 16:22:32 +00:00
Vadim Pisarevsky
3efa78311a
Merge pull request #16488 from vpisarev:filestorage_longlines
...
trying to fix handling file storages with extremely long lines
* trying to fix handling of file storages with extremely long lines: https://github.com/opencv/opencv/issues/11061
* * fixed errorneous pointer access in JSON parser.
* it's now crash-test time! temporarily set the initial parser buffer size to just 40 bytes. let's run all the test and check if the buffer is always correctly resized and handled
* fixed pointer use in JSON parser; added the proper test to catch this case
* fixed the test to make it more challenging. generate test json with
*
**
***
etc. shape
2020-02-11 18:46:15 +03:00
rayonnant14
fb13b87285
fix wrong memory allocation
2020-02-10 20:21:58 +03:00
Alexander Alekhin
aa2777ed61
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-10 19:40:29 +03:00
Alexander Alekhin
8a588f2c0b
Merge pull request #16542 from asmorkalov:asmorkal/base64_json
2020-02-10 16:28:55 +00:00
Alexander Alekhin
1dd24eeec0
Merge pull request #16539 from baka-gori:bugfix_cudacodec
2020-02-10 16:28:31 +00:00
Alexander Alekhin
5eec3be850
Merge pull request #16531 from paroj:featlinepy
2020-02-10 16:28:07 +00:00
Alexander Alekhin
236e3868df
Merge pull request #16527 from mshabunin:fix-msmf-fmt-34
2020-02-10 16:27:00 +00:00
Pavel Rojtberg
e13a73d084
core: export getCPUFeaturesLine to bindings
2020-02-10 14:06:43 +01:00
Alexander Smorkalov
bd6ab6d38e
Implemented BASE64 support in cv::FileStorage parser.
2020-02-10 11:38:19 +03:00
baka-gori
80aaed73e6
add cuda 10 support
2020-02-09 22:18:29 +09:00
Alexander Alekhin
db9f4436e0
Merge pull request #16473 from ashishkrshrivastava:opencvtf
2020-02-09 11:52:24 +03:00
ashishiva3@gmail.com
cd53144ed3
commit: Corrected end tensor_content parsing for StridedSlice layer.
2020-02-09 06:43:23 +05:30
Alexander Alekhin
eb14f9a464
Merge pull request #16463 from alalek:core_strong_ptr_alignment
2020-02-08 19:45:43 +00:00
Alexander Alekhin
0a691f7840
Merge pull request #16529 from alalek:dnn_skip_failed_ngraph_tests
2020-02-08 18:53:10 +00:00
Alexander Alekhin
8ecfb59930
dnn(test): skip failed ngraph tests
2020-02-07 22:43:40 +00:00
Alexander Alekhin
69944cd46b
Merge pull request #16421 from mshabunin:add-local-pool
2020-02-07 21:44:50 +00:00
Maksim Shabunin
6c8f50d1f3
videoio/MSMF: refactored format handling and selection, property reading and writing
2020-02-08 00:16:41 +03:00
Alexander Alekhin
8d078f63a9
Merge pull request #16530 from collinbrake:imread_unchanged_exif_doc
2020-02-07 20:37:44 +00:00
Alexander Alekhin
bcc9946650
Merge pull request #16438 from ashishkrshrivastava:opencvc
2020-02-07 23:17:59 +03:00
Collin Brake
d4a28f3bf6
improved documentation for imread()
2020-02-07 08:54:34 -05:00
Maksim Shabunin
55cdeaa6dd
BufferArea: initial version, usage in StereoBM
...
New class BufferArea is used to hide complexity of buffers allocations and allow instrumentation with valgrind and sanitizers.
2020-02-07 14:57:36 +03:00
Alexander Alekhin
7d998336d3
Merge pull request #16510 from andrey-golubev:unify_g_typed_kernel
2020-02-07 11:22:23 +00:00
Alexander Alekhin
6ad390a1cd
Merge pull request #16523 from collinbrake:imread_unchanged_exif_doc
2020-02-07 10:42:39 +00:00
Alexander Alekhin
3c2e5583d2
Merge pull request #16522 from alalek:dnn_build_warnings_from_ngraph
2020-02-07 10:33:00 +00:00
ashishiva3@gmail.com
d64529f6de
Added parsing for Connected and Dropout. Modified maxpool padding
2020-02-07 07:26:36 +05:30
Collin Brake
3cc07a4411
improved documentation for IMREAD_UNCHANGED flag
2020-02-06 17:49:14 -05:00
Alexander Alekhin
ac0a14631d
dnn: eliminate MSVC warnings from ngraph.hpp
2020-02-06 19:53:49 +00:00
Alexander Alekhin
745153098a
Merge pull request #16509 from omasaht:imwrite-throwerr-permissiondenied
2020-02-06 19:32:09 +00:00
Alexander Alekhin
d0d676929d
Merge pull request #16519 from TolyaTalamanov:at/fix-render-text-slowdown
2020-02-06 13:38:22 +00:00
Talamanov, Anatoliy
4dffcbd9f0
Fix render opencv backend text slowdown
2020-02-06 15:12:38 +03:00
Alexander Smorkalov
fb781834f5
Improved GStreamer documentation.
2020-02-06 12:51:09 +03:00
Alexander Alekhin
6eba1a4d44
dnn: auto network dump through parameter
2020-02-05 21:46:32 +00:00
Alexander Alekhin
fa4871b013
dnn: don't require setInput in .dump()
2020-02-05 21:28:07 +00:00
Omar Hassan
8dd0fd8a13
If applied, this commit will describe permission denied message in imwrite_ function when user does not have write permission
2020-02-05 22:23:10 +05:00
Andrey Golubev
5baa2c0706
Update documentation and clean up redundant code
2020-02-05 15:01:42 +02:00
Alexander Alekhin
225566da7b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-04 19:49:24 +03:00
Alexander Alekhin
0cb3bf95f1
Merge pull request #16490 from dkurt:dnn_refactor_resize
2020-02-04 16:45:35 +00:00
Alexander Alekhin
d917f889b1
Merge pull request #16504 from alalek:issue_16501
2020-02-04 16:39:17 +00:00
Vadim Pisarevsky
e50acb923e
Merge pull request #16495 from vpisarev:drawing_aa_border_fix
...
* fixed antialiased line rendering to process image border correctly
* fixed warning on Windows
* imgproc(test): circle drawing regression
2020-02-04 19:37:33 +03:00
Polina Smolnikova
4e4dfffe06
Merge pull request #16491 from rayonnant14:objdetect_decodeMulti_issue
...
* fixed issue with Mat reshape in decodeMulti()
* added test for decodeMulti
* used assign
2020-02-04 19:31:11 +03:00
Alexander Alekhin
f67c8e37d6
imgproc(resize): drop optimization for channels>4
2020-02-04 17:14:52 +03:00
Alexander Alekhin
0673866ceb
Merge pull request #16502 from tomoaki0705:fixTypo
2020-02-04 12:18:50 +00:00
Alexander Alekhin
c56e91dcc0
Merge pull request #16487 from asmorkalov:as/gapi_freetype
2020-02-04 11:40:15 +00:00
Vadim Pisarevsky
5c6d319ebc
Merge pull request #16493 from vpisarev:bordertype_sgbm_doc_fixes
...
* added note about BORDER_TYPE in separable filters; fixed SGBMStereo description
* added # to BORDER_ constants to generate hyperlinks
2020-02-04 14:30:16 +03:00
Tomoaki Teshima
edaf4e0104
apply to correct range (entire 3.0 and 4.0 series)
2020-02-04 18:49:19 +09:00
Dmitry Kurtaev
005f38fb45
Fix dnn::ResizeLayer to manage varying input shapes
2020-02-04 09:06:17 +03:00
Andrey Golubev
e569e9dcbd
Unify G_TYPED_KERNEL and G_TYPED_KERNEL_M
2020-02-04 02:16:51 +02:00
Alexander Smorkalov
a9a33d9a5f
Fixed build with FREETYPE and without tests.
2020-02-03 16:41:31 +03:00
Alexander Alekhin
8519db8efb
Merge pull request #15464 from tallestorange:3.4
2020-02-03 12:54:03 +00:00
Vadim Pisarevsky
174022547f
fixed incorrect dump of the pixel format
2020-02-03 13:22:56 +03:00
StefanBruens
f05d5888c9
Merge pull request #16479 from StefanBruens:fix_gles_glx_h_include
...
Fix compilation errors on GLES platforms
* Do not include glx.h when using GLES
GL/glx.h is included on all LINUX plattforms, which is wrong
for a number of reasons:
- GL_PERSPECTIVE_CORRECTION_HINT is defined in GL/gl.h, so we
want gl.h not glx.h, the latter just includes the former
- GL/gl.h is a Desktop GL header, and should not be included
on GLES plattforms
- GL/gl.h is already included via QtOpenGL ->
QtGui/qopengl.h on desktop plattforms
This fixes a problem when Qt is compiled with GLES, which
is often done on ARM platforms where desktop GL is not or
only poorly supported (e.g. slow due to emulation).
Fixes part of #9171 .
* Only set GL_PERSPECTIVE_CORRECTION_HINT when GL version defines it
GL_PERSPECTIVE_CORRECTION_HINT does not exist in GLES 2.0/3.x,
and has been deprecated in OpenGL 3.0 core profiles.
Fixes part of #9171 .
2020-02-02 16:29:04 +03:00
Alexander Alekhin
bf2f7b0f8b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-01 17:26:00 +00:00
gapry
ac9f8c1f41
Fixed Compilation warnings | Issue #16336
2020-02-01 03:32:42 +08:00
midjji
86e5e8d765
Merge pull request #15993 from midjji:master
...
This is a correction of the previously missleading documentation and a warning related to a common calibration failure described in issue 15992
* corrected incorrect description of failed calibration state.
see issue 15992
* calib3d: apply suggestions from code review by catree
2020-01-31 17:50:21 +03:00
Alexander Alekhin
27edba495a
Merge pull request #16246 from VadimLevin:dev/vlevin/videoio_classes_cleanup
2020-01-31 13:08:43 +00:00
Alexey Smirnov
0d456f9111
Merge pull request #16118 from smirnov-alexey:as/gopaque
...
G-API: GOpaque implementation
* Stub initial copypasted solution
* Fix mov test and add a couple of others
* Fix warnings
* More code coverage and tests
* fix macos warning
* address review comments
* Address review comments and fix indentation
* Fix build on armv7
2020-01-30 21:08:11 +03:00
Alexander Alekhin
591f427003
Merge pull request #16459 from nh2:patch-1
2020-01-30 14:25:18 +00:00
Alexander Alekhin
2ced568d34
Merge pull request #16220 from YashasSamaga:cuda4dnn-roi-pooling-test_fix-optim
2020-01-29 20:57:15 +00:00
Arnaud Brejeon
ecbba852cf
Merge pull request #16415 from arnaudbrejeon:bug_fix_16410
...
* Fix bug 16410 and add test
* imgproc(connectedcomponents): avoid manual uninitialized allocations
* imgproc(connectedcomponents): force 'odd' chunk range size
* imgproc(connectedcomponents): reuse stripeFirstLabel{4/8}Connectivity
* imgproc(connectedcomponents): extend fix from PR14964
2020-01-29 23:55:43 +03:00
Alexander Alekhin
48c8c95381
Merge pull request #16452 from alalek:objdetect_align_with_master
2020-01-29 16:12:31 +00:00
Alexander Alekhin
a4bd7506a5
core: CV_STRONG_ALIGNMENT macro
...
Should be used to guard unsafe type casts of pointers
2020-01-29 18:44:17 +03:00
Niklas Hambüchen
70cbc3d883
cvdef.h: Don't use C's limits.h under C++
...
Just like with the other headers in the rest of the file.
See e.g. https://stackoverflow.com/questions/36831465/what-difference-does-it-make-when-i-include-limits-or-limits-h-in-my-c-cod
for the reasons, the most important one being that limits.h does not respect
namespaces, which can make problems for downstream consumers of cvdef.h.
2020-01-29 16:41:31 +01:00
Sayed Adel
ec033330df
core:vsx workaround for the unexpected results of vec_vbpermq
in gcc4.9
2020-01-29 15:05:12 +02:00
Alexander Alekhin
e037800e46
Merge pull request #15714 from neurodroid:patch-1
2020-01-29 10:54:22 +00:00
cudawarped
5542dcb2bc
Merge pull request #16248 from cudawarped:fix_python_cudawarping_cudaarithm
...
* Move python CUDA tests to the contrib repo.
2020-01-29 12:54:02 +03:00
Sayed Adel
bd531bd828
core:vsx fix inline asm constraints
...
generalize constraints to 'wa' for VSX registers
2020-01-28 15:48:00 +02:00
Alexander Alekhin
8facf61bed
objdetect(QR): don't introduce deprecated API, compatibility code
2020-01-28 15:20:37 +03:00
Alexander Alekhin
560f85f8e5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-28 14:26:57 +03:00
Alexander Alekhin
5429b1f5ff
Merge pull request #16223 from l-bat:lip_jppnet
2020-01-27 19:17:43 +00:00
Liubov Batanina
4a19ac5aca
Move instruction
2020-01-27 16:18:32 +03:00
Polina Smolnikova
acc089ca64
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
2020-01-26 22:18:42 +03:00
Alexander Alekhin
282a15c9f9
Merge pull request #16434 from alalek:fix_build_i386
2020-01-26 07:21:59 +00:00
Alexander Alekhin
f8f74fc4ae
Merge pull request #16413 from l-bat:ngraph_deconv
2020-01-26 07:19:58 +00:00
Pierre Letessier
0853085ec6
Merge pull request #16190 from pletessier:videocapture_skip_frames
...
Videocapture skip frames
* enable skipping frames
* update videoio_skip test
2020-01-26 10:19:09 +03:00
Alexander Alekhin
e83438c23d
core(build): fix i386 compilation
2020-01-26 00:00:25 +00:00
Alexander Alekhin
3d5ca3ef75
Merge pull request #16418 from l-bat:ngraph_logsoftmax
2020-01-24 21:46:28 +00:00
Alexander Alekhin
76c21b73aa
Merge pull request #16374 from alalek:imgproc_dispatch_sumpixels
2020-01-24 21:21:48 +00:00
Chip Kerchner
4d2da2debe
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
2020-01-24 18:00:49 +03:00
Alexander Alekhin
4b2363de5c
gapi(test): update test tolerance for DIV operation on ARM
2020-01-24 17:07:24 +03:00
Alexander Alekhin
bd66f76fea
Merge pull request #16356 from alalek:dnn_ie_prevent_plugins_unloading
2020-01-24 12:07:05 +00:00
Alexander Alekhin
5265db82c7
Merge pull request #16409 from smirnov-alexey:as/gapi_fix_standalone_streaming
2020-01-24 08:47:57 +00:00
Liubov Batanina
d9474648f0
Fix diff
2020-01-24 11:00:06 +03:00
Liubov Batanina
0687cffe21
Support logSoftMax
2020-01-23 15:32:16 +03:00
Ganesh Kathiresan
504cd8a9f5
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)
2020-01-23 15:23:03 +03:00
Liubov Batanina
a3ae69893c
Extend nGraph Deconvolution layer support
2020-01-23 15:10:42 +03:00
Liubov Batanina
55b03dcaba
Refactoring
2020-01-23 10:25:41 +03:00
Alexander Smorkalov
1358c0ae66
Made automated triggering for ARAVIS cameras optional.
2020-01-23 09:00:28 +03:00
Alexander Alekhin
6670e6b0bb
dnn: prevent unloading of InferenceEngine plugins
2020-01-22 19:34:32 +03:00
Smirnov Alexey
e5ed22bd5b
Fix linkage in standalone mode
2020-01-22 17:51:16 +03:00
Alexander Alekhin
3d14dd4e39
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-22 16:58:30 +03:00
Alexander Alekhin
3019927a61
Merge pull request #16408 from alalek:dnn_test_tolerance_myriad
2020-01-22 13:56:15 +00:00
Alexander Alekhin
881cee4d8f
Merge pull request #16146 from pmur:reg_16137x2
2020-01-22 13:53:51 +00:00
Liubov Batanina
7e5b5390ba
Fix comments
2020-01-22 14:57:54 +03:00
Alexander Alekhin
b21a861c5b
dnn(test): adjust test tolerance for MYRIAD
2020-01-22 14:42:52 +03:00
Liubov Batanina
35c24480ae
Fix axis
2020-01-22 13:36:29 +03:00
Alexander Alekhin
16d8e9e0c8
Merge pull request #16358 from ashishkrshrivastava:opencv-2
2020-01-22 09:57:41 +00:00
Vadim Levin
3fe9dfaa2e
VideoIO classes refactoring
...
- Added `explicit` to `VideoCapture` constructors with 2
arguments, 1 of them has default value
- Applied library code style
- Introduced 2 debug macros to improve readability of the code
2020-01-22 12:05:10 +03:00
Liubov Batanina
832ca0734d
Refactoring
2020-01-22 10:52:40 +03:00
Ruslan Garnov
65ccafd494
Changed shared_ptr to unique_ptr for Priv storage in fluid::View
2020-01-21 18:03:03 +03:00
Ruslan Garnov
6c93e42d94
Changed sharev_ptr for Priv to unique_ptr for fluid::Buffer
2020-01-21 13:48:46 +03:00
Alexander Alekhin
6bc953e911
Merge pull request #16391 from l-bat:ngraph_lrn
2020-01-21 10:08:54 +00:00
Liubov Batanina
fada959b4b
Fix comment
2020-01-21 10:28:50 +03:00
Liubov Batanina
c6936f5a77
Support lrn with SPATIAL_NRM
2020-01-21 10:12:05 +03:00
Liubov Batanina
d825caf18e
Update check params
2020-01-21 10:09:24 +03:00
Alexander Alekhin
998e355b97
Merge pull request #16389 from alalek:core_fix_msa_build
2020-01-20 16:31:38 +00:00
Alexander Alekhin
7dad0f23d6
build: workaround for FORTIFY_SOURCE=2 builds on Alpine
2020-01-20 18:05:14 +03:00
Liubov Batanina
97455f1593
Remove useless condition
2020-01-20 17:31:58 +03:00
Liubov Batanina
08ba63da02
Add global pool flags
2020-01-20 15:37:11 +03:00
Alexander Alekhin
d42e04d0df
core(SIMD): fix MSA build - add v_reduce_min/max for u8/s8
2020-01-20 15:10:03 +03:00
Ganesh Kathiresan
80ade96c8c
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
2020-01-20 14:00:45 +03:00
Alexander Alekhin
00830d9dd8
Merge pull request #16385 from alalek:ts_update_optional_message
2020-01-20 10:54:40 +00:00
Alexander Alekhin
4e577b8d3c
Merge pull request #16378 from alalek:dnn_getMemoryShapes_error_dump_blobs
2020-01-20 10:49:17 +00:00
Alexander Alekhin
61b6d40539
Merge pull request #16377 from alalek:fix_16373
2020-01-20 10:48:21 +00:00
ashishiva3@gmail.com
f29bc22005
Convolutional padding parsing modified
2020-01-19 22:33:12 +05:30
Alexander Alekhin
ac30620344
ts: move message about misused 'optional' under the configuration parameter
2020-01-19 16:09:40 +00:00
Alexander Alekhin
8128f6284a
Merge pull request #15929 from sturkmen72:patch-3
2020-01-19 12:45:29 +00:00
Chip Kerchner
301626ba26
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
2020-01-17 19:37:35 +03:00
Julien
886220b9be
Merge pull request #16273 from JulienMaille:wrapper_available_target
...
* add a wrapper for getAvailableTargets
* add java wrapper on Target enum
2020-01-17 19:24:37 +03:00
Alexander Alekhin
55d54b56bf
dnn(onnx): handle unaligned access in ONNX importer
2020-01-17 19:03:34 +03:00
Alexander Alekhin
09b3383a7e
imgproc: dispatch sumpixels (integral)
2020-01-17 16:54:29 +03:00
Alexander Alekhin
b4316af834
imgproc: rename sumpixels.avx512_skx.{cpp,hpp}
2020-01-17 16:50:08 +03:00
Julien Maille
a696348ec5
FIX: disable dnn cuda input_shortcut on _half for CC<5.3
2020-01-17 14:21:25 +01:00
Alexander Alekhin
16b13c6e3b
Merge pull request #16367 from dkurt:dnn_ie_ngraph_mvn
2020-01-17 09:12:36 +00:00
Yashas Samaga B L
d85e67d3ec
Merge pull request #16063 from YashasSamaga:cuda4dnn-shortcut-unequal
...
support eltwise sum with different number of input channels in CUDA backend
* add shortcut primitive
* add offsets in shortcut kernel
* skip tests involving more than two inputs
* remove redundant modulus operation
* support multiple inputs
* remove whole file indentation
* skip acc in0 trunc test if weighted
* use shortcut iff channels are unequal
2020-01-16 21:54:00 +03:00
Alexander Alekhin
c30af724ef
Merge pull request #16349 from hannesa2:RemoveEclipseRelicts
2020-01-16 16:53:06 +00:00
Alexander Alekhin
3e2d8ca0a1
Merge pull request #16325 from alalek:core_simd_neon_fix_alignment_lut
2020-01-16 15:18:56 +00:00
Alexander Alekhin
1f8802b94d
Merge pull request #16351 from hannesa2:finishAndroidVersionGradleStyle
2020-01-16 15:17:17 +00:00
Dmitry Kurtaev
8b9e8a805d
MVN support through nGraph
2020-01-16 18:15:31 +03:00
Alexander Alekhin
358139b6b9
imgproc(dispatch): keep history of sumpixels.cpp
2020-01-16 15:09:10 +03:00
Alexander Alekhin
c6a622542d
imgproc: copy sumpixels.dispatch.cpp
2020-01-16 15:07:48 +03:00
Alexander Alekhin
4ecbcf0885
imgproc: copy sumpixels.simd.hpp
2020-01-16 15:06:34 +03:00
Alexander Alekhin
2638c5e9b7
dnn: dump layer's blobs on getMemoryShapes() error
2020-01-16 14:59:47 +03:00
Julien
ced3df73da
Fix: rsqrt(float) was improperly put in the ifdef for half
2020-01-16 09:21:50 +01:00
Alexander Alekhin
24ca53183d
Merge pull request #16361 from alalek:android_fix_javadoc
2020-01-15 19:42:35 +00:00
YashasSamaga
fd369a5004
fix and optimize ROIPooling
2020-01-15 22:53:48 +05:30
Alexander Alekhin
f6137292f1
Merge pull request #16357 from dkurt:dnn_ie_reset_myriad
2020-01-15 17:03:09 +00:00
Alexander Alekhin
a90dacdf75
android: fix javadoc
2020-01-15 19:44:27 +03:00
Dmitry Kurtaev
d92a883de1
Different way to reset Myriad device
2020-01-15 18:52:37 +03:00
Alexander Alekhin
f6a8f7859c
Merge pull request #16354 from dkurt:dnn_ie_custom_cpu_layers
2020-01-15 15:33:18 +00:00
Julien
4e2ef8c8f5
Merge pull request #16218 from JulienMaille:cuda-dnn-for-older-gpus
...
Enable cuda4dnn on hardware without support for __half
* Enable cuda4dnn on hardware without support for half (ie. compute capability < 5.3)
Update CMakeLists.txt
Lowered minimum CC to 3.0
* UPD: added ifdef on new copy kernel
* added fp16 support detection at runtime
* Clarified #if condition on atomicAdd definition
* More explicit CMake error message
2020-01-15 18:28:37 +03:00
Dmitry Kurtaev
7c741f54fa
Wrap custom OpenCV layers to try-catch
2020-01-15 17:44:38 +03:00
Dmitry Kurtaev
0d896af8ec
Fix uninitialized value
2020-01-15 12:58:12 +03:00
Hannes Achleitner
afc8dd5661
remove Eclipse relicts in Android sample
2020-01-15 07:19:58 +01:00
Hannes Achleitner
52f930cca7
finish Android version info to Gradle style
2020-01-15 06:34:42 +01:00
Alexander Alekhin
4cb9faf6c9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-14 17:04:22 +03:00
Alexander Alekhin
a67228cd73
Merge pull request #16291 from dkurt:dnn_onnx_graph_simplifier
2020-01-14 12:45:59 +00:00
Alexander Alekhin
f4daf14bfa
Merge pull request #16199 from sajarindider:computeGradientX
2020-01-14 12:42:28 +00:00
sajarindider
4b93820880
Fixed small inefficiency in seamless clone init
2020-01-14 12:57:52 +03:00
Liubov Batanina
be86338a79
Enable acrossSpatial normalizeL2 on Myriad
2020-01-14 12:51:19 +03:00
Dmitry Kurtaev
c1c84d2fd1
ONNX graphs simplifier
2020-01-14 12:45:49 +03:00
Alexander Alekhin
3f27f8cf41
Merge pull request #16232 from dkurt:dnn_ie_ngraph_fix_myriad_tests
2020-01-13 16:59:45 +00:00
Vadim Levin
31289d2f32
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
2020-01-13 18:11:34 +03:00
Dmitry Kurtaev
8f1e36f7c1
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
2020-01-13 15:35:47 +03:00
Anatoliy Talamanov
55f2370f36
Merge pull request #16221 from TolyaTalamanov:at/fix-g_typed_kernel_m
...
G-API: Fix G_TYPED_KERNEL_M macro
* Fix G_TYPED_KERNEL_M macro
* Fixes
* Fix windows build
* Fix doxygen
* Added several macros
* Add overloads for G_TYPED_KERNEL
2020-01-13 14:54:10 +03:00
Alexander Alekhin
fb61f88b9c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-12 09:35:39 +00:00
Alexander Alekhin
a9f3acb125
core(simd): fix NEON alignmnet issue
2020-01-11 18:39:50 +00:00
Alexander Alekhin
993b9af756
Merge pull request #16270 from dkurt:dnn_sort_tf_text_graphs
2020-01-11 17:39:13 +00:00
Alexander Alekhin
e180cc050b
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
2020-01-10 21:31:02 +03:00
olramde
c75d93337e
Merge pull request #16240 from olramde:olramde
...
* Changed plus operator to os.path.join()
* Remove '/' from PATH
2020-01-10 16:18:31 +03:00
Liubov Batanina
9ed372b297
Update get memory shapes
2020-01-10 14:09:08 +03:00
Liubov Batanina
4625337179
Add docs reduce mean
2020-01-10 12:49:06 +03:00
Liubov Batanina
e9e3af0aaa
Add global pool by axis test
2020-01-10 11:32:48 +03:00
Liubov Batanina
a33d50084d
Add global_pooling_dim flags
2020-01-10 09:01:57 +03:00
Liubov Batanina
7eba3a7c96
Add pack description
2020-01-09 13:59:35 +03:00
Samuel Thibault
e57ceea3d3
Fix build on non-Linux glibc-based systems
...
dl functions are provided by all glibc-based systems (GNU/Linux, but
also GNU/Hurd, GNU/kFreeBSD)
2020-01-08 01:32:44 +01:00
Nuzhny007
7d484d21f7
Fixed compilation on windows with openvx
2020-01-06 06:32:56 +03:00
Alexander Alekhin
1f2b2c5242
Merge pull request #16230 from YashasSamaga:cuda4dnn-fp-conversion
2020-01-05 11:59:33 +00:00
Janusz Lisiecki
178c4810e6
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>
2020-01-05 00:06:36 +01:00
Paul E. Murphy
c1cdb2416a
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.
2020-01-03 14:46:59 -06:00
Alexander Alekhin
40ac72a8f1
Merge pull request #16238 from alalek:imgproc_resize_fix_types
2020-01-03 16:30:28 +00:00
hannesa2
43a91f82fe
Merge pull request #16222 from hannesa2:AndroidMoveVersionInfo
...
Android move version info to Gradle style
* move version info to Gradle style
* Use VERSION_NAME in loader
* apply review suggestion
2020-01-03 19:15:35 +03:00
Alexander Alekhin
1996ae4a42
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-31 10:11:39 +00:00
Alexander Alekhin
bb93066558
Merge pull request #16249 from alalek:check_size
2019-12-31 10:09:00 +00:00
Dmitry Kurtaev
f954f0830c
Sort text TensorFlow graphs
2019-12-31 11:43:32 +03:00
YashasSamaga
48eecafc89
simplify code to help MSVC 19.10 and lower
2019-12-30 23:02:17 +05:30
Dmitry Kurtaev
76cfa65d55
AddV2 from TensorFlow
2019-12-30 20:06:58 +03:00
Peter Würtz
8aebef2459
Use global RNG for training RTrees.
2019-12-29 21:59:14 +01:00
Alexander Alekhin
7b12cbd7dc
Merge pull request #16254 from YashasSamaga:cuda4dnn-cudnn-optm-conv_bias_relu
2019-12-29 20:53:17 +00:00
YashasSamaga
01f97f150c
perfor fp conversions on GPU
2019-12-30 00:05:39 +05:30
YashasSamaga
17a35587e1
use optimized cuDNN path for conv + bias + relu
2019-12-29 13:08:38 +05:30
Alexander Alekhin
d76f24567b
Merge pull request #16250 from alalek:remove_moved_code
2019-12-28 21:59:19 +00:00
Liubov Batanina
752653c70b
Update global pooling
2019-12-28 18:03:40 +03:00
Alexander Alekhin
03a602b6ef
remove moved code
2019-12-28 13:57:11 +00:00
Alexander Alekhin
523f081923
core(check): add Size_<int>
2019-12-28 13:50:39 +00:00
Alexander Alekhin
515ec6b98a
Merge pull request #16247 from alalek:backport_16241
2019-12-27 16:20:52 +00:00
Alexander Alekhin
9ec3d76b21
Merge pull request #16241 from bwignall:typo
2019-12-27 16:18:57 +00:00
Alexander Alekhin
c4c94f891e
Merge pull request #16229 from hannesa2:RemoveAndroidEclipse
2019-12-27 13:41:38 +00:00
Alexander Alekhin
4ebd91e637
Merge pull request #16226 from YashasSamaga:cuda4dnn-permute-optm
2019-12-27 13:01:43 +00:00
Brian Wignall
f9c514b391
Fix spelling typos
...
backport commit 659ffaddb4
2019-12-27 12:46:53 +00:00
catree
badd0d1ff4
Add explicit size check for Rodrigues() function to prevent issue like https://stackoverflow.com/questions/58969553
2019-12-27 06:07:54 +01:00
Brian Wignall
659ffaddb4
Fix spelling typos
2019-12-26 06:45:03 -05:00
Alexander Alekhin
07729e396d
imgproc(resize): avoid unnecessary type conversions
2019-12-26 00:02:52 +00:00
Liubov Batanina
cf477f7e9f
Fix global axis
2019-12-24 16:42:00 +03:00
Liubov Batanina
543e0302d3
Support global pooling by axis
2019-12-24 16:16:58 +03:00
Hannes Achleitner
2da7360b63
Remove Android Eclipse relicts
2019-12-24 07:38:12 +01:00
YashasSamaga
16bc505d26
improve reduction logic and add fast transpose kernel
2019-12-24 00:23:45 +05:30
Liubov Batanina
6e33769e56
Add human parsing demo
2019-12-23 15:47:20 +03:00
Alexander Alekhin
89d3f95a8e
Merge tag '4.2.0'
2019-12-20 17:06:45 +03:00
Alexander Alekhin
bda89a6469
release: OpenCV 4.2.0
2019-12-20 16:44:16 +03:00
shimat
ee4feb4b09
Merge pull request #16208 from shimat:fix_compare_16f
...
* add cv::compare test when Mat type == CV_16F
* add assertion in cv::compare when src.depth() == CV_16F
* cv::compare assertion minor fix
* core: add more checks
2019-12-20 16:38:51 +03:00
Yashas Samaga B L
1fac1421e5
Merge pull request #16010 from YashasSamaga:cuda4dnn-fp16-tests
...
* enable tests for DNN_TARGET_CUDA_FP16
* disable deconvolution tests
* disable shortcut tests
* fix typos and some minor changes
* dnn(test): skip CUDA FP16 test too (run_pool_max)
2019-12-20 16:36:32 +03:00
Alexander Alekhin
5e2bcc9149
Merge tag '3.4.9'
2019-12-20 12:44:15 +03:00
Alexander Alekhin
97b6068c46
dnn(test): don't require downloaded data
2019-12-19 19:31:59 +00:00
Alexander Alekhin
64e6cf9fe5
release: OpenCV 3.4.9
2019-12-19 18:16:47 +03:00
Alexander Alekhin
71ef76ecad
Merge pull request #16201 from mshabunin:fix-dup-test
2019-12-19 14:43:53 +00:00
Alexander Alekhin
4c86fc13cb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-19 15:09:05 +03:00
Maksim Shabunin
b379969c63
Test: avoid duplicated test cases
2019-12-19 14:38:59 +03:00
Alexander Alekhin
24b05cb308
Merge pull request #16196 from alalek:issue_13574
2019-12-19 10:35:54 +00:00
Alexander Alekhin
dff8e29f98
Merge pull request #16139 from alalek:core_flip_avoid_unaligned
2019-12-19 10:29:07 +00:00
Alexander Alekhin
4733a19bab
Merge pull request #16194 from alalek:fix_16192
...
* imgproc(test): resize(LANCZOS4) reproducer 16192
* imgproc: fix resize LANCZOS4 coefficients generation
2019-12-19 13:20:42 +03:00
jeffeDurand
5bf7345743
Merge pull request #16090 from jeffeDurand:cuda_mog2_issue_5296
...
* cuda_mog2_issue_5296
2019-12-19 13:02:48 +03:00
Alexander Alekhin
4342657762
Merge pull request #16034 from Quantizs:irLoadFromBuffer
2019-12-19 10:00:07 +00:00
Sebastien Wybo
e801f0e954
Merge pull request #16011 from sebastien-wybo:fix_16007
...
* Fix #16007 - colinearity computed using all 3 coordinates
* calib3d(test): estimateAffine3D regression 16007
2019-12-19 12:59:18 +03:00
Alexander Alekhin
9cd1d087c3
android(camera2): apply .disconnectCamera() patch from issue 13574
2019-12-19 00:29:53 +00:00
Alexander Alekhin
8d22ac200f
core: workaround flipHoriz() alignment issues
2019-12-19 00:05:23 +00:00
Alexander Alekhin
a8345133ac
Merge pull request #16191 from terfendail:lres2c_fix
2019-12-18 22:31:52 +00:00
Vitaly Tuzov
f5a84f75c4
Fix for CV_8UC2 linear resize vectorization
2019-12-18 21:41:36 +00:00
Alexander Alekhin
b8e0898c7c
Merge pull request #16082 from YashasSamaga:cuda4dnn-roi-pooling
2019-12-18 14:41:58 +00:00
antalzsiroscandid
aa80f754f4
dnn: reading IR models from buffer
2019-12-18 15:31:08 +01:00
mcellis33
5d15c65e48
Merge pull request #16136 from mcellis33:mec-nan
...
* Handle det == 0 in findCircle3pts.
Issue 16051 shows a case where findCircle3pts returns NaN for the
center coordinates and radius due to dividing by a determinant of 0. In
this case, the points are colinear, so the longest distance between any
2 points is the diameter of the minimum enclosing circle.
* imgproc(test): update test checks for minEnclosingCircle()
* imgproc: fix handling of special cases in minEnclosingCircle()
2019-12-18 17:25:59 +03:00
Alexander Alekhin
f8b16fa293
Merge pull request #16188 from saskatchewancatch:issue-13551
2019-12-18 10:30:35 +00:00
Rajkiran Natarajan
af04b422c9
Change program type in hdr format files to modern value: RADIANCE so
...
modern readers that expect RADIANCE will read it
2019-12-17 20:17:32 -08:00
Alexander Alekhin
c97ff6c0f9
Merge pull request #16104 from alalek:issue_16095
2019-12-17 19:02:15 +00:00
Alexander Alekhin
61969dc158
Merge pull request #16171 from YashasSamaga:cuda4dnn-tensor-cores
2019-12-17 18:58:12 +00:00
Alexander Alekhin
fd4fac946a
gapi(test): avoid using of unstable random floating-point input
2019-12-17 13:48:40 +03:00
Orest Chura
287874a444
Merge pull request #15942 from OrestChura:fb_tutorial
...
G-API: Tutorial: Face beautification algorithm implementation
* Introduce a tutorial on face beautification algorithm
- small typo issue in render_ocv.cpp
* Addressing comments rgarnov smirnov-alexey
2019-12-17 11:00:49 +03:00
Alexander Alekhin
c6c8783c60
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-16 21:30:30 +00:00
Tatsuro Shibamura
971ae00942
Merge pull request #16027 from shibayan:arm64-windows10
...
* Support ARM64 Windows 10 platform
* Fixed detection issue for ARM64 Windows 10
* Try enabling ARM NEON intrin
* build: disable NEON with MSVC compiler
* samples(directx): gdi32 dependency
2019-12-17 00:23:30 +03:00
Alexander Alekhin
a11f9e1963
Merge pull request #16177 from cudawarped:fix_python_cudaarithm
2019-12-16 20:14:31 +00:00
cudawarped
d427cebd12
Fix mistake introcuded in previous PR and increase test coverage to avod this happening again
2019-12-16 18:38:58 +00:00
Alexander Alekhin
2c0d9fa81f
dnn(test): fix Test_Model.Keypoints* tests
2019-12-16 18:07:23 +03:00
YashasSamaga
cf93df41fc
enable tensor cores for fp16 convolutions
2019-12-16 15:38:12 +05:30
Alexander Alekhin
ba7b0f4c54
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-15 11:23:46 +00:00
Alexander Alekhin
90a17cf964
Merge pull request #16159 from alalek:imgcodecs_bmp_ubsan_enum_handling
2019-12-15 09:28:08 +00:00
Yashas Samaga B L
17c485eb03
Merge pull request #16092 from YashasSamaga:cuda4dnn-conv-act-fuse
...
cuda4dnn: fuse activations with convolutions
* fuse ReLU, ReLU6, TanH, Sigmoid with conv
* fix OpenCL errors
* improve ReLU, add power, swish and mish
* fix missing fusion entries
* fix handling of unsetAttached
* remove whole file indentation
* optimize power = 1.0, use IDENTITY instead of NONE
* handle edge case: change backend and then clear
2019-12-14 22:26:58 +03:00
Alexander Alekhin
d1c35e7b61
imgcodecs(bmp): make happy UBSAN with enum value range check
2019-12-13 18:51:46 +03:00
Xuanda Yang
3d60a9b96c
Merge pull request #16156 from TH3CHARLie:3.4
...
* Eltwise::DIV support in Halide backend
* fix typo
* remove div from generated test suite to pass CI, switching to manual test...
* ensure divisor not near to zero
* use randu
* dnn(test): update test data for Eltwise.Accuracy/DIV layer test
2019-12-13 18:29:39 +03:00
Diego
5b0b59ecfb
Merge pull request #15189 from dvd42:keypoints_module
...
Keypoints module
2019-12-13 18:00:06 +03:00
Alexander Alekhin
a45928045a
Merge pull request #16150 from alalek:cmake_avoid_deprecated_link_private
...
* cmake: avoid deprecated LINK_PRIVATE/LINK_PUBLIC
see CMP0023 (CMake 2.8.12+)
* cmake: fix 3rdparty list
- don't include OpenCV modules
2019-12-13 17:52:40 +03:00
Alexander Alekhin
43302c79ca
Merge pull request #16122 from alalek:cmake_update_cpu_compiler_detection
2019-12-13 14:51:19 +00:00
Alexander Alekhin
c2b6c67431
Merge pull request #16141 from OrestChura:oc/fix-standalone-build
2019-12-12 18:34:12 +00:00
RAJKIRAN NATARAJAN
e6ce752da1
Merge pull request #15966 from saskatchewancatch:issue-15760
...
Add checks for empty operands in Matrix expressions that don't check properly
* Starting to add checks for empty operands in Matrix expressions that
don't check properly.
* Adding checks and delcarations for checker functions
* Fix signatures and add checks for each class of Matrix Expr operation
* Make it catch the right exception
* Don't expose helper functions to public API
2019-12-12 19:23:57 +03:00
atalaman
4a4ff6749b
Merge pull request #16080 from TolyaTalamanov:at/fix-mosaic-primitive
...
G-API: Mosaic handle corner cases
* Handle corner cases
* Fix mosaic algo
* Fix bug with empty rects
2019-12-12 19:10:14 +03:00
Dmitry Matveev
f270e8d040
Merge pull request #16066 from dmatveev:dm/gapi_slides
...
* G-API: Added G-API Overview slides & its source code
- Sample code snippets are moved to separate files;
- Introduced a separate benchmark to measure Fluid/OpenCV
performance;
- Added notes on API changes (it is still a 4.0, not a 4.2 talk!)
- Added a "Metropolis" beamer download-n-build script.
* G-API: Addressed review issues on G-API overview slides
2019-12-12 18:48:38 +03:00
OrestChura
3cd8976493
Fix standalone-gapi
2019-12-12 18:22:16 +03:00
Alexander Alekhin
92b9888837
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-12 13:02:19 +03:00
Paul Murphy
1c4a64f0a1
Merge pull request #16138 from pmur:reg_16137
...
* imgproc: Prevent 1B overrun of 8C3 SIMD optimization
The fourth value read via v_load_q is essentially ignored,
but can cause trouble if it happens to cross page boundaries.
The final few iterations may attempt to read the most extreme
elements of S, which will read 1B beyond the array in most
aligment cases. Dynamically compute the stop. This could be
hoised from the loop, but will require a more extensive change.
Likewise, cleanup the iteration increment statements to make
it more obvious they do channel count (3) elements per pass.
This should resolve #16137
* imgproc(resize): extra check
2019-12-12 13:00:44 +03:00
Alexander Alekhin
afa072578c
Merge pull request #16120 from alalek:python3.8
2019-12-11 17:18:51 +00:00
Alexander Alekhin
5ee7abbe3c
Merge pull request #16088 from alalek:dnn_eltwise_layer_different_src_channels
...
dnn(eltwise): fix handling of different number of channels
* dnn(test): reproducer for Eltwise layer issue from PR16063
* dnn(eltwise): rework support for inputs with different channels
* dnn(eltwise): get rid of finalize(), variableChannels
* dnn(eltwise): update input sorting by number of channels
- do not swap inputs if number of channels are same after truncation
* dnn(test): skip "shortcut" with batch size 2 on MYRIAD targets
2019-12-11 20:16:58 +03:00
Alexander Alekhin
121bc50ca9
Merge pull request #16130 from alalek:fix_build_gapi_gcc_4.x
2019-12-11 14:17:03 +00:00
Alexander Alekhin
f2cce5fd8c
Merge pull request #16125 from alalek:core_safe_xadd
2019-12-11 14:15:46 +00:00
Alexander Alekhin
7d61426279
Merge pull request #16124 from alalek:issue_13354
2019-12-11 14:15:23 +00:00
Alexander Alekhin
8b97c93f3d
Merge pull request #16123 from alalek:opencv_include_port_file
2019-12-11 14:15:04 +00:00
atalaman
0d19fa0720
Merge pull request #16062 from TolyaTalamanov:at/add-default-initlization-for-primitives
...
G-API: Add default initialization for primitives
* Add ctors for primitives
* Add description for constructors
2019-12-11 17:10:42 +03:00
Alexander Alekhin
2a11103a73
Merge pull request #16098 from alalek:dnn_clarify_error_getMemoryShapes
2019-12-11 14:02:15 +00:00
Alexander Alekhin
b8ef2036b0
Merge pull request #16091 from dkurt:png_to_dot
2019-12-11 14:01:39 +00:00
Alexander Alekhin
8b9982a0a5
Merge pull request #16086 from alalek:gapi_test_bitwise_not_exclude_32f
2019-12-11 14:00:59 +00:00
Alexander Alekhin
15612ebd39
python: enable Python 3.8
2019-12-11 16:52:38 +03:00
Alexander Alekhin
6b6c2f6087
gapi: fix build with GCC 4.8
2019-12-11 13:31:50 +03:00
Alexander Alekhin
416848066c
core: provide safe implementations of CV_XADD() only
2019-12-11 00:48:45 +00:00
Alexander Alekhin
76b5e19eb3
core: add "namespace cv" in CV_StaticAssert fallback implementation
2019-12-11 00:35:13 +00:00
Alexander Alekhin
a675c4937a
core: OPENCV_INCLUDE_PORT_FILE for custom platform configuration
2019-12-11 00:31:45 +00:00
Alexander Alekhin
6ea29a7696
cmake: prefer using CMAKE_SYSTEM_PROCESSOR / CMAKE_SIZEOF_VOID_P
...
Drop:
- discouraged CMAKE_CL_64
- MSVC64
- MINGW64
2019-12-11 00:21:10 +00:00
shimat
b89581960c
s/Voroni/Voronoi/g
2019-12-11 09:13:58 +09:00
Alexander Alekhin
4ec4ec844f
python: fix issue with bindings loading on Python 3.8
2019-12-10 19:00:10 +00:00
Maksim Shabunin
435c97c7a2
imgproc: add parameter checks in calcHist and calcBackProj
2019-12-10 16:10:19 +03:00
Alexander Alekhin
939099b9ce
Merge pull request #16107 from dkurt:dnn_ie_ngraph_v1_conv
2019-12-10 12:10:50 +00:00
Alexander Alekhin
2a19db0f0a
Merge pull request #16106 from dkurt:dnn_ie_ngraph_weights_fusion
2019-12-10 12:08:04 +00:00
Dmitry Kurtaev
fe77223dee
Modify nGraph's ConvolutionBackpropData and GroupConvolution
2019-12-10 14:14:00 +03:00
Dmitry Matveev
9a18330f3a
Merge pull request #16081 from dmatveev:dm/ocv42_gapi_bugfixes
...
G-API: Fix various issues for 4.2 release
* G-API: Fix issues reported by Coverity
- Fixed: passing values by value instead of passing by reference
* G-API: Fix redundant std::move()'s in return statements
Fixes #15903
* G-API: Added a smarter handling of Stop messages in the pipeline
- This should fix the "expected 100, got 99 frames" problem
- Fixes #15882
* G-API: Pass enum instead of GKernelPackage in Streaming test parameters
- Likely fixes #15836
* G-API: Address review issues in new bugfix comments
2019-12-10 13:31:42 +03:00
Dmitry Matveev
c89780dfe0
Merge pull request #16039 from dmatveev:dm/gapi_tutorial_interactive_face_detection
...
* G-API-NG/Docs: Added a tutorial page on interactive face detection sample
- Introduced a "--ser" option to run the pipeline serially for
benchmarking purposes
- Reorganized sample code to better fit the documentation;
- Fixed a couple of issues (mainly typos) in the public headers
* G-API-NG/Docs: Reflected meta-less compilation in new G-API tutorial
* G-API-NG/Docs: Addressed review comments on Face Analytics Pipeline example
2019-12-10 00:30:10 +03:00
Yashas Samaga B L
3fddd3bf93
Merge pull request #16069 from YashasSamaga:cuda4dnn-crop_and_resize
...
add CropAndResize layer for CUDA backend
* add CropAndResize layer
* process multiple channels per iteration
2019-12-09 22:26:58 +03:00
Alexander Alekhin
45f6931352
Merge pull request #16089 from dkurt:dnn_ie_fix_fpga
2019-12-09 19:26:00 +00:00
RAJKIRAN NATARAJAN
b9435b9e38
Merge pull request #16094 from saskatchewancatch:issue-16053
...
* Add eps error checking for approxPolyDP to allow sensible values only
for epsilon value of Douglas-Peucker algorithm.
* Review changes for PR
2019-12-09 22:24:35 +03:00
Alexander Alekhin
a2642d83d3
Merge pull request #16093 from alalek:core_itt_thread_name_16072
2019-12-09 18:29:53 +00:00
Alexander Alekhin
a4cb914656
Merge pull request #16101 from dkurt:dnn_ie_ngraph_detection_output
2019-12-09 18:29:24 +00:00
Dmitry Kurtaev
c2ca3ee2fa
Fix weights fusion for Convolution and Deconvolution layers in nGraph
2019-12-09 19:06:47 +03:00
Alexander Alekhin
13bc55a015
calib3d: clarify error messages in collectCalibrationData()
2019-12-09 18:36:13 +03:00
Alexander Alekhin
b505cf84de
Merge pull request #16096 from YashasSamaga:cuda4dnn-region-optimize
2019-12-09 14:34:48 +00:00
Yashas Samaga B L
476a02739e
Merge pull request #16097 from YashasSamaga:cuda4dnn-optimize-resize-bilinear
...
cuda4dnn(resize): process multiple channels each iteration
* resize bilinear: process multiple chans. per iter.
* remove unused headers
* correct dispatch logic
* resize_nn: process multiple chans. per iter.
2019-12-09 17:31:27 +03:00
Paul Murphy
a011035ed6
Merge pull request #15257 from pmur:resize
...
* resize: HResizeLinear reduce duplicate work
There appears to be a 2x unroll of the HResizeLinear against k,
however the k value is only incremented by 1 during the unroll. This
results in k - 1 duplicate passes when k > 1.
Likewise, the final pass may not respect the work done by the vector
loop. Start it with the offset returned by the vector op if
implemented. Note, no vector ops are implemented today.
The performance is most noticable on a linear downscale. A set of
performance tests are added to characterize this. The performance
improvement is 10-50% depending on the scaling.
* imgproc: vectorize HResizeLinear
Performance is mostly gated by the gather operations
for x inputs.
Likewise, provide a 2x unroll against k, this reduces the
number of alpha gathers by 1/2 for larger k.
While not a 4x improvement, it still performs substantially
better under P9 for a 1.4x improvement. P8 baseline is
1.05-1.10x due to reduced VSX instruction set.
For float types, this results in a more modest
1.2x improvement.
* Update U8 processing for non-bitexact linear resize
* core: hal: vsx: improve v_load_expand_q
With a little help, we can do this quickly without gprs on
all VSX enabled targets.
* resize: Fix cn == 3 step per feedback
Per feedback, ensure we don't overrun. This was caught via the
failure observed in Test_TensorFlow.inception_accuracy.
2019-12-09 14:54:06 +03:00
Alexander Alekhin
734de34b7a
Merge pull request #16085 from alalek:imgproc_threshold_to_zero_ipp_bug
...
* imgproc(IPP): wrong result from threshold(THRESH_TOZERO)
* imgproc(IPP): disable IPP code to pass THRESH_TOZERO test
2019-12-09 14:51:02 +03:00
Alexander Alekhin
e0e683aedf
videoio(plugins): relax version check for FFmpeg wrapper on Windows
2019-12-09 14:47:38 +03:00
Dmitry Kurtaev
883c4c60c3
Remove Dummy layer
2019-12-09 12:49:47 +03:00
Alexander Alekhin
b1b505f783
dnn: clarify error message from getMemoryShapes()
2019-12-08 22:17:24 +00:00
Yashas
dd3f517fe9
optimize region kernels
2019-12-08 21:03:30 +05:30
Alexander Alekhin
65d606630d
Merge pull request #16084 from alalek:issue_15784
2019-12-07 22:33:11 +00:00
Alexander Alekhin
816f82682b
core(trace/itt): avoid calling __itt_thread_set_name() by default
...
- don't override current application thread names
- set name for own threads only
2019-12-07 21:41:15 +00:00
Dmitry Kurtaev
ad56838040
Replace .png to .dot
2019-12-07 15:03:28 +03:00
Alexander Alekhin
202ba124a5
Merge pull request #16087 from YashasSamaga:cuda4dnn-eltwise-div
2019-12-06 18:33:55 +00:00
Lubov Batanina
629d47fcd8
Merge pull request #15988 from l-bat:custom_layer
...
Test create custom layer in python
* check is contiguos
* Add custom layer test
* Fix test
* Remove assert
* Move assert to pyopencv dnn
* remove assert
* Add unregister
* Fix python2
* proto to bytearray
* Fix data type
2019-12-06 21:29:57 +03:00
Dmitry Kurtaev
beb5b291b9
Fix HETERO:FPGA,CPU plugin for IE backend
2019-12-06 19:35:11 +03:00
YashasSamaga
a91eca6ec2
add DIV support to EltwiseOp
2019-12-06 21:28:36 +05:30
Alexander Alekhin
c0503718cd
gapi(test): exclude 32F from bitwise_not case
2019-12-06 18:12:45 +03:00
Alexander Alekhin
51d54ad4f0
Merge pull request #16076 from l-bat:prior_ngraph
2019-12-06 14:08:21 +00:00
Alexander Alekhin
1ddcfc5c68
gapi: update CMakeLists.txt, fix TBB dependency handling
2019-12-06 16:36:42 +03:00
YashasSamaga
9b8ddba4d1
add ROIPoolingOp
2019-12-06 18:19:37 +05:30
Dmitry Matveev
b2b6f52d14
Merge pull request #16050 from dmatveev:dm/ocv42_gapi_doc_fixup
...
* G-API: Addressed various documentation issues
- Fixed various typos and missing references;
- Added brief documentaion on G_TYPED_KERNEL and G_COMPOUND_KERNEL macros;
- Briefly described GComputationT<>;
- Briefly described G-API data objects (in a group section).
* G-API: Some clean-ups in doxygen, also a chapter on Render API
* G-API: Expose more graph compilation arguments in the documentation
* G-API: Address documentation review comments
2019-12-06 15:36:02 +03:00
Alexander Alekhin
fb5db23463
Merge pull request #16079 from alalek:imgproc_color_clarify_error_message
2019-12-06 12:33:07 +00:00
Alexander Alekhin
0a35b97e75
Merge pull request #16070 from dkurt:backport_15611
2019-12-06 12:32:22 +00:00
Alexander Alekhin
15621532b8
Merge pull request #16077 from dmatveev:dm/gapi_narg_combine
2019-12-06 12:31:30 +00:00
Alexander Alekhin
b369c456f2
imgproc(color): clarify error message
2019-12-06 13:25:51 +03:00
Alexander Alekhin
c3023fb52b
pre: OpenCV 4.2.0 (version++)
2019-12-06 12:58:57 +03:00
Liubov Batanina
660a709840
Support Swish and Mish activations
2019-12-06 11:27:59 +03:00
Dmitry Matveev
ccf415c341
G-API: Added an arbitrary-argument version of cv::gapi::combine
...
- Now user doesn't need to do `combine(x, combine(y, combine(z, zz)))` but
just `combine(x, y, z, zz)`
2019-12-06 10:47:50 +03:00
Liubov Batanina
d99d18304a
Slice v1 op
2019-12-06 09:56:21 +03:00
Alexander Alekhin
76a27e3399
pre: OpenCV 3.4.9 (version++)
2019-12-05 18:28:38 +00:00
Dmitry Kurtaev
134094a442
Backport fix for autodetection of input shapes
2019-12-05 19:25:51 +03:00
Alexander Alekhin
8108fb0575
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-05 18:27:45 +03:00
Alexander Alekhin
c790779a37
Merge pull request #16024 from alalek:issue_15953
2019-12-05 14:23:48 +00:00
Alexander Alekhin
72f35e0626
Merge pull request #16052 from alalek:issue_16040
...
* calib3d: use normalized input in solvePnPGeneric()
* calib3d: java regression test for solvePnPGeneric
* calib3d: python regression test for solvePnPGeneric
2019-12-05 15:36:39 +03:00
Alexander Alekhin
f21bde4d9f
Merge pull request #16046 from alalek:issue_15990
...
* core: disable invalid constructors in C API by default
- C API objects will lose their default initializers through constructors
* samples: stop using of C API
2019-12-05 14:48:18 +03:00
Alexander Alekhin
986c5084a4
Merge pull request #16036 from dkurt:dnn_backport_15203
2019-12-05 09:56:00 +00:00
Alexander Alekhin
38180c2c97
Merge pull request #16014 from dkurt:dnn_ie_pooling_with_indices
2019-12-05 09:52:03 +00:00
Alexander Alekhin
95e36fd488
Merge pull request #16055 from alalek:issue_16041
2019-12-05 07:54:17 +00:00
Dmitry Kurtaev
d8e10f3a8d
Enable MaxPooling with indices in Inference Engine
2019-12-04 19:14:55 +03:00
cudawarped
b4a3c92867
Merge pull request #15957 from cudawarped:fix_cudacodec_python
...
Fix cudacodec python
* Add python bindings to cudacodec.
* Allow args with CV_OUT GpuMat& or CV_OUT cuda::GpuMat& to generate python bindings that allow the argument to be an optional output in the same way as OutputArray.
* Add wrapper flag to indicate that an OutputArray is a GpuMat.
* python: drop CV_GPU, extra checks in test
* Remove "cuda::GpuMat" check rom python parser
2019-12-04 18:57:58 +03:00
Alexander Alekhin
72315e7b00
Merge pull request #16045 from YashasSamaga:cuda4dnn-hotfix-log1p-expm1
2019-12-04 15:50:07 +00:00
Alexander Alekhin
1633c29f29
Merge pull request #16037 from alalek:dnn_test_fix_skip_vulkan
2019-12-04 15:49:47 +00:00
Alexander Alekhin
4dfa0a0383
bindings: basic support for #if preprocessor directives
...
- #if 0
- #ifdef __OPENCV_BUILD
2019-12-04 18:42:31 +03:00
Alexander Alekhin
818585fd12
core(tls): unblock TlsAbstraction destructor call
...
- required to unregister callbacks from system
2019-12-04 08:27:01 +00:00
Alexander Alekhin
529a241a26
Merge pull request #15972 from TolyaTalamanov:at/ftext-primitive
2019-12-03 20:09:21 +00:00
Pinaev Danil
5e3a7ac8a7
Merge pull request #16031 from aDanPin:dm/streaming_auto_meta
...
G-API-NG/Streaming: don't require explicit metadata in compileStreaming()
* First probably working version
Hardcode gose to setSource() :)
* Pre final version of move metadata declaration from compileStreaming() to setSource().
* G-API-NG/Streaming: recovered the existing Streaming functionality
- The auto-meta test is disabling since it crashes.
- Restored .gitignore
* G-API-NG/Streaming: Made the meta-less compileStreaming() work
- Works fine even with OpenCV backend;
- Fluid doesn't support such kind of compilation so far - to be fixed
* G-API-NG/Streaming: Fix Fluid to support meta-less compilation
- Introduced a notion of metadata-sensitive passes and slightly
refactored GCompiler and GFluidBackend to support that
- Fixed a TwoVideoSourcesFail test on streaming
* Add three smoke streaming tests to gapi_streaming_tests.
All three teste run pipeline with two different input sets
1) SmokeTest_Two_Const_Mats test run pipeline with two const Mats
2) SmokeTest_One_Video_One_Const_Scalar test run pipleline with Mat(video source) and const Scalar
3) SmokeTest_One_Video_One_Const_Vector test run pipeline with Mat(video source) and const Vector
# Please enter the commit message for your changes. Lines starting
* style fix
* Some review stuff
* Some review stuff
2019-12-03 19:14:13 +03:00
Alexander Alekhin
eb44e0a556
Merge pull request #16028 from catree:improve_calib3d_doc
2019-12-03 12:34:10 +00:00
Talamanov, Anatoliy
63b154396a
Implement cv::gapi::wip::draw::FText
2019-12-03 13:13:06 +03:00
YashasSamaga
fbb3f64a1a
fix expm1 and log1p for __half/__half2
2019-12-03 15:25:35 +05:30
Alexander Alekhin
0dc0bc80ae
dnn(test): fix Vulkan skip test tag
2019-12-02 18:22:10 +03:00
Dmitry Kurtaev
ca1ba7a53d
Backport for dnn input shape estimation
2019-12-02 16:28:59 +03:00
Alexander Alekhin
4b0132ed7a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-02 16:26:52 +03:00
Lubov Batanina
7523c777c5
Merge pull request #15537 from l-bat:ngraph
...
* Support nGraph
* Fix resize
2019-12-02 16:16:06 +03:00
catree
43d58aa760
Improve calib3d documentation:
...
- add reference to Rodrigues Jacobian
- add references to SE(3) and Lie Groups topics
- update some conventions and pinhole figure
2019-12-02 03:04:56 +01:00
Manjunath Bhat
78c5e41c23
Merge pull request #15808 from thebhatman:Mish_swish
...
* Added Swish and Mish activations
* Fixed whitespace errors
* Kernel implementation done
* Added function for launching kernel
* Changed type of 1.0
* Attempt to add test for Swish and Mish
* Resolving type mismatch for log
* exp from device
* Use log1pexp instead of adding 1
* Added openCL kernels
2019-12-02 00:06:17 +03:00
thebhatman
8a18d132fc
Port Swish and Mish layers
2019-12-01 11:55:39 +03:00
Alexander Alekhin
9a4404276a
calib3d: revert stereoRectify() changes from PRs: 6836, 6972, 6955
...
(1/4) Revert "Correct image borders and principal point computation in cv::stereoRectify"
This reverts commit 93ff1fb2f2
.
(2/4) Revert "fix calib3d changes in 6836 plus some others"
This reverts commit fa42a1cfc2
.
(3/4) Revert "fix compiler warning"
This reverts commit b3d55489d3
.
(4/4) Revert "add test for 6836"
This reverts commit d06b8c4ea9
.
2019-11-30 23:37:49 +00:00
sajarindider
101a147496
fixed Scheimpflug typo
2019-11-30 18:52:23 +00:00
Alexander Alekhin
01a28db949
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-29 18:57:33 +03:00
Vadim Levin
8d74101f07
Merge pull request #15955 from VadimLevin:dev/vlevin/generator_tests
...
Tests for argument conversion of Python bindings generator
* Tests for parsing elemental types from Python bindings
- Add positive and negative tests for int, float, double, size_t,
const char*, bool.
- Tests with wrong conversion behavior are skipped.
* Move implicit conversion of bool to integer/floating types to wrong
conversion behavior.
2019-11-29 16:24:13 +03:00
Alexander Alekhin
41af8aa046
Merge pull request #16017 from berak:fix_svm_train_auto
2019-11-29 11:38:22 +00:00
berak
0dfab6bbd0
ml: fix check in SVM::trainAuto
2019-11-28 20:33:58 +01:00
Pinaev Danil
53b6fb465c
Merge pull request #15695 from aDanPin:dp/incorrect_use_of_muve_fix
...
Fix incorrect use of std::move() in g-api perf tests
* First version
* Fix perfomace tests
Replace
c.apply(...);
with
cc = c.compile(...);
cc(...);
* Remove output meta arguments from .compile()
* Style fix
* Remove useless commented string
* Stick to common pattern : i.e. use gin() and gout() explicitly.
* Use cc(gin(...), gout(...)) in all cases.
2019-11-28 16:25:20 +03:00
Alexander Alekhin
873250f5de
Merge pull request #15998 from alalek:ts_count_skip_exception
2019-11-27 19:23:27 +00:00
Alexander Alekhin
6c37e10c83
Merge pull request #15994 from SSteve:affine_transform_docs
2019-11-27 19:23:09 +00:00
Alexander Alekhin
70146700aa
Merge pull request #15839 from alalek:core_simd_v_setall_template
2019-11-27 19:19:35 +00:00
atalaman
a7acb8805f
Merge pull request #15869 from TolyaTalamanov:at/plaidml-backend
...
G-API: Implement PlaidML2 backend
* PlaidML backend init version
* Add test
* Support multiply inputs/outputs in PlaidML2 backend
* Fix comment to review
* Add HAVE_PLAIDML macros
* Move plaidml tests to separate file
* Fix comment to review
* Fix cmake warning
* Fix comments to review
* Fix typos
overload -> overflow
* Fix comments to review
* Clean up
* Remove spaces from cmake scripts
* Disable tests with bitwise operations
* Use plaidml::exec::Binder
2019-11-27 18:21:00 +03:00
Dmitry Matveev
fb5e7964b3
Merge pull request #15753 from dmatveev:dm/ng-5000-security_barrier-interactive_face
...
G-API: Introduced Security Barrier & Interactive Face Detection samples
* G-API-NG/Samples: Added samples & relevant changes
- Security barrier camera sample
- Age/Gender/Emotions recognition sample
- GIEBackend now loads CPU extension libraries
- A couple of API-level workarounds added to deal with cv::Mat/Blob conversions
* G-API-NG/Samples: removed HAVE_INF_ENGINE remnants
2019-11-27 17:54:17 +03:00
Alexander Alekhin
5af747c6fd
Merge pull request #16001 from alalek:backport_15995
2019-11-26 18:35:28 +00:00
Brian Wignall
af997529a1
Fix some typos
2019-11-26 18:41:19 +03:00
Alexander Alekhin
5639f5a296
ts: count skipped tests via SkipTestException
...
- apply tag 'skip_other'
2019-11-26 18:34:04 +03:00
Brian Wignall
9276f1910b
Fix some typos
2019-11-25 19:55:07 -05:00
Steve Nicholson
0c644d1ec8
Rename parameter R to H in AffineWarper member declarations
2019-11-25 16:31:03 -08:00
Alexander Alekhin
a093a0e05c
Merge pull request #15986 from dkurt:fix_15863
2019-11-25 20:04:47 +00:00
Alexander Alekhin
cdc469786c
Merge pull request #15978 from alalek:videoio_refactor_v4l
2019-11-25 20:04:25 +00:00
Maksim Shabunin
5ff1fababc
Merge pull request #15959 from mshabunin:refactor-ml-tests
...
ml: refactored tests
* use parametrized tests where appropriate
* use stable theRNG in most tests
* use modern style with EXPECT_/ASSERT_ checks
2019-11-25 23:03:16 +03:00
Dmitry Kurtaev
6e14cc2189
Resolve https://github.com/opencv/opencv/issues/15863
2019-11-24 21:59:25 +03:00
Alexander Alekhin
501ff7f056
videoio(v4l2): use logging, update handling of EBUSY, device closing
...
- DEBUG logging compilation is enabled for all videoio backends
- eliminate output through perror(), stderr
2019-11-23 10:36:43 +00:00
Alexander Alekhin
ad0ab4109a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-22 22:47:13 +00:00
Vadim Levin
373160ce00
Merge pull request #15973 from VadimLevin:dev/vlevin/video_capture_inf_loop
...
* Fix infinite loop when trying to change state of the busy camera
- Add finite number of attempts in tryIoctl functions
10 by default.
* Introduced new flag for ioctl call to handle EBUSY
2019-11-23 01:10:16 +03:00
Alexander Alekhin
50ac880335
Merge pull request #15971 from alalek:core_kmeans_handle_overflow
2019-11-22 21:36:02 +00:00
Natsu
54e6f5c237
Merge pull request #15970 from akemimadoka:master
...
* Fix android armv7 c++_static init crash
* core: move initialization of 'ios_base::Init' for Android
2019-11-22 18:42:25 +03:00
Alexander Alekhin
3266ac7667
core(kmeans): bailout if can't select cluster center
2019-11-22 14:40:02 +00:00
Alexander Alekhin
ec55b6f6db
core: fix MSA build
2019-11-21 18:59:41 +03:00
Alexander Alekhin
86042af108
dnn: fix registration of custom OpenCVLayer
...
- do not require extensions library
2019-11-20 21:42:26 +00:00
Alexander Alekhin
e459a5108c
Merge pull request #15951 from alalek:python_reduce_code_size
2019-11-20 19:05:15 +00:00
Everton Constantino
75315fb297
Merge pull request #15494 from everton1984:hal_vector_get_n
...
Improving VSX performance of integral function
* Adding support for vector get function on VSX datatypes so the
integral function gains a bit of performance.
* Removing get as a datatype member function and implementing a new HAL
instruction v_extract_n to get the n-th element of a vector register.
* Adding SSE/NEON/AVX intrinsics.
* Implement new HAL instruction v_broadcast_element on VSX/AVX/NEON/SSE.
* core(simd): add tests for v_extract_n/v_broadcast_element
- updated docs
- commented out code to repair compilation
- added WASM and MSA default implementations
* core(simd): fix compilation
- x86: avoid _mm256_extract_epi64/32/16/8 with MSVS 2015
- x86: _mm_extract_epi64 is 64-bit only
* cleanup
2019-11-20 13:41:07 +03:00
Alexander Alekhin
5d96f984b1
python: reduce code size of cv2.cpp
2019-11-19 22:43:28 +00:00
Alexander Alekhin
318cba4ce3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-19 19:48:49 +00:00
Alexander Alekhin
9d14c0b37a
Merge pull request #15939 from alalek:ffmpeg_update_3.4
2019-11-19 18:45:39 +00:00
Alexander Alekhin
2f636b4456
Merge pull request #15918 from alalek:python_debug_parameter
2019-11-19 18:39:56 +00:00
Alexander Alekhin
e07a488012
Merge pull request #15925 from alalek:core_test_simd_cpp_emulation
...
core(test): extending tests with SIMD C++ emulation code (intrin_cpp.hpp)
* core(test): test SIMD CPP emulation code (intrin_cpp.hpp)
* core(simd): eliminate build warnings from intrin_cpp.hpp
2019-11-19 21:08:45 +03:00
Alexander Alekhin
77bf5593e5
Merge pull request #15946 from alalek:fix_js_test_features2d
2019-11-19 14:25:28 +00:00
Alexander Alekhin
26513285dd
Merge pull request #15945 from alalek:dnn_ie_extension_handling
2019-11-19 14:25:12 +00:00
Alexander Alekhin
de64db3064
Merge pull request #15919 from alalek:python_fix_arginfo
2019-11-19 13:24:58 +00:00
Alexander Alekhin
cf93217365
Merge pull request #15935 from rgarnov:rg/fix_own_mat_empty
2019-11-19 11:08:19 +00:00
Alexander Alekhin
ec8db970f9
js(test): update features2d test
2019-11-19 07:40:12 +00:00
Alexander Alekhin
09d54c9f52
dnn: update InferenceEngine extension handling
2019-11-19 06:55:14 +00:00
Alexander Alekhin
3f431a16a3
videoio: fix ffmpeg wrapper build
2019-11-18 18:56:57 +00:00
Alexander Alekhin
593e240d7c
Merge pull request #15938 from alalek:backport_15290
2019-11-18 18:26:00 +00:00
cudawarped
aff8c9bd28
videoio: retrieve encoded frames through FFmpeg backend
...
- backport 15290
- add extra test case
2019-11-18 19:23:19 +03:00
cudawarped
0867e3188d
Merge pull request #15290 from cudawarped:ffmpeg_raw_retrieve
...
Add retrieve encoded frame to VideoCapture
* Add capacity to retrieve the encoded frame from a VideoCapture object.
* Correct raw codec and pixle format output from ffmpeg capture.
* Remove warnings from build.
* Added VideoCaptureRaw subclass.
* Include abstract base class VideoCaptureBase and rename new subclass VideoContainer as suggested by mshabunin.
* Remove using.
* Change base class name for compatibility with jave bindings generator.
* Move grab and retrieve and add override specifier
* Add setRaw and readRaw to IVideoCapture interface
-setRaw to disable video decoding and enable bitstream filters from mp4 to h254 and h265.
-readRaw to return the raw undecoded/filtered bitstream.
Add createRawCapture to initiate a backend with setRaw enabled.
Remove inheritance and use an independant VideoContainer subclass with IVideoCapture member.
* Address unused parameter warings.
Remove VideoContainer from python bindings as it no longer returns a Mat.
Use opencv type uchar instead of unsigned char.
Add missing destructor to VideoContainer class.
* Address build warnings and include all params in documentation.
* Include deprecated bitstream filtering API.
* Update codec_id query to work with older ffmpeg api's.
Change api version defines to be consistent - most recent api version first.
* Fix typo.
* Update test to work with naming of new files in the extra repo
* Investigate test failure
* Check bytes read by ffmpeg
* Removed mp4 video container test
* Applied suggested changes.
* videoio: rework API for extraction of RAW video streams
- FFmpeg only
* address review comments
2019-11-18 17:07:06 +03:00
Ruslan Garnov
1261559305
Fixed own::Mat::empty() for non md case
2019-11-18 16:38:33 +03:00
clunietp
2185bce4b7
Fix 13577
2019-11-18 07:41:34 -05:00
Orest Chura
af230ec133
Merge pull request #15888 from OrestChura:facebeautification_gapi_sample
...
Introducing the sample of Face Beautification algorithm implemented via Graph-API
* Introducing the sample of Face Beautification algorithm implemented via Graph-API
- 'gapi/samples/face_beautification.cpp' added
- FIXME added in 'gcpukernel.hpp'
* INF_ENGINE fix
- preprocessing clauses added not to run the sample without Inference Engine
* INF_ENGINE fix 2
- warnings removed
* Fixes
- checking IE version cut as there is no dependency
- some alignments fixed
- the comment about preprocessing commands fixed
* ie::backend() issue fix (according to dmatveev)
- as the sample needs the cv::gapi::ie::backend() to be defined regardless of having IE or not, there is its throw-error definition in `giebackend.cpp` now (by dmatveev)
- for the same reason, #includes in `giebackend.hpp` are fixed
- HAVE_INF_ENGINE check is removed from the sample
2019-11-18 15:13:05 +03:00
Alexander Alekhin
fc41c18c6f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-18 13:56:24 +03:00
Alexander Alekhin
f4d55d512f
imgproc: fix bit-exact GaussianBlur() / sepFilter2D() ( #15855 )
...
* imgproc: fix bit-exact GaussianBlur() / sepFilter2D()
- avoid kernels with bad approximation
- GaussiabBlur - apply error-diffusion approximation for kernel (8-bit fraction)
* java(test): update features2d ref data
* test: update test_facedetect
2019-11-18 01:39:27 +03:00
Suleyman TURKMEN
eff514f8bb
Update seamless_cloning.cpp
2019-11-17 21:25:03 +03:00
Sebastián Gurin
955b20230c
Merge pull request #15503 from cancerberoSgx:js-test-puppeteer
...
Js test puppeteer
* run_puppeteer.js / tests
* js run test section
* rollback html
* whitespace
* js: update OpenCV.js tests infrastructure
* js: exclude puppeteer from default 'npm install'
* js: update notes
* js: more fixes in run_puppeteer
* fix build folder
2019-11-17 00:29:38 +03:00
Alexander Alekhin
686ea5c1a6
Merge pull request #15917 from ChipKerchner:demosaicingToHal2
2019-11-16 19:45:37 +00:00
Maxim Pashchenkov
1acadd363b
Merge pull request #15100 from Volskig:cam_multiplexing_function_v
...
Implement Camera Multiplexing API
* IdideoCapture + two wrong function
function waitAny
Add errors catcher
Stub for Python added.
Sifting warnings
One test added
Two tests for camera and Perf tests added
* Perf sync and async tests for waitAny() added, waitAnyInterior() deleted, getDeviceHandle() deleted
* Variable OPENCV_TEST_CAMERA_LIST added
* Without fps set
* ASSERT_FAILED for environment variable
* Perf tests is DISABLED_
* --Trailing whitespace
* Return false from cap.cpp deleted
* Two functions deleted from interface, +range for, +environment variable in test_camera
* Space deleted
* printf deleted, perror added
* CV_WRAP deleted, cv2 cleared from stubs
* -- space
* default timeout added
* @param changed
* place of waitAny changed
* --whitespace
* ++function description
* function description changed
* revert unused changes
* videoio: rework API for VideoCapture::waitAny()
2019-11-15 19:42:12 +03:00
Alexander Alekhin
7ec91aefc1
python: force using of ArgInfo
2019-11-15 19:16:22 +03:00
Alexander Alekhin
973b367da6
python: emit bindings conversion failures on OPENCV_PYTHON_DEBUG=1
2019-11-15 18:55:24 +03:00
ChipKerchner
1d33335e33
Convert demosiacing with variable number of gradients to HAL - 5.5x faster
2019-11-15 07:42:03 -06:00
Alexander Alekhin
1f57eb93fd
Merge pull request #15911 from l-bat:fix_reducel2
2019-11-15 11:04:05 +00:00
Alexander Alekhin
ac2dc29525
Merge pull request #15852 from akhakim:gauss_blur_kernel_5x5
2019-11-14 14:55:24 +00:00
Alexander Alekhin
6773b938b3
Merge pull request #15896 from alalek:build_gcc_9
2019-11-14 14:22:02 +00:00
Alexander Alekhin
d1c4e4b5a5
Merge pull request #15906 from anton-potapov:gapi_fluid_i420_support
2019-11-14 14:07:05 +00:00
Liubov Batanina
ac4fd4f4ae
Fix ReduceL2
2019-11-14 15:30:53 +03:00
Anna Khakimova
beb14c70da
GAPI Fluid: SIMD optimization for sep filters 5x5 kernel size (gaussBlur)
2019-11-14 13:42:20 +03:00
Alexander Alekhin
94f1c3d152
Merge pull request #15905 from alalek:issue_15904
2019-11-14 10:33:29 +00:00
Anton Potapov
b5426a8679
G-API (Fluid) core support for I420
...
- Extended NV12 support in Fluid Core engine to cover I420
2019-11-14 11:16:17 +03:00
Alexander Alekhin
7a52a4c134
Merge pull request #15874 from akhakim:runsepfilter_5x5_kernel_size
2019-11-13 14:53:14 +00:00
Alexander Alekhin
763b80d5fa
imgproc(IPP): disable ippiDistanceTransform_3x3_8u32f_C1R
2019-11-13 14:14:19 +03:00
Christoph Bachhuber
c638f085aa
Refactor for clarity and avoiding code duplication
...
Implement GArik's comments
Remove unnecessary c_str()
Fix brace position
2019-11-12 19:22:42 +01:00
Alexander Alekhin
7ecdcf6ca6
build: GCC9 compilation
2019-11-12 18:49:34 +03:00
Anna Khakimova
363976694e
GAPI Fluid: The run_sepfilter() has logic error into handler for 5x5 and larger kernels
2019-11-12 14:47:42 +03:00
Alexander Alekhin
b6a58818bb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-11 20:25:42 +00:00
Alexander Alekhin
e0b5637474
Merge pull request #15877 from mshabunin:fix-gst-relative-34
2019-11-10 09:25:29 +00:00
Alexander Alekhin
e9dcecf9b4
Merge pull request #15826 from alalek:cmake_fix_itt_define_condition
2019-11-10 09:22:22 +00:00
Maksim Shabunin
fccf284088
Fixed relative paths handling in cap_gstreamer:
2019-11-09 11:34:30 +00:00
Lubov Batanina
cfc781949d
Merge pull request #15811 from l-bat:eltwise_div
...
Supported ONNX Squeeze, ReduceL2 and Eltwise::DIV
* Support eltwise div
* Fix test
* OpenCL support added
* refactoring
* fix code style
* Only squeeze with axes supported
2019-11-09 14:11:09 +03:00
Alexander Alekhin
af23375352
Merge pull request #15861 from dkurt:dnn_fix_get_input_layers
2019-11-08 22:01:07 +00:00
Alexander Alekhin
6053996253
Merge pull request #15319 from cancerberoSgx:fs
2019-11-08 13:20:09 +00:00
Sebastián Gurín
dd9262c318
expose FS
2019-11-08 15:13:25 +03:00
Alexander Alekhin
d66aa2e0ff
Merge pull request #15848 from alalek:backport_test_15842
2019-11-07 16:48:41 +00:00
Alexander Alekhin
5dd3e6052e
Merge pull request #15868 from alalek:issue_15857
2019-11-07 14:21:35 +00:00
Alexander Alekhin
f42d5399aa
core(persistence): add more checks for implementation limitations
2019-11-07 14:19:00 +03:00
Maksim Shabunin
ad5874779c
Install: added missing gapi headers
2019-11-07 14:03:46 +03:00
Dimitri Gerin
7c4158d8c2
Fix dnn::getLayerInputs
2019-11-07 08:13:33 +03:00
czgdp1807
07ef08e966
removed typo
2019-11-06 17:15:31 +05:30
Alexander Alekhin
54d9597522
Merge pull request #15814 from i-murzov:3.4-ocl-cleanup
2019-11-06 09:54:29 +00:00
Alexander Alekhin
f3e788b8ab
Merge pull request #15813 from i-murzov:3.4-ocl-empty-platform
2019-11-06 08:12:40 +00:00
Igor Murzov
cdbfdcc363
Fix OpenCL device detection when some OpenCL platform has no devices
...
It's not an error if some OpenCL platform has no devices. This makes
OpenCL device detection work correctly in the following scenario:
$ OPENCV_OPENCL_DEVICE=:GPU: ./opencv_test_dnn
OpenCV version: 4.1.2-dev
OpenCV VCS version: 4.1.2-80-g467748ee98-dirty
Build type: Debug
Compiler: /usr/bin/g++ (ver 7.4.0)
Parallel framework: pthreads
CPU features: SSE SSE2 SSE3 *SSE4.1 *SSE4.2 *FP16 *AVX *AVX2 *AVX512-SKX?
Intel(R) IPP version: ippIP AVX2 (l9) 2019.0.0 Gold (-) Jul 24 2018
OpenCL Platforms:
AMD Accelerated Parallel Processing
Portable Computing Language
CPU: pthread-AMD Ryzen 7 2700X Eight-Core Processor (OpenCL 1.2 pocl HSTR: pthread-x86_64-pc-linux-gnu-znver1)
NVIDIA CUDA
dGPU: GeForce GTX 1080 (OpenCL 1.2 CUDA)
Current OpenCL device:
Type = dGPU
Name = GeForce GTX 1080
Version = OpenCL 1.2 CUDA
Driver version = 430.26
2019-11-05 20:02:39 +03:00
Chip Kerchner
2112aa31e6
Merge pull request #15828 from ChipKerchner:momentsToHal
...
* Convert moments in tile algorithms to HAL (1.3x faster for VSX).
* Adding NEON code back in for non 64-bit platforms.
* Remove floats from post processing.
2019-11-05 18:52:35 +03:00
TH3CHARLie
2c2716de0f
core(test): add test for YAML parse multiple documents
...
- added removal of temporary file
2019-11-05 18:39:07 +03:00
Alexander Alekhin
dcf72e49e2
core(persistence): fix processing of multiple documents
2019-11-05 18:28:15 +03:00
Alexander Alekhin
c4c4ac28dc
revert changes in modules/core/src/persistence_yml.cpp (PR15842)
2019-11-05 18:24:16 +03:00
Igor Murzov
6d5b900324
Simplify OpenCL info dumping code:
...
* Reduce code nesting
* Drop redundant .c_str() calls
2019-11-05 14:49:49 +03:00
TH3CHARLie
a165f55579
Merge pull request #15842 from TH3CHARLie:yaml-fix
...
* fix yaml parse
* add test for YAML parse multiple documents
* remove trailing whitespace in test
2019-11-04 16:27:48 +03:00
Alexander Alekhin
0d7f770996
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-04 09:58:29 +00:00
Oleg Alexandrov
53139e6ebe
Merge pull request #15838 from oleg-alexandrov:patch-2
...
Correct stereoRectify documentation
2019-11-03 16:37:25 +03:00
Alexander Alekhin
a893969ec9
core(simd): v_setall template
2019-11-03 12:49:25 +00:00
Alexander Alekhin
d5bbb16066
Merge pull request #15834 from berak:python_fix_type_error
2019-11-02 18:50:46 +00:00
berak
b7c8e9e874
python: fix type error msg
2019-11-02 08:17:07 +01:00
Gael Colas
e65b51ca3c
Merge pull request #15821 from ColasGael:colasg-viz-color
...
Fix wrong definition of viz::Color::navy()
2019-11-01 22:37:34 +03:00
Oleg Alexandrov
d56535afce
Merge pull request #15820 from oleg-alexandrov:patch-1
...
Clarify stereoRectify() doc
The function stereoRectify() takes as input a coordinate transform between two cameras. It is ambiguous how it goes. I clarified that it goes from the second camera to the first.
2019-11-01 22:34:11 +03:00
yuriyluxriot
4e156a162f
Merge pull request #15812 from yuriyluxriot:fls_replaces_tls
...
* Use FlsAlloc/FlsFree/FlsGetValue/FlsSetValue instead of TlsAlloc/TlsFree/TlsGetValue/TlsSetValue to implment TLS value cleanup when thread has been terminated on Windows Vista and above
* Fix 32-bit build
* Fixed calling convention of cleanup callback
* WINAPI changed to NTAPI
* Use proper guard macro
2019-11-01 22:33:12 +03:00
Chip Kerchner
ed7e4273cd
Merge pull request #15555 from ChipKerchner:flipVectorize
...
* Vectorize flipHoriz and flipVert functions.
* Change v_load_mirror_1 to use vec_revb for VSX
* Only use vec_revb in ISA3.0
* Removing vec_revb code since some of the older compilers don't fully support it.
* Use new v_reverse intrinsic and cleanup code.
* Ensure there are no alignment issues with copies
2019-11-01 22:30:48 +03:00
ab-dragon
2947877871
[move sift.cpp] Merge pull request opencv/opencv_contrib#2301 from ab-dragon:conditionally_compute_dog_pyramid
...
Build DoG Pyramid if useProvideKeypoints is false
The buildDoGPyramid operation need not be performed unconditionally. In cases where it is not needed, both memory and speed performance can be improved
original commit: e45887e1c0
2019-11-01 21:28:18 +03:00
Alexander Alekhin
48073e6d95
pylint: eliminate warnings
2019-11-01 18:59:35 +03:00
Alexander Alekhin
657c17bb8c
cmake: fix ITT define condition
2019-11-01 15:07:49 +03:00
Alexander Alekhin
cec7cc037b
Merge pull request #15819 from alalek:ts_unblock_reporting_of_disabled_tests
2019-10-31 20:39:41 +00:00
Alexander Alekhin
5c12bafe80
Merge pull request #15805 from i-murzov:3.4
2019-10-31 20:39:16 +00:00
Ciprian Alexandru Pitis
d2e02779c4
Merge pull request #15799 from Cpitis:feature/parallelization
...
Parallelize pyrDown & calcSharrDeriv
* ::pyrDown has been parallelized
* CalcSharrDeriv parallelized
* Fixed whitespace
* Set granularity based on amount of threads enabled
* Granularity changed to cv::getNumThreads, now each thread should receive 1/n sized stripes
* imgproc: move PyrDownInvoker<CastOp>::operator() implementation
* imgproc(pyramid): remove syloopboundary()
* video: SharrDerivInvoker replace 'Mat*' => 'Mat&' fields
2019-10-31 23:38:49 +03:00
Oleg Alexandrov
af433d0352
Merge pull request #15780 from oleg-alexandrov:master
...
* Doc bugfix
The documentation page StereoBinaryBM and StereoBinarySGBM says that it returns a disparity that is scaled multiplied by 16. This scaling must be undone before calling reprojectImageTo3D, otherwise the results are wrong. The function reprojectImageTo3D() could do this scaling internally, maybe, but at least the documentation must explain that this has to be done.
* calib3d: update reprojectImageTo3D documentation
* calib3d: add StereoBM/StereoSGBM into notes list
2019-10-31 22:28:01 +03:00
Alexander Alekhin
ee044771a7
Merge pull request #15478 from terfendail:wintr_stereosgbm
2019-10-31 19:24:06 +00:00
Dizhenin Vlad
edc5518f68
Merge pull request #15608 from SimpleVlad:3.4
...
* Add flags for build js
* Add poi.json
* Rebase whitelist into JSON file
* Rework generator of white_list
* Fix small typos
* Transfer opencv_js.josn in opencv_js.config.py
* Edit OPENCV_JS_WHITELIST
* Write comment
* Add description
* Fix typos in desc
* flag's append deleeted
* Fix whitespace
* variable deleted
* fix comment on lines 229 and 235
2019-10-31 22:09:33 +03:00
Alexander Alekhin
79f792ad05
ts: do not block reporting of launched "DISABLED_" tests
...
If tests are run through GTest option `--gtest_also_run_disabled_tests`
2019-10-31 15:13:50 +03:00
Alexander Alekhin
469addeca3
Merge pull request #15763 from akhakim:dynamic_set_kernel_window_size
2019-10-31 11:10:45 +00:00
Anna Khakimova
c394847c35
GAPI Fluid: Dynamic window size
2019-10-30 17:09:54 +03:00
atalaman
ea64bb58a5
Merge pull request #15751 from TolyaTalamanov:at/refactor-render-tests
...
* Refactor render tests
* Fix comment to review
* Move ocv render tests stuff to specific file
* Add OCV prefix for render tests
* Fix comments to review
2019-10-30 13:33:39 +03:00
Igor Murzov
a9d23a6479
Fix wording in some tutorials
2019-10-30 13:27:17 +03:00
Alexander Alekhin
ea5499fa51
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-29 20:46:51 +00:00
Alexander Alekhin
bad4e5c3eb
Merge pull request #15692 from alalek:core_tls_handle_thread_termination
2019-10-29 20:40:35 +00:00
Alexander Alekhin
e86c888a92
Merge pull request #15791 from alalek:android_camera2_issue_14915
2019-10-29 19:10:00 +00:00
Chip Kerchner
a71ff50130
Merge pull request #15623 from ChipKerchner:optimizeHOGpipeline
...
* Use circular lut hustory buffer in computeGradient of HOG
* Initialize prefetch data outside main loop. Avoid code duplication.
2019-10-29 13:42:20 +03:00
Alexander Alekhin
cd6d79d106
gapi: fix opencv_world build
2019-10-28 18:53:14 +00:00
Alexander Alekhin
80c4cedd25
android: use .getRowStride() in JavaCamera2View
2019-10-28 18:45:56 +00:00
André Lippok
86a8ff6129
Fixed typo in assertion
2019-10-27 17:43:31 +01:00
Alexander Alekhin
d8ab83600b
Merge pull request #15761 from alalek:core_trace_itt_parameter
2019-10-26 21:39:08 +00:00
Alexander Alekhin
6ec5ae0215
core(trace): add ITT control parameter
...
- OPENCV_TRACE_ITT_ENABLE
2019-10-26 15:03:51 +00:00
Dmitry Budnikov
8dfba51884
add empty implementation
2019-10-25 17:50:09 +03:00
Alexander Alekhin
7cf1054d36
Merge pull request #15764 from ChipKerchner:demosaicingToHal
2019-10-25 13:49:46 +00:00
Vitaly Tuzov
42b1d04999
StereoSGBM algorithm updated to use wide universal intrinsics
2019-10-25 16:34:16 +03:00
Alexander Alekhin
055ffc0425
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-24 18:21:19 +00:00
Vitaly Tuzov
1ce5a724c7
Fixed StereoBM uniqueness check
2019-10-24 17:54:49 +03:00
Alexander Alekhin
d65fead337
Merge pull request #15752 from dkurt:fix_15750
2019-10-24 07:06:32 +00:00
Alexander Alekhin
17e2bf5717
core(tls): implement releasing of TLS on thread termination
...
- move TLS & instrumentation code out of core/utility.hpp
- (*) TLSData lost .gather() method (to dispose thread data on thread termination)
- use TLSDataAccumulator for reliable collecting of thread data
- prefer using of .detachData() + .cleanupDetachedData() instead of .gather() method
(*) API is broken: replace TLSData => TLSDataAccumulator if gather required
(objects disposal on threads termination is not available in accumulator mode)
2019-10-24 06:36:18 +00:00
Alexander Alekhin
87a692b89e
Merge pull request #15736 from akhakim:fix_for_ADE-859_using_namespace_cv_G_TYPED_KERNEL_fail_c++
2019-10-23 17:07:32 +00:00
ChipKerchner
c46f119e0e
Convert demosaic functions to HAL
2019-10-23 10:47:07 -05:00
Alexander Alekhin
09619c1c45
Merge pull request #15762 from rgarnov:return_exported_mkdatanode
2019-10-23 12:05:28 +00:00
Anna Khakimova
8bf5bed0a9
GAPI:Fix for using cv makes G_TYPED_KERNEL fail
2019-10-23 12:17:49 +03:00
Alexander Alekhin
5ffeebabad
Merge pull request #15759 from alalek:issue_15758
2019-10-22 21:40:10 +00:00
Ruslan Garnov
e89c1103ff
Returned GModel::mkDataNode() overload for external backends
2019-10-22 18:57:31 +03:00
Chip Kerchner
5a6a49405d
Merge pull request #15738 from ChipKerchner:bugInt64x2Comparison
...
Fixing bug with comparison of v_int64x2 or v_uint64x2
* Casting v_uint64x2 to v_float64x2 and comparing does NOT work in all cases. Rewrite using epi64 instructions - faster too.
* Fix bad merge.
* Fix equal comparsion for non-SSE4.1. Add test cases for v_int64x2 comparisons.
* Try to fix merge conflict.
* Only test v_int64x2 comparisons if CV_SIMD_64F
* Fix compiler warning.
2019-10-22 16:37:20 +03:00
Alexander Alekhin
fe4f27b99b
gapi: fix build
...
- gcc 4.8.4 (ARMv7)
2019-10-22 16:31:40 +03:00
Alexander Alekhin
1864b64f64
Merge pull request #15739 from dkurt:darknet_shortcut_asymm
2019-10-22 12:52:13 +00:00
anton-potapov
471b40040a
Merge pull request #15735 from anton-potapov:gapi_async_documentaion
...
* G-API: Doxygen documentatation for Async API
* G-API: Doxygen documentatation for Async API
- renamed local variable (reading parameter async) async ->
asyncNumReq in object_detection DNN sample
to avoid Doxygen erroneous linking the sample to cv::gapi::wip::async
documentation
2019-10-21 22:33:18 +03:00
Dmitry Kurtaev
dfe0368835
Fix custom IE layers in case of no MKLDNN plugin
2019-10-21 19:09:44 +03:00
Yashas Samaga B L
613c12e590
Merge pull request #14827 from YashasSamaga:cuda4dnn-csl-low
...
CUDA backend for the DNN module
* stub cuda4dnn design
* minor fixes for tests and doxygen
* add csl public api directory to module headers
* add low-level CSL components
* add high-level CSL components
* integrate csl::Tensor into backbone code
* switch to CPU iff unsupported; otherwise, fail on error
* add fully connected layer
* add softmax layer
* add activation layers
* support arbitary rank TensorDescriptor
* pass input wrappers to `initCUDA()`
* add 1d/2d/3d-convolution
* add pooling layer
* reorganize and refactor code
* fixes for gcc, clang and doxygen; remove cxx14/17 code
* add blank_layer
* add LRN layer
* add rounding modes for pooling layer
* split tensor.hpp into tensor.hpp and tensor_ops.hpp
* add concat layer
* add scale layer
* add batch normalization layer
* split math.cu into activations.cu and math.hpp
* add eltwise layer
* add flatten layer
* add tensor transform api
* add asymmetric padding support for convolution layer
* add reshape layer
* fix rebase issues
* add permute layer
* add padding support for concat layer
* refactor and reorganize code
* add normalize layer
* optimize bias addition in scale layer
* add prior box layer
* fix and optimize normalize layer
* add asymmetric padding support for pooling layer
* add event API
* improve pooling performance for some padding scenarios
* avoid over-allocation of compute resources to kernels
* improve prior box performance
* enable layer fusion
* add const layer
* add resize layer
* add slice layer
* add padding layer
* add deconvolution layer
* fix channelwise ReLU initialization
* add vector traits
* add vectorized versions of relu, clipped_relu, power
* add vectorized concat kernels
* improve concat_with_offsets performance
* vectorize scale and bias kernels
* add support for multi-billion element tensors
* vectorize prior box kernels
* fix address alignment check
* improve bias addition performance of conv/deconv/fc layers
* restructure code for supporting multiple targets
* add DNN_TARGET_CUDA_FP64
* add DNN_TARGET_FP16
* improve vectorization
* add region layer
* improve tensor API, add dynamic ranks
1. use ManagedPtr instead of a Tensor in backend wrapper
2. add new methods to tensor classes
- size_range: computes the combined size of for a given axis range
- tensor span/view can be constructed from a raw pointer and shape
3. the tensor classes can change their rank at runtime (previously rank was fixed at compile-time)
4. remove device code from tensor classes (as they are unused)
5. enforce strict conditions on tensor class APIs to improve debugging ability
* fix parametric relu activation
* add squeeze/unsqueeze tensor API
* add reorg layer
* optimize permute and enable 2d permute
* enable 1d and 2d slice
* add split layer
* add shuffle channel layer
* allow tensors of different ranks in reshape primitive
* patch SliceOp to allow Crop Layer
* allow extra shape inputs in reshape layer
* use `std::move_backward` instead of `std::move` for insert in resizable_static_array
* improve workspace management
* add spatial LRN
* add nms (cpu) to region layer
* add max pooling with argmax ( and a fix to limits.hpp)
* add max unpooling layer
* rename DNN_TARGET_CUDA_FP32 to DNN_TARGET_CUDA
* update supportBackend to be more rigorous
* remove stray include from preventing non-cuda build
* include op_cuda.hpp outside condition #if
* refactoring, fixes and many optimizations
* drop DNN_TARGET_CUDA_FP64
* fix gcc errors
* increase max. tensor rank limit to six
* add Interp layer
* drop custom layers; use BackendNode
* vectorize activation kernels
* fixes for gcc
* remove wrong assertion
* fix broken assertion in unpooling primitive
* fix build errors in non-CUDA build
* completely remove workspace from public API
* fix permute layer
* enable accuracy and perf. tests for DNN_TARGET_CUDA
* add asynchronous forward
* vectorize eltwise ops
* vectorize fill kernel
* fixes for gcc
* remove CSL headers from public API
* remove csl header source group from cmake
* update min. cudnn version in cmake
* add numerically stable FP32 log1pexp
* refactor code
* add FP16 specialization to cudnn based tensor addition
* vectorize scale1 and bias1 + minor refactoring
* fix doxygen build
* fix invalid alignment assertion
* clear backend wrappers before allocateLayers
* ignore memory lock failures
* do not allocate internal blobs
* integrate NVTX
* add numerically stable half precision log1pexp
* fix indentation, following coding style, improve docs
* remove accidental modification of IE code
* Revert "add asynchronous forward"
This reverts commit 1154b9da9da07e9b52f8a81bdcea48cf31c56f70.
* [cmake] throw error for unsupported CC versions
* fix rebase issues
* add more docs, refactor code, fix bugs
* minor refactoring and fixes
* resolve warnings/errors from clang
* remove haveCUDA() checks from supportBackend()
* remove NVTX integration
* changes based on review comments
* avoid exception when no CUDA device is present
* add color code for CUDA in Net::dump
2019-10-21 14:28:00 +03:00
Alexander Alekhin
fadb90c579
[move sift.cpp] xfeatures2d: use updated TLS API
...
original commit: 3e4fb8f415
2019-10-20 14:17:05 +00:00
Steve Nicholson
acb3b3bd4d
Add documentation and example program for intersectConvexConvex
2019-10-19 22:08:07 -07:00
TH3CHARLie
da0fec7308
fix incorrect imshow behavior
2019-10-19 20:34:18 +08:00
Dmitry Kurtaev
af61a15839
Fix Darknet eltwise
2019-10-19 12:54:15 +03:00
Alexander Alekhin
938d8dce06
Merge pull request #15685 from pmur:cnz64f-simd
2019-10-18 20:19:40 +00:00
Dmitry Matveev
2477103707
Merge pull request #15216 from dmatveev:dm/ng-0010-g-api-streaming-api
...
* G-API-NG/Streaming: Introduced a Streaming API
Now a GComputation can be compiled in a special "streaming" way
and then "played" on a video stream.
Currently only VideoCapture is supported as an input source.
* G-API-NG/Streaming: added threading & real streaming
* G-API-NG/Streaming: Added tests & docs on Copy kernel
- Added very simple pipeline tests, not all data types are covered yet
(in fact, only GMat is tested now);
- Started testing non-OCV backends in the streaming mode;
- Added required fixes to Fluid backend, likely it works OK now;
- Added required fixes to OCL backend, and now it is likely broken
- Also added a UMat-based (OCL) version of Copy kernel
* G-API-NG/Streaming: Added own concurrent queue class
- Used only if TBB is not available
* G-API-NG/Streaming: Fixing various issues
- Added missing header to CMakeLists.txt
- Fixed various CI issues and warnings
* G-API-NG/Streaming: Fixed a compile-time GScalar queue deadlock
- GStreamingExecutor blindly created island's input queues for
compile-time (value-initialized) GScalars which didn't have any
producers, making island actor threads wait there forever
* G-API-NG/Streaming: Dropped own version of Copy kernel
One was added into master already
* G-API-NG/Streaming: Addressed GArray<T> review comments
- Added tests on mov()
- Removed unnecessary changes in garray.hpp
* G-API-NG/Streaming: Added Doxygen comments to new public APIs
Also fixed some other comments in the code
* G-API-NG/Streaming: Removed debug info, added some comments & renamed vars
* G-API-NG/Streaming: Fixed own-vs-cv abstraction leak
- Now every island is triggered with own:: (instead of cv::)
data objects as inputs;
- Changes in Fluid backend required to support cv::Mat/Scalar were
reverted;
* G-API-NG/Streaming: use holds_alternative<> instead of index/index_of test
- Also fixed regression test comments
- Also added metadata check comments for GStreamingCompiled
* G-API-NG/Streaming: Made start()/stop() more robust
- Fixed various possible deadlocks
- Unified the shutdown code
- Added more tests covering different corner cases on start/stop
* G-API-NG/Streaming: Finally fixed Windows crashes
In fact the problem hasn't been Windows-only.
Island thread popped data from queues without preserving the Cmd
objects and without taking the ownership over data acquired so when
islands started to process the data, this data may be already freed.
Linux version worked only by occasion.
* G-API-NG/Streaming: Fixed (I hope so) Windows warnings
* G-API-NG/Streaming: fixed typos in internal comments
- Also added some more explanation on Streaming/OpenCL status
* G-API-NG/Streaming: Added more unit tests on streaming
- Various start()/stop()/setSource() call flow combinations
* G-API-NG/Streaming: Added tests on own concurrent bounded queue
* G-API-NG/Streaming: Added more tests on various data types, + more
- Vector/Scalar passed as input;
- Vector/Scalar passed in-between islands;
- Some more assertions;
- Also fixed a deadlock problem when inputs are mixed (1 constant, 1 stream)
* G-API-NG/Streaming: Added tests on output data types handling
- Vector
- Scalar
* G-API-NG/Streaming: Fixed test issues with IE + Windows warnings
* G-API-NG/Streaming: Decoupled G-API from videoio
- Now the core G-API doesn't use a cv::VideoCapture directly,
it comes in via an abstract interface;
- Polished a little bit the setSource()/start()/stop() semantics,
now setSource() is mandatory before ANY call to start().
* G-API-NG/Streaming: Fix STANDALONE build (errors brought by render)
2019-10-18 19:29:58 +03:00
Dmitry Kurtaev
adbd613660
Enable Eltwise layer with different numbers of inputs channels
2019-10-18 18:51:52 +03:00
Alexander Alekhin
24ebca5c59
core(simd): v_reverse() for MSA backend
2019-10-18 16:43:03 +03:00
Alexander Alekhin
ead7d6d80f
Merge pull request #15716 from alalek:javadoc_fix
2019-10-17 22:35:14 +00:00
Alexander Alekhin
34df28db2b
Merge pull request #15180 from terfendail:wintr_stereobm
2019-10-17 20:18:30 +00:00
atalaman
2ff12c4981
Merge pull request #15699 from TolyaTalamanov:at/graph-ocv-render-backend-skeleton
...
G-API: Implement OpenCV render backend
* Implement render opencv backend
* Fix comment to review
* Add comment
* Add wrappers for kernels
* Fix comments to review
* Fix comment to review
2019-10-17 21:04:03 +03:00
Alexander Alekhin
a2b3cd9a2c
Merge pull request #15709 from alalek:js_simd_reverse
2019-10-17 13:14:50 +00:00
Alexander Alekhin
d31da08d43
Merge pull request #15708 from alalek:js_simd_support_1.38.48
2019-10-17 13:14:34 +00:00
Alexander Alekhin
17e9fde75a
Merge pull request #15718 from alalek:pylint_warnings
2019-10-17 10:46:03 +00:00
jasjuang
4c7db02925
document CC_STAT_MAX in ConnectedComponentsTypes
2019-10-16 17:22:25 -07:00
Alexander Alekhin
0e40c8a031
fix pylint warnings
...
pylint 1.8.3
2019-10-16 18:49:33 +03:00
Alexander Alekhin
86e7d82418
javadoc: fix generation with OpenJDK 11
2019-10-16 18:14:07 +03:00
Adam Rankin
3b070517ad
COMP: Enabling build with recent VTK version
...
VTK_MAJOR_VERSION not found unless header is included
2019-10-16 10:04:41 -04:00
Alexander Alekhin
ad5d14ec0e
Merge pull request #15701 from alalek:issue_15691
2019-10-16 11:13:07 +00:00
Alexander Alekhin
bce653117f
Merge pull request #15700 from alalek:issue_12943
2019-10-16 11:12:49 +00:00
Christoph Schmidt-Hieber
194304bbe4
Support software triggering aravis cameras
...
If an aravis camera is software triggered, a trigger needs to be explicitly sent using `arv_camera_software_trigger`, otherwise the camera will not grab any frames.
2019-10-16 10:59:43 +02:00
Alexander Alekhin
ad172726c0
js(simd): v_reverse implementation
2019-10-15 18:46:08 +03:00
Alexander Alekhin
cc9b199ecb
Merge pull request #15704 from alalek:gapi_avoid_dynamic_initializers_in_optimized_code
2019-10-15 15:22:09 +00:00
Alexander Alekhin
b1a8de0901
js(simd): support Emscripten 1.38.48-upstream
2019-10-15 15:39:22 +03:00
Alexander Alekhin
823884b064
core(alloc): force initialization of memalign flag
...
- before main() launch
2019-10-15 13:07:11 +03:00
Alexander Alekhin
a84969bdcd
gapi: avoid dynamic initialization in dispatched files
2019-10-14 23:07:57 +00:00
Alexander Alekhin
6a7d1c15d3
core(ipp): skip huge input in flip()
...
- IPP/SSE4.2 works well
2019-10-14 18:26:19 +03:00
Alexander Alekhin
823e767eed
Merge pull request #15684 from OrestChura:id_helper_class_semicolon_issue
2019-10-14 09:46:41 +00:00
Alexander Alekhin
e42560bed5
Merge pull request #15659 from malfet:use-atomic-in-getExpTab32f
2019-10-12 20:27:58 +00:00
Alexander Alekhin
d6630ab35b
Merge pull request #15655 from malfet:use-atomic-in-parallel-for
2019-10-12 20:26:15 +00:00
Chip Kerchner
027769bf5d
Merge pull request #15662 from ChipKerchner:addVReverseIntrinsic
...
* New v_reverse HAL intrinsic for reversing the ordering of a vector
* Fix conflict.
* Try to resolve conflict again.
* Try one more time.
* Add _MM_SHUFFLE. Remove non-vectorize code in SSE2. Fix copy and paste issue with NEON.
* Change v_uint16x8 SSE2 version to use shuffles
2019-10-11 18:34:17 +03:00
Everton Constantino
9ca9249992
Merge pull request #15527 from everton1984:faster_acc
...
* Adding support for vectorized masking for uchar/ushort.
* Fixing bug where mask was zeroing the dst. Improved the way to calculate
the mask and tweaked for further performance improvements.
* Fixing mask comparison test.
* Restricting to one channel.
* Adding support for 3 channels, switch old approach to start using HAL's
v_select.
2019-10-11 18:32:59 +03:00
Paul E. Murphy
ec91a3d59d
core: vectorize countNonZero64f
...
Improves performance a bit. 2.2x on P9 and 2 - 3x on coffee lake
x86-64.
2019-10-11 09:02:46 -05:00
Alexander Alekhin
2f30c3fd4f
Merge pull request #15681 from mshabunin:fix-gapi-ie-test
2019-10-11 13:12:45 +00:00
OrestChura
2f9351d995
Fix warning issue:
...
- unnecessary extra semicolon after member function definition removed
2019-10-10 18:48:27 +03:00
Maksim Shabunin
230e44b01d
G-API: removed deprecated IE call from test
2019-10-10 12:58:59 +03:00
Alexander Alekhin
46206b4814
Merge tag '4.1.2'
2019-10-09 23:01:31 +00:00
Alexander Alekhin
4c71dbf0af
release: OpenCV 4.1.2
...
OpenCV 4.1.2
2019-10-09 22:53:14 +00:00
Alexander Alekhin
9efafc3e33
Merge pull request #15673 from TolyaTalamanov:at/fix-valgrind-issue
2019-10-09 22:48:24 +00:00
Alexander Alekhin
65573784c4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-09 19:46:18 +00:00
Alexander Alekhin
dd4f591d54
Merge tag '3.4.8'
2019-10-09 18:33:35 +03:00
Alexander Alekhin
6bdb9ca725
OpenCV release (3.4.8)
...
OpenCV 3.4.8
2019-10-09 14:42:29 +03:00
Maksim Shabunin
1ca74c3c03
Merge pull request #15544 from mshabunin:disable_posix_memalign
...
* Disable posix_memalign by default
* core: fix memalign parameter handling
2019-10-09 14:06:12 +03:00
Alexander Smorkalov
c3a588037a
Merge pull request #15666 from seanm:Wnewline
2019-10-09 11:04:44 +00:00
Talamanov, Anatoliy
40215f99d7
Define operator<< for cv::gapi::wip::draw::Prim
2019-10-09 13:41:36 +03:00
Marcin Tolysz
3fd36c1be1
Merge pull request #15658 from tolysz:patch-1
...
* Cuda + OpenGL on ARM
There might be multiple ways of getting OpenCV compile on Tegra (NVIDIA Jetson) platform, but mainly they modify CUDA(8,9,10...) source code, this one fixes it for all installations.
( https://devtalk.nvidia.com/default/topic/1007290/jetson-tx2/building-opencv-with-opengl-support-/post/5141945/#5141945 et al.).
This way is exactly the same as the one proposed but the code change happens in OpenCV.
* Updated,
The link provided mentions: cuda8 + 9, I have cuda 10 + 10.1 (and can confirm it is still defined this way).
NVIDIA is probably using some other "secret" backend with Jetson.
2019-10-09 11:38:10 +03:00
Sean McBride
24effe8cd6
Fixed clang -Wnewline-eof warning by adding newline to end of file
2019-10-09 10:12:09 +03:00
Alexander Alekhin
6efdfee3f0
build: eliminate CUDA warnings
2019-10-08 15:30:02 +03:00
Pinaev Danil
9ab5e52f04
Merge pull request #15632 from aDanPin:dp/any_ref_tests
...
* Add a few more tests on `any`
Added tests:
- get_ref_to_val_from_any
- update_val_via_ref
* Style fix
2019-10-08 12:42:49 +03:00
Nikita Shulga
ec37364762
Use std::atomic in getExpTab32f and getLogTab32f
...
Reads and writes to volatile bool are not guaranteed to be atomic.
2019-10-07 16:35:07 -07:00
Nikita Shulga
23288b7cb5
Use atomic operations to modify flagNestedParallelFor
...
This ensures uniform behavior on any C++11 compliant compiler
2019-10-07 16:26:30 -07:00
Alexander Alekhin
4748aca61f
Merge pull request #15642 from alalek:issue_15597
2019-10-08 00:33:20 +03:00
Sayed Adel
f2fe6f40c2
Merge pull request #15510 from seiko2plus:issue15506
...
* core: rework and optimize SIMD implementation of dotProd
- add new universal intrinsics v_dotprod[int32], v_dotprod_expand[u&int8, u&int16, int32], v_cvt_f64(int64)
- add a boolean param for all v_dotprod&_expand intrinsics that change the behavior of addition order between
pairs in some platforms in order to reach the maximum optimization when the sum among all lanes is what only matters
- fix clang build on ppc64le
- support wide universal intrinsics for dotProd_32s
- remove raw SIMD and activate universal intrinsics for dotProd_8
- implement SIMD optimization for dotProd_s16&u16
- extend performance test data types of dotprod
- fix GCC VSX workaround of vec_mule and vec_mulo (in little-endian it must be swapped)
- optimize v_mul_expand(int32) on VSX
* core: remove boolean param from v_dotprod&_expand and implement v_dotprod_fast&v_dotprod_expand_fast
this changes made depend on "terfendail" review
2019-10-07 22:01:35 +03:00
Alexander Alekhin
7837ae0e19
Merge pull request #15654 from sturkmen72:patch-3
2019-10-07 16:15:04 +00:00
Alexander Alekhin
a007220c52
imgproc: update histogram test
2019-10-07 15:06:43 +03:00
Marcin Tolysz
53400d86e2
Fix compiler warnings for latest cuda npp which defines this itself as:
...
```
#define NPP_VER_MAJOR 10
#define NPP_VER_MINOR 2
#define NPP_VER_PATCH 0
#define NPP_VER_BUILD 243
#define NPP_VERSION (NPP_VER_MAJOR * 1000 + \
NPP_VER_MINOR * 100 + \
NPP_VER_PATCH)
2019-10-07 11:45:26 +01:00
Suleyman TURKMEN
c0489963bb
Update copy.cpp
2019-10-07 11:59:52 +03:00
Alexander Alekhin
626bfbf309
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-05 15:45:31 +00:00
Alexander Alekhin
98fc098216
Merge pull request #15646 from alalek:fix_avx512_detection
2019-10-05 15:30:09 +00:00
Alexander Alekhin
6d811f9879
Merge pull request #15641 from alalek:dnn_pytest_update_3.4
2019-10-05 15:28:52 +00:00
Alexander Alekhin
22d0c57a1c
Merge pull request #15602 from alalek:core_softfloat_ubsan_shift
2019-10-05 15:27:35 +00:00
Alexander Alekhin
c54753c185
Merge pull request #15638 from AsyaPronina:asyadev/gapi_filter2d_test
2019-10-05 11:22:11 +00:00
Alexander Alekhin
bdc097495a
fix avx512 detection
...
- renamed Cascade Lake AVX512_CEL => AVX512_CLX (align with Intel SDE tool)
- fixed CLX instruction sets (no IFMA/VBMI)
- added flag to bypass CPU baseline check: OPENCV_SKIP_CPU_BASELINE_CHECK
2019-10-05 11:03:57 +00:00
Alexander Alekhin
feff8bf972
Merge pull request #15626 from alalek:dnn_openvino_2019r3
2019-10-04 19:45:37 +00:00
AsyaPronina
4429352125
OpenCV G-API test for Filter2d has changed:
...
> Size parameter is changed from int to cv::Size type to allow rectangle kernels
> Kernel creation code is adopted for different kernel sizes to not create only white images on the output
2019-10-04 21:25:33 +03:00
Alexander Alekhin
f301f17b61
imgproc: accurate histogram value thresholding
2019-10-04 19:56:25 +03:00
Alexander Alekhin
c13a5ce229
Merge pull request #15622 from dkurt:enet_ie_cpu
2019-10-04 16:31:05 +00:00
Alexander Alekhin
ab5252c18e
dnn(pytest): backport changes from master, update test setUp()
2019-10-04 18:43:35 +03:00
Dmitry Kurtaev
e35fd463e7
Enable ENet with Inference Engine backend on CPU
2019-10-04 18:10:11 +03:00
Alexander Alekhin
fd11e3a81d
dnn: update IE tests
2019-10-04 17:49:10 +03:00
Alexander Alekhin
f0058bbed3
dnn(test): fix optional test data
2019-10-04 17:26:35 +03:00
Alexander Alekhin
22d86116ee
Merge pull request #15634 from alalek:issue_15083_4903
2019-10-04 11:54:54 +00:00
APrigarina
c99db2b9db
bug fix
2019-10-04 13:02:54 +03:00
Alexander Alekhin
c69245da1f
imgproc: fix fitLine() implementation
...
- update optimal solutions on each iteration
2019-10-03 21:23:52 +00:00
Alexander Alekhin
53c88f0f9e
Merge pull request #15627 from andrey-golubev:fix_perform_subst
2019-10-02 22:30:01 +00:00
andrey-golubev
d50babfc99
G-API: fix perform substitution UB/crash
2019-10-02 20:54:11 +03:00
Alexander Alekhin
2b66495a9d
dnn: use OpenVINO 2019R3 defines
2019-10-02 18:47:01 +03:00
Alexander Alekhin
3fb6617d62
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-02 17:49:19 +03:00
Alexander Alekhin
23bd1866ca
Merge pull request #15620 from alalek:issue_14727
2019-10-02 14:29:56 +00:00
Alexander Alekhin
59c182ed2b
Merge pull request #15467 from elmsfu:dshow/add_save_graph_file
2019-10-02 14:27:56 +00:00
Alexander Alekhin
c06115cb3f
Merge pull request #15619 from alalek:dnn_eltwise_sum_ie_ocl
2019-10-01 18:02:45 +00:00
Elms
8b483a91bc
dshow: Add ability to save direct show graph
2019-10-01 09:46:07 -07:00
Alexander Alekhin
8814645c8d
dnn(test): skip IE/OCL test for "sum"
2019-10-01 18:29:47 +03:00
Alexander Alekhin
77346d7286
core: workaround transform() inplace calls
2019-10-01 16:52:14 +03:00
Alexander Alekhin
3133bb49aa
Merge pull request #15492 from TolyaTalamanov:at/new-render-prims
2019-10-01 12:39:16 +00:00
Alexander Alekhin
440a937d24
dnn: increase async test timeout
2019-10-01 13:31:57 +03:00
Talamanov, Anatoliy
06067efa3f
Add new render primitives
2019-10-01 12:11:41 +03:00
Alexander Alekhin
ba0b3983c6
Merge pull request #15609 from sturkmen72:update_loadsave_cpp
2019-09-30 18:37:21 +00:00
Sebastián Gurin
a3144cbadc
Merge pull request #15480 from cancerberoSgx:estimateAffine2D
...
js - cv.estimateAffine2D, cv.warpPolar
2019-09-30 21:35:26 +03:00
ann
5c9a624a85
Merge pull request #15356 from APrigarina:3.4_version2
...
QR-Code detection: accuracy improvement
* first commit
* resize improvement
* resize improvement
* dummy commit
* warnings fix
* warnings fix
* warnings fix
* test added
* resize fix
* resize fix
* tests changed
* tests changed
2019-09-30 21:33:58 +03:00
Dmitry Kurtaev
fba9fdfd27
Fix autodetection of input size for dnn networks
2019-09-30 16:05:15 +03:00
Suleyman TURKMEN
d88d1c9935
Update loadsave.cpp
2019-09-28 23:24:17 +03:00
Alexander Alekhin
507ca291e1
Merge pull request #12670 from alalek:imgproc_getRotationMatrix2D_return_type
2019-09-28 18:03:34 +00:00
Alexander Alekhin
ed9bca969c
core: fix UBSAN in softfloat
2019-09-27 16:29:50 +03:00
Alexander Alekhin
aa61e79615
Merge pull request #15600 from alalek:imgproc_pyramid_fix_indexing
2019-09-27 10:21:52 +00:00
Brandon
25dee8383c
Merge pull request #15595 from frastlin:rodrigues
...
* Added Rodrigues to the JS embindgen.py and a unittest in test_calib3d.js on 3.4 base
2019-09-27 13:06:07 +03:00
Alexander Alekhin
f81e401cd0
imgproc: fix indexing issue in pyramids
...
UBSAN violation expression: 'tab = tabR - x;'
2019-09-26 18:09:47 +03:00
Alexander Alekhin
bc927f9788
Merge pull request #15591 from alalek:core_persistence_fix
2019-09-26 12:59:37 +00:00
Alexander Alekhin
e2a5a6a05c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-25 18:32:44 +00:00
Alexander Alekhin
7ce9428e96
Merge pull request #15580 from smbz:dnn-lstm-reverse
2019-09-25 15:54:06 +00:00
Andrey Golubev
9f4f9000bc
Merge pull request #15313 from andrey-golubev:map_subst_to_pattern
...
G-API: add transformation logic to GCompiler
* Introduce transformation logic to GCOmpiler
* Remove partialOk() method
* Fix minor issues
* Refactor code according to code review
1. Re-design matchPatternToSubstitute logic
2. Update transformations order
3. Replace check_transformations pass with a
one time check in GCompiler ctor
* Revert unused nodes handling in pattern matching
* Address minor code review issues
* Address code review comments:
1) Fix some mistakes
2) Add new tests for endless loops
3) Update GCompiler's transformations logic
* Simplify GCompiler check for endless loops
1. Simplify transformations endless loops check:
- Original idea wasn't a full solution
- Need to develop a good method (heuristic?) to find loops
in general case (TODO)
2. Remove irrelevant Endless Loops tests
3. Add new "bad arg" tests and unit tests
* Update comments
2019-09-25 18:19:45 +03:00
Alexander Alekhin
677b94c92e
Merge pull request #15579 from alalek:ocl_use_host_mem_ptr_flag
2019-09-25 15:12:59 +00:00
Andrew Ryrie
b88435fdc2
dnn: Allow LSTM layer to operate in reverse direction
...
This is useful for bidirectional LSTMs.
2019-09-25 14:12:43 +01:00
Alexander Alekhin
790927bb55
Merge pull request #15582 from terfendail:pyrdown_oob
2019-09-25 12:37:31 +00:00
Lubov Batanina
e923712d81
Merge pull request #15572 from l-bat:deconv3d
...
Fix computation of internal shapes in Deconvolution layer
* Fix computation of internal shapes
* Refactoring
2019-09-25 15:35:04 +03:00
Alexander Alekhin
eacadf0e73
core(ocl): add flag OPENCV_OPENCL_ENABLE_MEM_USE_HOST_PTR
...
to control CL_MEM_USE_HOST_PTR usage
2019-09-25 15:12:36 +03:00
Alexander Alekhin
6e246ee58c
core(persistence): fix reserveNodeSpace() implementation
...
- avoid data copying after buffer block shrink
- resize current block in case of single FileNode
2019-09-25 15:02:20 +03:00
Vitaly Tuzov
0a1b957331
StereoBM algorithm updated to use wide universal intrinsics
2019-09-25 14:37:12 +03:00
Vitaly Tuzov
1c17b3281a
Fixed OOB reading in pyrDown
2019-09-25 13:24:17 +03:00
Alexander Alekhin
d2cacac07a
Merge pull request #15573 from alalek:build_cxx11_warnings
2019-09-24 22:08:55 +00:00
Wenzhao Xiang
c2096771cb
Merge pull request #15371 from Wenzhao-Xiang:gsoc_2019
...
[GSoC 2019] Improve the performance of JavaScript version of OpenCV (OpenCV.js)
* [GSoC 2019]
Improve the performance of JavaScript version of OpenCV (OpenCV.js):
1. Create the base of OpenCV.js performance test:
This perf test is based on benchmark.js(https://benchmarkjs.com ). And first add `cvtColor`, `Resize`, `Threshold` into it.
2. Optimize the OpenCV.js performance by WASM threads:
This optimization is based on Web Worker API and SharedArrayBuffer, so it can be only used in browser.
3. Optimize the OpenCV.js performance by WASM SIMD:
Add WASM SIMD backend for OpenCV Universal Intrinsics. It's experimental as WASM SIMD is still in development.
* [GSoC2019]
1. use short license header
2. fix documentation node issue
3. remove the unused `hasSIMD128()` api
* [GSoC2019]
1. fix emscripten define
2. use fallback function for f16
* [GSoC2019]
Fix rebase issue
2019-09-24 16:30:42 +03:00
Alexander Alekhin
3cf9185159
Merge pull request #15538 from terfendail:wui_checkany
2019-09-23 15:52:24 +00:00
Maksim Shabunin
c8abf2ad14
backport: fixed warnings produced by clang-9.0.0
...
ea3dc78986
83fc27cb99
2019-09-23 18:36:18 +03:00
smirnov-alexey
bab8addcbb
Move maxval to threshold tests parameter
...
Fix documentation
2019-09-23 14:21:33 +03:00
Alexander Alekhin
c4d2e3c0b3
Merge pull request #15566 from alalek:issue_15558
2019-09-23 09:22:06 +00:00
Alexander Alekhin
b40fd6de32
Merge pull request #15565 from alalek:issue_15561
2019-09-23 09:21:49 +00:00
Alexander Alekhin
fcc69d5a60
core(test): fix check conditions
2019-09-22 11:28:41 +00:00
Alexander Alekhin
fef7fc343e
ml: add checks of empty train data
2019-09-22 11:12:19 +00:00
Alexander Alekhin
ad2854c8b3
imgcodecs: add check image.empty() in imwrite()/imencode()
2019-09-22 10:45:00 +00:00
Alexander Alekhin
a74fe2ec01
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-20 21:11:49 +00:00
mipsopen-fwu
b1ea91d8bd
Merge pull request #15422 from mipsopen-fwu:msa-dev
...
* Added MSA implementations for mips platforms. Intrinsics for MSA and build scripts for MIPS platforms are added.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Removed some unused code in mips.toolchain.cmake.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Added comments for mips toolchain configuration and disabled compiling warnings for libpng.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Fixed the build error of unsupported opcode 'pause' when mips isa_rev is less than 2.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* 1. Removed FP16 related item in MSA option defines in OpenCVCompilerOptimizations.cmake.
2. Use CV_CPU_COMPILE_MSA instead of __mips_msa for MSA feature check in cv_cpu_dispatch.h.
3. Removed hasSIMD128() in intrin_msa.hpp.
4. Define CPU_MSA as 150.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* 1. Removed unnecessary CV_SIMD128_64F guarding in intrin_msa.hpp.
2. Removed unnecessary CV_MSA related code block in dotProd_8u().
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* 1. Defined CPU_MSA_FLAGS_ON as "-mmsa".
2. Removed CV_SIMD128_64F guardings in intrin_msa.hpp.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Removed unused msa_mlal_u16() and msa_mlal_s16 from msa_macros.h.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
2019-09-20 19:52:48 +03:00
Vitaly Tuzov
66842f5a18
Extended v_check_any/v_check_all universal intrinsics to support 64-bit integer
2019-09-19 18:31:31 +03:00
Alexander Alekhin
ee23a7575d
Merge pull request #15515 from dkurt:dnn_detection_model_fix
2019-09-18 12:19:14 +00:00
Alexander Alekhin
46fd112f9b
Merge pull request #15399 from terfendail:perf_stereobm
2019-09-17 14:26:43 +00:00
Vitaly Tuzov
cd7fa04985
Fixed out of bound reading in DIS optical flow evaluation implementation
2019-09-17 15:53:18 +03:00
Daniel Kapusi
d2872afce0
Merge pull request #15341 from DiebBlue:is5769
...
* issue 5769 fixed: cv::stereoRectify fails if given inliers mask of type vector<uchar>
* issue5769 fix using reshape and add regression test
* regression test with outlier detection, testing vector and mat data
* Size comparision of wrong vector within CV_Assert in regression test corrected
* cleanup test code
2019-09-17 00:04:05 +03:00
Alexander Alekhin
70c88a2087
Merge pull request #15517 from mshabunin:fix-osx-avfoundation-auth
2019-09-16 15:28:34 +00:00
Alexander Alekhin
7770ba1f10
Merge pull request #15491 from terfendail:undistort_fix
2019-09-16 15:24:29 +00:00
Vitaly Tuzov
7b3a752012
Fixed universal intrinsic undistort() implementation
2019-09-16 17:16:38 +03:00
Alexander Alekhin
b4c5b50a3e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-13 17:15:45 +00:00
Alexander Alekhin
03c4c67dad
Merge pull request #15518 from mshabunin:fix-osx-qt
2019-09-13 17:06:00 +00:00
Alexander Alekhin
48fa39f675
Merge pull request #15487 from dkurt:fix_ie_2019r1
2019-09-13 16:57:34 +00:00
Maksim Shabunin
5c0502b470
Fixed OSX build with Qt
2019-09-13 15:23:59 +03:00
Maksim Shabunin
f10fce9ab4
AVFoundation: backported runtime authorization check from master
2019-09-13 13:20:29 +03:00
Maksim Shabunin
aaad238c6e
AVFoundation: fix authorization request not being shown
2019-09-13 13:11:35 +03:00
Dmitry Kurtaev
3ddb005480
Fix DetectionModel in case of out of [0, 1] range detection prediction
2019-09-13 12:58:56 +03:00
Dmitry Kurtaev
0428f60d66
Fix OpenVINO 2019R1 compilation
2019-09-13 09:22:34 +03:00
Paul E. Murphy
b465c82696
core: workaround old gcc vec_mul{e,o} (Issue #15506 )
...
ISA 2.07 (aka POWER8) effectively extended the expanding multiply
operation to word types. The altivec intrinsics prior to gcc 8 did
not get the update.
Workaround this deficiency similar to other fixes.
This was exposed by commit 33fb253a66
which leverages the int -> dword expanding multiply.
This fixes Issue #15506
2019-09-12 09:54:02 -05:00
Maksim Shabunin
349f0cf5e9
Merge pull request #15443 from anton-potapov:fluid_internal_parallellism_fix_review_comments
2019-09-09 19:27:59 +00:00
Anton Potapov
758156a9b6
Fluid Internal Parallelism:
...
- add comments on signature of custom parallel_for
- use cv::parallel_for_ by default
2019-09-09 17:37:52 +03:00
Vitaly Tuzov
bf8b5ffeb1
Added performance test for StereoBM algorithm
2019-09-09 16:37:06 +03:00
Anton Potapov
8747082091
G-API: fixing CMake warning for standalone build
2019-09-09 16:23:04 +03:00
Alexander Alekhin
b3a0507546
Merge pull request #15475 from alalek:build_eliminate_warning_array_bounds
2019-09-06 15:57:52 +00:00
Alexander Alekhin
bdf23ce855
ts: eliminate -Warray-bounds warning
2019-09-06 18:06:02 +03:00
Alexander Alekhin
60488ffbbd
gapi(test): disable memory consumption check in valgrind runs
2019-09-06 17:02:30 +03:00
Yuhel Tanaka
a13862e924
Fix issue #6450
2019-09-06 11:56:04 +09:00
Alexander Alekhin
e7b6753a10
imgproc: avoid manual memory allocation in connectedcomponents.cpp
2019-09-05 16:20:08 +03:00
Alexander Alekhin
bea2c75452
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-05 14:29:22 +03:00
Jaime
fafada28eb
Merge pull request #14872 from AhiyaHiya:feature/topmost_window
...
* Added mechanism to set/toggle NORMAL window to TOPMOST window.
* highgui: remove unnecessary/legacy code
2019-09-05 13:55:17 +03:00
Alexander Alekhin
0a13633411
Merge pull request #15444 from alalek:ocl_fix_fft_kernel
2019-09-04 16:25:34 +00:00
Everton Constantino
76e403cf25
Merge pull request #15440 from everton1984:new_integral_tests
...
* Adding all possible data type interactions to the perf tests since some
use SIMD acceleration and others do not.
* Disabling full tests by default.
* Giving proper names, removing magic numbers and sanity checks of new
performance tests for the integral function.
* Giving proper names, making array static.
2019-09-04 19:14:00 +03:00
Matt Bennett
b17d16623a
Prevent empty _Jo matrix multiplication when using calibrateCameraRO with iFixedPoint > 0
2019-09-04 15:33:03 +01:00
Dmitry Kurtaev
ba703157cf
Merge pull request #15063 from dkurt:dnn_ie_ocv_layers
...
* Wrap unsupported by IE layers as custom layers
* Replace pointers to layers blobs to their shapes
* Enable Faster R-CNN with IE backend on CPU
2019-09-03 18:58:57 +03:00
Alexander Alekhin
8bd2720c28
core(ocl): fix fft kernel compilation
...
- error: variables in the local address space can only be declared in the outermost scope of a kernel function
2019-09-03 15:46:53 +03:00
Alexander Alekhin
7e46766c8d
Merge pull request #15437 from devnexen:fbsd_opencl_build_fix
2019-09-03 12:21:02 +00:00
Alexander Alekhin
61cc855564
Merge pull request #15442 from alalek:fix_15293
2019-09-03 12:05:57 +00:00
Alexander Alekhin
e736f590f7
Merge pull request #15436 from alalek:update_version_4.1.2-pre
2019-09-03 12:05:16 +00:00
Alexander Alekhin
9ef5373776
Merge pull request #15435 from alalek:update_version_3.4.8-pre
2019-09-03 12:04:23 +00:00
Alexander Alekhin
6d669dcd7d
gapi(test): fix 32S->8U type in OwnMatConversion.WithND
2019-09-03 14:00:28 +03:00
Alexander Alekhin
abd7d63b74
Merge pull request #15424 from mshabunin:add-cmake-docs
2019-09-03 10:50:45 +00:00
OrestChura
55c1720719
Merge pull request #15419 from OrestChura:gapi_headers_internal_flag_issue
...
* - headers in "infer/" and "infer/ie/" folders are included into gapi_ext_hdrs;
+ because of that a few #includes are required in the headers
- HAVE_INF_ENGINE flag check in headers "infer/ie.hpp" and "infer/ie/util.hpp" is deleted
* - the "ie/util.hpp" header is a private header now as it's used for tests; it's been moved to the scr directory to the place next to the implementation file "ie/giebackend.cpp"
- the path to this header in files "ie/giebackend.cpp" and "test/infer/gapi_infer_ie_test.cpp" is updated
- As it's private header now and explicitly depends on IE, the "HAVE_INF_ENGINE" flag check is returned
2019-09-03 13:22:12 +03:00
David Carlier
6769ee3748
OpenCL: FreeBSD build fix
2019-09-02 18:30:53 +01:00
Anton Potapov
f7b5900671
Fluid Internal Parallelism
...
- make static analysis happy
2019-09-02 16:16:01 +03:00
Alexey Smirnov
8a7e74673e
Merge pull request #15312 from smirnov-alexey:gapi_fluid_garray
...
* Support GArray as input in fluid kernels
* Create tests on GArray input in fluid
* Some fixes to fully support GArray
* Refactor code and change the kernel according to review
* Add histogram calculation as a G-API kernel
Add assert that input GArgs in fluid contain at least one GMat
2019-09-02 15:51:58 +03:00
Alexander Alekhin
3c62f3a8e3
pre: OpenCV 4.1.2 (version++)
2019-09-02 15:26:14 +03:00
Alexander Alekhin
48d41ab088
dnn: bump API version
2019-09-02 14:25:18 +03:00
Alexander Alekhin
0fda243a05
pre: OpenCV 3.4.8 (version++)
2019-09-02 14:20:49 +03:00
Alexander Alekhin
70dfae31a2
experimental version++
2019-09-02 14:17:36 +03:00
atinfinity
3b9f981358
removed tegra optimization
2019-09-01 21:22:06 +09:00
Alexander Alekhin
048ddbf9ee
Merge pull request #15339 from pmur:dotprod-32s-vsx
2019-08-31 11:16:04 +00:00
Alexander Alekhin
2a6527e751
Merge pull request #15402 from ChipKerchner:normUnroll
2019-08-31 11:10:05 +00:00
Chip Kerchner
26228e6b4d
Merge pull request #15358 from ChipKerchner:imgwarpToHal
...
* Convert ImgWarp from SSE SIMD to HAL - 2.8x faster on Power (VSX) and 15% speedup on x86
* Change compile flag from CV_SIMD128 to CV_SIMD128_64F for use of v_float64x2 type
* Changing WarpPerspectiveLine from class functions and dispatching to static functions.
* Re-add dynamic runtime and dispatch execution.
* RRestore SSE4_1 optimizations inside opt_SSE4_1 namespace
2019-08-31 13:47:58 +03:00
Maksim Shabunin
f3aab47f94
Assorted documentation fixes
...
* removed private flann documentation
* common tutorial images moved to doc/images
* grouping issues
2019-08-31 01:50:11 +03:00
Alexander Alekhin
1661e83939
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-30 16:22:42 +03:00
Alexander Alekhin
f224d740a3
Merge pull request #15414 from kuzi117:instr
2019-08-30 12:03:19 +00:00
Alexander Alekhin
e319340253
Merge pull request #15417 from alalek:ts_fix_callback_signature
2019-08-29 18:40:19 +00:00
Braedy Kuzma
9bf8b496d6
Use commonly supported instruction mnemonic.
2019-08-29 10:00:40 -06:00
Braedy Kuzma
d4120dd2fe
Disambiguate vecpopcnt for (u)dword2.
2019-08-29 09:54:56 -06:00
Alexander Alekhin
654d0c29ad
ts: fix callback function signature
...
detected by UBSAN
2019-08-29 15:09:32 +03:00
Alexander Alekhin
8d0b3dad5c
Merge pull request #15357 from ChipKerchner:fastCorner
2019-08-29 08:26:31 +00:00
Lubov Batanina
90eb529bc4
Merge pull request #15395 from l-bat:fully_connected
...
* Fix IE FullyConnected layer
* Fix MyriadX
2019-08-29 10:52:02 +03:00
Alexander Alekhin
6506c19ac3
Merge pull request #15407 from terfendail:test_check_any
2019-08-28 16:39:01 +00:00
Chip Kerchner
30a60d396b
Merge pull request #15274 from ChipKerchner:lkpyramidToHal
...
* Convert lkpyramid from SSE SIMD to HAL - 90% faster on Power (VSX).
* Replace stores with reduce_sum. Rework to handle endianess correctly.
* Fix compiler warnings by casting values explicitly to shorts
* Switch to CV_SIMD128 compiler definition. Unroll loop to 8 elements since we've already loaded the data.
2019-08-28 18:56:48 +03:00
Vitaly Tuzov
d134ec54c5
Extend tests for v_check_any and v_check_all intrinsics
2019-08-28 14:53:31 +03:00
Alexander Alekhin
ca7640e10f
Merge pull request #15401 from ChipKerchner:vectorReduceInt8Bug
2019-08-27 19:59:39 +00:00
ChipKerchner
288e6f9c07
Improve vectorization in the 'norm' functions
2019-08-27 12:15:19 -05:00
ChipKerchner
70b883cfeb
Fix macro bug with v_reduce_min and v_reduce_max for chars in VSX
2019-08-27 11:38:53 -05:00
Alexander Alekhin
1ae001d10a
Merge pull request #15378 from andrey-golubev:acc_tests_doc
2019-08-27 12:20:05 +00:00
Vitaly Tuzov
1b40528e1a
Fix for AVX2 implementation of v_check_any(), v_check_all() intrinsics
2019-08-27 14:31:23 +03:00
atinfinity
824465ea27
Merge pull request #15388 from atinfinity:impl-turbo-colormap
...
Implementation of colormap "Turbo" (#15388 )
* implemented turbo colormap
* add colormap image
* changed float value to avoid cast
* sorted flag check alphabetically
2019-08-26 17:55:10 +03:00
Dmitry Kurtaev
57676cf64d
Fix https://github.com/opencv/opencv/issues/15141
2019-08-24 23:14:26 +03:00
Alexander Alekhin
a7b954f655
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-23 19:24:37 +03:00
Alexander Alekhin
114674c3d9
Merge pull request #15383 from alalek:fix_15379
2019-08-23 16:19:36 +00:00
Alexander Alekhin
c05595e482
Merge pull request #15382 from alalek:fix_15287
2019-08-23 16:09:13 +00:00
Alexander Alekhin
d7409604b5
core: handle empty Mat in Mat_ assignment operators
2019-08-23 16:54:24 +03:00
Alexander Alekhin
29dbeb253c
build: fix build with ICC
2019-08-23 16:36:32 +03:00
Alexander Alekhin
5a497077f1
objdetect: add input check in HOG detector
2019-08-23 16:14:53 +03:00
Alexander Alekhin
576644a197
Merge pull request #15236 from dbudniko:dbudniko/g_api_copy_kernels
2019-08-23 10:47:47 +00:00
Andrey Golubev
410583e5f9
Document usage of accuracy tests model
2019-08-23 13:15:35 +03:00
Alexander Alekhin
56e832ee43
Merge pull request #15372 from alalek:core_stat_fix_intrin
2019-08-22 20:52:54 +00:00
Alexander Alekhin
601096f360
Merge pull request #15370 from alalek:core_fastmath_hpp_update
2019-08-22 17:05:38 +00:00
Kazuma Furuhashi
ccecd3405a
Merge pull request #15007 from 284km:fixatypo
...
s/last_occurence/last_occurrence/
2019-08-22 17:32:25 +03:00
Alexander Alekhin
8a0b93bc4d
core: update fastmath.hpp
2019-08-22 16:43:07 +03:00
Alexander Alekhin
8b1fe8f6e0
core: fix stat SIMD code
2019-08-22 16:37:26 +03:00
Alexander Alekhin
7243eda2ff
Merge pull request #15316 from sturkmen72:update_seamless_cloning_cpp
2019-08-22 11:37:38 +00:00
Alexander Alekhin
84b8a2fb05
Merge pull request #15303 from dkurt:fix_15296
2019-08-21 16:59:20 +00:00
Alexander Alekhin
4700722444
Merge pull request #15359 from mgehre:fix_dangling_pointer
2019-08-21 11:38:36 +00:00
Zyrin
869ea22f34
Use std::move in Mat_<T> move constructors
2019-08-21 11:12:00 +02:00
Zyrin
8ef8088686
Fix stack overflow on gcc with c++17 ( #15343 )
2019-08-21 10:57:03 +02:00
Matthias Gehre
0e92ac2af7
modules/core/src/ocl.cpp: Fix dangling pointer
...
Detected by clang trunk:
```
opencv/modules/core/src/ocl.cpp:4337:37: warning: object backing the pointer will be destroyed at the end of the full-expression [-Wdangling]
CV_OCL_CHECK_RESULT(retval, cv::format("clCreateBuffer(capacity=%lld) => %p", (long long int)entry.capacity_, (void*)entry.clBuffer_).c_str());
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
opencv/modules/core/src/ocl.cpp:193:42: note: expanded from macro 'CV_OCL_CHECK_RESULT'
if (0) { const char* msg_ = (msg); CV_UNUSED(msg_); /* ensure const char* type (cv::String without c_str()) */ } \
```
because `cv::format` yields a temporary std::string, and thus `msg_` points to a destroyed buffer.
2019-08-20 23:30:34 +02:00
Philippe FOUBERT
b77a0039ee
Merge pull request #15351 from philippefoubert:pr_ximea
...
* Fix the detection of XIMEA on Windows (when it has been installed by another user with administrative privileges, for example).
* Change the flow: we first try HKEY_CURRENT_USER key and, if empty, then try HKEY_LOCAL_MACHINE
2019-08-21 00:01:34 +03:00
Paul E. Murphy
33fb253a66
core: vectorize dotProd_32s
...
Use 4x FMA chains to sum on SIMD 128 FP64 targets. On
x86 this showed about 1.4x improvement.
For PPC, do a full multiply (32x32->64b), convert to DP
then accumulate. This may be slightly less precise for
some inputs. But is 1.5x faster than the above which
is about 1.5x than the FMA above for ~2.5x speedup.
2019-08-20 15:28:36 -05:00
ChipKerchner
51ceabb2eb
Change fast corner flags in HAL version from char array to single int
2019-08-20 13:25:35 -05:00
Alexander Alekhin
6a439ae53d
videoio(doc): fix 'since' version
2019-08-20 13:15:56 +03:00
Alexander Alekhin
19a4b51371
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-16 18:48:08 +03:00
Suleyman TURKMEN
a1e96a7deb
Update seamless_cloning.cpp
2019-08-16 17:35:22 +03:00
luz.paz
fcc7d8dd4e
Fix modules/ typos
...
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
backporting of commit: ec43292e1e
2019-08-16 17:34:29 +03:00
luz.paz
ec43292e1e
Fix modules/ typos
...
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
2019-08-15 18:02:09 -04:00
Alexander Alekhin
0a02dd5f58
Merge pull request #15298 from smirnov-alexey:gapi_simplify_transform_tests
2019-08-15 10:09:14 +00:00
Alexander Alekhin
13ecd5bb25
Merge pull request #15122 from pmur:fast-math-improvements
2019-08-14 19:28:05 +00:00
Alexander Alekhin
a703b9ed84
Merge pull request #15101 from alalek:cmake_initialization
2019-08-14 19:17:07 +00:00
Dmitry Kurtaev
e4a80aee09
Fix #15296
2019-08-14 19:44:05 +03:00
ilbalance
0b5d0b83be
Merge pull request #15275 from ilbalance:js_inpaint
...
* in embindgen.py added inpaint function
* added test for inpaint function and fixed function in build_js
* fixed test for inpaint function
* rotate deleted, build_js.py fixed
2019-08-14 17:16:45 +03:00
Alexander Alekhin
32772a5436
3.4: backported changes from 'master' branch
2019-08-14 16:36:08 +03:00
smirnov-alexey
35e5f00cac
Simplify tests on GAPI_TRANSFORM
2019-08-14 13:37:40 +03:00
Alexander Alekhin
290da93845
Merge pull request #15285 from AsyaPronina:dev/asyadev/matching_requirements_test
2019-08-14 09:59:56 +00:00
Andrey Golubev
f6bb900259
Merge pull request #15238 from andrey-golubev:fluid_fix_journal
...
G-API: Fix Journal usage in Fluid backend (#15238 )
* Fix Journal usage in Fluid backend
* Delete dumpDotRequired(): invalid check
* Update mem consumption test
* Test that new test works
* Debug memory consumption function
* Increase iterations in test
* Re-write memory consumption measurement part
* Restore correct fix for Fluid journals
2019-08-14 10:03:52 +03:00
Diego
f7f2438478
Merge pull request #15082 from dvd42:segmentation-module
...
Segmentation module (#15082 )
2019-08-13 23:38:48 +03:00
Alexander Alekhin
2ad0487cec
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-13 18:32:29 +00:00
Alexander Alekhin
72ccb5fe6e
Merge pull request #15283 from smirnov-alexey:gapi_transform_tests
2019-08-13 14:45:18 +00:00
Alexander Alekhin
7c96857c02
Merge pull request #15292 from alalek:build_warnings_xcode_10_3
2019-08-13 14:18:48 +00:00
Alexander Alekhin
15b8a8d935
build: eliminate warnings with Xcode 10.3
2019-08-13 15:06:13 +03:00
Andrey Golubev
bf0765fc7f
Merge pull request #15282 from andrey-golubev:rename_argkind_opaque
...
* G-API: rename ArgKind OPAQUE to GOPAQUE
Rename ArgKind value to GOPAQUE to fix conflict in the
user code when wingdi.h is included: it defines OPAQUE
macro that (for some reason) is chosen instead of ArgKind
value
* Add compatibility with existing API
* Renamed GOPAQUE to OPAQUE_VAL
2019-08-13 13:57:27 +03:00
AsyaPronina
59de4d9ad8
Added Preproc use case test for graph pattern matching
2019-08-12 20:14:56 +03:00
Alexander Alekhin
e0cb01e2cf
Merge pull request #15249 from dkurt:dnn_ie_tests_2019r2
2019-08-12 16:32:38 +00:00
smirnov-alexey
4c168e95de
Extend test suite on GAPI_TRANSFORM macro
2019-08-12 16:44:05 +03:00
Alexander Alekhin
183fc43a67
Merge pull request #15217 from elatkin:15163_gapi_std_math
2019-08-12 09:41:11 +00:00
Alexander Alekhin
c95407f1bc
Merge pull request #14883 from AsyaPronina:dev/asyadev/pattern_matching
2019-08-09 20:52:52 +03:00
Lubov Batanina
f1ea9d86b9
Merge pull request #15203 from l-bat:determine_inp_shape
...
* Determine input shapes
* Add test
* Remove getInputShapes
* Fix model
* Fix constructors
* Add Caffe test
* Fix predict
2019-08-09 19:51:42 +03:00
AsyaPronina
e06efd5329
G-API: Added graph pattern matching routine and basic tests
2019-08-09 18:57:56 +03:00
Alexander Alekhin
358d69956a
Merge pull request #15198 from AsyaPronina:bump_to_new_ade_release
2019-08-09 15:24:01 +00:00
Hugo Lindström
935067ee05
Merge pull request #15265 from hugolm84:wince-armv7-supports-neon
...
* WINCE 8.0 requires ARMv7 Thumb2 and thus have NEON instructions
* Only add NEON if on _ARM_
2019-08-09 18:01:37 +03:00
Alexander Alekhin
212f0fb509
Merge pull request #15262 from alalek:fix_15252
2019-08-08 19:34:33 +00:00
Chip Kerchner
d513fb4c8e
Merge pull request #15199 from ChipKerchner:hogToHal
...
Convert HOG from SSE SIMD to HAL - 35-45% faster on Power (VSX) (#15199 )
* Convert SSE SIMD to HAL. 35-45% improvement for Power (VSX)
* Remove CV_NEON code. Use v_floor instead of 3 lines of code.
* Invert comparison logic to simplify code.
* Change initialization from v_load to constructor type.
2019-08-08 18:57:03 +03:00
Alexander Alekhin
596b8a5d06
Merge pull request #15263 from alalek:videoio_skip_msmf_tests3
2019-08-08 15:47:08 +00:00
Alexander Alekhin
6f267be6f1
Merge pull request #15260 from tomoaki0705:suppressNoisyWarning
2019-08-08 15:45:29 +00:00
Jake Howard
76b40a37e7
Merge pull request #15111 from RealOrangeOne:patch-1
...
* Remove unavoidable print of CV error
The return value covers whether the device exists.
This might be better hidden behind a debug flag, but I couldn't work out how to do that nicely.
* Use `CV_LOG_WARNING` macro to log rather than removing it entirely
2019-08-08 16:56:49 +03:00
Alexander Alekhin
a77275e650
videoio(test): skip unstable MSMF tests (3)
2019-08-08 16:25:19 +03:00
Alexander Alekhin
5e527d22e3
gapi: fix build with MSVS2017/2019
2019-08-08 16:13:25 +03:00
Tomoaki Teshima
40c71a2463
suppress noisy warning
...
* add -Wno-psabi when using GCC 6
* add -Wundef for CUDA 10
* add -Wdeprecated-declarations when using GCC 7
* add -Wstrict-aliasing and -Wtautological-compare for GCC 7
* replace cudaThreadSynchronize with cudaDeviceSynchronize
2019-08-08 21:49:32 +09:00
Alexander Alekhin
5ef548a985
cmake: update initialization
2019-08-08 15:23:16 +03:00
Paul E. Murphy
f38a61c66d
fast_math: implement optimized PPC routines
...
Implement cvRound using inline asm. No compiler support
exists today to properly optimize this. This results in
about a 4x speedup over the default rounding. Likewise,
simplify the growing number of rounding function overloads.
For P9 enabled targets, utilize the classification
testing instruction to test for Inf/Nan values. Operation
speedup is about 1.2x for FP32, and 1.5x for FP64 operands.
For P8 targets, fallback to the GCC nan inline. It provides
a 1.1/1.4x improvement for FP32/FP64 arguments.
2019-08-07 15:01:18 -05:00
Paul E. Murphy
3f92bcc11a
fast_math: selectively use GCC rounding builtins when available
...
Add a new macro definition OPENCV_USE_FASTMATH_GCC_BUILTINS to enable
usage of GCC inline math functions, if available and requested by the
user.
Likewise, enable it for POWER. This is nearly always a substantial
improvement over using integer manipulation as most operations can
be done in several instructions with no branching. The result is a
1.5-1.8x speedup in the ceil/floor operations.
1. As tested with AT 12.0-1 (GCC 8.3.1) compiler on P9 LE.
2019-08-07 15:01:18 -05:00
Paul E. Murphy
b2135be594
fast_math: add extra perf/unit tests
...
Add a basic sanity test to verify the rounding functions
work as expected.
Likewise, extend the rounding performance test to cover the
additional float -> int fast math functions.
2019-08-07 14:59:46 -05:00
AsyaPronina
816929c704
Bump to new ADE release v0.1.1f
2019-08-07 21:35:28 +03:00
Dmitry Kurtaev
a9839af903
Add preprocessing warps for separate parameters
2019-08-07 14:51:41 +03:00
Dmitry Kurtaev
6193e403e7
Enable some tests for 2019R2
2019-08-07 09:07:53 +03:00
Alexander Alekhin
32da0705cf
Merge pull request #15102 from dgel:force_input_format_ffmpeg
2019-08-06 20:52:57 +00:00
Alexander Alekhin
ba1a48c2ce
Merge pull request #14901 from fishjam:issue_8834
2019-08-06 20:52:21 +00:00
Alexander Alekhin
821f17d666
Merge pull request #15235 from pmur:vsx-v_signmask-vbpermq
2019-08-06 20:09:22 +00:00
Lubov Batanina
0e1ef8f8e1
Merge pull request #15184 from l-bat:IE_R2
...
Support new IE API (#15184 )
* Add support OpenVINO R2 for layers
* Add Core API
* Fix tests
* Fix expectNoFallbacksFromIE for ONNX nets
* Remove deprecated API
* Remove td
* Remove TargetDevice
* Fix Async
* Add test
* Fix detectMyriadX
* Fix test
* Fix warning
2019-08-06 22:20:26 +03:00
Douwe Gelling
96a27f4266
allow forcing the input format for ffmpeg backend with env var
2019-08-06 19:30:39 +03:00
fishjam
26ac5a3bdc
try to fix VideoCapture different time stamp
2019-08-06 19:04:22 +03:00
ilbalance
cf93a05d2d
Merge pull request #15230 from ilbalance:js_rotate
...
* in OpenCV.js added 'rotate' function and test sample
* value test added
2019-08-06 12:55:15 +03:00
Alexander Alekhin
174b4ce29d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-05 18:11:43 +00:00
Alexander Alekhin
a4b4432015
videoio(test): skip unstable MSMF tests (2)
2019-08-05 19:13:17 +03:00
Dmitry Budnikov
6427744063
perf tests are added
2019-08-05 19:04:14 +03:00
Alexander Alekhin
365323afec
Merge pull request #15234 from alalek:backport
2019-08-05 15:09:22 +00:00
Alexander Alekhin
99f709ca96
Merge pull request #15233 from alalek:videoio_skip_msmf_tests
2019-08-05 15:08:41 +00:00
Dmitry Matveev
0757a51e2b
Merge pull request #15090 from dmatveev:dm/ng-0001-g-api-inference-api
...
* G-API-NG/API: Introduced inference API and IE-based backend
- Very quick-n-dirty implementation
- OpenCV's own DNN module is not used
- No tests so far
* G-API-NG/IE: Refined IE backend, added more tests
* G-API-NG/IE: Fixed various CI warnings & build issues + tests
- Added tests on multi-dimensional own::Mat
- Added tests on GMatDesc with dimensions
- Documentation on infer.hpp
- Fixed more warnings + added a ROI list test
- Fix descr_of clash for vector<Mat> & standalone mode
- Fix build issue with gcc-4.8x
- Addressed review comments
* G-API-NG/IE: Addressed review comments
- Pass `false` to findDataFile()
- Add deprecation warning suppression macros for IE
2019-08-05 17:56:34 +03:00
Dmitry Budnikov
290078e0d0
copy kernels
2019-08-05 17:46:28 +03:00
Victor Romero
987bb2ca61
Fix build for UWP
...
backport of commit: f18cbd036a
2019-08-05 17:19:36 +03:00
TheGoddessInari
960bb540ec
Make sure to use defined(__GNUC__) instead of bare __GNUC__ in flann2 header.
...
This fixes a compiler error on MSVC with Unreal Engine (at least).
backport of commit: 4e998c9ade
2019-08-05 17:19:12 +03:00
John Smith
b9d6fc9dad
Fix cv::selectROI rectangle rendering issue
...
backport of commit: 95c65aff75
2019-08-05 17:18:30 +03:00
Paul E. Murphy
1031b7f4bc
hal: vsx: further optimize v_signmask
...
Use the quadword bit permutation instruction to creatively move
the sign bits to create the mask. Note that values above 127 will
result in 0.
2019-08-05 09:00:22 -05:00
Alexander Alekhin
406313bbc5
videoio(test): skip unstable MSMF tests
2019-08-05 16:57:26 +03:00
yaohai [姚海]
cadb4dee14
fix exif bug
2019-08-05 16:41:07 +03:00
Thang Tran
d659eb9327
core: fixed error message to avoid confusion
2019-08-04 17:17:03 +02:00
Evgeny Latkin
f17a6b478b
GAPI: use plain-C interface to math functions, sin/cos, etc.
...
- addresses #15163 : C++11 definition issue by @neheb
2019-08-04 08:07:46 +03:00
Victor Romero
f18cbd036a
Merge pull request #15207 from vicroms:fix-uwp-build
...
Fix build for UWP (#15207 )
* Guard non-WinRT calls to fix UWP build
* Remove unnecessary guard for WinRT
2019-08-03 22:53:38 +03:00
Alexander Alekhin
b584c23061
Merge pull request #15158 from dkurt:fix_tf_ssd_configs
2019-08-02 16:08:55 +00:00
Alexander Alekhin
ba934ff1ce
Merge pull request #15202 from hugolm84:support_build_shared_for_wince
2019-08-02 15:34:02 +00:00
Maksim Shabunin
b231e91d87
Fix for building with old V4L
2019-08-02 11:19:49 +03:00
Alexander Alekhin
f9cefc84a3
Merge pull request #15098 from RealJohnSmith:master
2019-08-01 16:35:07 +00:00
Alexander Alekhin
977d2c4330
Merge pull request #15197 from mshabunin:restore-ipp-cut
2019-08-01 16:33:37 +00:00
Andrey Golubev
fc85f3644d
Merge pull request #15190 from andrey-golubev:fluid_invalid_roi
...
G-API: verify y offset and height of Fluid output ROIs (#15190 )
* G-API: validate GFluidOutputRoi y and height
* Rearrange tested ROIs
2019-08-01 19:30:05 +03:00
Hugo Lindström
03fe1cb7fc
Support building shared libraries on WINCE.
2019-08-01 15:28:04 +02:00
Maksim Shabunin
4dadf17bd9
Merge pull request #15168 from dkurt:dnn_onnx_15120
2019-07-31 15:03:23 +00:00
Maksim Shabunin
6d5ac67681
Restored IPP call reduction
2019-07-31 15:41:22 +03:00
dcouwenh
d3cf0d2c06
Bayer VNG Demosaicing Fix #2 (Merge pull request #15086 )
...
* Update demosaicing.cpp
Fixed calculation of Bs for non-green pixels.
* Fixed cvtColor perf test for bayer VNG
2019-07-30 23:49:46 +03:00
Andrey Golubev
304e3ac12f
G-API: fix Fluid reshape with unused nodes (Merge pull request #15115 )
...
* G-API: fix fluid reshape with unused nodes
* Update test names
* Add FIXME for future improvement
2019-07-30 23:48:46 +03:00
Lubov Batanina
778f42ad34
Add high level API (Merge pull request #14780 )
...
* Add high level API
* Fix Model
* Add DetectionModel
* Add ClassificationModel
* Fix classify
* Add python test
* Fix pytest
* Fix comments to review
* Fix detect
* Fix docs
* Modify DetectionOutput postprocessing
* Fix test
* Extract ref boxes
* Fix draw rect
* fix test
* Add rect wrap
* Fix wrap
* Fix detect
* Fix Rect wrap
* Fix OCL_FP16
* Fix MyriadX
* Fix nms
* Fix NMS
* Fix coords
2019-07-30 23:07:37 +03:00
Lubov Batanina
5a6b23e8f3
Support for several min and max sizes in PriorBox layer (Merge pull request #15076 )
...
* Support for several min and max sizes in PriorBox layer
* Fix minSize
* Check size
* Modify initInfEngine
* Fix tests
* Fix IE support
* Add priorbox test
* Remove inputs
2019-07-30 17:23:47 +03:00
Maksim Shabunin
e90438fe3c
Merge pull request #14938 from LaurentBerger:face_clip
2019-07-30 14:18:51 +00:00
Maksim Shabunin
f7d5b39ec9
Merge pull request #15169 from dkurt:dnn_onnx_drop_vgg16
2019-07-30 14:15:34 +00:00
Maksim Shabunin
eec9fa9d5e
Merge pull request #15181 from berak:java_print_blob
2019-07-30 14:13:02 +00:00
berak
4d3989817c
java: fix Mat.toString() for higher dimensions
2019-07-29 19:39:09 +02:00
Dmitry Kurtaev
f9f160404a
Add support for slice from ONNX with multiple outputs
2019-07-28 21:20:25 +03:00
TheGoddessInari
4e998c9ade
Make sure to use defined(__GNUC__) instead of bare __GNUC__ in flann2 header.
...
This fixes a compiler error on MSVC with Unreal Engine (at least).
2019-07-28 10:21:15 -07:00
Dmitry Kurtaev
ebaefbb745
Remove VGG16 from ONNX test because there is VGG16_bn
2019-07-27 23:04:25 +03:00
Dmitry Kurtaev
47c5ee5d9c
Fixes for OpenCV face detection network
2019-07-27 17:25:09 +02:00
Dmitry Kurtaev
77d4e3e8d2
Fix 2019R2 tests
2019-07-27 13:30:15 +03:00
Dmitry Kurtaev
a0c3bb70a9
Modify SSD from TensorFlow graph generation script to enable MyriadX
2019-07-26 13:57:08 +03:00
Alexander Alekhin
3debb98805
Merge tag '4.1.1'
2019-07-26 03:34:59 +00:00
Alexander Alekhin
ddbd10c001
release: OpenCV 4.1.1
...
OpenCV 4.1.1
2019-07-26 03:24:45 +00:00
Alexander Alekhin
0cf479dd5c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-25 19:21:47 +00:00
Alexander Alekhin
2693ed9b22
Merge tag '3.4.7'
2019-07-25 19:19:49 +00:00
Alexander Alekhin
4a7ca5a291
OpenCV version++ (3.4.7)
...
OpenCV 3.4.7
2019-07-25 19:01:19 +00:00
Alexander Alekhin
7295983964
Merge pull request #15139 from alalek:openvino_2019R2
2019-07-25 18:59:56 +00:00
Alexander Alekhin
39a6889767
Merge pull request #15118 from dkurt:fix_15106
2019-07-25 18:56:32 +00:00
Chip Kerchner
0db4fb1835
Merge pull request #15136 from ChipKerchner:dotProd_unroll
...
* Unroll multiply and add instructions in dotProd_32f - 35% faster.
* Eliminate unnecessary v_reduce_sum instructions.
2019-07-25 21:21:32 +03:00
Dmitry Kurtaev
a2125594ea
Fix false positives of face detection network for large faces
2019-07-25 20:09:59 +03:00
Alexander Alekhin
1f736a95a7
Merge pull request #15131 from paroj:web
2019-07-25 16:25:57 +00:00
Alexander Alekhin
416c693b3f
dnn(test): OpenVINO 2019R2
2019-07-25 19:01:16 +03:00
Alexander Alekhin
321c74ccd6
objdetect: validate feature rectangle on reading
2019-07-25 18:58:53 +03:00
Alexander Alekhin
5691d998ea
core(persistence): added null ptr checks
2019-07-25 15:14:22 +03:00
Alexander Alekhin
6158bd2afa
Merge pull request #15103 from alalek:simd_intrinsics_in_user_code
2019-07-25 11:36:36 +00:00
Alexander Alekhin
d2911a8d41
dnn: use OpenVINO 2019R2 defines
2019-07-24 21:37:03 +00:00
Andrey Golubev
b10ec8ef8b
Merge pull request #14985 from andrey-golubev:gapi_fix_ocl_umat
...
* G-API: fix GOCLExecutable issue with UMat lifetime
Add tests on initialized/uninitialized outputs for all
backends
* Use proper clean-up procedure for magazine
* Rename InitOut test and reduce tested sizes
* Enable output allocation test
2019-07-24 23:36:18 +03:00
Alexey Smirnov
8313209704
Merge pull request #14952 from smirnov-alexey:gapi_transform_macro_rework
...
G-API: GAPI_TRANSFORM internal functionality rework (#14952 )
* Change internal pattern and substitute signatures and refactor tests
* Enhance GArrayU with type-checker function
Add a couple of new tests on GAPI_TRANSFORM
2019-07-24 23:29:52 +03:00
Alexander Alekhin
89f23a35c5
Merge pull request #15091 from anton-potapov:fluid_internal_parallellism_custom_pfor
2019-07-24 20:28:48 +00:00
Hugo Lindström
2ee00e7f7d
Merge pull request #15059 from hugolm84:improved-support-for-wince
...
* Improve support for Windows Embedded Compact
* Remove redundant set(WINCE true) and format CMake
2019-07-24 23:12:09 +03:00
Pavel Rojtberg
293729f48a
js: whitelist some more functions (calib3d , aruco)
2019-07-23 11:57:59 +02:00
Alexander Alekhin
79310a0051
Merge pull request #15105 from komakai:camera_permissions
2019-07-22 17:47:54 +00:00
Alexander Alekhin
426482e05b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-21 18:06:04 +00:00
Alexander Alekhin
ad092bf1ce
Merge pull request #15107 from dkurt:js_features2d_drawings
2019-07-21 17:57:19 +00:00
Alexander Alekhin
557990fdcf
Merge pull request #15104 from alalek:videoio_fix_debug_message
2019-07-21 17:56:41 +00:00
Dmitry Kurtaev
a66a1a24d7
Fix drawKeypoints and drawMatches for JS
2019-07-20 23:47:26 +03:00
Alexander Alekhin
099f4f9e7c
Merge pull request #15093 from tomoaki0705:fixCudaLegacyRansac
2019-07-20 08:07:14 +00:00
Giles Payne
2734291b35
Add CameraActivity utility class to automate Camera permission request handling
2019-07-20 13:40:10 +09:00
Alexander Alekhin
8bac8b513c
core: support SIMD intrinsics in user code
2019-07-19 20:33:32 +00:00
Lubov Batanina
781f4d439e
Merge pull request #15032 from l-bat:reduce_mean
...
* Added support for the ONNX "ReduceMean" Layer. (as this is the same as the GlobalAveragePool)
* Add ReduceMean test
* Fix ONNX importer
* Fix ReduceMean
* Add assert
* Split test
* Fix split test
2019-07-19 19:18:34 +03:00
John Smith
95c65aff75
Fix cv::selectROI rectangle rendering issue
2019-07-19 14:07:09 +02:00
Alexander Alekhin
61f589ddd0
videoio(gstreamer): more .get() checks
2019-07-19 13:16:58 +03:00
Alexander Alekhin
3361c59576
Merge pull request #15084 from lpea:calib3d_doc_fix
2019-07-19 10:11:35 +00:00
Anton Potapov
8936d55675
Fluid Internal Parallelism
...
- added ability to use custom implementation of "parallel for" function
2019-07-19 11:56:57 +03:00
Tomoaki Teshima
c6de84d868
cudalegacy: fix test failure of SolvePnPRansac
...
* use SOLVE_EPNP for the initial guess
2019-07-19 17:50:00 +09:00
Alexander Alekhin
228af2d617
videoio: fix debug message
2019-07-18 21:45:07 +00:00
Alexander Alekhin
199ddff13b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-18 20:25:25 +00:00
Alexander Alekhin
985e5014bc
Merge pull request #15058 from alalek:core_fix_base64_packed_struct_master
2019-07-18 19:09:08 +00:00
Alexander Alekhin
002904e445
Merge pull request #15050 from alalek:core_fix_base64_packed_struct
2019-07-18 19:07:06 +00:00
Vitaly Tuzov
e0f8bb83a6
Merge pull request #14994 from terfendail:wintr_undistort
...
WUI based implementation to initUndistortRectifyMap (#14994 )
* Add initUndistortRectifyMap performance test
* Move cv namespace boundaries
* Add wide universal intrinsics based implementation to initUndistortRectifyMap
* Dispatch undistort
2019-07-18 19:32:51 +03:00
Lubov Batanina
12fdaf895e
Merge pull request #15057 from l-bat:fix_vizualizer
...
* Fix dumpToFile
* Add test
* Fix test
2019-07-18 18:41:08 +03:00
Alexander Alekhin
e7bb0ecee0
gapi: fix build with unique_ptr
...
avoid generation of copy ctors with unique_ptr members
2019-07-18 14:08:42 +03:00
Guillaume Jacob
4a28ef8034
calib3d: fix format in findChessboardCornersSB doxygen
2019-07-18 10:04:47 +02:00
Liubov Batanina
0d2bc7b5fd
Fix TF Split layer
2019-07-17 15:50:50 +03:00
AsyaPronina
add1df4bcb
Fixed issue happened during merge
2019-07-16 20:47:34 +03:00
Alexander Alekhin
65d148d9a8
Merge pull request #15024 from alalek:android_stl_cxx_shared
2019-07-16 17:10:04 +00:00
Andrey Golubev
c9bd43c0f6
Merge pull request #14945 from andrey-golubev:delete_bool
...
G-API: clean up accuracy tests (#14945 )
* Delete createOutputMatrices flag
Update the way compile args function is created
Fix instantiation suffix print function
* Update comment (NB)
* Make printable comparison functions
* Use defines instead of objects for compile args
* Remove custom printers, use operator<< overload
* Remove SAME_TYPE and use -1 instead
* Delete createOutputMatrices flag in new tests
* Fix GetParam() printed values
* Update Resize tests: use CompareF object
* Address code review feedback
* Add default cases for operator<< overloads
* change throw to GAPI_Assert
2019-07-16 19:04:18 +03:00
Andrey Golubev
c11423df1e
Merge pull request #15012 from andrey-golubev:test_output
...
G-API: Add output allocation tests for backends (#15012 )
* Add output tests for backends
* Fix large size test: output is in fact reallocated
* Use cv::Mat copies for reallocation tracking
* Separate LargeSizeWithCorrectSubmatrix test
* Rename backed output allocation tests
* Address code review feedback
Update test names
Add illustrative "expect (non-)empty" checks
Rename mat "copy" to mat reference
Add more pointer checks
* Add illustrative checks
2019-07-16 19:01:45 +03:00
Alexander Alekhin
e4e0bb533d
Merge pull request #15052 from alalek:dnn_fix_required_data
2019-07-16 16:00:33 +00:00
Andrey Golubev
e629785a97
Merge pull request #15021 from andrey-golubev:gapi_fix_standalone_exports
...
* Fix G-API export specifier in standalone build
* Make dummy GAPI_EXPORTS in case of non-OpenCV builds
* Add old version under #if 0
2019-07-16 18:53:51 +03:00
Alexander Alekhin
3a2a74b655
Merge pull request #14968 from anton-potapov:fluid_internal_parallellism
2019-07-16 14:22:06 +00:00
Alexander Alekhin
f5e01f7b49
Merge pull request #15037 from hugolm84:noop-noexcept-for-vs13
2019-07-16 13:28:15 +00:00
Chip Kerchner
c9fcc12e3b
Merge pull request #15048 from ChipKerchner:reduceStoreGatheringThreshold
...
* Reduce store gathering pressures - speeds thresholds by up to 20%
* Rename temporary histogram array and initialize so that MACOSX builder is happy
2019-07-16 16:10:49 +03:00
Anton Potapov
97e88bd769
Fluid Internal Parallelism
...
- Added new graph compile time argument to specify multiple independent
ROIs (Tiles)
- Added new "executable" with serial loop other user specified
ROIs(Tiles)
- refactored graph traversal code into separate function to be called
once
- added saturate cast to Fluid AddCsimple test kernel
2019-07-16 16:09:14 +03:00
Alexander Alekhin
d4501f08b8
core(persistence): disable base64 tests due missing encoders
2019-07-16 15:37:58 +03:00
Alexander Alekhin
2df7736562
Merge branch 'core_fix_base64_packed_struct'
2019-07-16 15:35:43 +03:00
Alexander Alekhin
4ea8526e9f
core(persistence): fix writeRaw() / readRaw() struct support
...
- writeRaw(): support structs
- readRaw(): 'len' is buffer limit in bytes (documentation is fixed)
2019-07-16 14:03:39 +03:00
Alexander Alekhin
ee1de8f30d
Merge pull request #15053 from SciMad:fix-error-message
2019-07-16 09:55:06 +00:00
Alexander Alekhin
5ccb2a4cbd
dnn(test): fix required data
2019-07-16 07:53:50 +00:00
Madhav
bee510dbce
Fix error message on invalid seam finder parameter
2019-07-16 13:27:04 +05:45
Alexander Alekhin
c3b838b738
core(persistence): struct storage layout without alignment gaps
2019-07-15 21:37:20 +00:00
Alexander Alekhin
95415ac3a5
android: change ANDROID_STL='c++_shared'
...
- fixes crashes in face-detector application
- libc++_shared.so is bundled automatically via CMake helper project
2019-07-12 18:58:02 +00:00
Alexander Alekhin
f6c573880e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-12 18:45:06 +00:00
Alexander Alekhin
054c796213
Merge pull request #15026 from terfendail:gaussian_fix
2019-07-12 18:31:09 +00:00
Hugo Lindström
245c256b1c
Support compiliation for <=VS13
2019-07-12 19:02:36 +02:00
Alexander Alekhin
6aa07cdc7e
Merge pull request #15025 from alalek:issue_14281
2019-07-12 15:28:44 +00:00
Vitaly Tuzov
894ad33bf4
Fix pixel value evaluation overflow in bit-exact GaussianBlur implementation
2019-07-12 18:11:51 +03:00
Lubov Batanina
34f6b05467
Merge pull request #14996 from l-bat:ocv_deconv3d
...
* Support Deconvolution3D on IE backend
* Add test tag
* Fix tests
2019-07-12 15:51:44 +03:00
Alexander Alekhin
32c6e58bdb
imgproc: fix unaligned memory access
...
may cause crashes on ARM platform
2019-07-11 20:49:47 +00:00
Lubov Batanina
8bcd7e122a
Merge pull request #14842 from l-bat:ocv_conv3d
...
* Support Conv3D on OCV backend
* Add header
* Add perf tests
* Support pool3d
* Enable Resnet34_kinetics on OCV backend
* Add test
* Fix conv
* Optimize Conv2D
2019-07-11 20:13:52 +03:00
Alexander Alekhin
f663e8f903
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-09 19:57:57 +00:00
Alexander Alekhin
3c086fb2fe
Merge pull request #15001 from antmicro:v4l2-y10-support
2019-07-09 14:34:11 +00:00
Tomasz Gorochowik
4997a6bf06
V4L2: Add V4L2_PIX_FMT_Y10 (10 bit grey) support
2019-07-09 14:36:00 +02:00
Maksim Shabunin
2a9521661e
Fixed video writer filename check for plugins
2019-07-09 14:16:49 +03:00
Alexander Alekhin
eedbd1ad59
imgcodecs: force reshaping of imdecode() input into a single row
...
OpenCV upstream stuff may reinterpret vector as column.
2019-07-06 10:11:29 +00:00
Alexander Alekhin
7589225fc0
Merge pull request #14981 from alalek:android_camera_use_calc_frame_size_method
2019-07-06 08:20:20 +00:00
Alexander Alekhin
39a975cb29
Merge pull request #14983 from tomoaki0705:fixOclCvtColorMRGBA
2019-07-05 09:31:08 +00:00
Tomoaki Teshima
594a95839c
fix test failure of OCL_ImgProc/CvtColor8u.mRGBA2RGBA
2019-07-05 11:22:22 +09:00
Alexander Alekhin
3998b41d68
android: JavaCamera2View use calculateCameraFrameSize() method
...
from CameraBridgeViewBase (common base with JavaCameraView)
2019-07-04 21:43:09 +00:00
Diego
57fae4a6a1
Merge pull request #14858 from dvd42:instancenorm_onnx
...
Instancenorm onnx (#14858 )
* Onnx unsupported operation handling
* instance norm implementation
* Revert "Onnx unsupported operation handling"
* instance norm layer test
* onnx instancenorm layer
2019-07-04 21:15:04 +03:00
Alexander Alekhin
43eba3d750
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-04 18:44:13 +03:00
Ruslan Garnov
ad49138fae
Merge pull request #14917 from rgarnov:gapi_planar_kernels
...
G-API planar kernels (#14917 )
* Added resizeP with tests
* NV12 planar filters
* fix warnings in ResizeP test
* fix out mat ocv warning
* sz_on - > sz rename
* cpu tests new signature
* try to fix resizeP test
* trailing spaces remove
* doxygen doc fixed
* doxygen minor fix
* more doxygen fixes
* Doxygen corrected and extended after review.
2019-07-04 18:19:09 +03:00
Alexander Alekhin
3200fe0e53
Merge pull request #14970 from terfendail:undistort_avx2_fix
2019-07-04 14:01:27 +00:00
Vitaly Tuzov
82e5b961d3
Fixed initUndistortRectifyMap AVX2 implementation
2019-07-04 15:49:33 +03:00
Alexander Alekhin
e00b0f6f47
Merge pull request #14860 from vonchenplus:ocv_maxpoolgrad
2019-07-04 09:57:14 +03:00
Diego
6dfe2ddc21
Merge pull request #14959 from dvd42:onnx_clip
...
* onnx clip operation
2019-07-04 08:56:00 +03:00
Alexander Alekhin
fee87c5fdb
Merge pull request #14975 from alalek:clang_suppress_warnings
2019-07-03 22:33:26 +00:00
Alexander Alekhin
07fe1cd6b8
videoio: eliminate build warnings (clang)
2019-07-03 21:57:05 +00:00
Alexander Alekhin
bc95c609ff
ts: runtime check for misused 'optional' test data files
2019-07-03 20:07:44 +03:00
gal0is
206b546e5a
tensroflow support maxpoolgrad
2019-07-03 09:53:17 +08:00
Alexander Alekhin
097d81363b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-02 21:17:45 +00:00
Alexander Alekhin
2370079220
Merge pull request #14954 from rafagjordana:fix_blob_detection_insertion_sort
2019-07-02 21:14:02 +00:00
Rafa Gomez-Jordana
9a24886282
Fix blob detector insertion sort
2019-07-02 19:54:27 +00:00
arnaudbrejeon
a37201abee
Fix crash, add assert and test
2019-07-02 09:56:31 -07:00
Andrey Golubev
2bf8793632
Merge pull request #14946 from andrey-golubev:obj_not_ref
...
G-API: Use object instead of reference in extended lifetime case (#14946 )
* Use object instead of reference
* Make the object const
2019-07-02 19:03:45 +03:00
Alexander Alekhin
69560588fe
Merge pull request #14953 from alalek:core_static_analysis_eval_expr
2019-07-02 09:44:29 +00:00
armenpoghosov
edf2cbd5f7
Merge pull request #14828 from armenpoghosov:parmen_RANSACPointSetRegistrator_getSubset_disaster_cleanup
...
Parmen ransac point set registrator get subset disaster cleanup (#14828 )
2019-07-01 21:57:28 +03:00
Alexander Alekhin
6dea8309c5
Merge pull request #14880 from dkurt:dnn_ie_tests
2019-07-01 16:58:57 +00:00
Vitaly Tuzov
9befb7a1d7
Merge pull request #14916 from terfendail:wsignmask_deprecated
...
* Avoid using v_signmask universal intrinsic and mark it as deprecated
* Renamed v_find_negative to v_scan_forward
2019-07-01 19:53:51 +03:00
Alexander Alekhin
44836c7f78
core: evaluate CV_Error() parameters during static scans
2019-07-01 18:17:03 +03:00
Alexander Alekhin
65552bf403
dnn: fix build with Vulkan
2019-07-01 17:54:40 +03:00
StefanBruens
3e4a195b61
Merge pull request #14936 from StefanBruens:crosscorr_cleanup
...
Crosscorr cleanup (#14936 )
* Simplify code for convolution destination type/size
For the 2d filter code, destination size equals source size, and the
crossCorr function even (re-)creates the output matrix with the given size.
The number of channels also have to match. The destination type() is the
one used to create the output matrix, so we can use its type() here.
This is a preparatory patch.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
* Remove redundant destination size and type parameters from crossCorr
All calling sites of crossCorr already use (...,
mat, mat.size(), mat.type(), ...), so the parameters are redundant.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2019-06-30 19:04:25 +03:00
Stefan Brüns
e9a2e665b2
Explicitly default operator= for Vec<T, n>
...
Due to the explicitly declared copy constructor Vec<T, n>::Vec(Vec <T,n>&)
GCC 9 warns if there is no assignment operator, as having one typically
requires the other (rule-of-three, constructor/desctructor/assginment).
As the values are just a plain array the default assignment operator does
the right thing. Tell the compiler explicitly to default it.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2019-06-29 22:11:00 +02:00
Alexander Alekhin
6fdce865b8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-29 17:27:48 +00:00
Alexander Alekhin
453466eb1a
Merge pull request #14885 from anton-potapov:common_flow_explanatory_test_cases
2019-06-28 16:52:03 +00:00
Alexander Alekhin
49805f976a
Merge pull request #14923 from andrey-golubev:imgproc_tests_update_clean
2019-06-28 16:01:32 +00:00
Andrey Golubev
1666195984
Merge pull request #14922 from andrey-golubev:operators_tests_update_clean
...
G-API: Align operators tests to new test model (#14922 )
* Align operators tests to new test model
* Change init function in NotOperatorTest
2019-06-28 17:59:52 +03:00
Anton Potapov
3d345ca4c4
Async API for GAPI
...
- explanatory test cases for common usage models
2019-06-28 17:40:00 +03:00
atalaman
8dd596b7ba
Merge pull request #14892 from TolyaTalamanov:at/parameterized-render-tests
...
G-API: Parameterized render tests (#14892 )
* Init commit
* Add mat size as test parameter
* Add test for text render
* Add test for rect render
* Add tests for line and circle
* Remove old render tests
* Init output mats
* Remove methods input arguments
* Add comment about data loss in BGR2NV12 conversion
* Add edge test cases
* Replace default color for out mats black -> white
2019-06-28 17:11:03 +03:00
Dmitry Kurtaev
75f4c1abf2
Enable some tests for Inference Engine backend
2019-06-28 15:52:31 +03:00
Andrey Golubev
719912e46e
Align imgproc tests to new model
2019-06-28 14:31:50 +03:00
Andrey Golubev
75c567b6ab
Merge pull request #14757 from andrey-golubev:core_tests_update
...
G-API: Introduce new approach to write accuracy tests (#14757 )
* G-API: Introduce new common accuracy test fixture
* Enable Range<> to Seq<> implicit conversion
* Fix shadowing parameters
* Update license headers
* Rename ALIGNED_TYPE to SAME_TYPE
* Move MkRange to tests
* Fix TODO(agolubev) in test instantiations
* Squash simple fixture declarations in one line
* Remove unused line
* Fix Windows issues with macro expansion
* Choose between 1 or 2 matrix initialization
* Redesign common class behavior
Use "views" for GetParam() provided by GTest
base class instead of doing segregation
(with copy!) of common and specific parameters:
request common or specific parameter directly
by index from GetParam()-returned parameters
* Refine user-level API and usage of new test model
* Fix -fpermissive errors
* Remove unnecessary init calls
* Replace GCompileArgs member variable with func ptr
* Rename initMatsRandN to make its behavior explicit
Rename initMatsRandN to initMatrixRandN to eliminate confusion:
initMatsRandN only initialized first matrix (similarly to
initMatrixRandU)
* Fix common of initNothing
* Update copyright dates in missed files
* Add check for specific parameters
* Fix coment stlye
2019-06-28 13:07:41 +03:00
Alexander Alekhin
a743de0e24
dnn: adjust compilation options
2019-06-27 17:37:31 +03:00
Alexander Alekhin
c531e275cc
Merge pull request #14914 from Nuzhny007:3.4
2019-06-27 14:22:15 +00:00
Alexander Alekhin
e59c6caee5
Merge pull request #14905 from savuor:fix/inst_region_unique
2019-06-27 10:16:59 +00:00
Nuzhny007
031e57b359
Fixed names conflict with dldt
2019-06-27 13:13:48 +03:00
Dmitry Kurtaev
96a2f80bf2
Limit number of threads in CPU plugin of IE by OpenCV's getNumThreads
2019-06-27 12:09:00 +03:00
Rostislav Vasilikhin
f2f600f807
fixed multi instrumentations
2019-06-27 01:17:26 +03:00
Alexander Alekhin
b95e93c20a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-26 20:19:04 +00:00
Alexander Alekhin
24790e4061
Merge pull request #14899 from alalek:dnn_fix_bnll_layer
...
* dnn: fix BNLLLayer implementation
details: https://github.com/BVLC/caffe/blame/1.0/src/caffe/layers/bnll_layer.cpp#L17
* dnn: enable OCV/OpenCL BNLL layer
2019-06-26 23:04:26 +03:00
Alexander Alekhin
c251915198
Merge pull request #14895 from alalek:dnn_ie_extensions_path
2019-06-26 20:03:57 +00:00
Alexander Alekhin
4112866821
Merge pull request #14886 from alalek:fix_grabcut_kmeans_call_14879
2019-06-26 20:03:04 +00:00
Apoorv Goel
5b521bb778
Merge pull request #14898 from UnderscoreAsterisk:flann-warnings-and-4376
...
Keep a local copy of `features` from `flann::GenericIndex ` constructor (#14898 )
* Fix warnings on Windows
* Fix #4376
2019-06-26 19:35:11 +03:00
Alexander Alekhin
2172544bb7
Merge pull request #14890 from alalek:dnn_consistent_protobuf_readers
2019-06-26 14:13:03 +00:00
Alexander Alekhin
df7049d465
Merge pull request #14889 from alalek:issue_14863
2019-06-26 14:10:14 +00:00
Alexander Alekhin
01a41d86bc
Merge pull request #14775 from cudawarped:master
2019-06-26 13:35:21 +00:00
Alexander Alekhin
0a461e7922
Merge pull request #13252 from take1014:filter2d_13179
2019-06-26 13:34:10 +00:00
James Bowley
daa308f81c
Update obsolete flag in Intel video decoder.
...
Old flag resulted in software implementation being selected when the Intel decoder is not the primary adapter.
2019-06-26 12:32:20 +03:00
Alexander Alekhin
333e51b217
dnn: configure plugin path for InferenceEngine
2019-06-26 06:41:01 +00:00
Alexander Alekhin
44d146af9a
Merge pull request #14814 from alalek:dnn_skip_test_tags
2019-06-25 22:00:25 +00:00
Alexander Alekhin
f3e9eb3371
dnn: both protobuf readers have similar behavior
...
- ReadProtoFromTextFile
- ReadProtoFromTextBuffer
2019-06-25 18:03:04 +03:00
Alexander Alekhin
63e4b35c19
Merge pull request #14849 from thangktran:thangktran/feature/fillPoly_and_fillConvexPoly_js_binding
2019-06-25 15:01:12 +00:00
Alexander Alekhin
e8a703a71d
core(intrin): v_load_low() workaround for aarch64+clang
2019-06-25 17:29:04 +03:00
Alexander Alekhin
4a6888ccf6
imgproc: fix kmeans() call from grabCut()
2019-06-25 13:42:04 +03:00
Alexander Alekhin
b58b2c5ae8
Merge pull request #14878 from JoeHowse:4.1.0-patches
2019-06-24 18:29:30 +00:00
atalaman
de60600126
Merge pull request #14820 from TolyaTalamanov:at/circle_and_line
...
G-API: Implement line and circle draw operations (#14820 )
* Implement line and circle draw operations
* Fix comments to review
2019-06-24 17:37:32 +03:00
Maksim Shabunin
46205a7235
videoio: fix GStreamer plugin build
2019-06-24 13:56:43 +03:00
Feng Chen
5620306c70
Merge pull request #14845 from vonchenplus:ocv_mirrorpad
...
* tensorflow support mirror pad
* revert macro define
* revert macro define
* reduce code duplication
* revert macro define
2019-06-24 12:27:42 +03:00
Alexander Alekhin
894f208de3
dnn(test): replace SkipTestException with tags
2019-06-23 13:12:23 +00:00
Alexander Alekhin
f8c96cb18a
Merge pull request #14847 from alalek:dnn_fix_test_data_searching
2019-06-23 12:42:27 +00:00
Alexander Alekhin
e72f451173
Merge pull request #14305 from cameron-martin:calib3d-js
2019-06-22 16:43:40 +00:00
Lubov Batanina
16294437d5
Merge pull request #14833 from l-bat:ocv_eltwise3d
...
* Support Eltwise3d
* Refactoring
* Fix test
2019-06-22 10:13:28 +03:00
Alexander Alekhin
442bc80cd7
pre: OpenCV 4.1.1 (version++)
2019-06-21 19:18:50 +03:00
Alexander Alekhin
f84b08ff08
dnn: bump API version
2019-06-21 19:18:23 +03:00
Alexander Alekhin
f33f88de31
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-21 17:27:14 +03:00
Alexander Alekhin
779f59da6b
pre: OpenCV 3.4.7 (version++)
2019-06-21 16:57:17 +03:00
Alexander Alekhin
f5ddaef46b
experimental version++
2019-06-21 16:57:17 +03:00
Alexander Alekhin
aa6c66aa54
Merge pull request #14848 from alalek:build_warnings_avx512
2019-06-21 13:53:52 +00:00
Alexander Alekhin
e69ff71302
Merge pull request #14846 from alalek:videoio_gstreamer_issues_master
2019-06-21 13:51:22 +00:00
Alexander Alekhin
6b32bd5f15
Merge pull request #14834 from alalek:videoio_gstreamer_issues
2019-06-21 13:38:34 +00:00
Alexander Alekhin
2b2633c11f
videoio(gstreamer): port changes from 14834
2019-06-21 14:42:58 +03:00
Cameron Martin
0ae053fdf8
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.
2019-06-21 13:13:53 +03:00
Thang Tran
2a67375239
js: added fillPoly() and fillConvexPoly()
2019-06-20 19:56:23 +02:00
Alexander Alekhin
5ac55fc132
core: eliminate AVX512 build warnings
...
from MSVS2017 and GCC8 -O1 mode
2019-06-20 20:00:09 +03:00
Joe Howse
729848caeb
core: revise syntax to support Visual C++ 2013
2019-06-20 13:57:17 -03:00
Alexander Alekhin
13a782c039
test: fix usage of findDataFile()
...
misused 'optional' mode
2019-06-20 18:20:14 +03:00
Alexander Alekhin
8ab6efb8c0
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)
2019-06-20 17:48:18 +03:00
Alexander Alekhin
ab24325df3
videoio(test): avoid raw ptr in ffmpeg tests
...
causes leaks if FFmpeg is disabled through OPENCV_VIDEOIO_PRIORITY_FFMPEG=0
2019-06-20 17:48:18 +03:00
Alexander Alekhin
681e0323f2
core: backport toLowerCase()/toUpperCase()
2019-06-20 17:48:18 +03:00
Alexander Alekhin
baf372ad3d
videoio(test): add extra videoio tests
2019-06-20 17:48:18 +03:00
Alexander Alekhin
9cb239247d
Merge pull request #14689 from anton-potapov:gapi_async_cacnel
2019-06-20 13:48:05 +00:00
Ruslan Garnov
7c0a9ff4c1
Added overload of contains<> for tuple
2019-06-20 14:40:14 +03:00
Alexander Alekhin
95d9cfb5c3
static analysis issues
2019-06-20 13:55:20 +03:00
Anton Potapov
8d75bfae47
Cancelation support fo Async GAPI
...
-
2019-06-19 13:41:39 +03:00
Alexander Alekhin
1d2ef6b2a1
Merge pull request #14774 from alalek:videoio_ffmpeg_plugin_win32
2019-06-17 14:47:48 +00:00
Alexey Smirnov
7f9a9f2a09
Merge pull request #14648 from smirnov-alexey:as/gapi_transform
...
* Introduce GAPI_TRANSFORM initial interface
Comes along with simple tests and kernel package changes
* Fix documentation and adjust combine() function
* Fix stuff after rebasing on master
* Remove redundant functionality
* Refactoring according to review feedback provided
* Fixes according to review feedback
* Reconsider transformations return and fix a warning
* Fixes from code review
* Add a new simple test
* Cleanup, added tests on GScalar, GMatP, GArray
2019-06-17 16:26:28 +03:00
Alexander Alekhin
26dfa5e77c
ffmpeg: win32 wrapper update
2019-06-16 16:20:40 +00:00
Alexander Alekhin
7b099e0fe2
videoio: plugins support on Win32
2019-06-16 15:25:25 +00:00
gal0is
bb7dc5f992
Solve the import issue in Python2.
2019-06-16 06:10:00 +08:00
Alexander Alekhin
66d7956e67
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-15 16:25:11 +00:00
Kang Yifei
ba0ed79635
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
2019-06-14 22:57:21 +03:00
Alexander Alekhin
8ca4252303
Merge pull request #14583 from FanaticsKang:fix_undistortPoint_bug
2019-06-14 18:30:26 +00:00
Ruslan Garnov
3df83dce7e
Merge pull request #14741 from rgarnov:gapi_fix_includes
...
Changed quotes to brackets when including public includes (#14741 )
2019-06-14 19:27:19 +03:00
Kang
549c53121a
fix the bug, when k[4] is negative, icdist may be negative at the edge of image.
2019-06-14 19:00:36 +03:00
Dmitry Kurtaev
dfdc91f8c9
dnn: fix MVN layer (issue 14683)
2019-06-14 18:38:05 +03:00
atalaman
d3c0f4ef98
Merge pull request #14700 from TolyaTalamanov:at/cv_gapi_render
...
G-API: Render (#14700 )
* cv::Render
Implement OCVRedner for BGR as input
* Support two plane cv::Render::run
* Snapshot
* Add RenderCreator
* text2Points
* Snapshot
* Refactoring tests
* Remove text2points
* Fix render input data type in tests
* Refactoring
* Fix headers
* Change struct fields name
* Fix headers
* Fix warnings
* Replace cv::Scalar -> cv::gapi::own::Scalar
* Add test
* PutText and rectangle case
* Fix comments to review
* Fix comments to review
* Fix comments to review
* Create render_priv.hpp
* Implement BGR2NV12
* Fix NV12 test
* Fix comments to review
* Add header for GAPI_Assert
2019-06-14 18:29:49 +03:00
Dmitry Kurtaev
eba696a41e
Merge pull request #14792 from dkurt:dnn_ie_min_version_r5
...
* Remove Inference Engine 2018R3 and 2018R4
* Fix 2018R5
2019-06-14 18:17:02 +03:00
Alexander Alekhin
54a14c877c
Merge pull request #14794 from terfendail:wui512_interleavenames
2019-06-14 14:20:34 +00:00
Alexander Alekhin
cf9bddcb89
Merge pull request #14805 from alalek:fix_valgrind_issues
2019-06-14 14:15:01 +00:00
Alexander Alekhin
3af1b6ecdc
valgrind: fix issues
2019-06-14 14:31:38 +03:00
Vitaly Tuzov
a29e59a770
Rename parameters in AVX512 implementation of v_load_deinterleave and v_store_interleave
2019-06-14 14:16:30 +03:00
Maksim Shabunin
ae31115017
Improved MediaSDK detection mechanism
2019-06-14 12:37:49 +03:00
Alexander Alekhin
f9eab2de5e
Merge pull request #14673 from janstarzy:hidden-vis-with-java7
2019-06-13 17:59:39 +00:00
Jan Starzynski
e9ed7eb68d
make -fvisibility=hidden work with java 1.7
2019-06-13 17:39:10 +02:00
Maksim Shabunin
5015829ce8
Fixed plugin installation location on Windows
2019-06-13 16:06:06 +03:00
Alexander Alekhin
81fad9e247
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-11 20:43:40 +00:00
Alexander Alekhin
1c661e7548
Merge pull request #14784 from alalek:backport_14779
2019-06-11 20:36:16 +00:00
Alexander Alekhin
a457fbdb58
Merge pull request #14783 from alalek:backport_14777
2019-06-11 20:12:01 +00:00
Alexander Alekhin
e7dbc4ff28
Merge pull request #14782 from alalek:core_fix_log_level_default
2019-06-11 20:11:32 +00:00
Vitaly Tuzov
d2aadabc5e
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
2019-06-11 23:07:39 +03:00
Alexander Alekhin
f8791f072d
core: avoid function type cast, make happy UBSAN
...
backporting of commit: d3d13c41c4
2019-06-11 19:36:47 +00:00
Alexander Alekhin
db7f689728
imgcodecs(tiff): add more checks
...
backporting of commit: f6230ae019
2019-06-11 19:22:24 +00:00
Alexander Alekhin
b4d3ff378e
Merge pull request #14720 from rgarnov:gapi_remove_lut3d
2019-06-11 16:24:54 +00:00
Alexander Alekhin
6c8ffe81d0
core: repair default log level
2019-06-11 19:19:10 +03:00
Maksim Shabunin
d60ac98ef2
Limited API support for Python3
2019-06-11 15:20:43 +03:00
Maksim Shabunin
10d61a2b44
Limited API support for Python3
2019-06-11 15:15:49 +03:00
Alexander Alekhin
3f67623c26
Merge pull request #14779 from alalek:oss_fuzz_14115
2019-06-11 11:35:28 +00:00
Alexander Alekhin
d3d13c41c4
core: avoid function type cast, make happy UBSAN
...
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14115
2019-06-11 07:06:29 +00:00
Alexander Alekhin
f6230ae019
imgcodecs(tiff): add more checks
...
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=15154
2019-06-10 21:00:20 +00:00
Alexander Alekhin
11b020b9f9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-10 19:05:28 +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
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
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
Alexander Alekhin
5c05b7bc01
Merge pull request #14749 from alalek:fix_android_javadoc
2019-06-06 21:07:23 +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
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
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
Ruslan Garnov
25e4bce1a6
Removed LUT3D API entry
2019-06-04 17:13:21 +03: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
76fca0e755
imgcodecs: sanitize PAM decoding
...
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13282
2019-06-03 22:19:42 +00:00
bommo1
a38157a1f4
Fix https://github.com/opencv/opencv/issues/14265
2019-06-03 23:05:03 +02:00
Alexander Alekhin
f355b3505f
Merge pull request #14661 from dkurt:ie_deconv_adj
2019-06-03 16:58:17 +00:00
Vitaly Tuzov
3b015dfc7d
Merge pull request #14210 from terfendail:wui_512
...
AVX512 wide universal intrinsics (#14210 )
* Added implementation of 512-bit wide universal intrinsics(WIP)
* Added implementation of 512-bit wide universal intrinsics: implemented WUI vector types(WIP)
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented load/store
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented fp16 load/store
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented recombine and zip, implemented non-saturating and saturating arithmetics
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented bit operations
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented comparisons
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented lane shifts and reduction
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented absolute values
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented rounding and cast to float
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented LUT
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented type extension/narrowing and matrix operations
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented load_deinterleave for 2 and 3 channels images
* Added implementation of 512-bit wide universal intrinsics(WIP): reimplemented load_deinterleave for 2- and implemented for 4-channel images
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented store_interleave
* Added implementation of 512-bit wide universal intrinsics(WIP): implemented signmask and checks
* Added implementation of 512-bit wide universal intrinsics(WIP): build fixes
* Added implementation of 512-bit wide universal intrinsics(WIP): reimplemented popcount in case AVX512_BITALG is unavailable
* Added implementation of 512-bit wide universal intrinsics(WIP): reimplemented zip
* Added implementation of 512-bit wide universal intrinsics(WIP): reimplemented rotate for s8 and s16
* Added implementation of 512-bit wide universal intrinsics(WIP): reimplemented interleave/deinterleave for s8 and s16
* Added implementation of 512-bit wide universal intrinsics(WIP): updated v512_set macros
* Added implementation of 512-bit wide universal intrinsics(WIP): fix for GCC wrong _mm512_abs_pd definition
* Added implementation of 512-bit wide universal intrinsics(WIP): reworked v_zip to avoid AVX512_VBMI intrinsics
* Added implementation of 512-bit wide universal intrinsics(WIP): reworked v_invsqrt to avoid AVX512_ER intrinsics
* Added implementation of 512-bit wide universal intrinsics(WIP): reworked v_rotate, v_popcount and interleave/deinterleave for U8 to avoid AVX512_VBMI intrinsics
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed integral image SIMD part
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed warnings
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed load_deinterleave for u8 and u16
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed v_invsqrt accuracy for f64
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed interleave/deinterleave for u32 and u64
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed interleave_pairs, interleave_quads and pack_triplets
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed rotate_left
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed rotate_left/right, part 2
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed 512-wide universal intrinsics based resize
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed findContours by avoiding use of uint64 dependent 512-wide v_signmask()
* Added implementation of 512-bit wide universal intrinsics(WIP): fixed trailing whitespaces
* Added implementation of 512-bit wide universal intrinsics(WIP): reworked specific intrinsic sets dependent parts to check availability of intrinsics based on CPU feature group defines
* Added implementation of 512-bit wide universal intrinsics(WIP):Updated AVX512 implementation of v_popcount to avoid AVX512VPOPCNTDQ intrinsics if unavailable.
* Added implementation of 512-bit wide universal intrinsics(WIP): Fixed universal intrinsics data initialisation, v_mul_wrap, v_floor, v_ceil and v_signmask.
* Added implementation of 512-bit wide universal intrinsics(WIP): Removed hasSIMD512()
* Added implementation of 512-bit wide universal intrinsics(WIP): Fixes for gcc build
* Added implementation of 512-bit wide universal intrinsics(WIP): Reworked v_signmask, v_check_any() and v_check_all() implementation.
2019-06-03 18:05:35 +03:00
Dmitry Kurtaev
9c0af1f675
Enable more deconvolution layer configurations with IE backend
2019-06-03 08:15:52 +03:00
David Carlier
9fd95b93f7
FreeBSD build fix
2019-06-02 20:25:42 +01:00
Yashas Samaga B L
ae279966c2
Merge pull request #14660 from YashasSamaga:dnn-cuda-build
...
add cuDNN dependency and setup build for cuda4dnn (#14660 )
* update cmake for cuda4dnn
- Adds FindCUDNN
- Adds new options:
* WITH_CUDA
* OPENCV_DNN_CUDA
- Adds CUDA4DNN preprocessor symbol for the DNN module
* FIX: append EXCLUDE_CUDA instead of overwrite
* remove cuDNN dependency for user apps
* fix unused variable warning
2019-06-02 14:47:15 +03:00
Vitaly Tuzov
723165f878
fix for AVX2 version of v_reduce_min intrinsic
2019-05-31 16:14:54 +03:00
Alexander Alekhin
805ab6331f
Merge pull request #14662 from dkurt:dnn_tf_fix_identity_switch
2019-05-30 20:22:17 +00:00
Lubov Batanina
f94253b82b
Merge pull request #14627 from l-bat:demo_kinetics
...
* Support 3D ResNet-34-kinetics
* Update sample
* Remove preprocess
* Change test
* Fix sample
2019-05-30 17:36:00 +03:00
Alexander Alekhin
8ea2f59d33
Merge pull request #14671 from alalek:dnn_test_fast_read
2019-05-30 06:48:34 +00:00
Alexander Alekhin
52548bde05
dnn(test): replace file content reading
2019-05-29 23:08:33 +03:00
Alexander Alekhin
29b3f66507
Merge pull request #14606 from asashour:java_inline_return
2019-05-29 20:03:54 +00:00
Dmitry Kurtaev
081d9bc73f
Fix Identity Switch from Keras
2019-05-29 17:13:21 +03:00
Alexander Alekhin
9f68376c91
gapi: fix visibility conflict in OpenCV builds
2019-05-29 15:06:08 +03:00
Alexander Alekhin
216988b0b1
Merge pull request #14582 from alalek:android_update_debug
2019-05-29 11:22:53 +00:00
Alexander Alekhin
53c771551c
Merge pull request #14473 from alalek:video_dis_update_opencl
...
video(DISOpticalFlow): update OpenCL implementation (#14473 )
* video(DIS): add code for profiling
* video(DIS): fix test parameters
* video(DIS): simplify OpenCL kernels
- parameters -> defines
- avoid float3
- const / local scope
- improve readability, replace Kernel::set() -> args()
* video(DIS): use CV_32FC2 buffers
2019-05-29 14:22:21 +03:00
Alexander Alekhin
43467a2ac7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-28 18:29:48 +00:00
Alexander Alekhin
0d477d7364
Merge pull request #14651 from alalek:dnn_test_update_debug_tags
2019-05-28 16:26:49 +00:00
Ahmed Ashour
ca8a1d2cff
java: generated code inline return
2019-05-28 08:34:02 +02:00
Alexander Alekhin
38a3c1ce6b
dnn(test): update test tags for Debug build
2019-05-27 20:12:30 +00:00
LaurentBerger
a3be8d7cd7
dead link
2019-05-27 21:57:10 +02:00
Alexander Alekhin
483e9f341c
Merge pull request #14626 from dkurt:dnn_ie_slice_layer
2019-05-27 16:27:14 +00:00
Alexander Alekhin
aaf56c2839
Merge pull request #14649 from savuor:fix/luv_hls_read_oob
2019-05-27 16:24:55 +00:00
Alexey Nikolaev
05563f5bc4
Merge pull request #14592 from aleksey-nikolaev:master
...
VideoCapture Direct Show. Added getter for CV_CAP_PROP_CONVERT_RGB, CAP_PROP_CHANNEL properties. (#14592 )
* Added getter for CV_CAP_PROP_CONVERT_RGB, CAP_PROP_CHANNEL properties.
Some refactoring.
* One space less.
2019-05-27 19:18:36 +03:00
Lubov Batanina
61d3222a22
Merge pull request #14537 from l-bat:fix_network_vizualizer
...
Fix dnn visualizer (#14537 )
* Fixed print layer params
* Fix print
2019-05-27 19:17:07 +03:00
Alexander Alekhin
a81c0e6db9
Merge pull request #14447 from catree:fix_issue_14423
2019-05-27 15:00:21 +00:00
Alexander Alekhin
d73261844e
Merge pull request #14622 from asashour:junit
2019-05-27 14:55:45 +00:00
Alexander Alekhin
b07f951e6b
Merge pull request #14591 from thangktran:thangktran/feature/floodFill-on-opencv.js
2019-05-27 14:54:46 +00:00
Alexander Alekhin
42484f3bcb
Merge pull request #14647 from alalek:fix_coverity_issues
2019-05-27 14:32:02 +00:00
Alexander Alekhin
c5204a74c0
Merge pull request #14633 from alalek:java_test_filter
2019-05-27 14:13:25 +00:00
Alexander Alekhin
4a2544ff4b
Merge pull request #14632 from alalek:java_test_debug
2019-05-27 14:13:10 +00:00
Alexander Alekhin
c9b3e718db
Merge pull request #14609 from janstarzy:tiff-orientation-fix
2019-05-27 13:39:51 +00:00
Dmitry Kurtaev
44d21e5a79
Enable Slice layer on Inference Engine backend
2019-05-27 16:28:01 +03:00
Rostislav Vasilikhin
8c698262ea
rgb2hls_b: out of bounds read fixed
2019-05-27 16:19:52 +03:00
Alexander Alekhin
1094ed64e9
Merge pull request #14605 from terfendail:wsignmask_fixavx
2019-05-27 13:19:39 +00:00
Rostislav Vasilikhin
791ebd05fc
out of bounds read fixed in rgb2luv_b
2019-05-27 16:19:01 +03:00
Alexander Alekhin
483f28723c
calib3d: initialize local vars, fix indentation in for loops
2019-05-27 14:39:47 +03:00
Thang Tran
d1615ba11a
video:fixed DISOpticalFlow segfault from small img
2019-05-27 08:18:26 +02:00
utibenkei
898cf70210
Merge pull request #14597 from utibenkei:fix_java_missing_consts
...
* java: fix java missing_consts
* java: test Calib3d constants
2019-05-26 19:43:34 +03:00
Alexander Alekhin
b958498074
java(test): test package filtering
...
Usage example:
- run.py -a -t java --package=calib3d
2019-05-26 15:12:05 +00:00
Alexander Alekhin
171dd9eff5
java(test): enable debug mode to show useful stacktraces
2019-05-26 14:54:44 +00:00
David Carlier
a6144b8e1a
OpenBSD build fix
2019-05-25 10:18:34 +01:00
Rostislav Vasilikhin
e07ffe902e
Merge pull request #14616 from savuor:hsv_wide
...
HSV and HLS color conversions rewritten to wide intrinsics (#14616 )
* RGB2HSV_b vectorized
* RGB2HSV_f: widen
* RGB2HSV_f: shorten, more intuitive
* HSV2RGB_f and HSV2RGB_b widen
* hls2rgb_f widen
* instrumentation instead vx_cleanup
* RGB2HLS_f widen
* RGB2HLS_b rewritten to wide universal intrinsics
* define guard against no SIMD code
* hls2rgb_b rewritten
* extra define removed
* warning fixed
* hls2rgb_b: performance fixed
2019-05-24 23:01:08 +03:00
Alexander Alekhin
22701f0c27
imgcodecs(CAP_IMAGES): fix handling of input pattern
2019-05-24 22:13:25 +03:00
Vitaly Tuzov
f0fb91f2d4
Fixed v_signmask implementation for AVX2, updated universal intrinsics tests.
2019-05-24 19:34:54 +03:00
Ahmed Ashour
f9564e053d
java: test: use assertNotNull and assertFalse
2019-05-24 10:45:09 +02:00
Alexander Alekhin
166ecaeda8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-23 19:50:20 +03:00
Jan Starzynski
fb9c083a51
handle all orientations properly
2019-05-23 16:51:25 +02:00
Ahmed Ashour
f3319f6140
java: remove redundant declaration of java.lang package
2019-05-23 14:06:34 +02:00
Ahmed Ashour
1050b5351e
java: add CvType.CV_16F
2019-05-23 08:49:01 +02:00
Alexander Alekhin
8bf9dda604
Merge pull request #14514 from mshabunin:fix-videoio-docs
2019-05-22 18:15:43 +00:00
Ruslan Garnov
54ff72a1cc
Merge pull request #14599 from rgarnov:gapi_aux_kernels
...
G-API aux kernels (#14599 )
* Removed gcpuimgproc.hpp and gcpucore.hpp
* Changed GModel::orderedInputs and orderedOutputs to get ConstGraph&
* Added auxiliaryKernels() method of GBackend::Priv
2019-05-22 21:13:13 +03:00
atalaman
cbb699efd2
Merge pull request #14151 from TolyaTalamanov:at/own-mat-output-doesnt-support
...
G-API: own::Mat as output computation doesn't work (#14151 )
* Fix bug with output own::Mat
* Fix comments to review
* Fix preprocess condition
* Fix comments to review
2019-05-22 19:57:08 +03:00
atalaman
d9dac9cd1b
Merge pull request #14150 from TolyaTalamanov:at/computation-doesnt-work-with-out-vector
...
G-API: GComputation doesn't work with output vector<cv::Mat> (#14150 )
* Fix bug with gcomputation output vector
* Add test fixture
* Fix comments to review
* Fix alignment
2019-05-22 19:13:15 +03:00
Maksim Shabunin
bcf7286ad9
Docs: updated videoio module overview
2019-05-22 15:35:34 +03:00
catree
7ed858e38e
Fix issue with solvePnPRansac and Nx3 1-channel input when the number of points is 5. Try to uniform the input shape of projectPoints and undistortPoints.
2019-05-22 14:19:16 +02:00
atalaman
935c02c0a3
Merge pull request #13851 from TolyaTalamanov:at/new-kernel-package-design
...
G-API: Kernel package design (#13851 )
* Remove cv::unite_policy from API
* Add check that all id in kernel package are unique
* Refactor checker id procedure
* Remove cv::gapi::GLookupOrder from API
* Implement cv::gapi::use_only
* Fix samples
* Fix docs
* Fix comments to review
* Remove unite_policy
* Fix GKernelPackage::backends()
* Fix comments to review
* Fix all_unique
* Fix comments to review
* Fix comments to review
* Remove out of date tests
2019-05-22 14:53:44 +03:00
Dmitry Kurtaev
26e426adb1
StridedSlice from TensorFlow
2019-05-22 12:45:52 +03:00
Alexander Alekhin
190467b6c1
Merge pull request #14586 from dianlujitao:master
2019-05-21 18:30:02 +00:00
Thang Tran
eb243847eb
js: added floodFill function to JS binding
...
previously floodFill() is white-list without any implementation.
floodFill() is now fully functional in JS.
2019-05-21 14:19:50 +02:00
Alexander Alekhin
de977cc9c8
Merge pull request #14474 from alalek:ocl_kernel_args_variadic
2019-05-20 18:18:02 +00:00
Alexander Alekhin
a433394870
Merge pull request #14362 from catree:feat_ippe
2019-05-20 18:16:52 +00:00
Rostislav Vasilikhin
e90e0ef9aa
Merge pull request #14106 from savuor:lab_wide
...
Lab, Luv and XYZ conversions rewritten to wide intrinsics (#14106 )
* rgb2xyz<float> re-vectorized
* rgb2xyz_i vectorized for ushort and uchar
* xyz2rgb<float> vectorized
* xyz2rgb_i vectorized for both uchar and ushort
* intermediate conversions (int->float) rewritten
* packed rgb2luv rewritten
* (some) float conversions rewritten
* burnt volatile int _3 and similar
* RGB2Lab_b rewritten
* tests: logging made better
* RGB2Lab_f (LRGB path) rewritten
* Lab2RGBfloat rewritten
* Lab2RGBinteger and Lab2RGB_b rewritten to wide universal intrinsics
* Luv2RGBinteger wide vectorized
* RGB2Lab_b fixed: v_sub_wrap instead of saturated sub
* warnings fixed
* trying to fix compilation on older compilers
* using 16x8 registers for 8-element dot product
* cleanup added
* splineInterpolate: loop unrolled, perf fix for f32x4
* Lab2RGBfloat: grab 2x more data to process on f32x4
* nrepeats for Luv2RGBfloat, +20% perf
* minor
* nrepeats to RGB2Lab_f
* Lab2RGBinteger: no tab for linear BGR
* nrepeats for RGB2Luvfloat
* Luv2RGBinteger: no tab for linear RGB
* +10% more to perf of Luv2RGBfloat
* nrepeats for 256-simd for Lab2RGBfloat
* less warnings
* BOM removed
* CV_SIMD_WIDTH used for lanes number checking
* trilinearPackedInterpolate: 128-bit specialization added
* fix build; no vx_cleanup(), instrumentation instead
2019-05-20 21:10:20 +03:00
dianlujitao
f0f50b757d
Fix LogSoftmax for ONNX
...
Fix wrong indentation as well while at it
2019-05-20 22:55:31 +08:00
catree
33cb9c5ca5
Add SOLVEPNP_IPPE for planar pose estimation. Add solvePnPGeneric function that returns all the pose solutions and the reprojection errors.
2019-05-20 11:56:54 +02:00
Alexander Alekhin
e4b9a58c15
Merge pull request #14578 from mshabunin:add-mfx-plugin
2019-05-19 19:36:16 +00:00
Alexander Alekhin
3c1267dbe6
android: update 'debug' information support
2019-05-19 16:09:45 +00:00
Alexander Alekhin
132253c9f3
dnn: use AsyncArray
2019-05-18 19:32:23 +00:00
Alexander Alekhin
9340af1a8a
core: Async API / AsyncArray
2019-05-18 19:32:23 +00:00
Alexander Alekhin
447116a93c
Merge pull request #14524 from kohei-us:onnx-load-binary-blob
2019-05-18 16:19:34 +00:00
Alexander Alekhin
d848594deb
Merge pull request #14445 from l-bat:batchnorm3d
2019-05-17 17:03:53 +00:00
Alexander Alekhin
b4ec8fe3ef
Merge pull request #14539 from rgarnov:gapi_fix_nv12_odd_slices
2019-05-17 16:59:52 +00:00
Maksim Shabunin
6fc6207e93
Added videoio plugin for MediaSDK
2019-05-17 17:24:53 +03:00
catree
b5e2ec4ea4
Fix typo in NormTypes documentation.
2019-05-16 19:22:41 +02:00
Kohei Yoshida
7b4aefedea
Add support for loading ONNX model from in-memory buffer.
2019-05-16 11:26:20 -04:00
Alexander Alekhin
30a595789c
Merge pull request #14463 from thangktran:thangktran/fix-imgproc-intersectConvexConvex
2019-05-16 14:50:20 +00:00
Alexander Alekhin
9003b60d65
Merge pull request #14567 from alalek:core_drop_ostream_string_overload
2019-05-16 11:32:13 +00:00
Alexander Alekhin
d93588dfeb
Merge pull request #14562 from alalek:calid3d_fix_examples_paragraph
2019-05-16 11:23:16 +00:00
Alexander Alekhin
e21262deba
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-16 04:40:39 +00:00
Alexander Alekhin
84fd8190f3
Merge pull request #14232 from terfendail:popcount_rework
2019-05-15 17:58:11 +00:00
Vitaly Tuzov
7a55f2af3b
Updated AVX2 implementation of v_popcount for u8.
2019-05-15 19:39:25 +03:00
Alexander Alekhin
8b192b76c0
Merge pull request #14561 from alalek:fix_ctors_with_uninitialized_vars
2019-05-15 16:21:07 +00:00
Daniel Ingram
962d57b4d6
Merge pull request #14559 from daniel-s-ingram:master
...
* Fix typo: 'divisble' -> 'divisible'
* Fix typo: 'One of arguments' -> 'One of the arguments'
2019-05-15 18:41:43 +03:00
Alexander Alekhin
a70e1eecd9
Merge pull request #14552 from dkurt:fixed_detections_out_blob
2019-05-15 15:17:05 +00:00
Alexander Alekhin
3e876c5066
Merge pull request #14505 from alalek:android_fix_14477
2019-05-15 12:58:23 +00:00
Alexander Alekhin
b8f9076de0
core: drop 'operator << (ostream, String)' overload
...
'cv::String' is 'std::string' in OpenCV 4.x
2019-05-15 14:00:02 +03:00
Alexander Alekhin
8936a0f3a5
android: fix JavaCamera2View UV plane handling
2019-05-15 07:57:50 +00:00
Alexander Alekhin
d784b40e24
calib3d(docs): examples paragraph is related to findHomography()
2019-05-14 19:20:40 +00:00
Alexander Alekhin
68012bfbf9
calib3d: fix uninitialized fields in ctors
2019-05-14 19:15:13 +00:00
Vitaly Tuzov
1220dd4877
Updated v_popcount description, reference implementation and test.
2019-05-14 18:59:40 +03:00
Vitaly Tuzov
96ab78dc4f
Reworked v_popcount implementation to provide number of bits in a single lane
2019-05-14 18:59:38 +03:00
Ruslan Garnov
50af4df1d7
Fixed roi inference to always produce even sizes for nv12
2019-05-14 18:37:33 +03:00
Liubov Batanina
dfa753c6b4
Support OCV backend
2019-05-14 16:44:57 +03:00
Dmitry Kurtaev
6389dfe49c
Fixed DetectionOutput output blob shape
2019-05-14 15:09:32 +03:00
Liubov Batanina
dadb1473c1
Add BatchNorm3d layer
2019-05-14 12:44:48 +03:00
Dmitry Kurtaev
c3b0a68a2b
Async mode for dnn's object detection sample
2019-05-14 09:58:47 +03:00
Alexander Alekhin
b2abd8ca41
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-07 16:04:54 +00:00
Alexander Alekhin
5ba8aa781c
Merge pull request #14460 from dkurt:dnn_tf_no_extra_clone
2019-05-07 14:48:50 +00:00
Maksim Shabunin
9a81ff7315
Backported AVFoundation fixes from master branch
2019-05-07 13:57:44 +03:00
Anton Potapov
c2e26c1527
Async API for GAPI
...
- minor cosmetic changes : comments, typos
2019-05-07 13:12:15 +03:00
Dmitry Kurtaev
471b83ccd5
Modify paddings computation for SAME pad mode
2019-05-06 10:49:10 +03:00
Alexander Alekhin
7bb8d89ef3
Merge pull request #14484 from dkurt:dnn_ie_fix_async_u8
2019-05-05 11:51:54 +00:00
Sayed Adel
5a77f4cee3
Merge pull request #14007 from seiko2plus:core_avx512_infa
...
* core: improve AVX512 infrastructure by adding more CPU features groups
* cmake: use groups for AVX512 optimization flags
* core: remove gap in CPU flags enumeration
* cmake: restore default CPU_DISPATCH
2019-05-05 14:19:49 +03:00
Dmitry Kurtaev
adc1ef9308
Fix uint8 input data for Async mode of dnn
2019-05-05 12:49:38 +03:00
Alexander Alekhin
610f5481c1
core(ocl): ocl::Kernels::args() via variadic template
2019-05-04 00:06:31 +00:00
Alexander Alekhin
03ec1ca0a4
Merge pull request #14403 from alalek:issue_14372
2019-05-03 20:41:51 +00:00
Alexander Alekhin
04caf0549d
video(DIS): OpenCL workaround for AMDGPU
2019-05-03 19:01:14 +00:00
Alexander Alekhin
0e1dd63f5e
video(DIS): use OpenCL shared mem
...
- fix perf test iterations
2019-05-03 18:58:26 +00:00
Alexander Alekhin
fc57129300
Merge pull request #14431 from catree:feat_solvePnPRefine
2019-05-02 20:44:58 +00:00
seungju
ceff82877d
fix a typo in md file
...
fix a typo in ml_intro.md, tress -> trees
2019-05-01 14:05:33 +02:00
Thang Tran
1aff378ae8
imgproc: fixed bug from intersectConvexConvex
...
Added checks for all of vertices from each contour instead of checking
only for the first vertex.
2019-05-01 11:06:30 +02:00
Alexander Alekhin
e28e3c9491
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-01 08:27:45 +00:00
Alexander Alekhin
163d5e4d39
Merge pull request #14368 from dkurt:dnn_ie_tests
2019-04-30 19:35:00 +00:00
Alexander Alekhin
bc9893799d
Merge pull request #14457 from alalek:dnn_fix_msvc_build
2019-04-30 16:49:33 +00:00
Alexander Alekhin
076ee65c85
Merge pull request #14448 from rgarnov:gapi_gmatp
2019-04-30 16:48:34 +00:00
Alexander Alekhin
1c092a181d
Merge pull request #14454 from dkurt:dnn_tf_subgraph_fusion
2019-04-30 16:24:32 +00:00
Dmitry Kurtaev
a6ed8f268a
Remove extra weights cloning from TensorFlow importer
2019-04-30 19:18:41 +03:00
Alexander Alekhin
ddfaa41f07
Merge pull request #14452 from alalek:issue_14432
2019-04-30 16:15:46 +00:00
Ruslan Garnov
834d438d6e
Added GMatP type
2019-04-30 17:25:29 +03:00
Lubov Batanina
77fa59c3da
Merge pull request #14301 from l-bat:conv3d
...
Support Convolution3D layer on IE backend (#14301 )
* Add Convolution3D layer
* Disable CXX11
* Fixed tests
* Add Pooling3D layer
* Merge Conv2d with Conv3d and Pool2d with Pool3d layers
* Split pads
* Add Deconvolution layer
* Refactoring
* Deduplication
* Refactoring
* Add utils for Convolution and Pooling layers
2019-04-30 17:08:17 +03:00
Alexander Alekhin
3bcbd2a078
Merge pull request #14451 from alalek:fix_perf_calibation
2019-04-30 14:01:13 +00:00
Alexander Alekhin
85ea37ac01
Merge pull request #14450 from alalek:ts_hide_zero_memory_message
2019-04-30 14:00:36 +00:00
catree
dac31e84fb
Add solvePnPRefineLM to refine a pose according to a Levenberg-Marquardt iterative minimization process. Add solvePnPRefineVVS to refine a pose using a virtual visual servoing scheme.
2019-04-30 14:31:11 +02:00
Alexander Alekhin
138a80611c
build: avoid MSVC ICE
2019-04-30 14:16:01 +03:00
Alexander Alekhin
2da00161c5
Merge pull request #14446 from mshabunin:old-v4l
2019-04-30 10:41:33 +00:00
anton-potapov
f5801ee7da
Merge pull request #14346 from anton-potapov:gapi_async
...
* Async API for GAPI
- naive implementation as a starting point
* Fix namespace comment in header
2019-04-30 13:11:56 +03:00
Dmitry Kurtaev
9408c3e640
Refactored TensorFlow subgraphs fusion
2019-04-30 09:21:05 +03:00
Alexander Alekhin
1c180f4c7f
imgproc: fix RemoveOverlaps() with empty input vector
2019-04-29 21:15:23 +00:00
Alexander Alekhin
cd4926778e
ts: fix perf calibation
...
properly handle "check" mode with:
"--perf_min_samples=1 --perf_force_samples=1"
2019-04-29 19:10:38 +00:00
Alexander Alekhin
38c0278be3
ts: silence zero memory usage messages
2019-04-29 18:28:54 +00:00
Alexander Alekhin
ffd4a27901
Merge pull request #14443 from dkurt:fix_14435
2019-04-29 18:21:22 +00:00
Maksim Shabunin
683acd9ae2
Support very old V4L
2019-04-29 18:14:58 +03:00
Alexander Alekhin
faca45a7ea
Merge pull request #14429 from rgarnov:gapi_fluid_fix_small_rois
2019-04-29 15:08:11 +00:00
ostarling
643d9df42d
Merge pull request #14411 from ostarling:3.4_fix_for_14242
...
* Fix for Homogenous precision #14242 :
- moved scale computation to an inline function
- use std::numeric_limits<float>::epsilon() instead of != 0.0
* Fix for Homogenous precision #14242 :
- fixed warnings for type conversion
* Fix for Homogenous precision #14242 :
- use float epsilon() for truncation of doubles
2019-04-29 17:12:04 +03:00
Alexander Alekhin
84847cf4c3
Merge pull request #14342 from Victorlouisdg:bugfix-JavaCamera2View-green
2019-04-29 10:54:34 +00:00
Dmitry Kurtaev
61b928d9bd
Add an assertion for Async request status
2019-04-29 08:16:28 +03:00
Alexander Alekhin
e8a626d43a
Merge pull request #14407 from dkurt:dnn_ie_fix_batch_detection
2019-04-27 21:48:56 +00:00
Sayed Adel
afb157df67
core:vsx fix sum of v_reduce_sad
2019-04-27 02:01:24 +02:00
Alexander Alekhin
e8ac7a34dd
Merge pull request #14426 from alalek:cmake_fix_include_pkgconfig
2019-04-26 20:18:38 +00:00
Alexander Alekhin
b95fdc1992
Merge pull request #14394 from alalek:build_support_memory_sanitizers
2019-04-26 16:13:52 +00:00
Alexander Alekhin
d17699363c
Merge pull request #14385 from terfendail:intrin_sad
2019-04-26 15:34:02 +00:00
Alexander Alekhin
c9f3f4d1d3
cmake: fix pkg-config handling
...
Avoid non-intentional call of "include(FindPkgConfig)"
It should be handled in the root CMakeLists.txt (safely for cross-compiling)
2019-04-26 18:19:03 +03:00
Alexander Alekhin
7b8ce63730
Merge pull request #14402 from rgarnov:gapi_planar_mats
2019-04-26 14:59:12 +00:00
Ruslan Garnov
ffaf4d5da4
Fixed incorrect first window setting for fluid FilterAgent
2019-04-26 17:34:44 +03:00
Ruslan Garnov
fb326a3589
Added a reproducer
2019-04-26 17:33:50 +03:00
Ruslan Garnov
f81886d17c
Added planar flag to GMatDesc, intergated into framework, added tests
2019-04-26 14:04:44 +03:00
Dmitry Kurtaev
4f6be11c0e
Check if Inference Engine networks are fully supported by backend
2019-04-25 11:27:17 +03:00
Alexander Alekhin
0431ecb9e2
Merge pull request #14408 from l-bat:onnx_deconv
2019-04-24 14:30:09 +00:00
Vitaly Tuzov
18d10d6b86
Fixed v_reduce_sad intrinsics implementation and added tests
2019-04-24 14:53:59 +03:00
Liubov Batanina
45ced8e022
Fix ONNX deconvolution
2019-04-24 14:37:52 +03:00
Dmitry Kurtaev
520e351489
Fix batching in DetectionOutput layer
2019-04-24 12:08:49 +03:00
Thang Tran
2f7fc1a598
calib3d: add find4QuadCornerSubpix java wrapper
...
Fixes: https://github.com/opencv/opencv/issues/14169
2019-04-24 08:45:28 +02:00
Alexander Alekhin
7d2190a5d4
ts: +ENV{OPENCV_TEST_REQUIRE_DATA}
...
similar to '--test_require_data' parameter
2019-04-22 21:42:06 +00:00
Alexander Alekhin
c1981f28ad
build: +OPENCV_ENABLE_MEMORY_SANITIZER flag
2019-04-22 21:35:25 +00:00
Alexander Alekhin
d0032b0717
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-22 18:17:28 +00:00
Alexander Alekhin
8eb685de9d
Merge pull request #14390 from dkurt:dnn_onnx_const_reshape
2019-04-22 15:55:19 +00:00
Alexander Alekhin
de4be8e610
Merge pull request #14384 from terfendail:fp16_depint
2019-04-22 15:52:53 +00:00
Alexander Alekhin
0bbd28e0d4
Merge pull request #14382 from alalek:backport_14373
2019-04-22 15:52:10 +00:00
Alexander Alekhin
8fac166b66
Merge pull request #14379 from sturkmen72:upd_GeneralizedHough
2019-04-22 15:51:47 +00:00
masa-iwm
5c404bb142
Merge pull request #14376 from masa-iwm:3.4
...
* fix getting platformIDs in initializeContextFromD3D11Device
2019-04-22 18:50:31 +03:00
Dmitry Kurtaev
9b635830bc
Run Reshape layer for const input from ONNX models
2019-04-22 17:57:46 +03:00
Alexander Alekhin
44bd849697
build: reduce usage of constexpr
...
some compilers has lack of proper support for that
2019-04-22 15:41:27 +03:00
Vitaly Tuzov
4a54aa3fbd
Cleared up deprecated intrinsics for FP16
2019-04-22 10:35:37 +03:00
Suleyman TURKMEN
3f9343e238
Update imgproc.hpp
2019-04-22 00:48:11 +03:00
Ryan Wong
8af96248bf
Merge pull request #13909 from kinchungwong:logging_20190220
...
OE-11 Logging revamp (#13909 )
* Initial commit for log tag support.
Part of #11003 , incomplete. Should pass build.
Moved LogLevel enum to logger.defines.hpp
LogTag struct used to convey both name and log level threshold as
one argument to the new logging macro. See logtag.hpp file, and
CV_LOG_WITH_TAG macro.
Global log level is now associated with a global log tag, when a
logging statement doesn't specify any log tag. See getLogLevel and
getGlobalLogTag functions.
A macro CV_LOGTAG_FALLBACK is allowed to be re-defined by other modules
or compilation units, internally, so that logging statements inside
that unit that specify NULL as tag will fall back to the re-defined tag.
Line-of-code information (file name, line number, function name),
together with tag name, are passed into the new log message sink.
See writeLogMessageEx function.
Fixed old incorrect CV_LOG_VERBOSE usage in ocl4dnn_conv_spatial.cpp.
* Implemented tag-based log filtering
Added LogTagManager. This is an initial version, using standard C++
approach as much as possible, to allow easier code review. Will
optimize later.
A workaround for all static dynamic initialization issues is
implemented. Refer to code comments.
* Added LogTagConfigParser.
Note: new code does not fully handle old log config parsing behavior.
* Fix log tag config vs registering ordering issue.
* Started testing LogTagConfigParser, incomplete.
The intention of this commit is to illustrate the capabilities of
the current design of LogTagConfigParser.
The test contained in this commit is not complete. Also, design changes
may require throwing away this commit and rewriting test code from
scratch.
Does not test whitespace segmentation (multiple tags on the config);
will do in next commit.
* Added CV_LOGTAG_EXPAND_NAME macro
This macro allows to be re-defined locally in other compilation units
to apply a prefix to whatever argument is passed as the "tag" argument
into CV_LOG_WITH_TAG. The default definition in logger.hpp does not
modify the argument. It is recommended to include the address-of
operator (ampersand) when re-defined locally.
* Added a few tests for LogTagManager, some fail.
See test_logtagmanager.cpp
Failed tests are: non-global ("something"), setting level by name-part
(first part or any part) has no effect at all.
* LogTagManagerTests substring non-confusion tests
* Fix major bugs in LogTagManager
The code change is intended to approximate the spec documented in
https://gist.github.com/kinchungwong/ec25bc1eba99142e0be4509b0f67d0c6
Refer to test suite in test_logtagmanager.cpp
Filter test result in "opencv_test_core" ...
with gtest_filter "LogTagManager*"
To see the test code that finds the bugs, refer to original commits
(before rebase; might be gone)
.. f3451208 (2019-03-03T19:45:17Z)
.... LogTagManagerTests substring non-confusion tests
.. 1b848f5f (2019-03-03T01:55:18Z)
.... Added a few tests for LogTagManager, some fail.
* Added LogTagManagerNamePartNonConfusionTest.
See test_logtagmanager.cpp in modules/core/test.
* Added LogTagAuto for auto registration in ctor
* Rewritten LogTagManager to resolve issues.
* Resolves code review issues around 2019-04-10
LogTagConfigParser::parseLogLevel - as part of resolving code review
issues, this function is rewritten to simplify control flow and to
improve conformance with legacy usage (for string values "OFF",
"DISABLED", and "WARNINGS").
2019-04-22 00:01:10 +03:00
Alexander Alekhin
f7856a0f35
imgcodecs(tiff): update tile size checks
...
backporting of commit: 25247b9f6e
2019-04-21 18:36:39 +00:00
Alexander Alekhin
25247b9f6e
imgcodecs(tiff): update tile size checks
...
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14185
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14321
2019-04-20 20:13:47 +00:00
Dmitry Kurtaev
a5c92c2029
Merge pull request #13694 from dkurt:dnn_ie_async
...
Asynchronous API from Intel's Inference Engine (#13694 )
* Add forwardAsync for asynchronous mode from Intel's Inference Engine
* Python test for forwardAsync
* Replace Future_Mat to AsyncMat
* Shadow AsyncMat
* Isolate InferRequest callback
* Manage exceptions in Async API of IE
2019-04-19 21:01:19 +03:00
Alexander Alekhin
c024edb9a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-19 15:43:58 +03:00
Alexander Alekhin
4f764b812e
Merge pull request #14315 from dkurt:tf_squeeze_and_slim_softmax_v2
2019-04-18 16:01:24 +00:00
Alexander Alekhin
f7b6e30156
Merge pull request #14354 from alalek:workaround_apple_dyld_bug
2019-04-17 19:09:15 +00:00
Alexander Alekhin
9dccfe2a96
Merge pull request #13917 from sturkmen72:removed_c_api
2019-04-17 19:04:33 +00:00
Alexander Alekhin
96610c7ee1
Merge pull request #14332 from LaurentBerger:loadknearest
2019-04-17 19:00:42 +00:00
Ruslan Garnov
1f517b8a02
Merge pull request #13943 from rgarnov:export_headers_for_backend_development
...
G-API external backend development (#13943 )
* Moved HostCtor and ConstVal from gapi_priv.hpp to objref.hpp
* Added gmodel_priv.hpp, added export of symbols from gmodel.hpp
* Added export of binInArg and bindOutArg
* Renamed gapi_priv.*pp -> gorigin.*pp
* Added a fixme on collecting exports inside one class
2019-04-17 21:54:47 +03:00
Alexander Alekhin
52f16e0f55
tests: workaround for DYLD_LIBRARY_PATH on Apple MacOSX
2019-04-17 15:19:33 +03:00
Alexander Alekhin
dedd966002
Merge pull request #14345 from dkurt:fix_dnn_ie_mac
2019-04-16 19:18:49 +00:00
Alexander Alekhin
6d3ae8d4ca
Merge pull request #14341 from alalek:cmake_fix_pkgconfig_libs
2019-04-16 19:04:07 +00:00
Alexander Alekhin
c667de9b68
dnn: force visibility(default) for IE headers
2019-04-16 18:18:31 +03:00
LaurentBerger
621e3eaed8
Add Ptr KNearest::load and python binding
2019-04-16 16:32:37 +02:00
Alexander Alekhin
3ef046b6c9
Merge pull request #14338 from alalek:fix_13849
2019-04-16 13:42:27 +00:00
Alexander Alekhin
74d5cdb6d8
Merge pull request #14343 from alalek:dnn_static_scans_namespace
2019-04-16 13:11:23 +00:00
Alexander Alekhin
ebe13a9613
Merge pull request #14337 from alalek:ts_flush_stdout
2019-04-16 13:08:40 +00:00
Dmitry Kurtaev
62d079fa69
Fix Normalize layer for Mac
2019-04-16 12:39:04 +03:00
Alexander Alekhin
3902694075
static scans: preserve namespace name
2019-04-16 06:49:47 +00:00
vdgussem
00861b668a
Changed the way Images are converted into rgba Mats so that JavaCamera2View also shows correct colors when the Image contains I420 or YV12 data
2019-04-16 01:38:59 +02:00
Alexander Alekhin
0d747daf47
cmake: use absolute library paths from 'pkgconfig'
...
- drop legacy check_module() macro
- drop 'ALIASOF_'
2019-04-15 22:11:49 +00:00
Alexander Alekhin
78384d8923
build: avoid highgui dependency
2019-04-15 18:59:51 +00:00
Alexander Alekhin
64fd1c95a5
ts: flush stdout/stderr before test launch
2019-04-13 21:08:06 +00:00
Alexander Alekhin
4635356435
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-13 20:00:54 +00:00
Dmitry Kurtaev
92cbec6fb1
Fix dnn with IE from GitHub
2019-04-13 19:02:03 +03:00
Dmitry Kurtaev
0cfd95c097
Fix TensorFlow's Squeeze and a new fusion for SoftMax from slim backend
2019-04-13 17:04:31 +03:00
Lubov Batanina
60a841c797
Merge pull request #14255 from l-bat:networks_visualization
...
* Add networks visualization
* Disable CXX11
* Fixed multy inputs support
* Added output shapes
* Added color for DLIE/CPU
* Fixed graph colors
2019-04-12 19:31:07 +03:00
Alexander Alekhin
64629cb94e
Merge pull request #12783 from alalek:test_tag
2019-04-12 15:35:41 +00:00
Alexander Alekhin
5f500692f1
Merge pull request #14284 from dkurt:fix_14236
2019-04-12 13:05:38 +00:00
Alexander Alekhin
227ec19929
Merge pull request #14277 from dkurt:ie_enable_tests_2019r1
2019-04-12 13:05:19 +00:00
Dmitry Kurtaev
a2bbfa1db5
Enable some tests for Inference Engine 2019R1
2019-04-12 15:21:42 +03:00
Alexander Alekhin
a9ddf12187
Merge pull request #14078 from alalek:test_python_from_modules
2019-04-12 11:39:12 +00:00
Alexander Alekhin
d68e722b71
Merge pull request #11748 from paroj:cap_except
2019-04-12 11:36:17 +00:00
Maksim Shabunin
5cb0eded64
Merge pull request #14278 from mshabunin:fix-osx-camera-auth-rt
...
* AVFoundation: Use runtime check for camera authorization
2019-04-11 19:16:50 +03:00
Alexander Alekhin
7621b91769
Merge pull request #14292 from alalek:issue_14291
...
* macosx: fix C++11 build
backporting commit c3cf35ab63
* macosx: eliminate build warning
2019-04-11 17:46:28 +03:00
kiwixz
c8056b3e27
Merge pull request #14276 from kiwixz:pr/fix_compound
...
Do not use compound literals (fix MSVC C4576) (#14276 )
* do not use compound literals (compat cpp98)
* only fix msvc path
* remove unnecessary cplusplus check
2019-04-11 17:44:28 +03:00
Alexander Alekhin
a0a1fb5fec
python: discover tests from module/misc/python/test paths
2019-04-10 18:35:35 +00:00
Pavel Rojtberg
15bb0b86ce
VideoCapture: add exception error mode similar to fstream + test
2019-04-10 13:41:57 +02:00
Dmitry Kurtaev
7ce2397b62
Fix a bug in FusedBatchNorm (TensorFlow) layer importer
2019-04-09 13:35:34 +03:00
Alexander Alekhin
e0841f3d6e
dnn(test-tags): add time / memory tags
2019-04-08 19:18:25 +00:00
Alexander Alekhin
b38de57f9a
ts: test tags for flexible/reliable tests filtering
...
- added functionality to collect memory usage of OpenCL sybsystem
- memory usage of fastMalloc() (disabled by default):
* It is not accurate sometimes - external memory profiler is required.
- specify common `CV_TEST_TAG_` macros
- added applyTestTag() function
- write memory usage / enabled tags into Google Tests output file (.xml)
2019-04-08 19:12:49 +00:00
Alexander Alekhin
64168fc20a
'-dev' version
2019-04-08 14:34:32 +03:00
Alexander Alekhin
371bba8f54
release: OpenCV 4.1.0
...
OpenCV 4.1.0
2019-04-07 17:09:10 +00:00
Alexander Alekhin
0b9d53829f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-07 12:35:15 +00:00
Alexander Alekhin
dad2247b56
Merge tag '3.4.6'
2019-04-07 11:02:40 +00:00
Alexander Alekhin
33b765d797
OpenCV version++ (3.4.6)
...
OpenCV 3.4.6
2019-04-06 21:43:23 +00:00
Alexander Alekhin
b5961cc5d1
calib3d: don't change input data
...
- estimateAffine2D/estimateAffinePartial2D() calls
2019-04-06 19:28:41 +00:00
Alexander Alekhin
c9fc27b337
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-05 19:08:23 +00:00
Maksim Shabunin
aa1359dc19
Merge pull request #14267 from mshabunin:fix-osx-camera-auth
...
* Added authorization request to AVFoundation camera backend (OSX 10.14+)
2019-04-05 21:58:01 +03:00
Alexander Alekhin
0c490accae
imgcodecs(tiff): check TIFF tile size
...
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13280
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13283
2019-04-05 18:13:15 +03:00
Dmitry Kurtaev
4c2100e02c
Merge pull request #14266 from dkurt:fix_qrcode_decode_java
...
* Fix decode and detectAndDecode Java wrappers for QRCodeDetector
* revert changes in objdetect
* java: fix wrapping of std::string type
2019-04-05 17:15:51 +03:00
Alexander Alekhin
bd43e4f28b
Merge pull request #14251 from dkurt:dnn_tf_manage_switch
2019-04-05 12:43:22 +00:00
Dmitry Kurtaev
ec41a4897a
Remove Switch and Merge nodes from TensorFlow networks
2019-04-05 12:32:35 +03:00
Alexander Alekhin
473941c341
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-04 18:09:24 +00:00
Alexander Alekhin
1fb93b62c0
Merge pull request #14249 from alalek:imgcodecs_tiff_update_3.4
2019-04-04 16:17:09 +00:00
BALACHANDAR S
aa167434e6
Merge pull request #14252 from balachandarsv:master-mac-openvino-support
...
* Mac support for op inference engine
Adding condition to check for mac and add corresponding libraries
* Adding mac support in test cases
2019-04-04 17:37:45 +03:00
Alexander Alekhin
ba5ddd6499
imgcodecs(tiff): sanitize tiff decoder
...
- more checks
- drop separate branches for 32FC1/32FC3(read) handling
- added for 32F/64F non-compressed
- added tests for 32FC3 (RAW + hdr SGILOG compression)
- added test 64FC1
- dump tiff errors on stderr
2019-04-04 14:16:53 +03:00
Alexander Alekhin
4001346a30
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-03 19:33:52 +00:00
Alexander Alekhin
c300070b8a
Merge pull request #14241 from alalek:openvino_2019R1
2019-04-03 19:26:46 +00:00
103yiran
4bb6edf176
Merge pull request #14117 from 103yiran:103yiran-patch-dnn
...
* Postpone variable definitions
* dnn: reduce scope of 'Mat image' variable
2019-04-03 22:13:11 +03:00
Alexander Alekhin
cafa010389
dnn(test): skip tests
2019-04-03 17:49:05 +03:00
Alexander Alekhin
ee7255aac4
Merge pull request #14144 from alalek:issue_14143
2019-04-03 14:35:54 +00:00
Alexander Alekhin
8bc8a94645
dnn: update DNNTestOpenVINO.models tests
...
- models are moved out from OpenVINO package
- need to download them separatelly
2019-04-03 15:39:47 +03:00
Alexander Alekhin
8483801eab
dnn: use OpenVINO 2019R1 defines
2019-04-03 15:39:47 +03:00
Alexander Alekhin
5dc606097c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-02 20:54:41 +00:00
Alexander Alekhin
14843679af
Merge pull request #14217 from alalek:fix_world_gapi_tests
2019-04-02 16:27:12 +00:00
Alexander Alekhin
785a540ebd
Merge pull request #14175 from paroj:copyto
2019-04-02 16:18:00 +00:00
Alexander Alekhin
c4ec46c195
imgcodecs(sunras): avoid undefined shift
...
backporting of commit: f2803aba07
2019-04-02 18:38:01 +03:00
Alexander Alekhin
d2854448c2
Merge pull request #14203 from alalek:fix_ossfuzz_13292
2019-04-02 15:15:13 +00:00
Alexander Alekhin
69ff7a76d6
Merge pull request #14228 from dkurt:conv_1x1
2019-04-02 14:35:50 +00:00
Alexander Alekhin
7d2118e324
Merge pull request #14223 from alalek:backport_14201
2019-04-02 14:33:57 +00:00
Dmitry Kurtaev
e3286c9055
Enable 1x1 convolution optimization
2019-04-02 14:05:17 +03:00
Alexander Alekhin
cd6d8048bb
gapi: fix tests build
2019-04-02 13:46:25 +03:00
Alexander Alekhin
df1f62b34c
Merge pull request #14225 from zuoshaobo:my3.4
2019-04-02 09:57:26 +00:00
Dmitry Kurtaev
07655c2b4d
Fix build with IE > 2018R5
2019-04-02 11:54:50 +03:00
zuoshaobo
a34c02a001
add support for tf.add_n operation
2019-04-02 03:20:53 -04:00
Alexander Alekhin
b4e2c99346
Merge pull request #14201 from alalek:fix_ossfuzz_13295
2019-04-01 18:47:00 +00:00
Alexander Alekhin
33dde339fe
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-01 18:11:55 +03:00
Alexander Alekhin
341e2fa72d
Merge pull request #14214 from alalek:backport_14202
2019-04-01 14:39:25 +00:00
Alexander Alekhin
21f0146402
Merge pull request #14212 from dkurt:reduce_ie_models_tests
2019-04-01 14:38:07 +00:00
Alexander Alekhin
45169577ca
Merge pull request #14207 from alalek:fix_leak_eigenvalue_decomposition
2019-04-01 14:17:37 +00:00
Alexander Alekhin
2ece029fe0
imgcodecs(tiff): avoid leak of helper struct on malformed inputs
...
backporting of commit: 45428b897f
2019-04-01 14:08:40 +00:00
Dmitry Kurtaev
144b1f4d9d
Reduce number of tested models from OpenVINO
2019-04-01 15:15:00 +03:00
Alexander Alekhin
bda90dae77
Merge pull request #14200 from alalek:fix_imgcodecs_stream_set_pos
2019-04-01 11:04:20 +00:00
Alexander Alekhin
1e583942b9
core(lda): don't perform calculations in constructor
...
- exceptions from constructor will not cause destructor calls
2019-03-31 21:48:44 +00:00
Alexander Alekhin
142a524d2f
cmake: fix CUDA world build
2019-03-31 19:56:30 +00:00
Alexander Alekhin
6894651027
Merge pull request #14198 from alalek:issue_14195
2019-03-31 12:56:57 +00:00
Alexander Alekhin
6dfb6a3016
imgcodecs: fix RBaseStream::setPos() outside of current block
...
Seeking outside of the current block doesn't update actual data,
so getByte()/etc will get wrong data from stalled buffer.
2019-03-31 12:55:32 +00:00
Alexander Alekhin
f2803aba07
imgcodecs(sunras): avoid undefined shift
...
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13292
2019-03-31 12:14:42 +00:00
Alexander Alekhin
45428b897f
imgcodecs(tiff): avoid leak of helper struct on malformed inputs
...
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13285
2019-03-31 11:50:33 +00:00
Alexander Alekhin
ccb89a889a
imgcodecs(bmp): limit size of processed images
...
2Gb+ images can't be handled properly by current implementation
backporting of commit: 50a6f9d251
2019-03-31 10:52:33 +00:00
Alexander Alekhin
50a6f9d251
imgcodecs(bmp): limit size of processed images
...
2Gb+ images can't be handled properly by current implementation
ozz-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13295
2019-03-31 10:48:07 +00:00
David Carlier
06a4c20f60
OpenBSD build fix
...
required for close calls.
2019-03-31 10:54:47 +01:00
Alexander Alekhin
fcb07c64f3
cmake: fix build of dnn tests with shared common code
...
- don't share .cpp files (PCH support is broken)
2019-03-31 08:52:25 +00:00
Sayed Adel
de22442046
dnn:perf add missing definition __OPENCV_TEST to fix pch
2019-03-31 03:28:33 +02:00
Alexander Alekhin
7442100caa
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-29 19:29:36 +00:00
Maksim Shabunin
52cd1dacbf
Merge pull request #14156 from mshabunin:videowriter-bad-test
...
* videoio: added bad parameters handling to VideoWriter
* AVFoundation/Writer: support UTF-8, check input parameters
2019-03-29 17:52:22 +03:00
Lubov Batanina
7d3d6bc4e2
Merge pull request #13932 from l-bat:MyriadX_master_dldt
...
* Fix precision in tests for MyriadX
* Fix ONNX tests
* Add output range in ONNX tests
* Skip tests on Myriad OpenVINO 2018R5
* Add detect MyriadX
* Add detect MyriadX on OpenVINO R5
* Skip tests on Myriad next version of OpenVINO
* dnn(ie): VPU type from environment variable
* dnn(test): validate VPU type
* dnn(test): update DLIE test skip conditions
2019-03-29 16:42:58 +03:00
Pavel Rojtberg
62775660d1
core: python - test cv::copyTo with pre-allocated dst
2019-03-29 13:56:26 +01:00
Alexander Alekhin
f75152a597
gapi: fix build with Intel Compiler 2019
2019-03-28 19:24:43 +00:00
Alexander Alekhin
b761ec0132
Merge pull request #14177 from alalek:fix_14173
2019-03-28 14:57:07 +00:00
Alexander Alekhin
3cd6e3b304
Merge pull request #14166 from dkurt:fix_slim_mobilenet_v2
2019-03-28 14:37:35 +00:00
Alexander Alekhin
428ff431df
Merge pull request #14168 from alalek:dnn_fix_drop_IE_2018R2
2019-03-28 14:23:39 +00:00
Alexander Alekhin
c7c987843c
cmake: emit error if CUDA is enabled without opencv_contrib
2019-03-28 16:51:11 +03:00
Alexander Alekhin
73191ad3ec
Merge pull request #14172 from smirnov-alexey:gapi_fix_nv12_valgrind
2019-03-28 13:45:45 +00:00
smirnov-alexey
769d2f4c44
Fix valgrind issue in NV12 test
2019-03-28 12:59:51 +03:00
Alexander Alekhin
e8c20bfae6
dnn: fix support drop for IE<2018R3
...
- fix build with IE 2018R3
2019-03-27 20:36:48 +00:00
Alexander Alekhin
d6b82dcd65
Merge pull request #14162 from alalek:eliminate_coverity_scan_issues
...
core: eliminate coverity scan issues (#14162 )
* core(hal): avoid using of r,g,b,a parameters in interleave/deinterleave
- static analysis tools blame on possible parameters reordering
- align AVX parameters with corresponding SSE/NEO/VSX/cpp code
* core: avoid "i,j" parameters in Matx methods
- static analysis tools blame on possible parameters reordering
* core: resolve coverity scan issues
2019-03-27 15:48:00 +03:00
Alexander Alekhin
5368a4ac41
Merge pull request #14102 from alalek:core_refactor_eigenvalues
2019-03-27 12:46:51 +00:00
Dmitry Kurtaev
9cfd219d70
Fix Mobilenet v2 from TensorFlow slim
2019-03-27 15:10:57 +03:00
Alexander Alekhin
90df5e00b4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-26 18:56:54 +00:00
Alexander Alekhin
f738e490a3
Merge pull request #13989 from kohei-us:onnx-conv-transpose-output-shape
2019-03-26 17:04:52 +00:00
Alexander Alekhin
55366caecd
Merge pull request #14155 from alalek:fix_macos_ocl_warnings_3.4
2019-03-26 15:34:49 +00:00
Kohei Yoshida
212420516f
Add a test case for handling output_shape property for deconvolution layer.
2019-03-26 10:46:17 -04:00
Kohei Yoshida
3bcff7f941
Make use of explicit output shape for the de-convolution layer.
...
This is relevant to cases where the net is loaded from an ONNX model
containing ConvTranspose layers, which may include the output_shape
attribute.
c.f. https://github.com/onnx/onnx/blob/master/docs/Operators.md#ConvTranspose
2019-03-26 10:46:09 -04:00
Alexander Alekhin
6686559c70
ocl: define CL_SILENCE_DEPRECATION on MacOSX
2019-03-26 13:11:53 +03:00
Alexander Alekhin
cedd78d526
Merge pull request #14142 from mshabunin:fix-c-api-3.4
2019-03-25 18:58:28 +00:00
Maksim Shabunin
41da3ef1d2
Fixed cvdef.h for MSVC C users
2019-03-25 16:44:08 +03:00
Dmitry Kurtaev
714b38360f
Extend LRN layer support with IE backend
2019-03-25 12:53:34 +03:00
iPanda
097fc1a271
Merge pull request #13972 from Mainvooid:add_cuda_support_for_D3D11_interop
...
* Add CUDA support for D3D11 interop. #13888
color_detail.hpp: fixed build error : dynamic initialization is not supported for a __constant__ variable.
directx.cpp: Add CUDA support(cl_nv_d3d11_sharing) for D3D11 interop. #13888
Update directx.cpp
Format adjustment.
Update directx.cpp
fix error.
Update directx.cpp
Format adjustment
Update directx.cpp
fix trailing whitespace.
fix format errors
convert indentation to spaces .
Trim trailing whitespace.
Add information about source of cl_d3d11_ext.h
Avoid unrelated changes.
Increase compile-time conditional judgment.
Increase the judgment of whether the OCL device has the required extensions at compile time.
Add compilation option `HAVE_CLNVEXT`.Check CL support in runtime.
Check result of `clGetExtensionFunctionAddressForPlatform` for KHR is invalid.It always can get the address(from OpenCL.dll),So I check NV support(from nvopencl64.dll) before KHR when `HAVE_CLNVEXT` is enabled.
Delete cl_d3d11_ext.h
Modified parameter list
fix "cannot open include file: 'CL/cl_d3d11_ext.h'"
remove not referenced var
fix C2143: syntax error
Improve compile-time judgment.
dlrectx.cpp Modify the detection order.
initializeContextFromD3D11Device:
```
// try with NV(Need to check it first)
// try with KHR
```
fix warnig C4100
Revert "fix warnig C4100"
This reverts commit 76e5becb67780071d0cbde61cc4f5f807ad7c5ac.
fix warning C4100
fix warning C4505
Format alignment
Format adjustment and automatically detect header files.
Automatically detect header files when users are not configured or configuration errors occur.
avoid unrelated changes.
Update .cmake
Update .cmake
* fix build errors
* fix warning:defined but not used
* Revert "fix warning:defined but not used"
This reverts commit 7ab3537cd0
.
* fix warning:defined but not used
* fix build error for mac
* fix build error for win
* optimizing branch judgment
* Revert "optimizing branch judgment"
This reverts commit 88b72b870e
.
* fix warning C4702: unreachable code
* remove unused code
* Fix problems that may lead to undefined behavior
* Add status check
* fix error C2664,C2665 : cannot convert argument
* Format adjustment
VSCODE will automatically format the indentation to 4 spaces in some situation.
* fix error C2440
* fix error C2440
* add cl_d3d11_ext.h
* Format adjustment
* remove unnecessary checks
2019-03-24 18:34:09 +03:00
Brad Kelly
0fe17eeb68
Implementing AVX512 Support for 1 channel mats for CV_64F format
2019-03-22 09:44:23 -07:00
Alexander Alekhin
8c25a8eb7b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-22 19:31:31 +03:00
Alexander Alekhin
c43371f190
Merge pull request #14101 from alalek:core_fix_constexpt_fallback
2019-03-22 10:34:19 +00:00
Bharat123Rox
ea68f7ea1e
Remove dead link in calib3d.hpp
2019-03-21 07:41:32 +05:30
Alexander Alekhin
e09a464242
Merge pull request #14092 from mattismyname:fix-kmeans
2019-03-20 16:20:46 +00:00
Alexander Alekhin
4e60db9030
Merge pull request #14110 from seiko2plus:core_vsx_fp16
2019-03-20 16:04:20 +00:00
Matthew K. Gumbel
74e3403620
flann/kmeans: Fix non-determinism of KMeans index
...
When running with >1 OpenCV thread, KMeans index generation was
non-deterministic because of a RWW race. Issue is resolved by removing
the offending logic from the parallel section.
2019-03-20 08:44:31 -07:00
Alexander Alekhin
a8e635f177
Merge pull request #14069 from terfendail:transform_wintr
2019-03-20 15:39:40 +00:00
Sayed Adel
f41359688b
core:vsx Add support for VSX3 half precision conversions
2019-03-20 10:19:42 +02:00
Giles Payne
0d1a0b126b
Merge pull request #14005 from komakai:android-video-cap
...
* Add Android Media NDK video i/o file capture back-end
* Fix failing test
* Improve error handling/prevent resource leaks
* Add license text
* Modify default for WITH_ANDROID_MEDIANDK option
* Fix spelling of deleter_AMediaExtractor
2019-03-19 21:28:45 +03:00
Alexander Alekhin
9a202c1522
Merge pull request #14090 from andrey-golubev:gapi_unused_node_fluid_fix
2019-03-19 15:15:53 +00:00
Alexander Alekhin
6c862fae13
Merge pull request #14099 from seiko2plus:vsx_improvements_3
2019-03-19 14:59:58 +00:00
Alexander Alekhin
93a402d0f2
core: fix Core_EigenNonSymmetric.convergence test
2019-03-19 15:18:43 +03:00
Sayed Adel
4fe2d9bdbc
core:vsx Several improvements(3)
...
* optimize v_lut_deinterleave
* optimize v_interleave_/pairs/quads/triplets
* optimize v_lut, use vec_extract instead of aligned store
2019-03-19 12:30:50 +02:00
Alexander Alekhin
8518d078d7
core: fix fallback CV_CONSTEXPR definition
...
keep it empty to avoid failures of these declarations:
static CV_CONSTEXPR const int var = ...;
2019-03-19 13:02:22 +03:00
Vitaly Tuzov
d43597c199
transform() implementation updated to utilize wide universal intrinsics
2019-03-18 20:33:19 +03:00
Alexander Alekhin
6e90b85cae
core: cache dir version update
2019-03-18 19:17:54 +03:00
Alexander Alekhin
5451b89aed
core: refactor EigenvalueDecomposition (hqr2)
...
- fix resource allocation management
- reduce variables scope
- fix complex_div
- fix comments, constants
- simplify add/sub operations
2019-03-18 19:07:34 +03:00
Andrey Golubev
dd2823aaec
[G-API] Allow unused nodes in Fluid backend
...
Allow nodes produced after some operation to be
"unused": not being an output and not being used
as inputs to other operations
Add fluid test to cover this case
2019-03-18 18:20:11 +03:00
Alexander Alekhin
a7c4ee9ae1
core: add iterations limit check in eigenNonSymmetric()
2019-03-18 17:49:17 +03:00
Alexander Alekhin
26087e28ad
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-15 22:42:57 +00:00
Alexander Alekhin
19e8121a38
Merge pull request #14059 from alalek:imgcodecs_disable_jasper
2019-03-15 16:32:57 +00:00
zuoshaobo
8b52eabd48
fix the region layer's output anchor size normalization error
2019-03-15 08:41:11 -04:00
Alexander Alekhin
d4b9e2d0f4
Merge pull request #14068 from alalek:fix_python_standalone_build
2019-03-15 11:33:08 +00:00
Alexander Alekhin
470dfba96c
python: update CMake install rules
2019-03-15 13:11:00 +03:00
Alexander Alekhin
43c68d1864
imgcodecs: OPENCV_IO_ENABLE_JASPER runtime parameter
2019-03-14 21:43:24 +00:00
Alexander Alekhin
73bf170800
Merge pull request #14050 from npochhi:mlp_ann_eps_change
2019-03-14 13:36:57 +00:00
Alexander Alekhin
1ed47900d8
Merge pull request #14048 from alalek:issue_13522
2019-03-14 13:26:34 +00:00
Alexander Alekhin
990afa9032
Merge pull request #14054 from mshabunin:fix-dc1394
2019-03-14 13:04:56 +00:00
Alexander Alekhin
c03a936cfc
Merge pull request #14040 from seiko2plus:issue13211
2019-03-14 13:04:35 +00:00
Maksim Shabunin
e4a4f93b72
Removed obsolete functions from cap_dc1394_v2.cpp
2019-03-14 12:08:16 +03:00
npochhi
f1a99995c4
Changed eps checking condition
2019-03-14 14:01:34 +05:30
Sayed Adel
872e7894b4
core:vsx working around gcc aligned memory access bug
...
- allow cmake to check sanity of vsx aligned ld/st
- force universal intrinsics v_load_aligned/v_store_aligned
to failback to unaligned ld/st if cmake runtime vsx aligned test fail
2019-03-14 01:55:40 +02:00
Alexander Alekhin
bd1fd59fc1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-13 19:13:13 +00:00
Alexander Alekhin
1fa3d21f6a
android: don't install java/build.gradle
2019-03-13 18:52:15 +00:00
Alexander Alekhin
de8eda5fdf
Merge pull request #13655 from sturkmen72:update_doc_photo
2019-03-13 17:57:17 +00:00
Richard Veale
8158e5b7a0
Merge pull request #13695 from flyingfalling:3.4
...
* Fixed bug that made cuda::filter give corrupted output when different filters called in different threads. This was due to use of global texture variable shared by all filters.
* REV: fixed tab issue for opencv coding style...
2019-03-13 20:53:59 +03:00
Alexander Alekhin
f4b6ae46d1
Merge pull request #14045 from rpici:fix_bug_in_test_tiff
2019-03-13 16:17:43 +00:00
Alexander Alekhin
cdf6e460e8
Merge pull request #14021 from dkurt:init_opencv_wasm
2019-03-13 16:09:21 +00:00
Alexander Alekhin
be1ae9d4a6
Merge pull request #14046 from alalek:fix_static_analysis_issues_3.4
2019-03-13 16:03:21 +00:00
rpici
9cca066ee8
Fix bug in test_tiff.cpp
...
The big endian data in the tiff_sample_data array was never being tested. This could be observed by e.g. changing the 9th byte in the big endian data from 0xde to something that should fail the test, e.g. 0xdd, and the test would still pass even though it should fail.
2019-03-13 09:42:47 -05:00
Alexander Alekhin
8c8715c4dd
fix static analysis issues
2019-03-13 17:19:39 +03:00
Alexander Alekhin
f73b4f4a26
imgproc: revert #13843
...
This reverts commit 00e8c7810f
2019-03-13 15:07:37 +03:00
Namgoo Lee
a54affeb8d
Move Ptr-related code from lut.cu to lut.cpp
2019-03-13 20:25:28 +09:00
Dmitry Kurtaev
18ab85efc2
Backport commits from
...
https://github.com/opencv/opencv/pull/12601
https://github.com/opencv/opencv/pull/12622
2019-03-13 13:32:44 +03:00
take1014
e0b664f390
fix dftFilter2D
2019-03-13 00:27:56 +09:00
Alexander Alekhin
ea9a17ebc2
Merge pull request #14036 from jveitchmichaelis:Y16_v4l_fix
2019-03-12 14:38:37 +00:00
Josh Veitch-Michaelis
2143f7cee1
release frame after disabling convert rgb
2019-03-12 12:42:07 +00:00
Alexander Alekhin
80e5642ca2
pre: OpenCV 3.4.6 (version++)
2019-03-12 13:29:42 +03:00
Alexander Alekhin
6e2ede8c56
pre: OpenCV 4.1.0 (version++)
2019-03-12 13:01:44 +03:00
Alexander Alekhin
8c0b0714e7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-11 19:20:22 +00:00
Giles Payne
55f02d8c66
Merge pull request #14011 from komakai:debug-build
...
* Add Android SDK debug build flag
* Change LOG_TAG define for consistency with other modules
2019-03-11 17:16:42 +03:00
Alexander Alekhin
2c07c6718f
imgproc: dispatch morph
2019-03-11 13:54:12 +00:00
Alexander Alekhin
5a01227aa1
imgproc: dispatch box_filter
2019-03-11 13:54:12 +00:00
Alexander Alekhin
ce3c92eb1f
imgproc: dispatch bilateral_filter
2019-03-11 13:54:12 +00:00
Alexander Alekhin
b99c9145bf
imgproc: dispatch smooth
2019-03-11 13:54:12 +00:00
Alexander Alekhin
6ec08f268f
imgproc: dispatch medianBlur
2019-03-11 13:54:12 +00:00
Alexander Alekhin
8546ac3ce6
imgproc: get rid of filter.avx2.cpp
2019-03-11 13:54:12 +00:00
Alexander Alekhin
9a8dbfd57f
imgproc: dispatch filter.cpp
2019-03-11 13:54:12 +00:00
Alexander Alekhin
756a98a395
imgproc: keep history of filters files
2019-03-11 13:54:07 +00:00
Alexander Alekhin
9dc7554089
imgproc: copy .dispatch.cpp
2019-03-11 13:53:59 +00:00
Alexander Alekhin
6eac8f78b9
imgproc: copy .simd.hpp
2019-03-11 13:53:59 +00:00
Alexander Alekhin
98e2bb8721
Merge pull request #14022 from alalek:core_fix_neon_intrinsics
2019-03-11 13:52:43 +00:00
Alexander Alekhin
842c58a7d6
core(intrin): NEON v_load_expand_q() support unaligned addr
2019-03-11 12:06:05 +00:00
Alexander Alekhin
7a2dca5947
Merge pull request #14015 from saskatchewancatch:issue-13921
2019-03-11 10:08:06 +00:00
Gregor Mittag
d71977b4dd
Add JPEG2000 compression flag.
2019-03-10 07:59:09 +01:00
Giles Payne
11dbd86aa3
Merge pull request #13956 from komakai:java-mat-class-improvements
...
* Expose more C++ functionality in the Java wrapper of the Mat class
In particular expose methods for handling Mat with more than 2 dimensions
* add constructors taking an array of dimension sizes
* add constructor taking an existing Mat and an array of Ranges
* add override of the create method taking an array of dimension sizes
* add overrides of the ones and zeros methods taking an array of dimension sizes
* add override of the submat method taking an array of ranges
* add overrides of put and get taking arrays of indices
* add wrapper for copySize method
* fix crash in the JNI wrapper of the reshape(int cn, int[] newshape) method
* add test for each method added to Mat.java
* Fix broken test
2019-03-10 00:11:04 +03:00
Rajkiran Natarajan
40af53b1d6
issue-13921: Support setting compression setting for writing tiff images
2019-03-09 15:48:21 -05:00
Alexander Alekhin
7e8cc580c9
Merge pull request #13997 from alalek:imgproc_dispatch_cvtcolor
2019-03-08 16:18:44 +00:00
Alexander Alekhin
a1ef612662
Merge pull request #14000 from nglee:dev_FixCuda101BuildIssueMaster
2019-03-07 20:19:50 +00:00
Adrian Renner
442fdfd4b2
Merge pull request #13999 from addyi:fixAndroidLintingErrors
...
* fix android lint error in BaseLoaderCallback (LongLogTag)
Lint Error that was causde by the to long TAG:
BaseLoaderCallback.java:31:
Error: The logging tag can be at most 23 characters,
was 31 (OpenCVLoader/BaseLoaderCallback) [LongLogTag]
Log.e(TAG, "Package installation failed!");
* add requested "OCV" prefix for android logging
2019-03-07 23:18:22 +03:00
Alexander Alekhin
922cd208f7
Merge pull request #13875 from allnes:optimization_fuse
2019-03-07 14:38:59 +00:00
Alexander Alekhin
4f9a99141e
Merge pull request #13937 from smirnov-alexey:gapi_change_standalone_cmake
2019-03-07 14:38:14 +00:00
Namgoo Lee
713d91b04e
CUDA 10.1 Build Issue Fix on Master Branch
2019-03-07 23:13:03 +09:00
Alexander Alekhin
8b541e450b
imgproc: dispatch color*
...
Lab/XYZ modes have been postponed (color_lab.cpp):
- need to split code for tables initialization and for pixels processing first
- no significant performance improvements for switching between SSE42 / AVX2 code generation
2019-03-07 15:45:05 +03:00
Alexander Alekhin
39783a6584
core: keep history of color*.cpp
2019-03-07 15:38:13 +03:00
Alexander Alekhin
f26912960f
imgproc: clone color*.dispatch.cpp
2019-03-07 15:35:49 +03:00
Alexander Alekhin
db588bb831
imgproc: clone color*.simd.hpp
2019-03-07 15:35:13 +03:00
Alexander Alekhin
b9d2e6664d
Merge pull request #13979 from alalek:issue_13772
2019-03-07 09:53:25 +00:00
Alexander Alekhin
a43337c28e
Merge pull request #13986 from alalek:perf_ignore_ovx
2019-03-07 09:50:49 +00:00
Alexander Alekhin
eb9001665e
Merge pull request #13993 from liuyuns:issue_13963_thresh_nms_yolov3
2019-03-07 07:55:34 +00:00
Easton Liu
fcfb29766b
Add ability to read thresh and nms_threshold from YOLO layer in YOLOV3 cfg file.
...
Currently the thresh is hard-coded to be 0.2 and nms_threshold as 0.4.
2019-03-07 09:55:48 +08:00
Christopher N. Hesse
796b0fec7d
videoio: gst: Fix gst assertion on null msg
...
According to the gstreamer docs [1], the GstMessage pointer returned by
gst_bus_pop() is nullable, meaning NULL is a valid return value.
Previously, gst_is_missing_plugin_message would throw an assert when its
message object parameter would fail the GST_IS_MESSAGE macro check,
crashing the entire process (unless running in a try-catch block of course).
Instead of relying on valid messages, check if the message object itself is
valid before passing it to other gstreamer functions.
[1] https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstBus.html#gst-bus-pop
Signed-off-by: Christopher N. Hesse <raymanfx@gmail.com>
2019-03-06 17:37:02 +01:00
Alexander Alekhin
d5a2fe5180
perf: ignore _ovx tests
2019-03-06 15:52:23 +03:00
Alexander Alekhin
332c37f332
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-06 11:43:16 +03:00
Alexander Nesterov
74574dfae4
Added optimization fuse
2019-03-05 18:12:03 -01:00
Alexander Alekhin
d2f70f61aa
Merge pull request #13880 from catree:add_hand_eye_calibration
2019-03-05 16:02:39 +00:00
Alexander Alekhin
3182cc4277
Merge pull request #13980 from terfendail:bresize3_fix
2019-03-05 15:59:21 +00:00
Alexander Alekhin
7bcfe8f204
Merge pull request #13974 from alalek:fix_build_warnings
2019-03-05 14:57:50 +00:00
Vitaly Tuzov
99b39aa5bd
Fixed out of bound reading in LINEAR_EXACT resize for 8UC3
2019-03-05 17:21:21 +03:00
catree
bbf39b0964
Add Hand-Eye calibration methods (Tsai, Park, Horaud, Andreff, Daniilidis).
2019-03-05 14:51:33 +01:00
Alexander Alekhin
7366eebebb
core: fix condition in OutputArray::create(allowTransposed=True)
2019-03-05 16:26:59 +03:00
Alexander Alekhin
89c106b29e
Merge pull request #13945 from alalek:backport_bindings_generator
2019-03-05 12:45:21 +00:00
Alexander Alekhin
b46fa2e556
Merge pull request #13970 from alalek:videoio_plugins_update
2019-03-05 11:48:39 +00:00
Alexander Alekhin
35edad3e74
build: fix warnings
2019-03-05 14:47:04 +03:00
Alexander Alekhin
25a9a32f8e
videoio: plugins, add strict checks
2019-03-05 13:22:52 +03:00
Alexander Alekhin
11fd9e5fdc
videoio: revert registry chages, update cap.cpp
2019-03-04 21:37:20 +00:00
Alexander Alekhin
403f11fdbf
videoio: update plugin API
2019-03-04 21:36:22 +00:00
Alexander Alekhin
b4cba524d3
videoio: move backend.cpp -> backend_plugin.cpp
2019-03-04 20:06:19 +00:00
Alexander Alekhin
746cd1e1e6
Merge pull request #13949 from alalek:videoio_plugins_target
2019-03-04 19:25:11 +00:00
x3lif
19cf511895
Merge pull request #13910 from x3lif:Issue_13908
...
* Fix Issue 13908
Allocate the matrix _Jo only when the solver needs it (ie when solver.state == CvLevMarq::CALC_J)
* Fix calib3D unit test
Fix _Jo allocation when stddev is not empty
* Removing trailing whitespaces
* scope _dp* variables
* fix whitespaces
2019-03-04 19:34:10 +03:00
Alexander Alekhin
93dab9e1e9
videoio(v4l): fix build due missing defines
...
- V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT
- V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH
2019-03-04 18:46:56 +03:00
smirnov-alexey
6b31f58092
Modifies standalone G-API cmake for testing it properly
2019-03-04 15:33:15 +03:00
Alexander Alekhin
dd37c10d4a
Merge pull request #13922 from smirnov-alexey:gapi_fix_nv12_asserts
2019-03-04 11:36:53 +00:00
Namgoo Lee
65e76adeda
Windows Build Issue Fix
2019-03-04 09:52:50 +09:00
Suleyman TURKMEN
3d1dbd2ccd
clean up C API
2019-03-03 21:43:27 +03:00
Namgoo Lee
5a2faab2e6
CUDA 10.1 Build Issue Fix
2019-03-03 16:40:43 +00:00
Alexander Alekhin
6e9b6a27cf
Merge pull request #13951 from alalek:dnn_fix_logging_verbose
2019-03-02 20:09:07 +00:00
JoeHowse
c0d41f05d6
Merge pull request #13947 from JoeHowse:4.0.1-patches
...
* core, stitching: revise syntax to support Visual C++ 2013
* stitching: revise syntax again to support Visual C++ 2013 and other compilers
* stitching: minor update to clarify changes
2019-03-02 19:00:32 +03:00
Alexander Alekhin
80d37ba698
dnn: fix usage of CV_LOG_VERBOSE macro
2019-03-02 14:49:21 +00:00
Alexander Alekhin
9a6f2630b2
cmake: +opencv_videoio_plugins virtual target
...
- support comma-separated list in VIDEOIO_PLUGIN_LIST
- opencv tests/samples depend on plugins virtual target
2019-03-02 09:19:08 +00:00
Alexander Alekhin
0a98bc0ee9
java: avoid enum values with references on other enums
...
declaration order is not fixed
Error message:
Core.java:97: error: illegal forward reference
Hamming_normType = NORM_HAMMING,
2019-03-01 21:32:03 +00:00
Alexander Alekhin
47b6955ba0
Merge pull request #13942 from alalek:imgproc_lsd
2019-03-01 21:16:29 +00:00
Alexander Alekhin
030e955db7
python: support Python list for cv::Range
2019-03-01 20:52:35 +00:00
Alexander Alekhin
f5b58e5fc9
bindings: backport generator from OpenCV 4.x
...
- better handling of enum arguments
- less merge conflicts
2019-03-01 20:18:48 +00:00
Alexander Alekhin
f0179f96a7
Merge pull request #13940 from alalek:fix_13914
2019-03-01 19:32:36 +00:00
Alexander Alekhin
3ba49ccecc
imgproc: removed LSD code due original code license conflict
2019-03-01 16:25:39 +03:00
Alexander Alekhin
7d24727184
ml: handle sigmoid NaN result (should be Inf)
...
- added more debug checks
2019-03-01 13:47:45 +03:00
smirnov-alexey
939ea4ba30
Remove incorrect asserts in NV12 to RGB/BGR kernels
2019-03-01 13:31:16 +03:00
Sayed Adel
5478165e16
core:vsx Fix narrowing warning on vector splats
2019-03-01 00:48:38 +00:00
Alexander Alekhin
a9f67c2d1d
Merge pull request #13905 from terfendail:pyr_wintr2
2019-02-28 14:53:42 +00:00
Alexander Alekhin
ed8f0ab265
Merge pull request #13931 from berak:core_fix_mat_max_mult
2019-02-28 14:29:31 +00:00
berak
20afae5a14
core: fix mat matx multiplication
2019-02-28 14:22:54 +01:00
Vitaly Tuzov
9548093b46
Horizontal line processing for pyrDown() reworked using wide universal intrinsics.
2019-02-28 00:12:57 +03:00
catree
576ab3df9a
Add division operators for Matx.
2019-02-27 19:36:23 +01:00
Alexander Alekhin
f1f0f630c7
core: disable I/O perf test
...
- can be enable separately if needed
- not stable (due storage I/O processing)
2019-02-27 18:07:45 +03:00
Alexander Alekhin
c3cf35ab63
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-26 17:34:42 +03:00
Maksim Shabunin
9702987209
Framework for dynamic videoio backends, FFmpeg and GStreamer plugins
2019-02-26 13:50:30 +03:00
Alexander Alekhin
1bf1694506
Merge pull request #13840 from jaewoosong:jaewoosong-patch-1
2019-02-26 10:19:17 +00:00
Alexander Alekhin
865c29a754
Merge pull request #13892 from dkurt:onnx_upsample_unsqueeze
2019-02-26 10:17:07 +00:00
Maksim Shabunin
8c1e0537ec
Merge pull request #13889 from mshabunin:enable-narrowing-warning
...
* Enabled -Wnarrowing warning
* Fixed type narrowing issues
* Cast python constants
* Use long long for python constants
* Use int for python constants with fallback to long
* Update cv2.cpp
2019-02-26 13:15:59 +03:00
Jaewoo Song
225bdc21c0
Making JavaCamera2View behaves in the same way as JavaCameraView
2019-02-26 14:18:29 +08:00
Alexander Alekhin
4cf321f3f8
Merge pull request #13903 from nglee:dev_CudevRework
2019-02-25 16:11:38 +00:00
Alexander Alekhin
f6d3adcf3d
Merge pull request #13887 from dkurt:dnn_ie_lrn_bug
2019-02-25 14:26:22 +00:00
Namgoo Lee
2b6be3cb0f
cudev - Rework some code
...
- Use shfl_down, instead of __shfl_down, on warp scan
- Remove race conditions
2019-02-25 13:46:32 +09:00
Alexander Alekhin
fd49ee5f39
core: dispatch merge.cpp
2019-02-23 15:42:26 +00:00
Alexander Alekhin
93a36b0df1
core: keep history of merge.cpp
2019-02-23 15:41:39 +00:00
Alexander Alekhin
4e12febe90
core: clone merge.simd.hpp
2019-02-23 15:41:33 +00:00
Alexander Alekhin
6eabe6bc14
core: clone merge.dispatch.cpp
2019-02-23 15:41:33 +00:00
Alexander Alekhin
3bc9912f6e
Merge pull request #13893 from alalek:core_dispatch_split
2019-02-23 15:39:54 +00:00
AKAMath
4c94804bb0
Merge pull request #13837 from amithjkamath:test
...
New computeECC function, and updated findTransformECC function to make gaussian filtering optional (#13837 )
* fix for https://github.com/opencv/opencv/issues/12432 with doc and tests
* Added doc string for new parameter.
* Fixes suggested by Alalek for getting around ABI incompatibility.
* Update to docstring, to remove parameter that isn't relevant.
* More updates based on Alalek's usggestions.
2019-02-22 18:36:40 +03:00
Alexander Alekhin
ca4fd1e427
Merge pull request #13884 from dkurt:dnn_drop_ie_r1_r2
2019-02-22 11:21:43 +00:00
Alexander Alekhin
91d152e2c2
core: dispatch split.cpp
2019-02-22 09:54:31 +00:00
Alexander Alekhin
1d8b30bf4f
core: keep history of split.cpp
2019-02-22 09:18:51 +00:00
Alexander Alekhin
0311770e8b
core: clone split.simd.hpp
2019-02-22 09:18:27 +00:00
Alexander Alekhin
82cd2f8c93
core: clone split.dispatch.cpp
2019-02-22 09:17:51 +00:00
Dmitry Kurtaev
20400aa9f7
Import Upsample and Unsqueeze from ONNX
2019-02-21 20:17:28 +03:00
Dmitry Kurtaev
4cbd09c41c
Add extra limitations for LRN from Inference Engine backend
2019-02-21 14:20:24 +03:00
Alexander Alekhin
0e70363f4a
Merge pull request #13882 from dkurt:fix_13479
2019-02-21 09:38:26 +00:00
Alexander Alekhin
7baa5efbe4
Merge pull request #13874 from dkurt:dnn_default_conf_thresh
2019-02-21 09:36:44 +00:00
Dmitry Kurtaev
ed710eaa1c
Make Inference Engine R3 as a minimal supported version
2019-02-21 09:32:26 +03:00
Dmitry Kurtaev
bfd663c281
Add a test for grouped deconvolution from ONNX
2019-02-21 08:54:35 +03:00
Ayush Pandey
5c7fe0fe05
Fix Issue #13479
2019-02-21 08:36:16 +03:00
Alexander Alekhin
1db5d82b7f
Merge pull request #13844 from brad-kelly:integral_avx512_cn234
2019-02-20 12:27:16 +00:00
Alexander Alekhin
3064e40d9e
Merge pull request #13866 from alalek:core_dispatch_mean
2019-02-20 11:50:21 +00:00
Vitaly Tuzov
334c4d62b5
Merge pull request #13781 from terfendail:warp_wintr
...
Resize reworked using wide universal intrinsics (#13781 )
* Added wide universal intrinsics optimized implementation for 3 channel bit-exact linear resize
* Reworked linear resize using new wide LUT intrinsics
* Fix for VSX intrinsics
2019-02-20 14:30:28 +03:00
Dmitry Kurtaev
715f881dda
Replace default confidence threshold for dnn detections from -FLT_MAX to 0
2019-02-20 13:09:09 +03:00
Alexander Alekhin
8bde6aea4b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-19 19:49:13 +00:00
Brad Kelly
507f8add1c
Implementing AVX512 Support for 2 and 4 channel mats for CV_64F format
2019-02-19 11:31:20 -08:00
Alexander Alekhin
f1d9666a20
Merge pull request #13858 from rgarnov:fluid_nv12_support
2019-02-19 19:26:10 +00:00
Ruslan Garnov
c0076b58cd
Added NV12 support to fluid backend
2019-02-19 18:18:23 +03:00
Alexander Alekhin
8cedc052ca
Merge pull request #13841 from dkurt:dnn_ie_future_3
2019-02-19 14:19:36 +00:00
Alexander Alekhin
dc84cf9914
core: dispatch mean.cpp
2019-02-19 16:58:32 +03:00
Alexander Alekhin
4b82c8a22b
core: keep history of mean.cpp
2019-02-19 16:46:46 +03:00
Alexander Alekhin
7af7bcae18
core: clone mean.dispatch.cpp
2019-02-19 16:46:28 +03:00
Alexander Alekhin
93cea6e46e
core: clone mean.simd.hpp
2019-02-19 16:45:42 +03:00
Lindsay Roberts
7c72e095fa
Fix Flann compilation under nvcc + NEON
...
All <arm_neon.h> includes in core/cv_cpu_dispatch.h are protected by an
ifndef __CUDACC__ to prevent attempting to use neon intrinsics when
compiling cuda kernels (.cu) -- this prevents hard errors such as
error: identifier "__builtin_neon_qi" is undefined
Add this same protection to flann/dist.h to fix compilation involving
flann.hpp.
2019-02-19 15:11:01 +02:00
Pierre Chatelier
00e8c7810f
LineIterator witout a Mat ( #13843 )
...
* LineIterator witout a Mat
cv::LineIterator can be used without being attached to any cv::Mat, it only needs the size and type of data. An alternative constructor has been defined for that.
In that case, a LineIterator can no more be dereferenced with the * operator, but pos() still returns valid pixel positions.
It can be useful when LineIterator is just used to compute positions of pixels on a line, without requiring to build a Mat just for that.
Use case : with a dataset that would represent a huge image, pixel positions can be pre-computed before querying the dataset API.
* Update imgproc.hpp
removed trailing spaces
* Update drawing.cpp
fixed warning
2019-02-19 13:44:41 +03:00
Ruslan Garnov
322115bfcf
Removed unused functions from View::Priv
2019-02-18 19:26:54 +03:00
Dmitry Kurtaev
ca5976e3d4
Fix IE backend considering future changes.
2019-02-18 19:26:04 +03:00
LaurentBerger
9e94212eac
Solves bug 13853
2019-02-18 17:15:05 +01:00
Alexander Alekhin
3bba5b5a31
Merge pull request #13850 from nglee:dev_FixCudaStereoBMHangRace
2019-02-18 14:50:03 +00:00
Alexander Alekhin
428720f490
Merge pull request #13833 from alalek:core_dispatch_matmul
2019-02-18 13:38:44 +00:00
Alexander Alekhin
cd66f6e3db
core: dispatch matmul
...
- gemm: keep baseline only (lapack is 10x+ faster, lets reduce binary size)
- transform / distTransform
- scaleAdd (32f/64f only)
- Mahalanobis: keep baseline only (no perf tests)
- mulTransposed: keep baseline only (no perf tests)
- dot
2019-02-18 14:36:46 +03:00
Namgoo Lee
1a961660d8
cuda::StereoBM - fix hanging and racing issue
...
- Fix hanging issue on 2080 Ti
- Fix racing issue
2019-02-18 06:03:12 +00:00
Alexander Alekhin
9d3d5e9d65
Merge pull request #13774 from l-bat:fix-IE-tests
2019-02-15 13:54:24 +00:00
smirnov-alexey
406392e13d
Introduces yuv420p(nv12) to rgb and bgr color conversion
2019-02-15 14:25:57 +03:00
Alexander Alekhin
fbde57dba8
core: keep history of matmul.cpp
2019-02-14 19:07:41 +03:00
Alexander Alekhin
dcee7b1605
core: clone matmul.dispatch.cpp
2019-02-14 19:07:37 +03:00
Alexander Alekhin
b769ad2c23
core: clone matmul.simd.hpp
2019-02-14 19:07:37 +03:00
Alexander Alekhin
e3633ec4a2
core: dispatch count_non_zero
2019-02-14 13:16:20 +03:00
Alexander Alekhin
0b49680339
core: keep history of count_non_zero.cpp
2019-02-14 13:15:43 +03:00
Alexander Alekhin
439e43a027
core: clone count_non_zero.dispatch.cpp
2019-02-14 13:15:39 +03:00
Alexander Alekhin
af8a3a0b66
core: clone count_non_zero.simd.hpp
2019-02-14 13:15:39 +03:00
Liubov Batanina
183c0fcab1
Changed condition for resize and lrn layers
2019-02-14 13:11:14 +03:00
Alexander Alekhin
86136c0ccc
Merge pull request #13796 from alalek:core_dispatch_sum
2019-02-14 08:16:42 +00:00
Alexander Alekhin
b40a7ffbe4
core: dispatch sum
2019-02-13 18:17:38 +03:00
Alexander Alekhin
c88e6b344b
core: keep history of sum.cpp
2019-02-13 13:49:36 +03:00
Alexander Alekhin
6e88bff3e3
core: clone sum.dispatch.cpp
2019-02-13 13:49:29 +03:00
Alexander Alekhin
5aceac6b93
core: clone sum.simd.hpp
2019-02-13 13:49:29 +03:00
Alexander Alekhin
b12e1acdec
Merge pull request #13810 from nglee:dev_CudaSafeBlockScan
2019-02-12 21:50:29 +00:00
Alexander Alekhin
54a1bbe1c4
Merge pull request #13812 from smirnov-alexey:gapi_fix_sobelxy_valgrind
2019-02-12 18:15:14 +00:00
Namgoo Lee
21eb60f88b
cudalegacy: Use safe block scan function
2019-02-13 01:55:02 +09:00
smirnov-alexey
caf438c63b
Fixes an issue with valgrind and sobelxy
2019-02-12 18:36:06 +03:00
Alexander Alekhin
dfef04b325
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-12 17:54:40 +03:00
Alexander Alekhin
b1caa4f4d5
Merge pull request #13803 from thangktran:thangktran/fix-misleading-runtime-assertion-calibrateCamera
2019-02-12 14:25:21 +00:00
Alexander Alekhin
9e7014b59f
Merge pull request #13799 from dkurt:dnn_ie_future_2
2019-02-12 14:07:42 +00:00
Thang Tran
a1f4e65d03
calib3d: Fix calibrateCamera() misleading error
...
objectPoints and imagePoints are not checked whether they're empty and
cause checkVector() to fail, thus result in a wrong error message.
Fixes: https://github.com/opencv/opencv/issues/6002
2019-02-12 16:23:34 +03:00
Alexander Alekhin
f3d62c94b1
Merge pull request #13800 from dkurt:fix_nvidia_caffe
2019-02-12 13:02:22 +00:00
Alexander Alekhin
2e28ff78c1
Merge pull request #13780 from alalek:core_dispatch_convertTo
2019-02-12 12:08:30 +00:00
Dmitry Kurtaev
1606137df2
Read raw floats data from Caffe models
2019-02-11 20:08:17 +03:00
Dmitry Kurtaev
0711dab09d
Fix Intel's Inference Engine backend from future. Second try.
2019-02-11 19:47:57 +03:00
klemens
5d9c6723ee
spelling fixes
...
backport 997b7b18af
2019-02-11 15:35:10 +03:00
Liubov Batanina
6b4becfd03
Enabled tests on IE backend
2019-02-11 12:39:28 +03:00
klemens
997b7b18af
spelling fixes
2019-02-09 22:29:54 +01:00
Alexander Alekhin
b17c1c6721
Merge pull request #13782 from paroj:pypath
2019-02-09 15:26:11 +00:00
Alexander Alekhin
f8786c9bf4
Merge pull request #13783 from alalek:fix_13741
2019-02-09 15:25:48 +00:00
Alexander Alekhin
f414c16c13
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-08 17:18:56 +00:00
Pavel Rojtberg
f0ef4b2246
python: sys.path[0] is reserved for the main script
2019-02-08 17:24:31 +01:00
Alexander Alekhin
d32d576d6d
core: dispatch convert_scale
2019-02-08 18:32:10 +03:00
Alexander Alekhin
39b90ae9fb
core: dispatch convert
2019-02-08 18:32:10 +03:00
Alexander Alekhin
c6f39870ff
Merge pull request #13776 from alalek:fix_13741
2019-02-08 15:30:36 +00:00
Alexander Alekhin
757d8ac8f7
Merge pull request #13769 from savuor:cvtColor_tests_16u_32f
2019-02-08 15:29:35 +00:00
Alexander Alekhin
52050ebe32
Merge pull request #13760 from AnastasiaaSenina:fix-bug
2019-02-08 15:22:17 +00:00
Alexey Smirnov
b1cc114b7b
Merge pull request #13723 from smirnov-alexey:gapi_add_sobelxy
...
* Add Sobel kernel which returns both dx and dy
* Splice dx and dy and extend add_border function
Also change some tests parameters
* Add borderValue parameter in test
* Introduces fluid kernel for sobelxy
Adds tests (basic and performance) on new backend
* Introduces BufHelper struct for some arithmetic
2019-02-08 16:59:56 +03:00
Alexander Alekhin
33d477e049
core: keep history of convert_scale.cpp
2019-02-08 16:39:13 +03:00
Alexander Alekhin
c4abdb8050
core: clone convert_scale.dispatch.cpp
2019-02-08 16:38:50 +03:00
Alexander Alekhin
0af9e19be7
core: clone convert_scale.simd.hpp
2019-02-08 16:35:52 +03:00
Alexander Alekhin
b6a0acb8f6
core: keep history of convert.cpp
2019-02-08 16:29:54 +03:00
Alexander Alekhin
5527c41468
core: clone convert.dispatch.cpp
2019-02-08 16:29:16 +03:00
Alexander Alekhin
1629e29b98
core: clone convert.simd.hpp
2019-02-08 16:27:59 +03:00
Alexander Alekhin
3091d10b00
Merge pull request #13746 from allnes:fix_step_dnn
2019-02-08 10:18:43 +00:00
Alexey Smirnov
766fd20faa
Merge pull request #13745 from smirnov-alexey:gapi_add_gout_overloading
...
* Add GOut overloading for tuple of parameter pack
* Move getGOut_impl into namespace and add const to input references
2019-02-08 13:16:50 +03:00
Alexander Alekhin
8f7e92e466
Merge pull request #13764 from nglee:dev_CudaCLAHE16bitSupport
2019-02-08 10:13:11 +00:00
AnastasiaaSenina
d7b1f28a90
fixed bug: added threshold for variables 'rotate_a', ' rotate_c'
2019-02-08 13:06:23 +03:00
Rostislav Vasilikhin
4e679e1cc5
disabled 16u and 32f perf tests
2019-02-07 19:26:36 +03:00
Rostislav Vasilikhin
87f651c119
disabled sanity check for 32f
2019-02-07 18:20:29 +03:00
Vitaly Tuzov
07c10d6fc3
Fixed out of bound reading issue in erode() and dilate()
2019-02-07 17:28:58 +03:00
Alexander Alekhin
66d9a33b50
core(ocl): fix log messages
2019-02-07 16:35:14 +03:00
Alexey Smirnov
315e7fbbee
Merge pull request #13721 from smirnov-alexey:gapi_add_normalize
...
GAPI: Add normalize kernel in G-API (#13721 )
* Add normalize kernel in G-API
In addition add several tests on new kernel
* Fix indentations and normalize test structure
* Move normalize kernel from imgproc to core
Set default parameter ddepth to -1
* Fix alignment
2019-02-07 16:05:39 +03:00
Alexander Nesterov
9cbdb48d6d
Fix change step
2019-02-07 11:14:20 -01:00
Liubov Batanina
b068d26fad
Using IE backend for normalize layer tests
2019-02-07 11:52:27 +03:00
Namgoo Lee
fb8e652c3f
Add CV_16UC1 support for cuda::CLAHE
...
Due to size limit of shared memory, histogram is built on
the global memory for CV_16UC1 case.
The amount of memory needed for building histogram is:
65536 * 4byte = 256KB
and shared memory limit is 48KB typically.
Added test cases for CV_16UC1 and various clip limits.
Added perf tests for CV_16UC1 on both CPU and CUDA code.
There was also a bug in CV_8UC1 case when redistributing
"residual" clipped pixels. Adding the test case where clip
limit is 5.0 exposes this bug.
2019-02-06 17:21:55 +00:00
Rostislav Vasilikhin
bbedebb57c
perf tests for cvtColor for 16U and 32f added
2019-02-06 17:56:44 +03:00
Alexander Alekhin
f67b197d49
Merge pull request #13738 from dkurt:dnn_ie_lock_shared_plugins
2019-02-06 12:09:58 +00:00
Dmitry Kurtaev
bc4e471847
Add a mutex for shared Inference Engine plugins
2019-02-05 19:26:58 +03:00
Alexander Alekhin
fcec053d59
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-05 19:12:41 +03:00
Alexander Alekhin
eab6744ac7
dnn(ocl): use compile-time LOCAL_SIZE parameter
...
instead of get_local_size(0) and dynamic local memory allocation
2019-02-05 15:51:16 +03:00
winice
37a5af3673
Merge pull request #13737 from winice-test:master
...
* Optical Flow rework to use wide universal intrinsics
* remove if (useSIMD) check as review requested
2019-02-04 18:59:00 +03:00
Dmitry Kurtaev
8ecc5e6f64
Add tests for features2d JavaScript bindings
2019-02-01 19:12:31 +03:00
Alexander Alekhin
d073215f10
Merge pull request #13705 from mshabunin:clang-warnings
2019-02-01 16:11:00 +00:00
Rostislav Vasilikhin
554eae56d1
Merge pull request #13708 from savuor:yuv42x_wide
...
YUV42x color conversions rewritten to wide intrinsics (#13708 )
* a*b+c -> fma
* YUV420sp2RGB initially vectorized
* shorter var names
* loops by 4
* yuv420p2rgb vectorized
* yuv422toRGB vectorized
* reg arrays
* rgb2yuv420 vectorized
* warnings fixed
* try to fix align error
2019-02-01 19:09:31 +03:00
Alexander Alekhin
4e66d078d2
Merge pull request #13722 from alalek:ocl_pass_ptr_for_empty_umat
2019-02-01 16:07:43 +00:00
Alexander Alekhin
665408e57f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-01 13:17:32 +03:00
Alexander Alekhin
a42bbc9722
Merge pull request #13736 from dkurt:dnn_ie_future
2019-02-01 10:01:39 +00:00
Alexander Alekhin
9362639437
Merge pull request #13716 from dkurt:dnn_conv_weights_clone
2019-02-01 09:57:08 +00:00
Hannah McLaughlin
418898029c
Merge pull request #13718 from lochsh:svm-sigmoid-fix
...
SVM sigmoid kernel fix (issue #13621 ) (#13718 )
* Added test for sigmoid case for retrieving support vectors
* undo unhelpful test
* add test for sigmoid SVM with data that is easily separable into two concentric circles
* Update sigmoid kernel to use tanh(gamma * <x, y> + coef0) instead of -tanh(gamma * <x, y> + coef0)
* remove unnecessary constraint on coef0
* cleanup
* fixing inappropriate use of doubles
* Add f to float literal
* replace CV_Assert with ASSERT_EQ where appropriate
2019-01-31 15:34:36 +03:00
Dmitry Kurtaev
c918ac298c
Fix IE tests
2019-01-31 14:14:38 +03:00
Vitaly Tuzov
2f5af1bd33
Merge pull request #13693 from terfendail:spatialgrad_wintr
...
* spatialGradient() reworked to use wide universal intrinsics
* Moved row pointers inside loops
2019-01-30 22:37:27 +03:00
Alexander Alekhin
4501a2cdea
ocl: support empty "ptr only" UMat in Kernel::set()
...
add messages to avoid silent kernel destruction
2019-01-30 14:51:06 +03:00
Maksim Shabunin
ea3dc78986
Fixed warnings produced by clang-9.0.0
2019-01-30 14:05:32 +03:00
Ramez Rafla
eb00dce78e
Merge pull request #13710 from ramezrafla:3.4
...
* Added DMatch bindings
* Added CR which was accidently removed to maintain consistency
* Removed trailing white-space
2019-01-30 00:14:33 +03:00
Alexander Alekhin
268d73165e
Merge pull request #13684 from terfendail:lblend_wintr
2019-01-29 16:21:08 +00:00
Alexander Alekhin
5916ebf500
Merge pull request #13679 from alalek:imgproc_median_blur_cleanup
...
* imgproc: cleanup medianBlur_8u_O1 code
Unnecessary per-channel buffers: H[c] / lut[c]
* imgproc(medianBlur_8u_O1): use CV_SIMD_WIDTH for alignment
2019-01-29 19:20:24 +03:00
Dmitry Kurtaev
ac262f5b5d
Clone convolution layer weights only for fusion
2019-01-29 14:29:47 +03:00
Arnaud Brejeon
d998e70a25
Merge pull request #13672 from arnaudbrejeon:bug_fix_12961
...
PyrDown: Fix bug #12961 (#13672 )
* Force unaligned pointer and create test
* More cross-platform solution
* MSVC expects a proper order
* Remove useless clang macro
2019-01-28 21:36:00 +03:00
Alexander Alekhin
3585522b24
Merge pull request #13692 from dkurt:dnn_do_not_crash_myriad_in_tests
2019-01-28 18:34:20 +00:00
Dmitry Kurtaev
3c3c5ef2b6
Fix a dnn bug with retrieving all the output blobs
2019-01-28 18:48:56 +03:00
Alexey Smirnov
a65ccc0603
Merge pull request #13678 from smirnov-alexey:gapi_fix_descrof_overloading
...
* Return vector of MetaArg instead of MatDesc and fix test with ADL check
* Fix construction of vector
* Change names and tests according to review
Also add GAPI_EXPORTS prefix for two ostream operators
2019-01-28 16:26:32 +03:00
Dmitry Kurtaev
ff775b2e54
Remove ASSERT_ANY_THROW checks fpr Myriad plugin and FP32 networks
2019-01-25 20:09:54 +03:00
Alexander Alekhin
e2dbf054ac
Merge pull request #13686 from mshabunin:fix-avfoundation
2019-01-25 14:06:24 +00:00
Alexander Alekhin
4f668e1023
Merge pull request #13608 from allnes:dnn_rework
2019-01-25 11:59:29 +00:00
Vitaly Tuzov
ed2e1af3e8
Added performance test for blendLinear
2019-01-25 14:16:19 +03:00
Vitaly Tuzov
266725a378
blendLinear() reworked to use wide universal intrinsics
2019-01-25 14:16:20 +03:00
Suleyman TURKMEN
9be8ab06ed
Update photo.hpp
2019-01-25 10:44:44 +03:00
Ruslan Garnov
3c6d5aba22
Fixed fluid heterogeneity support
2019-01-24 17:45:26 +03:00
Alexander Nesterov
97c3bcb1b7
Added fix for other size
2019-01-24 12:51:16 -01:00
Maksim Shabunin
9c4eb20221
AVFoundation on Mac: fixed frame count and unsupported format handling
2019-01-24 16:15:08 +03:00
Maksim Shabunin
eeb6f7726e
AVFoundation on Mac: fixed frame count and unsupported format handling
2019-01-24 16:12:38 +03:00
Alexander Alekhin
631b246881
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-01-22 18:00:34 +00:00
Alexander Alekhin
e1c8256602
Merge pull request #13666 from savuor:yuv_wide_port
2019-01-22 15:31:28 +00:00
Alexey Smirnov
5728679fd5
Merge pull request #13664 from smirnov-alexey:gapi_add_descrof_overloading
...
* Add version of descr_of function taking vector of Mat
* Overload descr_of function for cv::Mat
* Add template function instead of copypasting and change tests a little
2019-01-22 13:14:33 +03:00
Alexander Alekhin
dcdbaef348
Merge pull request #13658 from nglee:dev_CudaShflUpCompat
2019-01-21 18:12:38 +00:00
Rostislav Vasilikhin
a6af9c75e9
a*b+c -> fma
2019-01-21 18:57:08 +03:00
Namgoo Lee
970293a229
__shfl_up_sync with mask for CUDA >= 9
...
* __shfl_up_sync with proper mask value for CUDA >= 9
* BlockScanInclusive for CUDA >= 9
* compatible_shfl_up for use in integral.hpp
* Use CLAHE in cudev
* Add tests for BlockScan
2019-01-21 15:31:15 +00:00
Rostislav Vasilikhin
74ba4b7ae2
fixed (un)signed packing s16 -> u8
2019-01-21 18:10:29 +03:00
Rostislav Vasilikhin
6de86e325f
fixed (un)signed packing s16 -> u8
2019-01-21 18:01:44 +03:00
Alexander Alekhin
a84e11451b
imgproc(test): RGB2YUV regression test
2019-01-21 16:07:20 +03:00
Rostislav Vasilikhin
48e471fdd4
YUV vectorizations ported to master from 3.4
2019-01-21 15:35:34 +03:00
Alexander Alekhin
e5917a8fa5
Merge pull request #13580 from LaurentBerger:PythonStitch2
2019-01-19 13:44:30 +00:00
LaurentBerger
49a43dfc8f
Check syntax of stitchnig detailed
2019-01-18 19:31:05 +01:00
Alexander Alekhin
0395b2ea9c
Merge pull request #13650 from terfendail:shapedescr_wintr
2019-01-18 16:18:47 +00:00
Rostislav Vasilikhin
3812ae7949
Merge pull request #13649 from savuor:yuv_wide
...
YUV/YCrCb conversions rewritten to wide intrinsics (#13649 )
* YUV: minors
* YUV42x conversions template-merged
* more template-merged YUV42x conversions; some NEON code removed
* rgb2yuv<float> vectorized
* yuv2rgb<float> vectorized
* memcpy removed
* Yuv2RGB<ushort> vectorized
* unused code removed
* rgb2yuv<ushort> vectorized
* rgb2yuv<uchar> vectorized
* v_pack_u used (up to +30% perf)
* yuv2rgb<uchar> vectorized
* fixed compilation
2019-01-18 19:06:29 +03:00
Alexander Alekhin
400fd5c3ec
Merge pull request #13539 from dkurt:ie_graph_api
2019-01-18 16:00:18 +00:00
Vitaly Tuzov
a84bbc62b1
boundingRect() reworked to use wide universal intrinsics
2019-01-18 18:31:54 +03:00
Alexander Alekhin
dc5e69b4d4
Revert "Merge pull request #13586 from eightco:Core_bugfix3"
...
This reverts commit 3721c8bb06
except changes in modules/dnn/test/test_tf_importer.cpp
2019-01-18 18:29:12 +03:00
Alexander Alekhin
40959fcc61
Merge pull request #13637 from berak:fix_openvx
2019-01-18 14:56:31 +00:00
Vitaly Tuzov
78f80c35d2
Performance test for bounding rect estimation
2019-01-18 15:50:21 +03:00
Andrey Golubev
55770c9853
Merge pull request #13640 from andrey-golubev:gapi_gcallpriv_doc
...
* GAPI: document GCall's recursive behavior
* Move documentation outside the class
2019-01-17 20:59:47 +03:00
Lee Jaehwan
3721c8bb06
Merge pull request #13586 from eightco:Core_bugfix3
...
* Add Operator override for multi-channel Mat with literal constant.
* simple test
* Operator overloading channel constraint for primitive types
* fix some test for #13586
2019-01-17 17:23:09 +03:00
Dmitry Kurtaev
f0ddf302b2
Move Inference Engine to new API
2019-01-17 14:28:48 +03:00
Alexander Alekhin
49de982ee7
Merge pull request #13625 from nglee:dev_CudaFarnebackInitFlowFix
2019-01-16 18:18:57 +00:00
Alexander Alekhin
ca00c1dce2
Merge pull request #13631 from terfendail:thresh_wintr
2019-01-16 15:45:26 +00:00
Andrey Golubev
c8a89134a7
GAPI: fix GCall misuse in unrollExpr
2019-01-16 18:15:44 +03:00
berak
53c2ebf7f6
fix openvx wrappers
2019-01-16 12:10:22 +01:00
Alexander Alekhin
133eb8d13a
Merge pull request #13593 from brad-kelly:integral_avx512_ver34
2019-01-15 17:47:21 +00:00
Alexander Alekhin
dcdb3b36ef
Merge pull request #13622 from sturkmen72:code_clean_up
2019-01-15 17:46:26 +00:00
Vitaly Tuzov
a202dc9a90
threshold() reworked to use wide universal intrinsics
2019-01-15 19:15:19 +03:00
Alexander Alekhin
0e9c90a0d9
Merge pull request #13610 from terfendail:morph_wintr
2019-01-15 11:22:00 +00:00
Brad Kelly
0165ffa90d
Implementing AVX512 support for 3 channel cv::integral for CV_64F
2019-01-14 16:11:01 -08:00
Suleyman TURKMEN
794c14b29a
code clean up
2019-01-14 22:21:21 +03:00
Vitaly Tuzov
012e43de4b
Morphology reworked to use wide universal intrinsics
2019-01-14 19:02:58 +03:00
Namgoo Lee
4366c8734f
Fix Farneback Optical Flow Algorithm
...
- Before this PR, following tests failed on some platform.
CUDA_OptFlow/FarnebackOpticalFlow.Accuracy/19
CUDA_OptFlow/FarnebackOpticalFlow.Accuracy/23
- The algorithm now recognizes the OPTFLOW_USE_INITIAL_FLOW flag.
Previously, when the flag was set, it did not use the flow data
passed as input, instead used some garbage data in memory.
- More strict test limit.
2019-01-13 15:14:45 +00:00
Vitaly Tuzov
ea882d58c6
Added CV_ALWAYS_INLINE macro
2019-01-11 22:40:35 +03:00
Jim Zhou
78bd55c8df
Merge pull request #13601 from JimZhou-001:JimZhou-001
...
* Fix the bug in case determinant of rotation matrix is -1
* calib3d(test): check det(R) == 1
2019-01-11 16:58:47 +03:00
Raphael Graf
82c77fa244
dnn: remove malloc.h include
2019-01-10 13:07:36 +01:00
Alexander Alekhin
7e2ebecd52
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-01-10 12:29:41 +03:00
Alexander Alekhin
054bd23a43
Merge pull request #13560 from cuihaoleo:master
2019-01-09 15:45:09 +00:00
Alexander Alekhin
facd5988ce
Merge pull request #13599 from dkurt:dnn_conv_error_msg
2019-01-09 14:02:14 +00:00
Quentin Chateau
581d0ef8a9
Merge pull request #13584 from qchateau:improve_stitching_detailed
...
Improve stitching detailed (#13584 )
* Added block size getter/setters
* Added a bunch of new features to the stitching_detailed sample
* Do not required XFEATURES2D for default use
* Add support for akaze features in stitching_detailed
* Improved sample logs
2019-01-09 17:01:07 +03:00
Alexander Alekhin
a9c1af39d6
Merge pull request #13571 from paroj:jsaruco
2019-01-09 13:59:49 +00:00
Alexander Alekhin
b11566bfc7
Merge pull request #13553 from luctowers:master
2019-01-09 13:33:45 +00:00
CUI Hao (Lab)
e5e1ba3c97
Fix typo in core+RotatedRect.java
2019-01-09 16:30:54 +03:00
Alexander Alekhin
ebe14fa4ac
Merge pull request #13587 from catree:add_matplotlib_colormaps
2019-01-09 13:30:21 +00:00
Alexander Alekhin
3da8b4ccad
Merge pull request #13591 from scramsby:fix-unicode-errors
2019-01-09 13:25:14 +00:00
Lucas Towers
9cc12ff0ac
Fix improper defining of CV_XADD when using Intel C++
2019-01-09 14:41:21 +03:00
Dmitry Kurtaev
d0504c95f4
Add a text message for Convolution layer's input channels check
2019-01-09 13:10:19 +03:00
Namgoo Lee
4b4874e67a
Remove build warning msg with CUDA10.0
2019-01-08 10:57:12 +09:00
Scott Ramsby
7d0d6cd5ee
Fix build error when building with Unicode on Windows
2019-01-07 10:18:58 -08:00
catree
d745af6763
Add Matplotlib Perceptually Uniform Sequential colormaps (viridis, plasma, inferno, magma, cividis, twilight and twilight shifted).
2019-01-06 22:48:06 +01:00
Quentin Chateau
ed7607935e
Do not compute gains when no images overlap
2019-01-05 16:39:09 +01:00
Alexander Alekhin
78da679472
Merge pull request #13555 from qchateau:nr_blocks_gain_filtering_iterations
2019-01-04 12:12:35 +00:00
Lee Jaehwan
71aee662bd
Merge pull request #13544 from eightco:bugfix
...
Fix a bug in cv :: merge when array of 3-channel mat is input (#13544 )
* Mat merge function bug fix - Bug fix of merge function of 3-channel vector <Mat> of 3 or 4 matrices
* Add Core_merge test for opencv#13544
* fixups
2019-01-04 15:10:50 +03:00
Pavel Rojtberg
2f89158339
js: allow building with basic aruco functionality
2019-01-03 19:04:00 +01:00
Pavel Rojtberg
27d15894d8
js: allow building without dnn
2019-01-03 18:50:36 +01:00
Quentin Chateau
c72a855214
Fixed uninitialized value and naming
2019-01-02 22:06:29 +01:00
Quentin Chateau
d93ec07dd8
Setter/getter for number of gain filtering iterations
2018-12-31 18:52:47 +01:00
Quentin Chateau
6b96512d46
Merge pull request #13532 from Tytan:channel_exp_comp
...
Channels exposure compensators (#13532 )
* feed compatible with single channel images
* Simplified BlockGainCompensator::apply
* ChannelsCompensator
* BlocksChannelsCompensator
* Make source level compatibility detector happy
2018-12-28 13:53:46 +03:00
Alexander Alekhin
a9cf01113a
Merge pull request #13534 from mshabunin:fix-external-ffmpeg
2018-12-28 10:51:12 +00:00
Alexander Alekhin
85ade61ef7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-27 18:15:50 +03:00
WuZhiwen
3d44e9ad92
Merge pull request #13520 from wzw-intel:hang
...
* dnn/Vulkan: fix GPU hang for heavy convolution tasks
Intel i915 driver will declare GPU hang if the compute shader
takes too long to complete. See
https://bugs.freedesktop.org/show_bug.cgi?id=108947 for details.
The idea in this commit is to divide heavy task into several light
ones and run compute shader multiple times to make each run take
short time enough.
TODO: Add more efficient compute shader
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/Vulkan: add a more efficient conv shader
2018-12-27 15:06:44 +03:00
Maksim Shabunin
a8fb72a807
Fixed standalone FFmpeg search with pkg-config
2018-12-27 14:40:44 +03:00
Maksim Shabunin
73959fed45
Merge pull request #13422 from mshabunin:split-videoio-cmake
...
* Split videoio dependencies search into pieces, removed obsolete backends
2018-12-26 15:50:20 +03:00
Alexander Alekhin
5f2fed0e25
Merge pull request #13453 from crackwitz:w32-opengl-mouse-position
2018-12-26 12:38:59 +00:00
Alexander Alekhin
caa3633cbf
Merge pull request #13451 from crackwitz:gdi-off-by-one
2018-12-26 12:10:09 +00:00
Christoph Rackwitz
deb8ba2237
fix for #4990 : highgui w32 ogl: correct calculation of image coordinates from window coordinates
2018-12-26 15:00:39 +03:00
Alexander Alekhin
e267342108
Merge pull request #13504 from Tytan:stitcher_result_mask
2018-12-26 10:27:38 +00:00
Quentin Chateau
757411bffc
Merge pull request #13503 from Tytan:gain_comp_multi_feed
...
Stitching: multi-feed on gain and block compensator (#13503 )
* multi-feed on gain and block compensator
* ABI compatibility
2018-12-26 10:24:38 +03:00
Alexander Alekhin
7d69289092
Merge pull request #13511 from knsong:3.4
2018-12-26 07:23:49 +00:00
Christoph Rackwitz
beba82b22b
Off-by-ones in windows/GDI window calculations
...
Check for "gutter" around displayed image. there was one row/column missing on the bottom/right.
Might as well set gutter = 0?
2018-12-25 17:54:44 +01:00
Vitaly Tuzov
cd169941f2
Added test for addition of Mat and Matx
2018-12-25 19:22:04 +03:00
Vitaly Tuzov
c8f59bf1e0
Fixed operations on Mat and Matx simultaneously
2018-12-25 19:22:09 +03:00
Dmitry Kurtaev
ff8c53ea20
Merge pull request #13481 from dkurt:fix_13227
...
* Fix drawMatches and drawKeypoints for BGRA input images
* keep BGRA too
* Combine different input types for drawMatches test
2018-12-25 17:29:12 +03:00
Vitaly Tuzov
7beb24553a
Speedup filter2d by loop unrolling
...
Added filter2d tests for 16S
2018-12-25 14:40:48 +03:00
Alexander Alekhin
6142b21dd5
Merge pull request #13518 from wzw-intel:test_vulkan
2018-12-24 16:49:45 +00:00
Wu Zhiwen
dae03273cd
dnn: fixup missing vkcom/vulkan combination of backend/target in dnn test
2018-12-24 11:00:45 +08:00
Wu Zhiwen
be6a837e15
dnn: add Vulkan device check for BackendRegistry
2018-12-24 10:41:58 +08:00
Kangning Song
d4917a5bd3
fix initial values bug
2018-12-23 11:28:28 +08:00
Alexander Alekhin
e1f5b886fb
Merge tag '4.0.1'
...
OpenCV 4.0.1
2018-12-22 07:05:31 +00:00
Alexander Alekhin
c9ad5779f2
release: OpenCV 4.0.1 (version++)
2018-12-22 07:03:30 +00:00
Alexander Alekhin
1dee705074
Merge branch '3.4' into merge-3.4
2018-12-22 05:40:15 +00:00
Alexander Alekhin
c0e11bb50e
imgproc: revert "Speedup filter2d by loop unrolling"
...
Commit: 124011c321
PR: https://github.com/opencv/opencv/pull/13392
Sobel filter with 16S/16U datatype is broken.
2018-12-22 05:37:29 +00:00
Quentin Chateau
f9c951440d
stitcher result mask getter
2018-12-21 23:21:22 +01:00
Alexander Alekhin
f35e043cf9
Merge tag '3.4.5'
2018-12-21 21:48:03 +03:00
Alexander Alekhin
8f1356c3c5
OpenCV version++ (3.4.5)
...
OpenCV 3.4.5
2018-12-21 17:31:20 +03:00
Alexander Alekhin
14633bc857
Merge pull request #13497 from dkurt:dnn_torch_bn_train
2018-12-21 14:29:10 +00:00
Alexander Alekhin
578ea4bae9
Merge pull request #13386 from alalek:android_gradle
2018-12-21 13:56:03 +00:00
Alexander Alekhin
2bba0f297b
Merge pull request #13493 from dkurt:dnn_ie_r5
2018-12-21 12:18:23 +00:00
Alexander Alekhin
6c1638b132
Merge pull request #13487 from alalek:videoio_test_frame_size_changing
2018-12-21 12:17:06 +00:00
Alexander Alekhin
1a6c2b37ea
Merge pull request #13499 from alalek:issue_13498
2018-12-21 12:15:59 +00:00
Dmitry Kurtaev
840c892abd
Batch normalization in training phase from Torch
2018-12-21 14:36:55 +03:00
Alexander Alekhin
09d8bbb138
Merge pull request #13467 from alalek:issue_12594
2018-12-21 11:01:25 +00:00
Alexander Alekhin
832217907f
Merge pull request #13435 from alalek:issue_13434
2018-12-21 11:01:04 +00:00
Alexander Alekhin
26c5b846e6
Merge pull request #13392 from terfendail:filter_wintr
2018-12-21 11:00:44 +00:00
Dmitry Kurtaev
59ce1d80a5
Fix dnn tests for Inference Engine R5
2018-12-21 12:33:30 +03:00
Alexander Alekhin
2f3e06ac1f
objdetect(qrcode): don't process small/non-regular images
2018-12-21 12:19:35 +03:00
Alexander Alekhin
37a63ca02b
Merge pull request #13488 from alalek:fix_videoio_v4l2_build
2018-12-21 09:07:38 +00:00
Alexander Alekhin
0d63bd575c
Merge pull request #13489 from alalek:openvino_2018r5
2018-12-21 10:05:04 +03:00
Dmitry Kurtaev
257f60582a
Add serialize method for IE net wrapper
...
backport 4ba4901ca9
2018-12-21 05:52:27 +00:00
Alexander Alekhin
bbdc987fc6
dnn: add OpenVINO 2018R5 defines
...
https://software.intel.com/en-us/openvino-toolkit
2018-12-21 05:52:27 +00:00
Vitaly Tuzov
124011c321
Speedup filter2d by loop unrolling
2018-12-20 21:18:42 +03:00
Alexander Alekhin
8456d096d2
videoio(v4l2): fix build due missing V4L2_CID_ISO_SENSITIVITY
2018-12-20 16:28:12 +03:00
Alexander Alekhin
a3a3670027
videoio(test): test V4L frame size changing manual test
2018-12-20 15:14:20 +03:00
Vasiliy Sorokin
b6a72826dd
videio: Fix new frame size appling in v4l.
2018-12-20 14:59:39 +03:00
Dmitry Kurtaev
6bcf0b5519
Merge pull request #13482 from dkurt:fix_python_bindings_without_stitching
...
* Fix python bindings without stitching module
* stitching: move stitching specific code into modules/stitching/misc
2018-12-19 23:37:55 +03:00
Vitaly Tuzov
131c09cf76
Fixed medianBlur implementation for hi-resolution images
2018-12-19 18:05:42 +03:00
Vitaly Tuzov
06f32e3b3e
Reworked separable filter to use wide universal intrinsics
2018-12-19 17:50:09 +03:00
Dmitry Budnikov
eedd7bfd50
fix size
2018-12-19 17:45:00 +03:00
Alexander Alekhin
2b35c1708b
android: gradle-based package and samples
...
- drop hello-android sample
2018-12-19 14:59:48 +03:00
Alexander Alekhin
e093a19c70
Merge pull request #13471 from dkurt:fix_enum_struct_java
2018-12-19 11:53:41 +00:00
Dmitry Kurtaev
6fbcb283b9
Try to fix "enum struct" wrapping for Java
2018-12-19 13:16:43 +03:00
Alexander Alekhin
7fb70e1701
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-18 19:07:43 +00:00
LaurentBerger
2fb409b286
Merge pull request #13267 from LaurentBerger:StitchPython
...
* Python wrapper for detail
* hide pyrotationwrapper
* copy code in pyopencv_rotationwarper.hpp
* move ImageFeatures MatchInfo and CameraParams in core/misc/
* add python test for detail
* move test_detail in test_stitching
* rename
2018-12-18 21:49:16 +03:00
Alexander Alekhin
82b7803a7a
Merge pull request #13456 from alalek:fix_eigen2cv_type_check
2018-12-18 18:35:27 +00:00
Alexander Alekhin
8ed4fb9405
Merge pull request #13464 from alalek:ocl_max_group_size_parameter
2018-12-18 12:06:14 +00:00
Alexander Alekhin
de82d9da9e
Merge pull request #13458 from alalek:fix_python_install_path
2018-12-18 11:46:03 +00:00
Quentin Chateau
fd27d5ea00
Merge pull request #13449 from Tytan:stitching-warp-interpolation
...
Stitching: added functions to set warp interpolation mode (#13449 )
* Added functions to set warp interpolation mode
* Use InterpolationFlags enum
* Improved getter/setter naming
2018-12-18 14:43:05 +03:00
Alexander Alekhin
3f3c8823ac
features2d: fix retainBest() implementation
2018-12-18 05:33:21 +00:00
Alexander Alekhin
d9d9b05912
core(ocl): add parameter to limit device max workgroup size
...
used by OpenCV
2018-12-17 18:33:05 +00:00
vishwesh5
3eb2c940de
Fix Scharr and Sobel functions
...
Resolves #13375
2018-12-17 20:39:22 +05:30
Rostislav Vasilikhin
493611ace5
Merge pull request #13440 from savuor:rgb_wide
...
* conversions of color_rgb.cpp vectorized
* CL impl: coeffs updated
* unused constants removed
* CUDA color coeffs updated
2018-12-17 17:22:38 +03:00
Alexander Alekhin
bb8c19aad3
cmake: fix python install paths
2018-12-17 14:32:29 +03:00
Alexander Alekhin
f605898bae
core: fix eigen2cv() - don't change fixed type of 'dst'
2018-12-16 06:43:08 +00:00
Alexander Alekhin
5736bf5dd5
stitching: fix l_gains data type from Eigen solver (float / double)
2018-12-16 06:29:18 +00:00
Alexander Alekhin
eb1f3733ee
videoio(dc1394): use lazy initialization on demand
2018-12-15 07:58:39 +00:00
Alexander Alekhin
d993b9c1df
Merge pull request #13443 from seiko2plus:issue13442
2018-12-14 22:31:35 +00:00
Sayed Adel
4e16ae9a1f
core:vsx fix build failure on GCC<=6 due implementation of v_reduce_sum(v_float64x2)
2018-12-14 19:24:12 +00:00
Quentin Chateau
ab86f15ba0
Merge pull request #13400 from Tytan:optimize_exposure_compensation
...
Optimize exposure compensation (#13400 )
* Added perf test
* Optimized gains computation
* Use Eigen for gains calculation
2018-12-14 21:37:00 +03:00
Pavel Rojtberg
d7f60f69f1
videoio: fix CAP_IMAGES
...
broken in 11eafca3e2
2018-12-14 15:32:33 +01:00
Rostislav Vasilikhin
d99a4af229
Merge pull request #13379 from savuor:color_5x5
...
RGB to/from Gray rewritten to wide intrinsics (#13379 )
* 5x5 to RGB added
* RGB25x5 added
* Gray2RGB added
* Gray2RGB5x5 added
* vx_set moved out of loops
* RGB5x52Gray added
* RGB2Gray written
* warnings fixed (int -> (u)short conversion)
* warning fixed
* warning fixed
* "i < n-vsize+1" to "i <= n-vsize"
* RGBA2mRGBA vectorized
* try to fix ARM builds
* fixed ARM build for RGB2RGB5x5
* mRGBA2RGBA: saturation, vectorization
* fixed CL implementation of mRGBA2RGBA (saturation added)
2018-12-14 17:01:01 +03:00
Alexander Alekhin
4b33910449
Merge pull request #13428 from rgarnov:gapi_add_kernels_pass_stage
2018-12-14 12:30:36 +00:00
Alexander Alekhin
8d907d2e32
cmake(java): add OPENCV_JAVA_SOURCE_VERSION/OPENCV_JAVA_TARGET_VERSION
2018-12-14 00:15:57 +00:00
Alexander Alekhin
0c16d8f6c3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-13 15:12:26 +03:00
Alexander Alekhin
b7bb79c7c8
videoio(MSMF): backport WITH_MSMF_DXVA flag
2018-12-13 14:56:20 +03:00
Ruslan Garnov
5340073770
Removed UNUSED macro
2018-12-13 14:39:33 +03:00
Vitaly Tuzov
3903174f7c
Merge pull request #13334 from terfendail:histogram_wintr
...
* added performance test for compareHist
* compareHist reworked to use wide universal intrinsics
* Disabled vectorization for CV_COMP_CORREL and CV_COMP_BHATTACHARYYA if f64 is unsupported
2018-12-13 14:20:22 +03:00
Alexander Alekhin
a9771078df
Merge pull request #13427 from dkurt:dnn_onnx_dynamic_reshape
2018-12-13 11:15:51 +00:00
Alexander Alekhin
eb1f7797e4
Merge pull request #13387 from dkurt:dnn_minor_ie_fixes
2018-12-13 10:08:34 +00:00
Dmitry Kurtaev
e71758cfdf
Operate with shapes in ONNX models
2018-12-12 18:34:22 +03:00
Alexander Alekhin
cea3289bd4
Merge pull request #13420 from ThadHouse:Windows7shlwapi
2018-12-12 14:58:51 +00:00
Ruslan Garnov
d38676085a
Added "kernels" pass stage to compiler, removed unused opaque from cv::gimpl::Op
2018-12-12 17:22:52 +03:00
Alexander Alekhin
d8583b2c7a
dnn: fix vulkan backend builds with Clang
2018-12-12 15:25:39 +03:00
Alexander Alekhin
82227b5ace
Merge pull request #13419 from seanm:SemiWarnings
2018-12-12 11:07:00 +00:00
Alexander Alekhin
c8f934b5b1
Merge pull request #13415 from alalek:issue_13406
...
* python: add checks for drawKeypoints() symbol
* python: more hacks in hdr_parser.py
2018-12-12 13:26:31 +03:00
Thad House
857fba0878
Remove MinCore_Downlevel, replace with Shlwapi
...
On windows 7, MinCore_Downlevel does not work correctly. However, the only API used was QISearch, which can be found in Shlwapi.
Closes #12010
2018-12-11 17:06:01 -08:00
Sean McBride
a4111fab39
Fixed -Wextra-semi warnings in public headers
2018-12-11 14:45:27 -05:00
Alexander Alekhin
0915df5b18
python: don't use 'cv2.' in documentation
2018-12-11 16:05:12 +03:00
Dmitry Kurtaev
53f6198f27
Minor fixes in IE backend tests
2018-12-10 20:08:13 +03:00
Alexander Alekhin
ea64e860de
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-09 13:21:58 +00:00
Rijubrata Bhaumik
e70786e05e
Merge pull request #13300 from riju:photoModule
...
* Enable Javascript bindings for photo module.
1. Enable the build flag in build_js.py.
2. Append js into WRAP list of photo’s CMakefiles.txt
3. Add photo module's API into JS API whitelist (embindgen.py)
Exposing the HDR imaging part of photo module.
[TODO]
Add tests
Fix opencv/doc/js_tutorials/
* [WIP] TODO: Add tests
* Remove TonemapDurand: algorithm patented in US, so moved to opencv_contrib
* Fix ningxin's comment: expose the base class.
* Add some more simple binding tests.
Also expose process function
2018-12-09 15:08:59 +03:00
LaurentBerger
f1dc26d7ce
Merge pull request #13382 from LaurentBerger:imreadsize
...
* try to solve #13381
* Add note
2018-12-09 15:05:27 +03:00
Alexander Alekhin
40a53e3d64
Merge pull request #13388 from alalek:ocl_fix_perf_stitching
2018-12-08 17:51:47 +00:00
Dmitry Kurtaev
8422dda2c7
Element-wise subtraction from TensorFlow
2018-12-07 13:38:05 +03:00
Alexander Alekhin
606622ab36
stitching(perf): increase threshold of transform vector
2018-12-07 13:22:39 +03:00
Alexander Alekhin
cab15f6c5e
Merge pull request #13377 from dkurt:hotfix_dnn_ie_master
2018-12-06 15:11:09 +00:00
Alexander Alekhin
492a072ea8
Merge pull request #13376 from dkurt:hotfix_dnn_ie
2018-12-06 15:09:51 +00:00
Alexander Alekhin
e82e672a93
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-06 07:06:58 +00:00
Dmitry Kurtaev
93971a53d9
Exclude Input layer from list of outputs for IE networks
2018-12-06 09:12:05 +03:00
Dmitry Kurtaev
3868cb44f1
Exclude Input layer from list of outputs for IE networks
2018-12-06 09:08:50 +03:00
Alexander Alekhin
6fbf6f8bea
Merge pull request #13359 from dkurt:dnn_keras_pad_concat
2018-12-05 19:48:58 +00:00
Alexander Alekhin
e090ea3efd
Merge pull request #13370 from alalek:ocl_update_perf_stitching_matchers_threshold
2018-12-05 19:46:12 +00:00
Alexander Alekhin
a618d8bc9e
stitching(perf): update test threshold
2018-12-05 18:59:30 +00:00
Tsukasa Sugiura
09b3dcb6db
Merge pull request #13341 from UnaNancyOwen:fix_librealsense
...
* videoio(librealsense): fix pipeline start with config
fix to apply pipeline settings by passing config to start.
* videoio(librealsense): add support get props
add support get some props.
2018-12-05 20:12:25 +03:00
Alexander Alekhin
9ff1c39daa
dnn: fixup available backends/targets
2018-12-05 19:19:17 +03:00
okriof
ef42baf9f0
Merge pull request #13361 from okriof:brisk_getset
...
* Get/Set functions for BRISK parameters, issue #11527 .
Allows setting threshold and octaves parameters after creating a brisk object. These parameters do not affect the initial pattern initialization and can be changed later without re-initialization.
* Fix doc parameter name.
* Brisk get/set functions tests. Check for correct value and make tests independent of default parameter values.
* Add dummy implementations for BRISK get/set functions not to break API in case someone has overloaded the Feature2d::BRISK interface. This makes BRISK different from the other detectors/descriptors on the other hand, where get/set functions are pure virtual in the interface.
2018-12-05 18:44:23 +03:00
Maksim Shabunin
fe459c82e5
Merge pull request #13332 from mshabunin:dnn-backends
...
DNN backends registry (#13332 )
* Added dnn backends registry
* dnn: process DLIE/FPGA target
2018-12-05 18:11:45 +03:00
Alexander Alekhin
cdf906b233
Merge pull request #12945 from terfendail:core_wintr_full
2018-12-05 12:52:03 +00:00
Alexander Alekhin
ead7bc883d
Merge pull request #13364 from nglee:dev_FixLineIteratorExample
2018-12-05 10:09:48 +00:00
Namgoo Lee
83c7dfb6a4
Fix error in LineIterator example code in doc
2018-12-05 11:31:19 +09:00
Dmitry Kurtaev
c9e0c77d73
Concat layer from TensorFlow with constant inputs
2018-12-04 19:41:40 +03:00
Alexander Alekhin
742f22c09b
photo: move TonemapDurand to opencv_contrib
2018-12-04 18:59:27 +03:00
Vitaly Tuzov
6ad8a9c09d
Replaced core module calls to universal intrinsics with wide universal intrinsics
2018-12-04 16:24:20 +03:00
Vitaly Tuzov
388ccda85d
Fixed static analyzer warnings in DISOpticalFlow
2018-12-04 12:57:14 +03:00
Alexander Alekhin
2e0150e601
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-03 18:38:27 +03:00
Alexander Alekhin
aee865fec9
Merge pull request #13352 from alalek:issue_13324
2018-12-03 15:34:23 +00:00
Alexander Alekhin
2dc5e245d0
Merge pull request #13350 from alalek:fix_kw_gapi
2018-12-03 15:16:45 +00:00
Alexander Alekhin
ea3a5950a3
Merge pull request #13346 from alalek:fix_kw_persistence
2018-12-03 15:16:31 +00:00
Alexander Alekhin
0d439a9879
Merge pull request #13351 from mshabunin:fix-va-compile
2018-12-03 15:15:55 +00:00
Alexander Alekhin
99f6f8ea9d
Merge pull request #13348 from alalek:kw_videoio_v4l
2018-12-03 14:45:03 +00:00
Alexander Alekhin
80c2adbda1
core: add getcwd() stub
2018-12-03 17:38:57 +03:00
Maksim Shabunin
c26c43c69c
Fixed compilation with VA-interop on 32-bit platforms
2018-12-03 17:16:09 +03:00
Alexander Alekhin
4e8311085f
core(persistence): fix KW issues
2018-12-03 17:10:20 +03:00
Alexander Alekhin
26d2095dd6
videoio(v4l): initialize members in ctor
2018-12-03 15:22:20 +03:00
Alexander Alekhin
c577c2cc6a
gapi: eliminate KW issues
2018-12-03 15:20:47 +03:00
Maksim Shabunin
905d96dd4a
Restored 500ms delay in highgui test
2018-12-03 14:34:29 +03:00
Alexander Alekhin
2d5ccc7b3e
imgproc(resize): update checks (static analyzers)
2018-12-03 13:13:48 +03:00
Alexander Alekhin
4e29e2fc7d
imgproc(test): fix resize bitexact test
...
- use "random" area on input image
- avoid duplicate cases
2018-11-30 16:38:07 +03:00
Alexander Alekhin
a811059bfb
Merge pull request #13336 from sergiud:core_sse_immediates_gcc-5.4.0
2018-11-30 09:51:59 +00:00
Sergiu Deitsch
e43a5ff9be
fixed gcc 5.4.0 compilation errors
2018-11-30 08:48:19 +01:00
Vitaly Tuzov
00c9ab8c23
Merge pull request #13317 from terfendail:norm_wintr
...
* Added performance tests for hal::norm functions
* Added sum of absolute differences intrinsic
* norm implementation updated to use wide universal intrinsics
* improve and fix v_reduce_sad on VSX
2018-11-29 19:34:14 +03:00
Alexander Alekhin
197285d12a
Merge pull request #13331 from dbudniko:dbudniko/gapi_gpu_to_ocl_renaming_patch
2018-11-29 15:39:14 +00:00
Evgeny Latkin
ab430b8c87
Merge pull request #13329 from elatkin:el/gapi_perf_medblur
...
GAPI (fluid): Median blur optimization (#13329 )
* GAPI (fluid): Median blur optimization: reference 3x3
* GAPI (fluid): Median blur optimization: CPU dispatcher
* GAPI (fluid): Median blur optimization: manual CV_SIMD
2018-11-29 18:02:29 +03:00
Dmitry Budnikov
d1029faa90
patch removes gpu mention from ocl backend
2018-11-29 17:05:41 +03:00
Dmitry Budnikov
6374b99a1a
Merge pull request #13240 from dbudniko:dbudniko/gapi_gpu_to_ocl_renaming
...
G-API rename GPU backend to OCL backend (#13240 )
* renaming draft
* inline namespace instead non-safe define
* more back compatibility
* Updates after review from Dmitry
2018-11-29 16:29:11 +03:00
Alexander Alekhin
ccf96b9e05
Merge pull request #13323 from alalek:issue_13297
2018-11-29 12:40:03 +00:00
Alexander Nesterov
adb630ba3a
Corrected parameters
2018-11-29 11:57:45 -01:00
Alexander Alekhin
5ed7d5a5d9
imgproc: local "CV_Assert(totalSampleCount > 0)" check
2018-11-28 20:16:37 +00:00
Alexander Alekhin
4fb9bce79f
Merge pull request #13264 from mshabunin:fix-windows
2018-11-28 20:00:04 +00:00
Evgeny Latkin
c928c21fe7
Merge pull request #13319 from elatkin:el/gapi_perf_erdilate_2
...
GAPI (fluid): Erode/Dilate optimization, part 2 (#13319 )
* GAPI (fluid): Erode/Dilate optimization: hard-code 3x3 case
* GAPI (fluid): Erode/Dilate optimization: CPU dispatcher
* GAPI (fluid): Erode/Dilate optimization: speed-up 10-15x times with CV_SIMD
* GAPI (fluid): Erode/Dilate optimization: 20-30% speed-up
2018-11-28 19:50:39 +03:00
Evgeny Latkin
992d5b8bcd
Merge pull request #13315 from elatkin:el/gapi_perf_erdilate
...
GAPI (fluid): Erode/Dilate optimization (#13315 )
* GAPI (fluid): Erode/Dilate optimization: hard-code 3x3 case
* GAPI (fluid): Erode/Dilate optimization: CPU dispatcher
* GAPI (fluid): Erode/Dilate optimization: speed-up 10-15x times with CV_SIMD
2018-11-28 18:20:31 +03:00
Evgeny Latkin
6808d33b2f
Merge pull request #13290 from elatkin:el/gapi_perf_filter2d
...
GAPI (fluid): Filter 2D optimization (#13290 )
* GAPI (fluid): Filter 2D optimization: speedup 13x if float, 2x if integral
* GAPI (fluid): Filter 2D speedup 8x if output is short/ushort
* GAPI (fluid): Filter 2D speedup 7x if output is uchar
* GAPI (fluid): Filter 2D optimization: fixed compiler warnings
* GAPI (fluid): fix compiler warnings on Mac
* GAPI (fluid): fix compiler warnings on Mac
* GAPI (fluid): fix compiler errors on VS2015
* GAPI (fluid): fix compiler errors on VS2015
* GAPI (fluid): fix compiler errors on VS2015
2018-11-27 19:12:14 +03:00
Alexander Alekhin
65f22292ed
Merge pull request #13298 from mshabunin:fix-intrin-indent
2018-11-27 13:58:02 +00:00
Alexander Alekhin
b1064efb44
Merge pull request #13294 from terfendail:contours_wintr
2018-11-27 13:54:23 +00:00
Maksim Shabunin
89f0e0a8d1
Fixed misleading indentation in intrin_cpp.hpp
2018-11-27 15:29:37 +03:00
Maksim Shabunin
966f27df34
Merge pull request #13293 from dkurt:dnn_add_extra_ie_net_method
2018-11-27 12:26:09 +00:00
Alexander Alekhin
83c8214b38
eliminate build warnings
2018-11-27 15:24:59 +03:00
Dmitry Kurtaev
4ba4901ca9
Add serialize method for IE net wrapper
2018-11-27 12:02:00 +03:00
Maksim Shabunin
9de63c1edd
Made FileNode::operator string inline
2018-11-27 11:47:23 +03:00
Vitaly Tuzov
e991e05b9b
Added anonymous namespace to perf_contours
2018-11-27 11:35:40 +03:00
Dmitry Budnikov
51cc78b2a2
Merge pull request #13251 from dbudniko:dbudniko/gapi_more_fixes_for_tests
...
More fixes for G-API tests (#13251 )
* scalar comparator and more fixes for tests
* add weighted aligned
* white space
* more white space
* Add weighted test accuracy check enabled
2018-11-26 17:44:46 +03:00
Alexander Alekhin
8f4e5c2fb8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-26 15:37:45 +03:00
Alexander Alekhin
223893ea5a
Merge pull request #13242 from terfendail:contours_wintr
2018-11-26 12:29:31 +00:00
Maksim Shabunin
db1c8b3f9e
Restored function to rescale pixel values before imshow
2018-11-26 15:25:05 +03:00
Evgeny Latkin
f07856eab9
Merge pull request #13221 from elatkin:el/gapi_perf_sepfilter
...
GAPI (fluid): optimization of Separable filter (#13221 )
* GAPI (fluid): Separable filter: performance test
* GAPI (fluid): enable all performance tests
* GAPI: separable filters: alternative code for Sobel
* GAPI (fluid): hide unused old code for Sobel filter
* GAPI (fluid): especial code for Sobel if U8 into S16
* GAPI (fluid): back to old code for Sobel
* GAPI (fluid): run_sepfilter3x3_impl() with CPU dispatcher
* GAPI (fluid): run_sepfilter3x3_impl(): fix compiler warnings
* GAPI (fluid): new engine for separable filters (but Sobel)
* GAPI (fluid): new performance engine for Sobel
* GAPI (fluid): Sepfilters performance: fixed compilation error
2018-11-26 15:05:35 +03:00
Dmitry Kurtaev
84ce2cc211
Enable some dnn tests according to the new Intel's Inference Engine release (R4)
2018-11-26 13:02:24 +03:00
Wu Zhiwen
4e65283081
dnn/Vulkan: make thread safe
...
Use a global dedicated mutex to make sure initialize once and
protect command buffer pool and queue.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2018-11-26 14:08:37 +08:00
Alexander Alekhin
ca5455c592
Merge pull request #13270 from 1over:flann_dist_fix
2018-11-25 18:27:42 +00:00
Alexander Alekhin
82f4322d18
Merge pull request #13269 from alalek:ocl_fix_kernels_with_use_host_mem
2018-11-25 18:27:01 +00:00
Alexander Alekhin
36b6bcb674
Merge pull request #13268 from alalek:core_findfile_linux_use_dladdr
2018-11-25 18:26:28 +00:00
Alexander Alekhin
5a804e3c74
Merge pull request #13254 from alalek:update_python_install_path
2018-11-25 18:25:48 +00:00
1over
5ff76088b9
fixed memory issue in flann
2018-11-25 01:31:54 +01:00
Alexander Alekhin
9fd822f97e
ocl: fix kernels launching with USE_HOST_PTR UMat
...
created from RAW memory buffers (without proper lifetime management)
2018-11-24 15:37:16 +00:00
Alexander Alekhin
3c49b1dbbe
core: use dladdr() instead of parsing /proc/self/maps
2018-11-24 15:22:54 +00:00
Alexander Alekhin
ad35b79e3f
python: update install paths
...
- don't require "OPENCV_PYTHON{2,3}_INSTALL_PATH" if OPENCV_SKIP_PYTHON_LOADER=ON
- avoid unnecessary relative paths in generated config-X.Y.py
2018-11-24 13:55:46 +00:00
Alexander Alekhin
c6daa4aa16
Merge pull request #13260 from alalek:cmake_ade_12856
2018-11-23 17:09:47 +00:00
Alexander Alekhin
c0016d7fe9
Merge pull request #13253 from alalek:fix_13201
...
* cmake: install 'legacy/constants_c.h' files
* samples: add compatibility test code
2018-11-23 20:02:46 +03:00
Dmitry Kurtaev
2f6f52d644
Fix ONNX's emotion_ferplus model.
...
Reduce input size for OpenPose tests
2018-11-23 19:00:17 +03:00
Dmitry Budnikov
a518e7063d
Merge pull request #13120 from dbudniko:dbudniko/gapi_opencl_kernel_example
...
* custom OpenCL G-API kernel draft
* clean up and warnings fix
* more warnings
* white space
* new blank line at the EOF removed
* HAVE_OPENCL guard
* remove unnecessary ocl API call
* remove sum test workaround
* check if opencl activated
* fix std::str warning
* CPU fall back for symm7x7
* gpu test kernel draft
* adjust have opencl guard
* more guards
* one more attempt to adjust guards
* empty stub files and kernel source files creation in the test directory
* try to force auto generation
* one more attempt to force build
* remove symm7x7 custom from gapi module
* looks like that this version works properly on Win desktop
* clean up
* more clean up
* address some suggestions from Dmitry's review
* const kernel coefficients
* CV_Error in kernel + try to fix cpu fallback
* CV_Error_ instead CV_Error
* everything in one gapi_gpu_test.cpp
* fix warning
* remove kernel generation, add kernel string
* avoid generated code and ocl internal namespace
* fix misprint
* c_str
2018-11-23 17:51:15 +03:00
Alexander Alekhin
de8696aa43
cmake: allow to disable ADE build too (BUILD_opencv_gapi=OFF is not enough)
...
CMake option: WITH_ADE=OFF
2018-11-23 12:52:41 +03:00
WuZhiwen
02cc1cd6e6
Merge pull request #13244 from wzw-intel:init_vulkan
...
* dnn/Vulkan: don't init Vulkan runtime if using other backend/target
Don't need to explictly call a init API but will automatically
init Vulkan environment the first time to use an VkCom object.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/Vulkan: depress compilier warning for "-Wsign-promo"
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2018-11-22 19:46:30 +03:00
Alexander Alekhin
dc80f9d0fb
Merge pull request #13243 from etienne02:3.4
2018-11-22 16:05:14 +00:00
Alexander Alekhin
ad0d812aa0
Merge pull request #13239 from bramton:freebsd-build-fix
2018-11-22 14:17:35 +00:00
Bram
724620b476
Fixed build on FreeBSD
2018-11-22 09:23:09 +01:00
Etienne Brateau
736683ce2f
Fix missing check part (defined(__cplusplus)) in header types_c.h
2018-11-22 01:39:09 +01:00
pascal
7579cd8068
updated documentation for imread and imwrite (added pfm image format)
2018-11-21 17:59:37 +01:00
Vitaly Tuzov
e9e8bf4b81
Added performance tests for findContours
2018-11-21 19:57:02 +03:00
Vitaly Tuzov
e1a2c034e8
Updated findContours to use wide universal intrinsics
2018-11-21 19:57:02 +03:00
Alexander Alekhin
6b346c92be
Merge pull request #13236 from tomoaki0705:featureHighguiGetProp
2018-11-21 15:55:00 +00:00
Alexander Alekhin
b6a447798a
Merge pull request #13235 from berak:highgui_window_w32
2018-11-21 15:54:42 +00:00
Tomoaki Teshima
a1c073d289
add missing API cvGetPropVisible_W32
2018-11-21 23:04:23 +09:00
berak
9344d0d0e3
highgui: restore convertscale semantics in window_w32.cpp
2018-11-21 11:05:24 +01:00
Alexander Alekhin
7fa7fa0226
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-21 08:33:39 +00:00
Alexander Alekhin
45d2e18808
Merge pull request #13232 from huangqinjin:openmp
2018-11-21 08:32:14 +00:00
huangqinjin
e1ac8589f8
fix numThreadsMax for OpenMP
...
introduced by commit 4e62900009
2018-11-21 10:54:24 +08:00
Alexander Alekhin
6e67fd2752
Merge pull request #13224 from seiko2plus:core_ppc64le_infa
2018-11-20 21:26:05 +00:00
Sayed Adel
474a0dac49
core: several improves and fixes on ppc64le infrastructure
...
- add infrastructure support for Power9/VSX3
- fix missing VSX flags on GCC4.9 and CLANG4(#13210 , #13222 )
- fix disable VSX optimzation on GCC by using flag ENABLE_VSX
- flag ENABLE_VSX is deprecated now, use CPU_BASELINE, CPU_DISPATCH instead
- add VSX3 to arithmetic dispatchable flags
2018-11-20 15:28:46 +00:00
Alexander Alekhin
495cadddbd
Merge pull request #13223 from dan-masek:fix_drawmatches_alpha
2018-11-20 14:59:35 +00:00
Alexander Alekhin
60b13d50c9
Merge pull request #13214 from 1over:fix_rect
2018-11-20 14:55:42 +00:00
Alexander Alekhin
eaf39f6b6b
Merge pull request #13213 from alalek:fix_format
2018-11-20 14:53:20 +00:00
Ruslan Garnov
a3df05d93b
Merge pull request #13215 from rgarnov:rg/overhead
...
* Added caching of agents execution sequence
* Merged linesRead() and nextWindow() methods on FluidAgent in one method
* Added caching of input lines for fluid::View
* Added caching of output lines for fluid::Buffer
* Fixed GAPI_Assert to work in standalone mode
2018-11-20 17:25:04 +03:00
Dan Mašek
2075fa9c15
Resolve #13219 : Make randomly generated colours opaque.
2018-11-20 15:08:40 +01:00
Dmitry Matveev
1b13df5368
G-API: Recent inclusion has broken STANDALONE build
...
This MR fixes this.
2018-11-20 14:00:08 +03:00
1over
b6367f5821
fixed operator- for Rect
2018-11-20 00:48:17 +01:00
Alexander Alekhin
d7272f76fb
dnn: fix format
2018-11-19 19:33:56 +00:00
Alexander Alekhin
36432cf4d9
Merge pull request #13181 from dkurt:ocv_dnn_fpga
2018-11-19 16:03:20 +00:00
Alexander Alekhin
605071e76f
Merge pull request #13146 from terfendail:bilateral_nan
2018-11-19 15:59:12 +00:00
Evgeny Latkin
083332f85f
Merge pull request #13206 from elatkin:el/gapi_perf_rgb2lab
...
GAPI (fluid): RGB to Lab optimization (#13206 )
* GAPI (fluid): BGR2LUV, RGB2Lab: performance test
* GAPI (fluid): BGR2LUV, RGB2Lab: using cv::hal::cvtBGRtoLab
* GAPI (fluid): BGR2LUV, RGB2Lab: hide reference code with #ifdef
2018-11-19 18:52:48 +03:00
Evgeny Latkin
6757c2c5a6
Merge pull request #13174 from elatkin:el/gapi_perf_rgb2yuv
...
GAPI (fluid): RGB to YUV optimization (#13174 )
* GAPI (fluid): RGB to YUV: activate performance tests
* GAPI (fluid): speedup 4-8x RGB-to-YUV, 2.5x YUV to RGB with int16 arithmetic
* GAPI (fluid): RGB <--> YUV: fixed compiler warning
* GAPI (fluid): RGB <--> YUV: additional speedup 2-3x times (10-15x over original) via manual CV_SIMD
* GAPI (fluid): RGB <--> YUV: dynamic CV_SIMD dispatching
2018-11-19 17:30:14 +03:00
Dmitry Kurtaev
0d117312c9
DNN_TARGET_FPGA using Intel's Inference Engine
2018-11-19 11:41:43 +03:00
Alexander Alekhin
59e2ca16d9
Merge tag '4.0.0'
...
OpenCV 4.0.0
2018-11-18 09:22:00 +00:00
Alexander Alekhin
75ed282b20
release: OpenCV 4.0.0 (version++)
2018-11-18 09:19:28 +00:00
Alexander Alekhin
f6ee03471d
imgproc: use Matx23d as result type of getRotationMatrix2D() call
2018-11-18 09:02:40 +00:00
Alexander Alekhin
a574788e89
move legacy C-API constants into separate files
2018-11-17 23:47:51 +00:00
Alexander Alekhin
22dbcf98c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-17 14:17:35 +00:00
Alexander Alekhin
183bc5c281
Merge tag '3.4.4'
...
OpenCV 3.4.4
2018-11-17 13:00:28 +00:00
Alexander Alekhin
a1fe8f754f
OpenCV version++ (3.4.4)
...
OpenCV 3.4.4
2018-11-17 10:22:17 +00:00
Alexander Alekhin
dd3398416b
experimental version++
2018-11-17 10:22:17 +00:00
Alexander Alekhin
780ae864a0
Merge pull request #13192 from alalek:fix_valgrind_3.4
2018-11-17 13:20:33 +03:00
berak
96c99c716a
Merge pull request #13193 from berak:core_copyMakeBorder
2018-11-17 13:19:42 +03:00
Alexander Alekhin
c26dd5d7aa
core: fix issues from valgrind builder
2018-11-17 07:32:06 +00:00
Alexander Alekhin
e580061b74
Merge pull request #12908 from alexevans:Issue11855
2018-11-16 20:42:54 +00:00
Dmitry Matveev
d7540c9a3c
Merge pull request #13176 from dmatveev:gapi_doxygen
...
G-API: Doxygen class reference
* G-API Doxygen documentation: covered cv::GComputation
* G-API Doxygen documentation: added sections on compile arguments
* G-API Doxygen documentation: restructuring & more text
* Added new sections (organized API reference into it);
* Documented GCompiled, compile args, backends, etc.
* G-API Doxygen documentation: documented GKernelPackage and added group for meta
2018-11-16 23:38:10 +03:00
Alexander Alekhin
3705648c9b
Merge pull request #13184 from paroj:imshow_cvtscale
2018-11-16 20:34:22 +00:00
Christopher Gundler
b58a8729c2
Merge pull request #13131 from Christopher22:add_transposedConv_onnx
...
* Add support for ConvTranspose when parsing ONNX.
* Add support for ConvTranspose when parsing ONNX.
* Add test for Deconvolution
2018-11-16 22:50:40 +03:00
Alexander Alekhin
b321851e53
Merge pull request #12977 from alalek:python_package
2018-11-16 22:45:33 +03:00
Alexander Alekhin
1d5a528107
Merge pull request #12354 from alalek:samples_find_file
2018-11-16 22:40:49 +03:00
Alexander Alekhin
a68835f7f1
features2d(test): add crossCheck=true test
2018-11-16 19:30:00 +00:00
Alexander Alekhin
f2bec05e6d
Merge pull request #12913 from dkurt:dnn_fix_ie_hyperparams
2018-11-16 18:36:12 +00:00
Alexander Alekhin
940dc1f2b7
Merge pull request #13151 from paroj:nocapmodes
2018-11-16 17:20:48 +00:00
Pavel Rojtberg
f54b230906
highgui: Qt - restore convertscale semantics
...
broken in 11eafca3e2
2018-11-16 16:13:05 +01:00
Vitaly Tuzov
9ad1a84853
Unrolled bilateral filter neighbor processing loop
2018-11-16 13:51:46 +03:00
Vitaly Tuzov
f5b6bea2d4
Raised bilateralFilter processing precision for CV_32F matrices containing NaNs
2018-11-16 12:07:04 +03:00
Alexander Alekhin
ce6acd3ecd
python: bindings loader package
...
Configures and loads OpenCV bindings extension including 3rdparty dependencies
Based on running Python specify:
- configure PYTHON_PATH (via "sys.path")
- configure LD_LIBRARY_PATH / PATH
2018-11-16 00:51:16 +00:00
Alexander Alekhin
1c04a5ec47
Merge pull request #12965 from terfendail:medianBlur_wintr
2018-11-16 00:47:11 +00:00
Alexander Alekhin
2fa9bd221d
core: add utils::findDataFile() / samples::findFile()
2018-11-16 00:25:06 +00:00
Dmitry Kurtaev
b5c54e447c
Extra hyperparameters for Intel's Inference Engine layers
2018-11-15 20:06:37 +03:00
Evgeny Latkin
f81370232a
Merge pull request #13162 from elatkin:el/gapi_perf_rgb2gray
...
GAPI (fluid): RGB/BGR to gray: optimization (#13162 )
* GAPI (fluid): RGB/BGR to Gray: add performance tests
* GAPI (fluid): RGB/BGR to Gray: speedup 8-12x with manual CV_SIMD
* GAPI (fluid): RGB/BGR to Gray: fix compiler warning
* GAPI (fluid): RGB/BGR to Gray: dynamic dispatching to AVX2
* GAPI (fluid): RGB/BGR to Gray: check R/G/B coefficients
* GAPI (fluid): RGB/BGR to Gray: fixed compilation error (caused by change in master)
2018-11-15 18:14:27 +03:00
Dmitry Matveev
85fad1504a
Merge pull request #13030 from dmatveev:tutorial
...
* G-API: First steps with tutorial
* G-API Tutorial: First iteration
* G-API port of anisotropic image segmentation tutorial;
* Currently works via OpenCV only;
* Some new kernels have been required.
* G-API Tutorial: added chapters on execution code, inspection, and profiling
* G-API Tutorial: make Fluid kernel headers public
For some reason, these headers were not moved to the public
headers subtree during the initial development. Somehow it even
worked for the existing workloads.
* G-API Tutorial: Fix a couple of issues found during the work
* Introduced Phase & Sqrt kernels, OCV & Fluid versions
* Extended GKernelPackage to allow kernel removal & policies on include()
All the above stuff needs to be tested, tests will be added later
* G-API Tutorial: added chapter on running Fluid backend
* G-API Tutorial: fix a number of issues in the text
* G-API Tutorial - some final updates
- Fixed post-merge issues after Sobel kernel renaming;
- Simplified G-API code a little bit;
- Put a conclusion note in text.
* G-API Tutorial - fix build issues in test/perf targets
Public headers were refactored but tests suites were not updated in time
* G-API Tutorial: Added tests & reference docs on new kernels
* Phase
* Sqrt
* G-API Tutorial: added link to the tutorial from the main module doc
* G-API Tutorial: Added tests on new GKernelPackage functionality
* G-API Tutorial: Extended InRange tests to cover 32F
* G-API Tutorial: Misc fixes
* Avoid building examples when gapi module is not there
* Added a volatile API disclaimer to G-API root documentation page
* G-API Tutorial: Fix perf tests build issue
This change came from master where Fluid kernels are still used
incorrectly.
* G-API Tutorial: Fixed channels support in Sqrt/Phase fluid kernels
Extended tests to cover this case
* G-API Tutorial: Fix text problems found on team review
2018-11-15 18:12:36 +03:00
Dmitry Kurtaev
ef5d921eac
Fix Vulkan's max pooling in case of no output indices
2018-11-15 14:10:54 +03:00
Alexander Alekhin
96c71dd3d2
dnn: reduce set of ignored warnings
2018-11-15 13:15:59 +03:00
Alexander Alekhin
8409aa9eba
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-14 19:41:09 +00:00
Alexander Alekhin
02d2cc58d7
Merge pull request #13164 from alalek:ocl_morph
2018-11-14 19:32:32 +00:00
catree
10b482ff1e
Fix code and missing intrin header. Remove useless header.
2018-11-14 19:00:59 +01:00
Alexander Alekhin
42742727d6
imgproc(ocl): fix morph generic filter checks
...
'ksize' is not updated with 'kernel'
2018-11-14 20:15:01 +03:00
Alexander Alekhin
ca9aa180c1
Merge pull request #13096 from alalek:gapi_tests_checks
2018-11-14 15:59:01 +00:00
Alexander Alekhin
ce46cc9852
Merge pull request #13153 from savuor:fix/filenodeit_member_ptr
2018-11-14 14:22:58 +00:00
Dmitry Kurtaev
80265a0815
Fix a bug with OpenVINO backend
2018-11-14 13:42:06 +03:00
Alexander Alekhin
6189b47648
gapi(test): more reliable checks
...
avoid `countNonZero()`, use `norm()`
2018-11-14 13:30:53 +03:00
Alexander Alekhin
dd6f5949c2
gapi(test): use relative error check for Norm/Sum tests
2018-11-14 13:30:53 +03:00
Latkin, Yevgeny I
a62539489d
GAPI (fluid): Sobel 3x3 optimization: remove needless file
2018-11-14 10:17:40 +03:00
Rostislav Vasilikhin
d6b2739525
removed FileNodeIterator::operator->()
2018-11-13 20:18:53 +03:00
Pavel Rojtberg
846a500fb4
videoio: drop VideoCaptureModes enum in favour of fourcc
2018-11-13 17:20:24 +01:00
Alexander Alekhin
8b7f805642
Merge pull request #13150 from dmatveev:update_ade011d
2018-11-13 16:18:32 +00:00
Evgeny Latkin
cc5190eb91
Merge pull request #13133 from elatkin:el/gapi_perf_sobel_2
...
GAPI (fluid): Sobel 3x3 optimization: CV_SIMD dynamic dispatching (#13133 )
* GAPI (fluid): Sobel 3x3: remove template for run_sobel_row()
* GAPI (fluid): Sobel 3x3: dynamic dispatching of CV_SIMD code
* GAPI (fluid): Sobel 3x3 optimization: fixed CV_SIMD dynamic dispatcher
2018-11-13 17:48:10 +03:00
Dmitry Matveev
4eff798270
Update ADE to version 0.1.1d
2018-11-13 16:44:29 +03:00
Evgeny Latkin
4e40e5bb88
Merge pull request #13070 from elatkin:el/gapi_perf_sobel
...
GAPI (fluid): optimization of Sobel 3x3 (#13070 )
* GAPI: performance test for Sobel
* GAPI: performance test for Sobel w/FP32 input
* GAPI: Sobel speedup: 2.5x (U8) up to 10x (float)
* GAPI: Sobel 3x3 to support U8 into S16
* GAPI (fluid): Sobel 3x3 speedup: 10% (uchar), 1.5x (float)
* GAPI (fluid): Sobel 3x3 speedup: +10x (uchar), but -20% (float)
* GAPI (fluid): Sobel 3x3 speedup: +10% (float)
* GAPI (fluid): Sobel 3x3 speedup: +15% (float), +10% (uchar)
* GAPI (fluid): Sobel 3x3: address GCC warnings
* GAPI (fluid): Sobel 3x3: separate *.cpp file w/SIMD code
* GAPI (fluid): Sobel 3x3: fixed AVX2 code, AVX2 speedup 20-50% (uchar), 10-20% (float)
* GAPI (fluid): Sobel 3x3: fix CV_SIMD code for AVX2
* GAPI (fluid): Sobel 3x3: refactor
2018-11-13 15:04:37 +03:00
Alexander Alekhin
2a9c81eb25
Merge pull request #13124 from alalek:workaround_13121
2018-11-12 22:33:47 +03:00
Alexander Alekhin
65fb8ae33e
Merge pull request #13137 from alalek:videoio_v4l_disable_normalization
2018-11-12 22:15:00 +03:00
Alexander Alekhin
fc3fc6005e
Merge pull request #13126 from mshabunin:remove_libv4l
2018-11-12 22:10:49 +03:00
Alexander Alekhin
e0e828ef5c
videoio: remove using of HAVE_CAMV4L
2018-11-12 18:53:19 +00:00
Alexander Alekhin
9992c4d275
stitching(test): workaround ParallelFeaturesFinder.IsSameWithSerial
2018-11-12 20:17:28 +03:00
Maksim Shabunin
ab65b9745b
Repair V4L backend
2018-11-12 20:04:33 +03:00
Alexander Alekhin
4e3ab026fe
videoio(v4l): turn off normalization of V4L properties
2018-11-12 19:10:13 +03:00
Alexander Alekhin
f5b212a9d4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-12 17:58:45 +03:00
Alexander Alekhin
e31eb46123
Merge pull request #13123 from dkurt:fs_keys
2018-11-12 17:46:49 +03:00
Alexander Alekhin
cae2992af1
Merge pull request #13125 from dkurt:fs_keys_test
2018-11-12 14:33:14 +00:00
Alexander Alekhin
265cb58750
Merge pull request #13112 from alalek:fix_coverity_reports_3.4
2018-11-12 14:32:51 +00:00
Alexander Nesterov
82c2aa6e65
Added bugfix and some tests
2018-11-12 12:08:02 -01:00
Pavel Rojtberg
0d65397ae7
videoio: remove cap_libv4l in favour of cap_v4l
...
cap_libv4l depends on an external library (libv4l) yet is still larger
(1966 loc vs 1822 loc).
It was initially introduced copy pasting cap_v4l in order to offload
various color conversions to libv4l.
However nowadays we handle most of the needed color conversions inside
OpenCV. Our own implementation is better tested and (probably) also
better performing. (as it can optionally leverage IPP/ OpenCL)
Currently cap_v4l is better maintained and generally the code is in
better shape. There is however an API
difference in getting unconverted frames:
* on cap_libv4l one need to set `CV_CAP_MODE_GRAY=1` or
`CV_CAP_MODE_YUYV=1`
* on cap_v4l one needs to set `CV_CAP_PROP_CONVERT_RGB=0`
the latter is more flexible though as it also allows accessing undecoded
JPEG images.
fixes #4563
2018-11-12 13:38:59 +03:00
Dmitry Kurtaev
6c76c8f881
Add a test for FileNode::keys()
2018-11-12 13:38:18 +03:00
Dmitry Kurtaev
a7f30391d0
Add FileNode::keys() missed during refactoring
2018-11-12 13:34:01 +03:00
catree
c96850ba59
Fix missing intrin.hpp header in dis_flow.cpp.
...
Fix #ifdef CV_SIMD128, should be #if CV_SIMD128.
2018-11-11 23:34:04 +01:00
Alexander Alekhin
801c943009
fix coverity reports
2018-11-11 13:51:47 +00:00
Alexander Alekhin
96ee83898d
core(test): extend divideByZero test
...
to verify SIMD code path
2018-11-10 22:17:19 +00:00
Alexander Alekhin
1913482cf5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-10 20:50:26 +00:00
Alexander Alekhin
56eebb926d
Merge pull request #13102 from alalek:issue_13101
2018-11-10 19:11:06 +00:00
Alexander Alekhin
c7d04c6c5c
Merge pull request #13104 from alalek:docs_fix_bib_Kroeger2016
...
docs: fix Kroeger2016 bib reference
move from opencv_contrib
2018-11-10 20:11:28 +03:00
Jiri Horner
1ba7c728a6
Merge pull request #12827 from hrnr:stitching_4
...
[evolution] Stitching for OpenCV 4.0
* stitching: wrap Stitcher::create for bindings
* provide method for consistent stitcher usage across languages
* samples: add python stitching sample
* port cpp stitching sample to python
* stitching: consolidate Stitcher create methods
* remove Stitcher::createDefault, it returns Stitcher, not Ptr<Stitcher> -> inconsistent API
* deprecate cv::createStitcher and cv::createStitcherScans in favor of Stitcher::create
* stitching: avoid anonymous enum in Stitcher
* ORIG_RESOL should be double
* add documentatiton
* stitching: improve documentation in Stitcher
* stitching: expose estimator in Stitcher
* remove ABI hack
* stitching: drop try_use_gpu flag
* OCL will be used automatically through T-API in OCL-enable paths
* CUDA won't be used unless user sets CUDA-enabled classes manually
* stitching: drop FeaturesFinder
* use Feature2D instead of FeaturesFinder
* interoperability with features2d module
* detach from dependency on xfeatures2d
* features2d: fix compute and detect to work with UMat vectors
* correctly pass UMats as UMats to allow OCL paths
* support vector of UMats as output arg
* stitching: use nearest interpolation for resizing masks
* fix warnings
2018-11-10 19:53:48 +03:00
Alexander Alekhin
858a7da5c0
core: rework getContinuousSize() for vector-col/row support
2018-11-10 11:08:28 +00:00
Alexander Alekhin
be9b676db3
Merge pull request #13072 from gineshidalgo99:Pendantic_warning
2018-11-09 22:52:41 +00:00
Vadim Pisarevsky
82e8657a6d
backport: refined QRCodeDetector API for OpenCV 4.0
2018-11-09 22:27:38 +00:00
Alexander Alekhin
8675a8c743
Merge pull request #12878 from tompollok:3.4
2018-11-09 19:54:17 +00:00
Alexander Alekhin
75a6eaf147
Merge pull request #13024 from rgarnov:gapi_fix_lut_test
2018-11-09 19:16:39 +00:00
Matt Bennett
10e1c2b3cd
Merge pull request #11935 from mattmyne:filestorage_matx
...
* Support for Matx read/write by FileStorage
* Only empty filestorage read now produces default Matx. Split Matx IO test into smaller units. Test checks for exception thrown if reading a Mat into a Matx of different size.
2018-11-09 20:05:59 +03:00
Alexander Alekhin
a1dd30ed50
Merge pull request #13094 from alalek:ocl_reduce_sync
2018-11-09 16:44:10 +00:00
Pavel Rojtberg
afa0f80c61
videoio: add manual white-balance and implement it for V4L2
2018-11-09 17:14:33 +01:00
Vitaly Tuzov
2dd98e7cc6
bilateralFilter implementation moved to separate file
2018-11-09 18:26:26 +03:00
Alexander Alekhin
f74f1a94fe
core(ocl): run "reduce" kernels in synchronous mode
2018-11-09 17:57:13 +03:00
Vadim Pisarevsky
96bf26611e
Merge pull request #13084 from vpisarev:shuffle_optflow_algos
...
* moved DIS optical flow from opencv_contrib to opencv, moved TVL1 from opencv to opencv_contrib
* fixed compile warning
* TVL1 optical flow example moved to opencv_contrib
2018-11-09 17:52:06 +03:00
Vadim Pisarevsky
841741aa52
significantly reduced OpenCV binary size by disabling IPP in some funcs ( #13085 )
...
* significantly reduced OpenCV binary size by disabling IPP calls in some OpenCV functions: Sobel, Scharr, medianBlur, GaussianBlur, filter2D, mean, meanStdDev, norm, sum, minMaxIdx, sort.
* re-enable IPP in norm, since it's much faster (without adding too much space overhead)
2018-11-09 17:39:29 +03:00
Alexander Alekhin
596ada51f3
Merge pull request #13080 from alalek:issue_13078
2018-11-09 13:20:27 +00:00
Vadim Pisarevsky
8f15a609af
mostly removed obsolete C API from calib3d (at least at the interface level) ( #13081 )
2018-11-09 16:12:22 +03:00
Vitaly Tuzov
28fd967148
Updated bilateralFilter implementations to use wide universal intrinsics
2018-11-09 15:27:30 +03:00
Vadim Pisarevsky
8cdf7bb84b
refined QRCodeDetector API for OpenCV 4.0 ( #13086 )
...
* refined QRCodeDetector API for OpenCV 4.0
* expanded and tested QRCodeDetector::detectAndDecode()
2018-11-09 12:57:27 +03:00
Ruslan Garnov
858ba6c798
Fixed uniniitialized mats in tests, added operator<< for compare_f
2018-11-09 12:00:55 +03:00
Alexander Alekhin
386733aea1
gapi: fix ARM build
2018-11-09 06:37:48 +00:00
Vadim Pisarevsky
11eafca3e2
removed C API in the following modules: photo, video, imgcodecs, videoio ( #13060 )
...
* removed C API in the following modules: photo, video, imgcodecs, videoio
* trying to fix various compile errors and warnings on Windows and Linux
* continue to fix compile errors and warnings
* continue to fix compile errors, warnings, as well as the test failures
* trying to resolve compile warnings on Android
* Update cap_dc1394_v2.cpp
fix warning from the new GCC
2018-11-09 00:52:09 +03:00
Dmitry Budnikov
5087ff0814
Merge pull request #13008 from dbudniko:dbudniko/gpu_opencl_backend
...
G-API GPU-OpenCL backend (#13008 )
* gpu/ocl backend core
* accuracy tests added and adjusted + license headers
* GPU perf. tests added; almost all adjusted to pass
* all tests adjusted and passed - ready for pull request
* missing license headers
* fix warning (workaround RGB2Gray)
* fix c++ magic
* precompiled header
* white spaces
* try to fix warning and blur test
* try to fix Blur perf tests
* more alignments with the latest cpu backend
* more gapi tests refactoring + 1 more UB issue fix + more informative tolerance exceed reports
* white space fix
* try workaround for SumTest
* GAPI_EXPORTS instead CV_EXPORTS
2018-11-08 22:14:53 +03:00
Alexey Nikolaev
8396ae6e4f
Merge pull request #12893 from aleksey-nikolaev:cap-update
...
V4L (V4L2): Refactoring. Added missed camera properties. Fixed getting `INF` for some properties. Singlethread as always (#12893 )
* cap_v4l:
1 Added cap_properties verbalization.
2 Set Get of properties elementary refactoring.
3 Removed converting parameters to/from [0,1] range.
4 Added all known conversion from V4L2_CID_* to CV_CAP_PROP_*
* cap_v4l:
1. Removed all query for parameters range.
2. Refactored capture initialization.
3. Added selecting input channel by CV_CAP_PROP_MODE. Default value -1 the channels not changed.
* cap_v4l:
1. Refactoring of Convert To RGB
* cap_v4l:
1. Fixed use of video buffer index.
2. Removed extra memcopy for grab image.
3. Removed device closing from autosetup_capture_mode_v4l2
* cap_v4l:
1. The `goto` was eliminated
2. Fixed use of temporary buffer index for V4L2_PIX_FMT_SN9C10X
3. Fixed use of the bufferIndex
4. Removed trailing spaces and unused variables.
* cap_v4l:
1. Alias for capture->buffers[capture->bufferIndex]
2. Reduced size of data for memcpy: bytesused instead of length
3. Refactoring. Code duplication. More info for debug
* cap_v4l:
1. Added the ability to grab and retrieveFrame independently several times
* cap_v4l:
1. Not need to close/open device for new capture parameters applying.
2. Removed using of device name as a flag that the capture is closed. Added sufficient function.
3. Refactoring. Added requestBuffers and createBuffers
* cap_v4l:
1. Added tryIoctl with `select` like was in mainloop_v4l2.
2. Fixed buffer request for device without closing the device.
3. Some static function moved to CvCaptureCAM_V4L
4. Removed unused defines
* cap_v4l:
1. Thread-safe now
* cap_v4l:
1. Fixed thread-safe destructor
2. Fixed FPS setting
* Missed brake
* Removed thread-safety
* cap_v4l:
1. Reverted conversion parameters to/from [0,1] by default for backward compatibility.
2. Added setting for turn off compatibility mode: set CV_CAP_PROP_MODE to 65536
3. Most static functions moved to CvCaptureCAM_V4L
4. Refactoring of icvRetrieveFrameCAM_V4L and using of frame_allocated flag
* cap_v4l:
1. Added conversion to RGB from NV12, NV21
2. Refactoring. Removed wrappers for known format conversions.
* Added `CAP_PROP_CHANNEL` to the enum VideoCaptureProperties.
CAP_V4L migrated to use VideoCaptureProperties.
* 1. Update comments.
2. Environment variable `OPENCV_VIDEOIO_V4L_RANGE_NORMALIZED` for setting default backward compatibility mode.
3. Revert getting of `CAP_PROP_MODE` as fourcc code in backward compatibility mode.
* videoio: update cap_v4l - compatibilityMode => normalizePropRange
* videoio(test): V4L2 MJPEG test
`v4l2-ctl --list-formats` should have 'MJPG' entry
* videoio: fix buffer initialization
to avoid "munmap: Invalid argument" messages
2018-11-08 21:27:45 +03:00
Alexander Alekhin
5059523937
core: fix processing of vector-rows
2018-11-08 20:04:22 +03:00
tompollok
2da56d5af6
refactoring catching all exceptions as const ref
2018-11-08 19:59:47 +03:00
Alexander Alekhin
b74b05d1b3
Revert CV_TRY/CV_CATCH macros
...
This reverts commit 7349b8f5ce
(partially).
2018-11-08 19:56:52 +03:00
Alexander Alekhin
0c261acf3a
Merge pull request #13065 from dkurt:dnn_update_tf_faster_rcnn
2018-11-08 16:31:39 +00:00
Alexander Alekhin
ebc8015638
Merge pull request #13074 from alalek:cleanup_videoio
2018-11-08 19:09:32 +03:00
Alexander Alekhin
35c7cab742
Merge pull request #13073 from alalek:cleanup_carbon
2018-11-08 19:08:33 +03:00
Alexander Alekhin
c1921f1b12
Merge pull request #13069 from alalek:move_viz_contrib
2018-11-08 19:04:31 +03:00
Alexander Alekhin
9b978afaa2
Merge pull request #13029 from alalek:move_videostab_contrib
2018-11-08 19:03:14 +03:00
Alexander Alekhin
92a58a0eae
Merge pull request #12454 from jveitchmichaelis:y16_dshow_windows
2018-11-08 14:05:23 +00:00
Alexander Alekhin
bb7cfcbcdb
Merge pull request #12064 from seiko2plus:coreUnvintrinArithm2
2018-11-08 14:02:40 +00:00
Alexander Alekhin
997ad12730
Merge pull request #12985 from wzw-intel:vkcom_refine
2018-11-08 10:26:57 +00:00
unknown
13ede34516
Add support for changing fourcc and support mono formats (e.g. Y8, Y16)
2018-11-07 21:03:36 +00:00
Alexander Alekhin
777eaa7352
Merge pull request #13057 from sturkmen72:Mat_to_IOArray
2018-11-07 21:00:14 +00:00
Vitaly Tuzov
e5d7f446d6
Merge pull request #13056 from terfendail:box_wintr
...
* Updated boxFilter implementations to use wide universal intrinsics
* boxFilter implementation moved to separate file
* Replaced ROUNDUP macro with roundUp() function
2018-11-07 23:59:36 +03:00
Alexander Alekhin
c72b6b3be8
Merge pull request #13043 from alalek:compatibility_12623
2018-11-07 20:54:40 +00:00
Alexander Alekhin
5869415a57
videoio: drop obsolete backends
...
- VFW
- QuickTime/QtKit
- Unicap - GPL, no active support: https://github.com/unicap/unicap
- DC1394 (1st version) / CMU1394
2018-11-07 19:49:09 +03:00
gineshidalgo99
b5248da826
Fixed pendantic warnings
2018-11-07 11:23:21 -05:00
Alexander Alekhin
b059a361dd
highgui: drop obsolete Carbon API
...
https://en.wikipedia.org/wiki/Carbon_(API)
In 2012, with the release of OS X 10.8 Mountain Lion, most Carbon APIs were considered deprecated.
2018-11-07 19:21:33 +03:00
Dmitry Kurtaev
dc9e6d3af8
Update a script to generate text graphs for Faster-RCNN networks from TensorFlow
2018-11-07 18:33:01 +03:00
Alexander Alekhin
3c99dc96b1
Merge pull request #13001 from rgarnov:gapi_standalone_cmake
2018-11-07 15:12:29 +00:00
Alexander Alekhin
787f5236a9
viz: move to opencv_contrib
2018-11-07 16:14:10 +03:00
Alexander Alekhin
9636ffc471
videostab: move to opencv_contrib
2018-11-07 15:41:04 +03:00
Alexander Alekhin
b17e1531d2
Merge pull request #13026 from alalek:move_superres_contrib
2018-11-07 12:36:55 +00:00
Alexander Alekhin
05dc645b81
Merge pull request #13025 from alalek:move_shape_contrib
2018-11-07 12:36:30 +00:00
catree
eebf0dd7c9
Fix integer overflow when accumulating timing values.
2018-11-07 13:04:48 +01:00
Ruslan Garnov
c972c94662
Added Standalone.cmake
2018-11-07 14:54:18 +03:00
Wu Zhiwen
33c9d57c6f
dnn/Vulkan: skip heavy convolution task
...
This is a workaround for GPU hang on heavy convolution workload (> 10 GFLOPS).
e.g. ResNet101_DUC_HDC
For the long time task, vkWaitForFences() return without error but next call on
vkQueueSubmit() return -4, i.e. "VK_ERROR_DEVICE_LOST" and driver reports GPU hang.
Need more investigation on root cause of GPU hang and need to optimize convolution shader
to reduce process time.
2018-11-07 16:38:36 +08:00
Alexander Alekhin
18c44b2ce8
Merge pull request #13036 from berak:java_MatOfRotatedRect_utils
2018-11-06 20:28:45 +00:00
Alexander Alekhin
4531f9f2f4
Merge pull request #13023 from terfendail:medianBlur_sep
2018-11-06 20:22:08 +00:00
Alexander Alekhin
2c6f1ab57d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-06 20:04:31 +00:00
Evgeny Latkin
000110e760
Merge pull request #13052 from elatkin:yl/gapi_sobel3x3_f32_v2
...
* GAPI: Sobel 3x3 with FP32 input
* GAPI: Sobel 3x3 with FP32 input, v2
2018-11-06 23:08:50 +03:00
Alexander Alekhin
fa91e4ff27
Merge pull request #12999 from fegorsch:improve-circle-detector
2018-11-06 18:40:55 +00:00
Alexander Alekhin
7a686a0c43
Merge pull request #13010 from dkurt:fix_cl_eye_fp16
2018-11-06 18:36:09 +00:00
Alexander Alekhin
d4e3405db2
Merge pull request #13045 from LaurentBerger:kmeansdoc
...
typo in kmeans doc
2018-11-06 20:00:47 +03:00
Alexander Alekhin
857b64efef
Merge pull request #13040 from alalek:docs_cleanup_3.4
2018-11-06 19:51:47 +03:00
Alexander Alekhin
835e4b6de9
Merge pull request #13032 from ijean:mingw-w64-build
2018-11-06 16:26:56 +00:00
Alexander Alekhin
0a5301bc5b
Merge pull request #13041 from berak:docs_highgui
2018-11-06 19:19:51 +03:00
Alexander Alekhin
572af7640f
Merge pull request #13053 from berak:highgui_win32_waitkey
2018-11-06 16:18:11 +00:00
lqy123000
cceeca3052
Merge pull request #12916 from lqy123000:bugfix_templmatch
...
* avoid rounding errors
* imgproc: replace condition in matchTemplate
2018-11-06 19:13:48 +03:00
berak
eaee63d96b
java: add converters, tests for MatOfRotatedRect
2018-11-06 16:40:56 +01:00
Alexander Alekhin
cfb02b5370
shape: move sample to opencv_contrib
2018-11-06 16:52:17 +03:00
Vadim Pisarevsky
b8175f8976
removed the old C API for Haar-based object detection; use CascadeClassifier from now on
2018-11-06 15:39:37 +03:00
berak
cae2a53563
highgui: fix broken waitKey() condition in window_w32
2018-11-06 11:43:58 +01:00
Suleyman TURKMEN
182f43b6f9
Update imgproc.hpp
2018-11-05 04:48:49 +03:00
LaurentBerger
5132102863
typo in kmeans doc
2018-11-04 21:30:31 +01:00
Alexander Alekhin
4395c1b9f8
videoio: backport "VideoCapture(int index, int apiPreference)" interface
2018-11-04 17:27:47 +00:00
berak
6d2a97e954
docs: remove NULL strings from highgui.hpp
2018-11-04 12:59:35 +01:00
Alexander Alekhin
79dc0ed175
docs: intro formatting update, minor cleanup
2018-11-04 02:36:24 +00:00
Alexander Alekhin
c6d2f0399a
videoio: fix build of standalone ffmpeg plugin
2018-11-03 02:17:47 +00:00
Jean Carass
66e4ace39f
Replaced strcpy_s, strcat_s for MinGW builds.
2018-11-02 08:51:57 -07:00
fegorsch
ce00d38bd9
Add test for symmetric circles with clustering
2018-11-02 15:13:46 +01:00
Vitaly Tuzov
877de883b0
medianBlur() implementation moved to separate file
2018-11-02 16:28:23 +03:00
Alexander Alekhin
a920ed9e1e
superres: move to opencv_contrib
2018-11-02 16:06:16 +03:00
Vadim Pisarevsky
d9b8a9d90e
Merge pull request #13013 from berak:java_MatOfRotatedRect
2018-11-02 12:36:06 +00:00
Alexander Alekhin
6c8ec5336f
shape: move to opencv_contrib
2018-11-02 15:23:05 +03:00
fegorsch
30bf4a5e34
CircleGridClusterFinder: map circle pattern width and height correctly
...
During the cluster-based detection of circle grids, the detected circle
pattern has to be mapped to 3D-points. When doing this the width (i.e.
more circles) and height (i.e. less circles) of the pattern need to
be identified in image coordinates.
Until now this was done by assuming that the shorter side in image
coordinates (length in pixels) corresponds to the height in 3D.
This assumption does not hold if we look at the pattern from
a perspective where the projection of the width is shorter
than the projection of the height. This in turn lead to misdetections in
although the circle pattern was clearly visible.
Instead count how many circles have been detected along two edges of the
projected quadrangle and use the one with more circles as width and the
one with less as height.
2018-11-02 12:03:20 +01:00
Vitaly Tuzov
0fda551dbc
Updated medianBlur implementations to use wide universal intrinsics
2018-11-02 12:26:23 +03:00
Alexander Alekhin
687fa6a8ca
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-02 05:33:35 +00:00
Dmitry Kurtaev
32797515de
Fix https://github.com/opencv/opencv/issues/12824
2018-11-02 08:26:08 +03:00
Vadim Pisarevsky
0f622206e4
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
2018-11-02 00:27:06 +03:00
Alexander Alekhin
a724525c00
Merge pull request #10584 from eruffaldi:F10583_videoio_ffmpeg_lossless
2018-11-01 16:57:11 +00:00
berak
0cd14e3fb4
java: add support for MatOfRotatedRect
2018-11-01 15:37:23 +01:00
Alexander Alekhin
a1816e8c77
Merge pull request #13002 from dkurt:onnx_padding
2018-11-01 11:40:22 +00:00
Ilari Venäläinen
e6c41f0de6
Merge pull request #12989 from venalil:fix_thresholded_tiff_read
...
* Fix reading of black-and-white (thresholded) TIFF images
I recently updated my local OpenCV version to 3.4.3 and found out that
I could not read my TIFF images related to my project. After debugging I
found out that there has been some static analysis fixes made
that accidentally have broken reading those black-and-white TIFF images.
Commit hash in which reading of mentioned TIFF images has been broken:
cbb1e867e5
Basically the fix is to revert back to the same functionality that has been there before,
when black-and-white images are read bpp (bitspersample) is 1.
Without the case 1: this TiffDecoder::readHeader() function always return false.
* Added type and default error message
* Added stdexcept include
* Use CV_Error instead of throw std::runtime_error
* imgcodecs(test): add TIFF B/W decoding tests
2018-11-01 14:34:34 +03:00
Dmitry Kurtaev
ea67060081
Fix https://github.com/opencv/opencv/issues/12970
2018-11-01 11:22:28 +03:00
Emanuele Ruffaldi
b4398d62b2
ffmpeg for lossy
2018-11-01 00:06:29 +00:00
Dmitry Kurtaev
a6f9170f10
Add ONNX's padding import
2018-10-31 18:24:05 +03:00
Alexander Alekhin
2dfaad3259
Merge pull request #12889 from alalek:drop_untested_flann_hdf5_header
2018-10-31 15:11:32 +00:00
Suleyman TURKMEN
4d0ed5c13c
Merge pull request #12971 from sturkmen72:upd_imgproc_hpp
...
* Update imgproc.hpp
* update color conversion codes
2018-10-31 18:08:24 +03:00
Alexander Alekhin
06ffa408ce
Merge pull request #12988 from LaurentBerger:test_copyto_py
2018-10-31 14:23:08 +00:00
Vadim Pisarevsky
b669e9f648
Merge pull request #12994 from vpisarev:fix_imshow_mac
2018-10-31 11:13:28 +00:00
Vadim Pisarevsky
ebdc870296
fixed imshow on mac; before that just the window titlebar was shown, without the window content.
2018-10-31 10:40:58 +03:00
Wu Zhiwen
34e9d1eb3c
dnn/Vulkan: support log softmax
...
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2018-10-31 09:47:38 +08:00
Wu Zhiwen
3914c17b0d
dnn/Vulkan: Refine error handle mechanism
...
Fallback to OPENCV backend and CPU target if catch exception from
vkcom backend.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2018-10-31 09:47:33 +08:00
Alexander Alekhin
c92e0838c1
Merge pull request #12951 from catree:easy_fixes_const_viz
2018-10-30 18:55:21 +00:00
Alexander Alekhin
850053f9ca
Merge pull request #12982 from eldruin:python-gen-close-file
2018-10-30 18:41:23 +00:00
Ruslan Garnov
443fed796a
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
2018-10-30 21:12:36 +03:00
AsyaPronina
08536943ad
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
2018-10-30 21:10:47 +03:00
Rostislav Vasilikhin
fa91d621fa
Merge pull request #12876 from savuor:color_rgb2rgb_wide
...
* RGB2RGB initially rewritten
* NEON impl removed
* templated version added for ushort, float
* data copying allowed for RGB2RGB
* inplace processing fixed
* fields to local vars
* no zeroupper until it's fixed
* vx_cleanup() added back
2018-10-30 18:36:23 +03:00
Alexander Alekhin
2268ed1b6e
Merge pull request #12948 from catree:add_drawFrameAxes
2018-10-30 13:33:01 +00:00
LaurentBerger
936523ae52
Add python test for copyto with mask
2018-10-30 13:25:38 +01:00
Sayed Adel
93ffebc273
core: reimplement SIMD arithmetic, logic and comparison operations into wide universal intrinsics
...
- initialize arithmetic dispatcher
- add new universal intrinsic v_absdiffs
- add new universal intrinsic v_pack_b
- add accumulate version of universal intrinsic v_round
- fix sse/avx2:uint8 multiplication overflow
- reimplement arithmetic, logic and comparison operations into wide universal intrinsics
with full support for all types
- reimplement IPP arithmetic, logic and comparison operations in a sperate file arithm_ipp.hpp
- avoid scalar multiplication if scaling factor eq 1 and use integer multiplication
- move C arithmetic operations to precomp.hpp and delete [arithm_simd|arithm_core].hpp
- add compatibility with new opencv4 divide policy
2018-10-30 12:48:31 +02:00
Wu Zhiwen
7fff245f87
dnn/Vulkan: Rename function_list.inl
...
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2018-10-30 08:29:43 +08:00
Alexander Alekhin
76b6f6b017
Merge pull request #12938 from dkurt:java_ndim_mat
2018-10-29 17:06:44 +00:00
WuZhiwen
6e3ea8b49d
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.
2018-10-29 17:51:26 +03:00
Dmitry Budnikov
220b278575
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
2018-10-29 17:34:20 +03:00
catree
2b022311a4
Make cast() function const. Make parameters of addLight() const.
2018-10-29 14:53:28 +01:00
Alexander Alekhin
853f5111c2
Merge pull request #12978 from xoox:fix-collectCalibrationData-signature
2018-10-29 12:23:39 +00:00
Diego Barrios Romero
7a884ab6a5
Fix closing input file
2018-10-29 13:05:46 +01:00
Vadim Pisarevsky
792079ad33
Merge pull request #12964 from savuor:fix/zeroupper_all
2018-10-29 11:35:57 +00:00
Vadim Pisarevsky
a9d77b5c64
Merge pull request #12966 from catree:fix_distortion_image
2018-10-29 11:27:49 +00:00
Vadim Pisarevsky
65ab6ed59f
Merge pull request #12980 from LaurentBerger:copyToPy
2018-10-29 11:22:20 +00:00
Alexander Nesterov
aba66352dd
Fix dataset: russian.jpg
2018-10-29 10:30:49 -01:00
LaurentBerger
389aae59ae
add python copyto with mask ( https://github.com/opencv/opencv/issues/10225 )
2018-10-29 09:09:30 +01:00
Wenfeng CAI
c9abb823a7
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.
2018-10-29 10:19:02 +08:00
Alexander Alekhin
6c444ced08
Merge pull request #12954 from seanm:MinorMac
2018-10-28 14:52:32 +00:00
AsyaPronina
e6dd9a78ae
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
2018-10-27 19:54:32 +03:00
Alexander Alekhin
012f36e47d
Merge pull request #12958 from kamino410:doc_dist_param
2018-10-27 16:28:57 +00:00
root
1196eb33fc
remove non-ideal pairs when using crosscheck in batchdistance
2018-10-26 20:25:24 +00:00
catree
d37164bab6
Fix distortion figure in calib3d. Positive radial distortion corresponds to pincushion distortion and negative to barrel distortion. Add another figure that illustrates the influence of k1 in the distortion effect.
2018-10-26 20:27:37 +02:00
Alexander Alekhin
e0c888acf7
Merge pull request #12952 from seanm:fix12933
2018-10-26 18:27:27 +00:00
Alexander Alekhin
cc2f8f1778
Merge pull request #12946 from HenryDev:patch-1
2018-10-26 18:26:06 +00:00
Rostislav Vasilikhin
daff6e6484
_mm256_zeroupper replaced by zeroall
2018-10-26 18:12:07 +03:00
Alexander Alekhin
50bec53afc
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-26 17:56:55 +03:00
Alexander Alekhin
3e0c72ea84
core(ipp): disable SSE4.2 meanStdDev() optimization for CV_32F
2018-10-26 15:57:26 +03:00
kamino410
3972c526ce
fix document about camera distortion parameters
2018-10-26 19:55:46 +09:00
Sean McBride
75f67ed207
Fixed a few comments related to macOS support
2018-10-25 15:16:55 -04:00
Sean McBride
828091cfbb
Fixed #12933 : added cast to silence clang -Wcomma warning
2018-10-25 13:27:17 -04:00
wanghanmin
eb981cc7d7
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.
2018-10-25 19:41:37 +03:00
Wenfeng CAI
31be03a805
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
2018-10-25 19:38:55 +03:00
catree
644846c702
Add a function that draws frame axes. Useful for debugging purpose and to check the correctness of the output of a pose estimation method.
2018-10-25 18:38:19 +02:00
Alexander Alekhin
defeda2f70
Merge pull request #12905 from tomoaki0705:fixQrcodePeakyFailure
2018-10-25 16:24:56 +00:00
Henry
4102855edd
Update intro.markdown
...
"as opposed to" is a phrase of opposed meaning distinguished from or in contrast with. e.g., "an approach that is theoretical as opposed to practical"
synonyms: in contrast with, as against, as contrasted with, rather than, instead of, as an alternative to
example: "we use only steam, as opposed to chemical products, to clean our house"
2018-10-25 10:54:07 -05:00
Alexander Alekhin
602989ae9e
Merge pull request #12935 from alalek:python_so_warning
2018-10-25 15:11:44 +00:00
Alexander Alekhin
f50b58b509
Merge pull request #12854 from allnes:detect_qr_code
2018-10-25 14:16:55 +00:00
Alexander Alekhin
b184b19970
Merge pull request #12934 from alalek:issue_12932
2018-10-25 11:28:13 +00:00
Alexander Alekhin
28556f1498
core: move compiler defines from base.hpp into cvdef.h
2018-10-25 14:05:46 +03:00
Alexander Alekhin
55676b7173
Merge pull request #12928 from alalek:fix_typo_3.4
2018-10-25 11:04:59 +00:00
Dmitry Kurtaev
92f754c675
Add methods to reshape Mat in Java by array of shapes and retreive sizes of each dimension.
2018-10-25 10:48:23 +03:00
Maksim Shabunin
0ccd810738
Fixed several issues found by static analysis
2018-10-25 10:45:59 +03:00
Alexander Alekhin
aa6e296236
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`
2018-10-25 04:23:45 +00:00
Alexander Alekhin
7f608db244
core: move compiler defines from base.hpp into cvdef.h
2018-10-25 03:02:01 +00:00
Alexander Nesterov
d305fd4fca
Added perf tests with sanity check
2018-10-24 16:37:56 +00:00
Alexander Alekhin
8486f1b8f0
Merge pull request #12888 from alalek:cmake_fix_objdetect
2018-10-24 16:22:26 +00:00
Alexander Alekhin
a1bd39441f
videoio: fix typo
2018-10-24 19:12:35 +03:00
Alexander Alekhin
e959f449ae
Merge pull request #12894 from alalek:c_api_drop_samples
2018-10-24 15:40:04 +00:00
Alexander Alekhin
9a12aa45ad
Merge pull request #12881 from huangqinjin:orb
2018-10-24 13:28:57 +00:00
Alexander Alekhin
2c029aae46
Merge pull request #12914 from seiko2plus:issue12830
2018-10-24 13:15:23 +00:00
maver1
e397434cb6
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()
2018-10-24 15:02:53 +03:00
Alexander Alekhin
71009c9b4d
core: fix merge from 3.4
...
`CV_ErrorNoReturn` should not be used in OpenCV
2018-10-24 14:45:45 +03:00
Antonio Borondo
7a3cb2280b
Recognize ConvolutionDepthwise as Convolution
2018-10-24 08:37:51 +01:00
Sayed Adel
8b26906d6d
core:vsx change behavior of v_round to rounding to nearest even
2018-10-24 06:31:31 +00:00
Dmitry Matveev
dbed39a931
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
2018-10-24 07:47:56 +03:00
Tomoaki Teshima
d3f75df0a6
objdetect: fix test failure of QR code on Aarch64
...
* use boundingRect instead of manual loop
2018-10-24 09:35:02 +09:00
Vadim Pisarevsky
ea31c09384
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
2018-10-23 17:09:23 +03:00
Alexander Alekhin
329a1fb781
drop C-API sample code
2018-10-23 14:38:20 +03:00
huangqinjin
1fbaa48cec
ORB: compute default norm by wta_k
2018-10-22 10:10:49 +08:00
Alexander Alekhin
043e7e3516
flann: drop untested hdf5.h
2018-10-21 15:16:52 +00:00
Mansoo Kim
6974fce183
cmake: fix objdetect QR decoder link_libraries
2018-10-21 15:13:43 +00:00
Alexander Alekhin
9c23f2f1a6
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-20 11:37:54 +00:00
Apoorv Goel
d8ffddd075
Merge pull request #12871 from UnderscoreAsterisk:document-Distance
...
* Document distance functors in dist.h
* Add spec for Distance
* Generate appropriate links for symbols
2018-10-20 11:15:13 +03:00
Dmitry Matveev
5e9750d1f5
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
2018-10-19 18:32:48 +03:00
Dmitry Kurtaev
e7015f6ae8
Fix ENet test
2018-10-19 17:43:26 +03:00
Alexander Alekhin
9c9fb1c6d0
Merge pull request #12867 from UnderscoreAsterisk:document-radiusSearch
2018-10-18 07:52:49 +00:00
Alexander Alekhin
80c64fce11
Merge pull request #12832 from kmansoo:fix-compile-errors-on-nvcc10
2018-10-18 07:51:47 +00:00
Apoorv
a7dfa261d8
Add documentation for radiusSearch
2018-10-18 04:09:16 +05:30
Mansoo Kim
4d1f0ef2d9
cuda: fix build with CUDA 10.x
2018-10-17 17:35:40 +00:00
Alexander Alekhin
df6728e64c
Merge pull request #12852 from nangchoo:bugfix/increase_magic_threshold_for_perf_test
2018-10-17 17:31:19 +00:00
Alexander Alekhin
6d9e66eca1
Merge pull request #12864 from dkurt:dnn_ie_get_batch_size
2018-10-17 14:02:25 +00:00
Dmitry Kurtaev
365451dab0
Implement getBatchSize for Intel's Inference Engine networks
2018-10-17 14:02:37 +03:00
Alexander Alekhin
1188c6fe14
Merge pull request #12838 from dmatveev:gapi_fluid_resize_lpi
2018-10-17 09:22:28 +00:00
Alexander Alekhin
c09a3cf098
Merge pull request #12860 from janisozaur:include-guards
2018-10-17 08:20:31 +00:00
Alexander Alekhin
842341fc16
Merge pull request #12859 from janisozaur:empty-block
2018-10-17 08:20:08 +00:00
Michał Janiszewski
85b9960f62
Fix clashing include guards
...
Relevant guards can be found in
ef5579dc86/modules/features2d/src/kaze/AKAZEConfig.h (L8)
and
ef5579dc86/modules/ml/include/opencv2/ml.hpp (L44)
2018-10-16 22:59:38 +02:00
Michał Janiszewski
5640b36f6d
Remove unused empty block
2018-10-16 22:51:03 +02:00
Michał Janiszewski
c8e6ce304f
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.
2018-10-16 22:43:54 +02:00
Paul Shin
1c468add20
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
2018-10-15 20:03:39 -07:00
Alexander Alekhin
edacd91a27
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-15 20:15:42 +00:00
Alexander Alekhin
5dd46b54c1
Merge pull request #12848 from alalek:issue_12337
2018-10-15 20:09:36 +00:00
Alexander Alekhin
24ced3d657
Merge pull request #12846 from alalek:issue_12834
2018-10-15 19:19:46 +00:00
Alexander Alekhin
c5a5d7eb51
Merge pull request #12843 from alalek:fix_qrdecode_input_validation
2018-10-15 19:18:58 +00:00
Alexander Alekhin
ab2c16b2e5
Merge pull request #12829 from tomoaki0705:fixTestVideoOpenCLPyrLK
2018-10-15 19:18:24 +00:00
Alexander Alekhin
113793fee7
Merge pull request #12837 from dkurt:dnn_fix_ie
2018-10-15 19:17:18 +00:00
Alexander Alekhin
954536073d
core: update solveLP() interface
2018-10-15 18:58:11 +00:00
Alexander Alekhin
b54a70a538
videoio: return -1 is incorrect for function with 'bool' result
2018-10-15 18:20:15 +00:00
Alexander Alekhin
cc45c10f3d
ocl: bailout from unsupported types
2018-10-15 18:06:06 +00:00
Alexander Alekhin
6d2cfac303
objdetect: validate QRdecode inputs
...
- drop unnecessary matrix initialization
2018-10-15 17:16:17 +00:00
Alexander Alekhin
13aa23f706
Merge pull request #12836 from dmatveev:gapi_upd151018
2018-10-15 16:20:52 +00:00
Alexander Alekhin
f8a27d2603
Merge pull request #12775 from radomsak:radomsak_dnn_fix_caffe_importer_reused_layers
2018-10-15 14:44:23 +00:00
Alexander Alekhin
f185640eda
Merge pull request #12799 from alalek:update_build_js
...
* js: update build script
- support emscipten 1.38.12 (wasm is ON by default)
- verbose build messages
* js: use builtin Math functions
* js: disable tracing code completelly
2018-10-15 17:35:21 +03:00
Alexander Alekhin
72eccb7694
Merge pull request #12825 from alalek:issue_8413_3.4
2018-10-15 14:23:21 +00:00
Dmitry Matveev
922d5796b9
G-API: Introduce LPI (multiple Lines-Per-Iteration) support for Resize
...
Several Resize optimizations count on fetching multiple input lines at
once to do interpolation more efficiently.
At the moment, Fluid backend supports only LPI=1 for Resize kernels.
This patch introduces scheduling support for Resizes with LPI>1 and
covers these cases with new tests.
The support is initially written by Ruslan Garnov.
2018-10-15 17:11:55 +03:00
Tomoaki Teshima
803f86b9ca
fix test failure of PyrLKOpticalFlow.Mat
...
* remove race condition
* upload _prevPts to OpenCL device explicitly before calling "sparse"
2018-10-15 22:57:08 +09:00
Alexander Alekhin
7bac615d8f
Merge pull request #12344 from terfendail:core_wintr
2018-10-15 13:48:15 +00:00
Dmitry Kurtaev
dc3406eed9
Fix Pooling and Convolution layers from Intel's Inference Engine
2018-10-15 16:40:28 +03:00
Dmitry Matveev
f0ddc2a53c
G-API: Fixed static analysis issue in own::Mat
...
Tool reported a false alarm on possible out-of-bounds access which
was work-arounded to make code more clear
2018-10-15 16:31:31 +03:00
Alexander Alekhin
1cc3f7abbb
Merge pull request #12516 from seiko2plus:changeUnvMultiply16
2018-10-15 12:07:40 +00:00
Adam Radomski
70177143a7
Added test caffe importer layers sharing weights
2018-10-15 11:42:26 +02:00
Vitaly Tuzov
43d9256096
Replaced core module calls to universal intrinsics with wide universal intrinsics
2018-10-15 11:46:45 +03:00
tellowkrinkle
803ff64b14
Merge pull request #12697 from tellowkrinkle:FasterCocoaWindows
...
* Make cocoa windows draw faster
* Use a CALayer for rendering when possible Uses GPU to scale images, which is important because retina macs will want window sizes much larger (in pixels) than the image
* Fix mouse logic for cocoa windows
* Only halve resolution on retina if image is larger than display
2018-10-14 21:18:05 +03:00
Alexander Alekhin
d5d059690f
gapi(test): disable divide tests with zeros
2018-10-14 10:47:50 +00:00
Alexander Alekhin
fd832bb57d
core: follow IEEE 754 rules for floating-point division
2018-10-14 10:47:50 +00:00
Alexander Alekhin
09cb329d73
core(test): zero values divide test (4.0+)
2018-10-14 03:46:29 +00:00
Alexander Alekhin
4a9291fd89
Merge branch 'issue_8413_3.4'
2018-10-14 03:46:01 +00:00
Alexander Alekhin
5677a683a5
core(test): zero values divide test (3.x)
2018-10-14 02:23:17 +00:00
Alexander Alekhin
c813ad5533
core(ocl): replace ambiguous 'depth' to 'DEPTH_dst'
...
- always pass DEPTH_dst value to core/arithm kernel
2018-10-14 02:18:04 +00:00
tompollok
0b77600718
change area() emptiness checks to empty()
2018-10-13 21:35:10 +02:00
Alexander Alekhin
5115e5decb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-13 16:19:05 +00:00
Alexander Alekhin
429a643f42
Merge pull request #12805 from drkoller:imwritedoc
2018-10-13 13:20:33 +00:00
Alexander Alekhin
d2a66d3c99
Merge pull request #12815 from alalek:issue_12812
2018-10-13 13:12:55 +00:00
Alexander Alekhin
0f41daeba5
Merge pull request #12641 from dkurt:dnn_samples_args_autofill
2018-10-13 12:28:08 +00:00
drkoller
978ad4981e
Clean up documentation for imread and imwrite
2018-10-12 17:08:01 -04:00
Alexander Alekhin
8c4f886f5f
core: re-throw allocation exception if there is no fallback
2018-10-12 19:10:06 +00:00
Alexander Alekhin
0d63c4c28e
Merge pull request #12811 from take1014:resize_large_image
2018-10-12 16:59:25 +00:00
take1014
24af70c7e0
resolves 11283
2018-10-12 23:08:25 +09:00
Alexander Alekhin
1ed9ff17e1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-12 10:05:55 +00:00
Sayed Adel
9dc1d388af
imgproc: Enable VSX on pyrDown & pyrUp
2018-10-11 23:03:57 +00:00
Alexander Alekhin
91c6d36ff8
Merge pull request #12796 from alalek:fix_openmp_performance
2018-10-11 19:29:04 +00:00
Alexander Alekhin
be76b451cb
Merge pull request #12791 from alalek:win32_dllmain_detect_termination
2018-10-11 19:28:29 +00:00
Alexander Alekhin
53785b6ac6
Merge pull request #12784 from terfendail:pyramids_wintr
2018-10-11 19:26:36 +00:00
Alexander Alekhin
2332fb852d
Merge pull request #12748 from terfendail:resize_wintr2
2018-10-11 19:26:17 +00:00
Alexander Alekhin
f1fdfa1a51
Merge pull request #12623 from sturkmen72:videoio-4
2018-10-11 19:24:57 +00:00
Alexander Alekhin
0f3fe957f5
Merge pull request #12450 from sturkmen72:update_HOGDescriptor
2018-10-11 19:23:35 +00:00
Alexander Alekhin
41398987c3
Merge pull request #12792 from tomoaki0705:fixCudaImgprocColorGray
2018-10-11 16:32:11 +00:00
Tomoaki Teshima
944710de4e
update the threshold
...
* fix test failure of cudaimgproc convert color bgr2lab series
2018-10-11 18:45:20 +09:00
Alexander Alekhin
2b3c7490d5
Merge pull request #12521 from allnes:detect_qr_code
...
Objdetect: QRCode detect + decode
2018-10-11 12:42:05 +03:00
Sayed Adel
8965f3ae06
imgproc:simd Enable VSX and wide universal intrinsics for accumulate operations
...
- improve cpu dispatching calls to allow more SIMD extentions
(SSE4.1, AVX2, VSX)
- wide universal intrinsics
- replace dummy v_expand with v_expand_low
- replace v_expand + v_mul_wrap with v_mul_expand for product accumulate operations
- use FMA for accumulate operations
- add mask and more types to accumulate's performance tests
2018-10-11 04:37:12 +02:00
Sayed Adel
5771fd693d
Change behaviour of 16-bit multiply operator
...
- redefine 16-bit multiply operator to perform saturating multiply
instead of non-saturating multiply
- implement 8-bit multiply operator to perform saturating multiply
- implement v_mul_wrap() for 8-bit, 16-bit non-saturating multiply
- improve performance of v_mul_hi() for VSX
- update intrin tests with new changes
- replace unv 16-bit multiplication operator with v_mul_wrap due behavior changes
- Several improvements depend on vpisarev review
* initial forward declarations for universal intrinsics
* move emulating SSE intrinsics into separate file
* implement v_mul_expand for 8-bit
* reimplement saturating multiply using v_mul_expand + v_pack
* map v_expand, v_load_expand, v_load_expand_q to sse4.1
* fix overflow avx2::v_pack(uint32)
* implement two universal intrinsics v_expand_low and v_expand_high
2018-10-11 04:35:39 +02:00
Vitaly Tuzov
1ff11c84ab
Fixed meanStdDev() implementation for the case input matrix has more than 4 channels
2018-10-11 04:30:33 +02:00
Alexander Alekhin
fc4679d4cf
Merge pull request #12795 from mshabunin:fix-win-python
2018-10-10 20:55:32 +00:00
Alexander Alekhin
761c269e47
Merge pull request #12794 from alalek:fix_warnings
2018-10-10 20:22:07 +00:00
Alexander Alekhin
35c53204cb
Merge pull request #12781 from alalek:videoio_drop_rectification_dc1394
2018-10-10 20:01:06 +00:00
Alexander Alekhin
f731515628
cmake: fix Python detection for standalone bindings
2018-10-10 22:59:42 +03:00
Alexander Alekhin
4e62900009
core: call omp_set_dynamic() for better CPU usage
...
Similar to 'OMP_DYNAMIC=TRUE'.
2018-10-10 19:57:43 +00:00
Alexander Alekhin
7813eef92b
fix build warnings
2018-10-10 19:26:19 +00:00
Suleyman TURKMEN
59bf2a34fa
Update videoio
2018-10-10 21:58:04 +03:00
Suleyman TURKMEN
abbb73e894
Update HOGDescriptor
2018-10-10 21:53:35 +03:00
Vitaly Tuzov
cc10e6b344
pyrDown and pyrUp SSE2 implementations replaced with wide universal intrinsics implementations
2018-10-10 21:12:47 +03:00
Alexander Alekhin
11e2a216c5
ocl(win32): bypass deallocate() during process termination
2018-10-10 18:06:06 +00:00
Alexander Alekhin
404893810c
cmake: fix Python detection for standalone bindings
2018-10-10 16:58:23 +00:00
Alexander Nesterov
53ec8f286b
Added QR code decoding.
2018-10-10 15:27:00 +00:00
Alexander Alekhin
70f2ee917e
cmake: add DllMain() into each OpenCV DLL
...
to detect process termination after ExitProcess() call
2018-10-10 11:00:59 +00:00
Adam Radomski
cc3ec5d453
Fix dnn caffe importer extract blobs from reused layers
2018-10-10 10:44:56 +02:00
Alexander Alekhin
dada5a422d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-09 21:20:15 +00:00
Hamdi Sahloul
c4d434fd6f
CUDA/BgSegm: fix the threshold of MOG2.Update test when detectShadow=true ( #12762 )
2018-10-09 17:39:39 +03:00
Alexander Alekhin
8bb3d363a4
videoio: drop rectification code for VIDERE cameras
2018-10-09 14:06:15 +00:00
Apoorv Goel
b8aa0cddab
Merge pull request #12777 from UnderscoreAsterisk:document-cvtColorTwoPlane
...
* Add documentation for cvtColorTwoPlane
* Change brief and add links
2018-10-09 15:49:17 +03:00
Lubov Batanina
50811e04f2
Merge pull request #12596 from l-bat:l-bat/shufflenet_onnx
...
* Add Shufflenet support in ONNX
* Add test for transpose layer
2018-10-08 22:18:41 +03:00
Alexander Alekhin
449826288b
Merge pull request #12765 from cv3d:ts/cuda/device_name
2018-10-08 19:15:54 +00:00
Alexander Alekhin
68fe37b008
Merge pull request #12755 from alalek:fix_allocSingleton
2018-10-08 15:30:17 +00:00
Alexander Alekhin
26ba4f3c1d
Merge pull request #12754 from alalek:dnn_ocl4dnn_async_expressions
2018-10-08 15:22:24 +00:00
Alexander Alekhin
e19b422854
Merge pull request #12752 from alalek:dnn_cleanup_getUMat
2018-10-08 15:21:50 +00:00
Vitaly Tuzov
9d602f2752
Replaced SSE2 area resize implementation with wide universal intrinsic implementation
2018-10-08 16:27:52 +03:00
Dmitry Kurtaev
7649e537b7
Fix JavaScript bindings for features2d module
2018-10-07 22:55:38 +03:00
Hamdi Sahloul
2faa4cd933
TS/CUDA: Show device ID in case of multiple devices
2018-10-08 03:00:25 +09:00
Alexander Alekhin
18bf91a08b
core: update allocSingleton implementation, valgrind suppression
2018-10-05 18:25:13 +03:00
Alexander Alekhin
634dd656d5
dnn: don't use Mat expressions with async UMat functions
2018-10-05 17:09:50 +03:00
Alexander Alekhin
9d02d42afe
dnn(ocl4dnn): don't use getUMat()
...
especially in CPU only processing
2018-10-05 15:24:51 +03:00
Alexander Alekhin
c716e374c1
Merge pull request #12744 from alalek:issue_12736
2018-10-05 10:20:13 +00:00
Alexander Alekhin
aeec6e43eb
Merge pull request #12749 from powderluv:fix-clang-cl-tzcnt
2018-10-05 09:28:07 +00:00
Alexander Alekhin
8f1f4273a2
calib3d: move undistort files from imgproc
2018-10-05 07:52:21 +00:00
Anush Elangovan
630a94b8b7
_tzcnt_u32() is undefined in clang-cl so use alternate impl
...
_tzcnt_u32() is not exported by clang-cl intrin.h so check for
clang-cl and enable an alterate for _tzcnt_u32()
Some discussions:
http://lists.llvm.org/pipermail/cfe-dev/2016-October/051329.html
https://bugs.llvm.org/show_bug.cgi?id=30506
TEST=Build with clang-cl
2018-10-04 14:04:22 -07:00
Rostislav Vasilikhin
da5e0ef461
ocl::KernelArg::Local(): added size argument
2018-10-04 17:19:09 +03:00
Alexander Alekhin
0926a84a45
cmake: define CV_ErrorNoReturn under CV_STATIC_ANALYSIS
...
to avoid build break without `__OPENCV_BUILD`
2018-10-04 14:43:43 +03:00
Alexander Alekhin
0101fa789c
Merge pull request #12735 from tomoaki0705:fixCudaStereoTestFailure
2018-10-04 11:33:34 +00:00
Alexander Alekhin
12b3d157a5
Merge pull request #12726 from alalek:dnn_ocl_conv_avoid_multiple_expr_evaluation
2018-10-04 11:31:47 +00:00
Tomoaki Teshima
7294ae0f17
fix test failure of StereoBeliefPropagation
...
* if the src has odd number of height, access error happens
* it could happen on width, too
* check both dst and src range in both width and height
2018-10-04 08:35:34 +09:00
Apoorv Goel
0ffc186680
Merge pull request #12731 from UnderscoreAsterisk:fix-12012
...
* fix #12012
* Replace CV_StsBadFlag with Error::StsBadFlag
2018-10-03 15:50:04 +03:00
Alexander Alekhin
068ebe8b4d
Merge pull request #12693 from peters:patch-1
2018-10-03 06:14:44 +00:00
Alexander Alekhin
eec468fa13
dnn(ocl4dnn): calculate activation expression once
...
- to avoid multiple conditional calls via sub_group() functions
2018-10-02 21:23:41 +00:00
Alexander Alekhin
81c94357e8
Merge pull request #12722 from tomoaki0705:fixCudaFiltersFailure
2018-10-02 20:52:34 +00:00
Peter Rekdal Sunde
042c486b68
Obtain fourcc when AVStream
is network stream
...
The `codec_tag` is only available when opening a file from disk. If `AVStream` is a network stream then `fourcc` must be obtained using `codec_id`. I have tested the following scenarios:
1) Open a `.mp4` file and verify that `codec_tag` is returned (old behavior)
2) Open a `rtsp` stream and verify that `codec_fourcc` is returned (Tested with a MJPEG, H264 and H265 stream)
2018-10-02 22:15:05 +02:00
Alexander Alekhin
6921f967a1
Merge pull request #12605 from terfendail:integral_wintr
2018-10-02 16:40:13 +00:00
Alexander Alekhin
83a0c12144
Merge pull request #12581 from terfendail:lapack_intr
2018-10-02 16:39:50 +00:00
Tomoaki Teshima
fa8684b5c8
fix test failure of cudafilters Median_Accuracy
...
* avoid race condition
2018-10-03 00:59:08 +09:00
Alexander Alekhin
690fb0544c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-02 14:31:05 +03:00
Vitaly Tuzov
283348afc3
SSE2 code in invert() replaced with universal intrinsics
2018-10-02 12:47:07 +03:00
Suleyman TURKMEN
ee0c985491
Merge pull request #12649 from sturkmen72:patch-9
...
Update hog.cpp (#12649 )
2018-10-01 22:22:37 +03:00
Alexander Alekhin
b41f38ecc7
Merge pull request #12669 from mshabunin:add-paths-config
2018-10-01 15:57:57 +00:00
Alexander Alekhin
682180e0cd
Merge pull request #12620 from alalek:ocl_extra_build_options
2018-10-01 15:57:31 +00:00
Alexander Alekhin
1385db48f5
Merge pull request #12711 from alalek:dnn_ocl_idlf_drop_weights_buf
2018-10-01 15:36:49 +00:00
Alexander Alekhin
94201b7cf9
ocl: OPENCV_OPENCL_BUILD_EXTRA_OPTIONS parameter
2018-10-01 17:56:17 +03:00
Maksim Shabunin
15632c6305
Added support for multi-path configuration parameter (env)
2018-10-01 17:50:47 +03:00
Vitaly Tuzov
6b84990620
integral() implementation updated to utilize wide universal intrinsics
2018-10-01 17:25:43 +03:00
Alexander Alekhin
c9b6b2cf04
Merge pull request #12714 from antonioborondo:fix_documentation_cuda_compare
2018-10-01 13:35:03 +00:00
Alexander Alekhin
617fe2545c
Merge pull request #12709 from WydD:3.4
2018-10-01 13:32:51 +00:00
Antonio Borondo
28e55dc5f3
Fix documentation of cv::cuda::compare
2018-10-01 13:23:18 +01:00
Alexander Alekhin
ae4c72a153
Merge pull request #12668 from alalek:calib3d_chessboardsb_updates
2018-10-01 00:00:01 +03:00
Alexander Alekhin
9253e8bda2
Merge pull request #12705 from berak:imread_document_grayscale
2018-09-30 23:59:48 +03:00
Alexander Alekhin
0f031b6680
dnn(ocl4dnn): drop weights_buf
...
- avoid memory access violation during "prefetch" stage
2018-09-30 20:35:41 +00:00
Loic Petit
255b20f6de
Fix frame rate rounding in ffmpeg wrapper ( #9023 )
2018-09-30 22:24:02 +02:00
berak
df4139d373
document imread grayscale behaviour
2018-09-30 15:22:26 +02:00
Hamdi Sahloul
1059735bfb
Merge pull request #12667 from cv3d:fix/ts_report
...
TS: fix Python v2/v3 compatibility (#12667 )
* TS: fix Python2.7 compatibility
* TS: fix Python3 compatibility
* py3: use integer division '/' => '//' instead of cast
2018-09-29 20:03:54 +03:00
Alexander Alekhin
8f2eb60719
Merge pull request #12690 from cv3d:fix/ts_python_exe
2018-09-29 16:39:05 +00:00
Alexander Alekhin
a1ffc00ba8
Merge pull request #12666 from tomoaki0705:cudevTestFailureLuvRGB
2018-09-29 16:36:25 +00:00
Hamdi Sahloul
1a81a97e9f
Utilize the currently running Python executable
...
especially if it matches the module being tested
2018-09-29 23:58:27 +09:00
Tomoaki Teshima
e6ef9221cb
fix test failure of cudev
...
* follow the implementation of Luv2RGBfloat in imgproc/src/color_lab.cpp
* loosen threshold in cudaimgproc
2018-09-29 23:13:12 +09:00
Alexander Alekhin
ee84ae0551
Merge pull request #12682 from soonbro:patch-1
2018-09-29 16:03:38 +03:00
Alexander Alekhin
ea92c2b1a6
Merge pull request #12663 from sturkmen72:patch-12
2018-09-29 12:52:27 +00:00
Alexander Alekhin
5a3bca8d5c
Merge pull request #12576 from cv3d:fix/cuda/polar_to_cart
2018-09-29 12:45:47 +00:00
soonbro
9b9f38afc8
fix typo in FpsMeter.java
...
'mFramesCouner' -> 'mFramesCounter'
2018-09-29 11:36:47 +00:00
Hamdi Sahloul
5f17cc1abd
Fix Python wrapper for GpuMat
2018-09-29 02:47:59 +09:00
Alexander Alekhin
8f6695acc7
CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement
2018-09-29 02:47:59 +09:00
chacha21
9524abcd28
Merge pull request #12658 from chacha21:clr-mutex
...
* hide use of std::mutex from /clr compilation under Visual Studio
C++11 <mutex> is not available when compiling with /clr under Visual Studio, thus opencv cannot be easily included.
It is fixed by making a CEEMutex wrapper class, around an opaque implementation using std::mutex internally
* fixed compilation outside of Visual Studio
fixed compilation outside of Visual Studio by avoiding some macros
* fixed indentation, prepare getting rid of CEEMutex/CEELockGuard
fixed indentation
After discussion, CEEMutex and CEELockGuard can be totally removed, letting the developer in a /clr context to provide his own implementation
* remove CEEMutex/CEELockGuard
2018-09-28 19:19:05 +03:00
Alexander Alekhin
4fea6179a0
Merge pull request #12659 from dkurt:js_features2d
2018-09-28 16:18:09 +00:00
Alexander Alekhin
83efde6243
Merge pull request #12678 from cv3d:cleanup/python/enums
2018-09-28 16:07:21 +00:00
Suleyman TURKMEN
8eb987e393
Update findContours parameter type
2018-09-28 18:42:48 +03:00
Dmitry Matveev
2c6ab65476
Merge pull request #12674 from dmatveev:gapi_upd270918
...
* Update G-API code base to 27-Sep-18
Changes mostly improve standalone build support
* G-API code base update 28-09-2018
* Windows/Documentation warnings should be fixed
* Fixed stability issues in Fluid backend
* Fixed precompiled headers issues in G-API source files
* G-API code base update 28-09-18 EOD
* Fixed several static analysis issues
* Fixed issues found when G-API is built in a standalone mode
2018-09-28 18:42:09 +03:00
Alexander Alekhin
5575171652
Merge pull request #12673 from alalek:fix_build_warnings
...
* fix build warnings
* python: forbid wrapping of functions with "void*" arguments
2018-09-28 16:53:05 +03:00
Alexander Alekhin
a8b0db4e5d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-28 14:14:47 +03:00
Alexander Alekhin
4b895a4d1f
Merge pull request #12657 from alalek:docs_repair_cuda_section
2018-09-28 09:45:50 +00:00
Dmitry Kurtaev
e9f99063c7
JavaScript bindings for features2d module
2018-09-28 11:04:13 +03:00
Hamdi Sahloul
e104fcc000
Generate enum bindings automatically
2018-09-28 15:39:51 +09:00
Alexander Alekhin
9ba659af84
Merge pull request #12660 from alalek:flann_drop_useless_mutex
2018-09-27 19:46:59 +00:00
Rostislav Vasilikhin
be989b3b60
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
2018-09-27 22:39:06 +03:00
Alexander Alekhin
0706bd72b8
Merge pull request #12671 from alalek:fix_build_warnings_3.4
2018-09-27 16:23:05 +00:00
Alexander Alekhin
f6dc396a0f
Merge pull request #12568 from sturkmen72:patch-3
2018-09-27 13:42:44 +00:00
Alexander Alekhin
48e8e76a34
fix build warnings
2018-09-27 16:31:31 +03:00
Alexander Alekhin
e4f71994c2
calib3d: findChessboardCornersSB() minor updates
...
- avoid updating of input image during equalizeHist() call
- avoid for() with double variable (use 'int' instead)
- more CV_Check*() macros
- use Mat_<T>, Matx
- static for local variables
2018-09-27 15:38:01 +03:00
Alexander Alekhin
fae329a0ca
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
2018-09-27 12:54:23 +03:00
Dmitry Matveev
29e88e50ff
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
2018-09-26 21:50:39 +03:00
Alexander Alekhin
52f52f6786
flann: drop useless mutex
2018-09-26 19:37:44 +03:00
Alexander Alekhin
852f061b26
Merge pull request #12655 from alalek:fix_printf_format_warning
2018-09-26 16:21:07 +00:00
Alexander Alekhin
fe56bdeeb9
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
2018-09-26 18:53:02 +03:00
Vadim Pisarevsky
b34d86ca24
Merge pull request #12548 from alalek:videoio_backend_name
2018-09-26 15:19:55 +00:00
Dmitry Kurtaev
24ab751547
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
2018-09-26 16:27:00 +03:00
Dmitry Kurtaev
c8f3579f93
Fix #12542 ( #12603 )
...
* Fix #12542
* Remove ignore of non-virtual-dtor error
2018-09-26 16:08:51 +03:00
Menghui Xie
f0d277e452
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
2018-09-26 16:05:02 +03:00
Alexander Alekhin
962dc21f2b
docs: fix CUDA docs section
2018-09-26 15:36:55 +03:00
Alexander Alekhin
3eec8fd0eb
dnn: fix printf format warning
2018-09-26 14:06:04 +03:00
Alexander Alekhin
43e66e7ff9
Merge pull request #12644 from dkurt:dnn_out_layers_names
2018-09-25 16:12:59 +00:00
Dmitry Kurtaev
ad5898224d
Add a file with preprocessing parameters for deep learning networks
2018-09-25 18:28:37 +03:00
Dmitry Kurtaev
f8398d80bc
add Net::getUnconnectedOutLayersNames method
2018-09-25 18:10:45 +03:00
Alexander Alekhin
d8d025c33b
Merge pull request #12599 from mshabunin:printf
2018-09-25 14:44:21 +00:00
Alexander Duda
8811dabbac
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
2018-09-25 17:06:46 +03:00
Alexander Alekhin
9faacfbc0d
Merge pull request #12639 from tomoaki0705:fixFp16CudaFailure
2018-09-25 13:19:51 +00:00
Alexander Alekhin
a610be6335
Merge pull request #12591 from sturkmen72:patch-6
2018-09-25 10:05:16 +00:00
Tomoaki Teshima
6a5266df79
fix CvFp16Test failure
2018-09-25 15:00:37 +09:00
Hamdi Sahloul
47bb09bc4b
OpenGL: avoid losing precision in double-to-float conversion
2018-09-24 19:06:48 +09:00
Maksim Shabunin
e0f524d3b7
Fixed several incorrect printf format specifiers
2018-09-24 11:31:40 +03:00
Pavel Rojtberg
d1c842cf29
core: fix printf warnings by using c++11 format
2018-09-24 11:31:40 +03:00
Pavel Rojtberg
4d23a5d92d
core: enable printf format warnings for cv::format
2018-09-24 11:31:40 +03:00
Hamdi Sahloul
0739d1c2eb
JS: Support enum properties
2018-09-24 16:37:52 +09:00
Hamdi Sahloul
b7e8ce4523
fix a bug in OpenGL
2018-09-23 23:07:28 +09:00
Hamdi Sahloul
5db13fe2a7
cuda::polarToCart: update documentation
2018-09-22 07:02:43 +09:00
Hamdi Sahloul
9932612373
cuda::polarToCart: test double precision and tune tolerance
2018-09-22 07:02:43 +09:00
Hamdi Sahloul
6203c95d31
cuda::polarToCart: Support double precision
2018-09-22 07:02:43 +09:00
Alexander Alekhin
d5d19a9f67
Merge pull request #12592 from alalek:dnn_test_at_least_one
2018-09-21 16:49:51 +00:00
Hamdi Sahloul
ef5579dc86
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
2018-09-21 18:12:35 +03:00
Hamdi Sahloul
84ae8097b1
Merge pull request #12601 from cv3d:fix/js
...
* JS: Support enum types in constructors
* JS: Avoid unary expression on enum-based consts
2018-09-21 18:11:46 +03:00
Alexander Alekhin
f33f236ab6
Merge pull request #12598 from cv3d:cmake/js
2018-09-21 14:59:27 +00:00
Hamdi Sahloul
95b1fe0776
JS: Provides meaningful message in case of compile issues
2018-09-21 04:02:34 +09:00
Hamdi Sahloul
35bee663eb
JS: Improves Emscripten detection
2018-09-21 04:02:34 +09:00
Suleyman TURKMEN
98f6ea0785
Update hog.cpp
2018-09-20 13:45:01 +03:00
Alexander Alekhin
c5920df159
cuda: move CUDA modules to opencv_contrib
...
OpenCV 4.0+
2018-09-19 18:57:00 +03:00
Alexander Alekhin
908978d00b
Merge pull request #12589 from xoox:fix-stddev-request
2018-09-19 15:07:58 +00:00
Alexander Alekhin
e0a5824028
dnn(test): test at least CPU code path
2018-09-19 13:56:59 +03:00
Alexander Alekhin
5fb0f34e8a
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
2018-09-19 13:55:26 +03:00
Alexander Alekhin
861415133e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-19 10:58:43 +03:00
Wenfeng CAI
fce75cd858
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.
2018-09-19 12:27:07 +08:00
Alexander Alekhin
ec9c53eeff
ts: update valgrind test filter
...
- DNN: avoid very large models
- build filter per module
- fixed longTestFilter
2018-09-19 00:55:56 +00:00
Alexander Alekhin
d3eed2cf23
videoio: CAP_PROP_BACKEND property interface
2018-09-18 16:25:01 +00:00
Alexander Alekhin
51f7eb3a3c
videoio(test): add "camera" tests
...
- disabled due specific requirements (camera, OpenNI camera, etc)
- designed for manual validation
2018-09-18 16:19:19 +00:00
Alexander Alekhin
b35fbff675
videoio: added '.getBackendName()' method
2018-09-18 16:19:19 +00:00
Alexander Alekhin
15e9e3304c
Merge pull request #12579 from dkurt:dnn_reset_myriad_device
2018-09-18 16:14:38 +00:00
Alexander Alekhin
53ad291ef1
Merge pull request #12572 from alalek:ffmpeg_update_master
2018-09-18 16:12:10 +00:00
Alexander Alekhin
145d3ba99d
Merge pull request #12574 from alalek:fixes_master
2018-09-18 11:16:24 +00:00
Dmitry Kurtaev
8ac7b21716
Enable Myriad device for OpenVINO models test
2018-09-18 13:49:24 +03:00
Alexander Alekhin
e6171d17f8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-18 12:49:52 +03:00
Alexander Alekhin
3cab9e7a9c
3.4: fixes
2018-09-18 08:31:11 +00:00
Alexander Alekhin
aa1c86f95e
ts: flush stdout/stderr before and after test code run
2018-09-18 08:04:52 +00:00
Alexander Alekhin
699565828d
videoio(test): dump file size information
2018-09-18 08:04:51 +00:00
Suleyman TURKMEN
30597e5c98
Update seamless_cloning.cpp
2018-09-18 07:22:39 +03:00
Alexander Alekhin
38de2a8754
calib3d: fix build warnings
2018-09-17 22:16:31 +00:00
Alexander Alekhin
70f38b4dfa
Merge pull request #12510 from take1014:doc_hough
2018-09-17 21:39:12 +03:00
Alexander Alekhin
d389edd843
Merge pull request #12528 from dkurt:dnn_py_tests
2018-09-17 18:34:43 +00:00
Alexander Alekhin
27a4e370f9
Merge pull request #12559 from dkurt:dnn_remove_usrtype1
2018-09-17 18:13:29 +00:00
Alexander Alekhin
b4fd3e8674
Merge pull request #12563 from cv3d:bug/cuda_msseg
2018-09-17 18:09:11 +00:00
Lubov Batanina
43f889ae1f
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
2018-09-17 20:26:17 +03:00
Gaetano Checinski
e628fd7bce
Merge pull request #12503 from nikhedonia:12500-move-gcgraph
...
* feat: move gcgraph to detail
* chore: puts gcgraph cv::detail namespace
2018-09-17 20:13:47 +03:00
Dmitry Kurtaev
7d75526373
Use TorchType enum
2018-09-17 18:55:05 +03:00
Hamdi Sahloul
ecc9bd0925
Support GpuMat in copyTo() functions
2018-09-17 23:43:14 +09:00
Dmitry Kurtaev
d259eb28bb
Add python tests for dnn module
2018-09-17 15:22:47 +03:00
Vadim Pisarevsky
2113818f19
Merge pull request #12364 from dkurt:dnn_change_blob_from_image
2018-09-17 12:04:41 +00:00
Alexander Alekhin
29bee6f07e
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
2018-09-17 14:55:42 +03:00
Dmitry Kurtaev
a7b3d2581f
Replace CV_USRTYPE1 for int64 to CV_32SC2 in Torch importer
2018-09-17 12:31:09 +03:00
Alexander Alekhin
808ba552c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-14 23:44:35 +00:00
Suleyman TURKMEN
6d5f7b72c0
Update seamless_cloning.cpp
2018-09-14 19:51:40 +03:00
Alexander Alekhin
cecb878915
Merge pull request #12527 from terfendail:mean_wintr
2018-09-14 16:34:30 +00:00
Alexander Alekhin
29c10b6792
Merge pull request #12535 from terfendail:testparser_update
2018-09-14 16:32:25 +00:00
Alexander Alekhin
92ec971453
Merge pull request #12526 from terfendail:avx2_resize_fix
2018-09-14 15:57:47 +00:00
Vitaly Tuzov
95502242c9
meanStdDev() implementation updated to use wide universal intrinsics
2018-09-14 17:52:08 +03:00
Vitaly Tuzov
1f88a1af9c
testlog_parser updated to handle output of latest GTest as well
2018-09-14 17:29:06 +03:00
Hamdi Sahloul
5d54def264
Add semicolons after CV_INSTRUMENT
macros
2018-09-14 06:45:31 +09:00
Alexander Alekhin
dbfeb8892d
Merge pull request #12403 from dkurt:dnn_replace_darknet_reorg
2018-09-13 20:58:11 +00:00
Alexander Alekhin
949d7d7d25
Merge pull request #12524 from alalek:fix_dnn_skx_dlie
2018-09-13 20:56:31 +00:00
Takuho NAKANO
451340fd3d
Merge pull request #12523 from takotakot:12455_rotatedrect_constructor
...
* Fix perpendicular decision of RotatedRect::RotatedRect
Error estimation is based on #12455 .
* Fix abs to std::fabs and atan to std::atan
2018-09-13 22:26:05 +03:00
Alexander Alekhin
fdaeb20253
dnn(test): run DL IE tests on Intel OpenCL devices only
2018-09-13 15:45:51 +00:00
Vitaly Tuzov
29770e13e8
Fixed bit-exact resize SIMD implementation for AVX2 baseline
2018-09-13 18:20:27 +03:00
Alexander Alekhin
e51d7cb3d8
Merge pull request #12502 from alalek:fix_dnn_tests_32bit
2018-09-13 14:20:42 +00:00
Alexander Alekhin
f512bf7004
Merge pull request #12522 from mshabunin:remove-va-msdk-34
2018-09-13 14:15:59 +00:00
Alexander Alekhin
63affb2be9
Merge pull request #12515 from hmaarrfk:fix_bayer2rgba_blue_channel
2018-09-13 12:53:08 +00:00
Alexander Alekhin
87b1100027
Merge pull request #12410 from terfendail:sum_wintr
2018-09-13 15:49:56 +03:00
Alexander Duda
a024593fa6
Merge pull request #12147 from D-Alex:master
...
* add new chessboard detector
The chessboar detector is based on the paper.
Accurate Detection and Localization of Checkerboard Corners for
Calibration Alexander Duda, Udo Frese
British Machine Vision Conference, o.A., 2018.
It utilizes point symmetry of checkerboard corners in combination with a
localized Radon transform approximated by box filters to achieve high
performance even on large images. Here, tests have shown that the
ability to localize checkerboard corners is close to the theoretical
limit of 1/100 of a pixel while being considerably less sensitive
to image noise than standard methods.
* chessboard: add reference to bibtex file
* chessboard: add dependency to opencv_flann
* fix: test chesscorners. It is valid to return an empty list
In case no chessboard was detected it should be valid for the detector
to return an empty list.
For simplifcation, it should be allowed to return any number of corners
if they are flagged as not found.
* fix: opencv.bib remove empty lines
* fix: doc findChessboardCorners replace cvSize with cv::Size
* chessboard tests: factor out logic selecting detector
* chessboard: add unit test for findChessboardCorners2
This is includes a new chessboard generator which supports subpix
corners with high accuracy by wrapping an optimal chessboard using
wrapPerspective.
* fix: chessboard unit test - overwrite of default parameter flag of findCirclesGrid
* chessboard: remove trailing whitespace
* chessboard: fix debug drawing
* chessboard: fix some issues during code review
* chessboard: normalize asymmetric chessboard
* chessboard: fix float double warning
* remove trailing whitespace
* chessboards: fix compiler warnings
* chessboards: fix compiler warnings
* checkerboard: some performance improvements
* chessboard: remove NULL macros for language bindinges from internal headers
* chessboard: shorten license terms
* chessboard: remove unused internal method
* chessboard: set helper functions to static
* chessboard: fix normalizePoints1D using unshifted points
* chessboard: remove wrongly copied text
* chessboard: use CV_CheckTypeEQ macro
* chessboard: comment all NaN checks
* chessboard: use consistent color conversion
* chessboard: use CheckChannelEQ macro
* chessboard: assume gray color image for internal methods
* chessboard: use std::swap
* chessboard: use Mat.dataend
* chessboard: fix compiler warnings
* chessboard: replace some checks witch CV_CHECK macro
* chessboard: fix comparison function for partial sort
* chessboard: small cleanup
* chessboard: use short license header
* chessboard: rename findChessboard2 to findChessboardSB
* chessboard: fix type in unit test
2018-09-13 15:43:04 +03:00
Maksim Shabunin
78c500e97a
Removed unnecessary build-time MediaSDK detection
2018-09-13 13:43:11 +03:00
Alexander Alekhin
347e09cd07
Merge pull request #12511 from GeorgeMironov:rename-tf-namespace
2018-09-12 20:13:43 +00:00
Mark Harfouche
095b0d3272
Fix BayerXX2RGBA when blue is on the first line.
2018-09-12 16:06:44 -04:00
Alexander Alekhin
b7b82c1cef
dnn(tensorflow): re-generate files using protoc
2018-09-12 21:33:45 +03:00
George Mironov
cb5da8983f
Rename tensorflow namespace
2018-09-12 21:33:11 +03:00
Alexander Alekhin
796795ac89
Merge pull request #12501 from alalek:fix_qt_build
2018-09-12 17:14:23 +00:00
Alexander Alekhin
3e8934dec0
Merge pull request #12507 from cv3d:fix_warnings
2018-09-12 17:12:46 +00:00
Dmitry Kurtaev
58ac3e09da
Change default value of crop argument of blobFromImage from true to false
2018-09-12 19:02:58 +03:00
Dmitry Kurtaev
09fa758725
Replace Darknet's Reorg to permute layer
2018-09-12 18:13:39 +03:00
take1014
57ae3ac7a2
fix document about HoughLines
2018-09-12 22:18:30 +09:00
Alexander Alekhin
6fc855865f
dnn(test): fix failures of 32-bit builders
2018-09-12 13:06:16 +00:00
Alexander Alekhin
b80c978f5d
core: change cv::Ptr DefaultDeleter
2018-09-12 12:20:15 +00:00
Vadim Pisarevsky
f4b9acb4db
Merge pull request #12497 from tomoaki0705:removeRawSSE
2018-09-12 11:59:44 +00:00
Vadim Pisarevsky
acbfd85737
Merge pull request #12204 from allnes:detect_qr_code
2018-09-12 11:55:44 +00:00
Hamdi Sahloul
03b3be0f51
MSVC: Slience external/meaningless warnings
2018-09-12 20:02:13 +09:00
Marat K
38f8fc6c82
Merge pull request #12249 from kopytjuk:feature/region-layer-batch-mode
...
Feature/region layer batch mode (#12249 )
* Add batch mode for Darknet networks.
Swap variables in test_darknet.
Adapt reorg layer to batch mode.
Adapt region layer.
Add OpenCL implementation.
Remove trailing whitespace.
Bugifx reorg opencl implementation.
Fix bug in OpenCL reorg.
Fix modulo bug.
Fix bug.
Reorg openCL.
Restore reorg layer opencl code.
OpenCl fix.
Work on openCL reorg.
Remove whitespace.
Fix openCL region layer implementation.
Fix bug.
Fix softmax region opencl bug.
Fix opencl bug.
Fix openCL bug.
Update aff_trans.cpp
When the fullAffine parameter is set to false, the estimateRigidTransform function maybe return empty, then the _localAffineEstimate function will be called, but the bug in it will result in incorrect results.
core(libva): support YV12 too
Added to CPU path only.
OpenCL code path still expects NV12 only (according to Intel OpenCL extension)
cmake: allow to specify own libva paths
via CMake:
- `-DVA_LIBRARIES=/opt/intel/mediasdk/lib64/libva.so.2\;/opt/intel/mediasdk/lib64/libva-drm.so.2`
android: NDK17 support
tested with NDK 17b (17.1.4828580)
Enable more deep learning tests using Intel's Inference Engine backend
ts: don't pass NULL for std::string() constructor
openvino: use 2018R3 defines
experimental version++
OpenCV version++
OpenCV 3.4.3
OpenCV version '-openvino'
openvino: use 2018R3 defines
Fixed windows build with InferenceEngine
dnn: fix variance setting bug for PriorBoxLayer
- The size of second channel should be size[2] of output tensor,
- The Scalar should be {variance[0], variance[0], variance[0], variance[0]}
for _variance.size() == 1 case.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Fix lifetime of networks which are loaded from Model Optimizer IRs
Adds a small note describing BUILD_opencv_world (#12332 )
* Added a mall note describing BUILD_opencv_world cmake option to the Installation in Windows tutorial.
* Made slight changes in BUILD_opencv_world documentation.
* Update windows_install.markdown
improved grammar
Update opengl_interop.cpp
resolves #12307
java: fix LIST_GET macro
fix typo
Added option to fail on missing testdata
Fixed that object_detection.py does not work in python3.
cleanup: IPP Async (IPP_A)
except header file with conversion routines (will be removed in OpenCV 4.0)
imgcodecs: add null pointer check
Include preprocessing nodes to object detection TensorFlow networks (#12211 )
* Include preprocessing nodes to object detection TensorFlow networks
* Enable more fusion
* faster_rcnn_resnet50_coco_2018_01_28 test
countNonZero function reworked to use wide universal intrinsics instead of SSE2 intrinsics
resolve #5788
imgcodecs(webp): multiple fixes
- don't reallocate passed 'img' (test fixed - must use IMREAD_UNCHANGED / IMREAD_ANYCOLOR)
- avoid memory DDOS
- avoid reading of whole file during header processing
- avoid data access after allocated buffer during header processing (missing checks)
- use WebPFree() to free allocated buffers (libwebp >= 0.5.0)
- drop unused & undefined `.close()` method
- added checks for channels >= 5 in encoder
ml: fix adjusting K in KNearest (#12358 )
dnn(perf): fix and merge Convolution tests
- OpenCL tests didn't run any OpenCL kernels
- use real configuration from existed models (the first 100 cases)
- batch size = 1
dnn(test): use dnnBackendsAndTargets() param generator
Bit-exact resize reworked to use wide intrinsics (#12038 )
* Bit-exact resize reworked to use wide intrinsics
* Reworked bit-exact resize row data loading
* Added bit-exact resize row data loaders for SIMD256 and SIMD512
* Fixed type punned pointer dereferencing warning
* Reworked loading of source data for SIMD256 and SIMD512 bit-exact resize
Bit-exact GaussianBlur reworked to use wide intrinsics (#12073 )
* Bit-exact GaussianBlur reworked to use wide intrinsics
* Added v_mul_hi universal intrinsic
* Removed custom SSE2 branch from bit-exact GaussianBlur
* Removed loop unrolling for gaussianBlur horizontal smoothing
doc: fix English gramma in tutorial out-of-focus-deblur filter (#12214 )
* doc: fix English gramma in tutorial out-of-focus-deblur filter
* Update out_of_focus_deblur_filter.markdown
slightly modified one sentence
doc: add new tutorial motion deblur filter (#12215 )
* doc: add new tutorial motion deblur filter
* Update motion_deblur_filter.markdown
a few minor changes
Replace Slice layer to Crop in Faster-RCNN networks from Caffe
js: use generated list of OpenCV headers
- replaces hand-written list
imgcodecs(webp): use safe cast to size_t on Win32
* Put Version status back to -dev.
follow the common codestyle
Exclude some target engines.
Refactor formulas.
Refactor code.
* Remove unused variable.
* Remove inference engine check for yolov2.
* Alter darknet batch tests to test with two different images.
* Add yolov3 second image GT.
* Fix bug.
* Fix bug.
* Add second test.
* Remove comment.
* Add NMS on network level.
* Add helper files to dev.
* syntax fix.
* Fix OD sample.
Fix sample dnn object detection.
Fix NMS boxes bug.
remove trailing whitespace.
Remove debug function.
Change thresholds for opencl tests.
* Adapt score diff and iou diff.
* Alter iouDiffs.
* Add debug messages.
* Adapt iouDiff.
* Fix tests
2018-09-12 13:29:43 +03:00
Alexander Alekhin
d7ac4495c3
highgui: fix QT build
2018-09-11 20:30:50 +00:00
Alexander Alekhin
492ef14550
Merge pull request #12494 from DEEPIR:3.4
2018-09-11 19:38:00 +00:00
Hamdi Sahloul
10ae0c4364
Merge pull request #12486 from cv3d:fix_cpp11
...
Support MSVC 2013 (#12486 )
* Added CV_CONSTEXPR macro
* Utilize CV_NOEXCEPT and CV_CONSTEXPR
* Provides some Ptr<> logical operators
2018-09-11 22:35:03 +03:00
Alexander Alekhin
be2ccdbf0b
Merge pull request #12479 from sturkmen72:patch-2
2018-09-11 19:33:50 +00:00
Alexander Alekhin
cb3ae1232b
Merge pull request #12478 from alalek:fix_python_converters
2018-09-11 19:33:11 +00:00
Alexander Alekhin
e73e393c82
Merge pull request #12477 from alalek:drop_legacy_headers
2018-09-11 19:31:16 +00:00
Tomoaki Teshima
88b04c3cd4
remove raw SSE2 implementation
2018-09-11 21:28:18 +09:00
Alexander Nesterov
1fb7ee0e16
Optimiaztion search template lines and added sample
2018-09-11 11:46:36 +00:00
cyy
8f78a1123b
fix uninitialized read errors reported by CUDA-INITCHECK
2018-09-11 14:47:39 +08:00
Alexander Alekhin
b9fd5f8186
Merge pull request #12483 from terfendail:meanstddev_multichan
2018-09-10 19:27:51 +00:00
Lubov Batanina
0c8590027f
Merge pull request #12071 from l-bat/l-bat:onnx_parser
...
* Add Squeezenet support in ONNX
* Add AlexNet support in ONNX
* Add Googlenet support in ONNX
* Add CaffeNet and RCNN support in ONNX
* Add VGG16 and VGG16 with batch normalization support in ONNX
* Add RCNN, ZFNet, ResNet18v1 and ResNet50v1 support in ONNX
* Add ResNet101_DUC_HDC
* Add Tiny Yolov2
* Add CNN_MNIST, MobileNetv2 and LResNet100 support in ONNX
* Add ONNX models for emotion recognition
* Add DenseNet121 support in ONNX
* Add Inception v1 support in ONNX
* Refactoring
* Fix tests
* Fix tests
* Skip unstable test
* Modify Reshape operation
2018-09-10 21:07:51 +03:00
Vitaly Tuzov
0a5bd0ac8b
sum() implementation updated to use wide universal intrinsics
2018-09-10 20:16:38 +03:00
Vitaly Tuzov
2f929376ec
Fixed meanStdDev() implementation for the case input matrix has more than 4 channels
2018-09-10 20:05:45 +03:00
Vadim Pisarevsky
b01f63835e
Merge pull request #12467 from alalek:core_use_shared_ptr
2018-09-10 13:59:14 +00:00
Vadim Pisarevsky
6d7f5871db
added basic support for CV_16F (the new datatype etc.) ( #12463 )
...
* added basic support for CV_16F (the new datatype etc.). CV_USRTYPE1 is now equal to CV_16F, which may break some [rarely used] functionality. We'll see
* fixed just introduced bug in norm; reverted errorneous changes in Torch importer (need to find a better solution)
* addressed some issues found during the PR review
* restored the patch to fix some perf test failures
2018-09-10 16:56:29 +03:00
Suleyman TURKMEN
30a4e2f7ac
Update hog.cpp
2018-09-10 16:49:39 +03:00
Alexander Alekhin
89720ae24d
python: fix "unsigned int" / "size_t" overloading conflict
2018-09-10 11:24:47 +00:00
Alexander Alekhin
c331a214d0
Merge pull request #12054 from alalek:debug_bindings
2018-09-10 10:44:32 +00:00
Alexander Alekhin
9097ccf515
drop legacy headers
2018-09-10 08:33:16 +00:00
Alexander Alekhin
dca657a2fd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-10 00:10:21 +03:00
Alexander Alekhin
df8b057b44
avoid Ptr<> == NULL
checks
2018-09-09 19:30:46 +00:00
Alexander Alekhin
64b3c1e691
core(test): update cv::Ptr tests
2018-09-09 19:30:46 +00:00
Alexander Alekhin
15aee09c7f
core: replace cv::Ptr implementation => std::shared_ptr
2018-09-09 19:30:46 +00:00
Suleyman TURKMEN
92517fa359
Update window.cpp
2018-09-09 19:24:25 +00:00
Sergey Nuzhny
80610ca054
Merge pull request #12449 from Nuzhny007:master
...
* Fixed compilation error WITH_OPENMP under Windows
* Move up OpenMP condition
2018-09-08 23:20:14 +03:00
Alexander Alekhin
95dd4b3f27
bindings: add debug helpers for args conversions
2018-09-08 12:23:08 +00:00
Hamdi Sahloul
b487e2df0b
opencv_js: Support Python3 and MSVC
2018-09-08 18:23:41 +09:00
Hamdi Sahloul
c6ed2bf9aa
opencv_js: fix a bug in handling enums using the new parser
2018-09-08 18:23:41 +09:00
Alexander Alekhin
40b1dc12de
Merge pull request #12464 from alalek:fix_contrib_1754
2018-09-07 20:03:41 +00:00
Mark Harfouche
53bbed89ae
Output RGBA images when bayer_xx2YYYA is called
2018-09-07 16:03:04 -04:00
Alexander Alekhin
8eba3c1e7e
Merge pull request #12462 from alalek:issue_12453
2018-09-07 16:55:01 +00:00
Alexander Alekhin
b50c70bbfa
features2d(test): extract common extract/invariance test code
...
to share with opencv_contrib/xfeatures2d
2018-09-07 19:30:51 +03:00
cyy
286c2c236b
Merge pull request #12458 from DEEPIR:3.4
...
* may be an typo fix
* remove identical branch,may be paste error
* add parentheses around macro parameter
* simplify if condition
* check malloc fail
* change the condition of branch removed by commit 3041502861
2018-09-07 18:43:47 +03:00
Alexander Alekhin
af021e79d9
video(perf): drop unreliable sanity checks
2018-09-07 18:09:00 +03:00
Hamdi Sahloul
a39e0daacf
Utilize CV_UNUSED macro
2018-09-07 20:33:52 +09:00
Alexander Alekhin
73bfe68821
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-07 12:40:27 +03:00
Alexander Alekhin
f90aea22b1
cuda: fix build (legacy C-API usage)
2018-09-07 07:26:17 +00:00
Alexander Alekhin
bd98ed46bd
Merge pull request #12446 from alalek:imgproc_grabcut_numeric_issues
2018-09-06 20:18:45 +00:00
cyy
8b48c2a10c
Merge pull request #12443 from DEEPIR:master
...
* simplify condition
* dims must > 0 or latter sz[dims-1] will underflow
2018-09-06 23:09:39 +03:00
Alexander Alekhin
f1f15841d7
Merge pull request #11630 from alalek:c_api_eliminate_constructors
2018-09-06 20:07:16 +00:00
Sayed Adel
f5d181db3a
python:ppc64 Add missing support for PyLongObject
2018-09-06 20:04:05 +00:00
Vadim Pisarevsky
80b62a41c6
Merge pull request #12411 from vpisarev:wide_convert
...
* rewrote Mat::convertTo() and convertScaleAbs() to wide universal intrinsics; added always-available and SIMD-optimized FP16<=>FP32 conversion
* fixed compile warnings
* fix some more compile errors
* slightly relaxed accuracy threshold for int->float conversion (since we now do it using single-precision arithmetics, not double-precision)
* fixed compile errors on iOS, Android and in the baseline C++ version (intrin_cpp.hpp)
* trying to fix ARM-neon builds
* trying to fix ARM-neon builds
* trying to fix ARM-neon builds
* trying to fix ARM-neon builds
2018-09-06 19:36:59 +03:00
Vadim Pisarevsky
54279523a3
Merge pull request #12437 from vpisarev:avx2_fixes
...
* trying to fix the custom AVX2 builder test failures (false alarms)
* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests
* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests
* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests
* seemingly disabled false alarm warning in surf.cpp; increased tolerance thresholds in the tests for SolvePnP and in DNN/ENet
2018-09-06 18:56:55 +03:00
Alexander Alekhin
24e72e151a
imgproc: grabcut numeric stability
2018-09-06 17:05:54 +03:00
Alexander Alekhin
8a3c394d6a
don't use constructors for C API structures
2018-09-06 14:34:16 +03:00
Alexander Alekhin
ad146e5a6b
core: remove constructors from C API structures
...
POD structures can't have constructors.
2018-09-06 14:34:09 +03:00
Alexander Alekhin
66d15e89df
Merge pull request #12440 from woodychow:fix_normL2Sqr_speed_regression_3.4
2018-09-06 10:33:33 +00:00
Rostislav Vasilikhin
da7e1cfb49
Merge pull request #12279 from savuor:cvtcolor_bgr2gray_8u_15bits
...
* bgr2gray 8u fixed to be in conformance with IPP code
* coefficients fixed so their sum is 32768
* java test for CascadeDetect fixed: equalizeHist added
2018-09-06 13:28:24 +03:00
Dmitry Kurtaev
d486204a0d
Merge pull request #12264 from dkurt:dnn_remove_forward_method
...
* Remove a forward method in dnn::Layer
* Add a test
* Fix tests
* Mark multiple dnn::Layer::finalize methods as deprecated
* Replace back dnn's inputBlobs to vector of pointers
* Remove Layer::forward_fallback from CV_OCL_RUN scopes
2018-09-06 13:26:47 +03:00
woody.chow
07c6b0a8df
Replace naive normL2Sqr with hal::normL2Sqr_ for better performance
2018-09-06 17:43:07 +09:00
Alexander Alekhin
43b64140ae
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-05 19:54:09 +03:00
Zhenqing Hu
d621a99e73
To fix bug #12389 , which is a validation for the potential null pointer.
...
Signed-off-by: Zhenqing Hu <huzq85@gmail.com>
2018-09-05 19:14:34 +03:00
Alexander Alekhin
107660c7ba
Merge pull request #12433 from alalek:fix_contrib_1746
2018-09-05 16:09:27 +00:00
Alexander Alekhin
e70526625f
imgproc: fix Subdiv2D::getTriangleList()
2018-09-05 16:24:27 +03:00
Alexander Alekhin
8a328e393d
Merge pull request #12408 from dkurt:dnn_myriad_batch_tests
2018-09-05 10:04:04 +00:00
Dmitry Kurtaev
6ec230480d
Enable Myriad tests with batch size > 1
2018-09-05 10:45:09 +03:00
Alexander Alekhin
c441ad36c8
build: don't use nullptr without C++11 guard
2018-09-05 06:19:02 +00:00
Hamdi Sahloul
3f3d805663
Workaround for GTest v1.8.1 + Visual Studio 2013 (vc12)
2018-09-05 12:16:47 +09:00
Alexander Alekhin
d74b98c3d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-04 18:39:03 +00:00
Alexander Alekhin
351ee2e3a5
Merge pull request #12409 from dkurt:fix_12407
2018-09-04 16:34:30 +00:00
Alexander Alekhin
7f7f30a08b
Merge pull request #12406 from alalek:backport_12357_12391
2018-09-04 16:09:44 +00:00
Alexander Alekhin
e0bfe44cac
Merge pull request #12400 from alalek:dnn_update_inline_namespace_master
2018-09-04 15:17:15 +00:00
Alexander Alekhin
fda99c1c6c
Merge pull request #12394 from alalek:imgproc_GaussianBlur_allow_HAL_8U
2018-09-04 15:16:08 +00:00
Alexander Alekhin
71c8de8fa1
Merge pull request #12383 from alalek:ts_qemu_support
2018-09-04 15:15:39 +00:00
Dmitry Kurtaev
27a6be8763
Fix #12407
2018-09-04 17:48:52 +03:00
Alexander Alekhin
acce95f446
backport fixes for static analyzer warnings
...
Commits:
- 09837928d9
- 10fb88d027
Excluded changes with std::atomic (C++98 requirement)
2018-09-04 16:49:42 +03:00
cyy
10fb88d027
Merge pull request #12391 from DEEPIR:master
...
fix some errors found by static analyzer. (#12391 )
* fix possible divided by zero and by negative values
* only 4 elements are used in these arrays
* fix uninitialized member
* use boolean type for semantic boolean variables
* avoid invalid array index
* to avoid exception and because base64_beg is only used in this block
* use std::atomic<bool> to avoid thread control race condition
2018-09-04 16:39:19 +03:00
Alexander Alekhin
a78e5344df
Merge pull request #12382 from alalek:update_gtest_1.8.1
2018-09-04 13:28:55 +00:00
Alexander Alekhin
e5236cecd6
Merge pull request #12405 from todortomov:3.4_cap_v4l_query_conrtols
2018-09-04 12:55:05 +00:00
Alexander Alekhin
4f9db2c03a
Merge pull request #12377 from alalek:inputarray_raw_wrapper_customtype
2018-09-04 11:29:23 +00:00
Todor Tomov
9988e1b6ee
cap_v4l: Fix private control enumeration end condition
...
Currently the private control enumeration will be stopped when QUERYCTRL
returns -EINVAL only. It is possible however that other errors occur.
One particular case is when the v4l2 device doesn't support any controls
and doesn't implement the QUERYCTRL ioctl. In that case the v4l2
framework returns -ENOTTY. In that case the current control enumeration
will go in an endless loop.
To fix this change the control enumeration stop condition. If any errors
occur, end the control enumeration.
Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
2018-09-04 11:33:08 +03:00
Alexander Alekhin
0f0a82b619
Merge pull request #12402 from alalek:fix_build_dnn_tests
2018-09-04 06:39:20 +00:00
Alexander Alekhin
2cf34c0fe5
dnn: fix tests build with disabled OpenCL
2018-09-03 23:11:25 +00:00
Alexander Alekhin
f826709452
Merge pull request #12303 from cv3d:improvements/binding_python
2018-09-03 20:57:11 +00:00
Alexander Alekhin
f10fd64630
dnn: update "guard" inline namespace
...
- differ from 3.4 branch
2018-09-03 20:46:57 +00:00
Alexander Alekhin
49a1328046
Merge pull request #12396 from LaurentBerger:I12392
2018-09-03 20:26:14 +00:00
Alexander Alekhin
2877f17372
Merge pull request #12397 from terfendail:resize_wintr_fix
2018-09-03 20:25:45 +00:00
Alexander Alekhin
00cbb894ec
CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement
2018-09-03 18:41:48 +00:00
Alexander Alekhin
a0f86479e0
core: wrap custom types via _RawArray (raw() call)
...
- support passing of `std::vector<KeyPoint>` via InputArray
2018-09-03 18:41:48 +00:00
Vitaly Tuzov
f9a5c4d181
Fixed bit-exact resize wide intrinsics implementation for 16U
2018-09-03 20:37:25 +03:00
LaurentBerger
d71812425a
Solves issue 12392
2018-09-03 19:30:49 +02:00
Alexander Alekhin
aa5c45339c
Merge pull request #12393 from peterjozsa:issue_12301
2018-09-03 16:16:48 +00:00
Alexander Alekhin
1e362ff5c3
imgproc(GaussianBlur): restore processing order
2018-09-03 18:39:42 +03:00
Vadim Pisarevsky
fc71316690
Merge pull request #12371 from alalek:issue_12366
2018-09-03 14:30:16 +00:00
yuki takehara
cb7ee27cd9
Fix bug in distanceTransform ( #12278 )
...
* fix 12218
* Update test_distancetransform.cpp
marked the test as "BIGDATA_TEST" in order to skip it on low-mem platforms
* modify test
* use a smaller image in the test
* fix test code
2018-09-03 17:18:10 +03:00
Dmitry Kurtaev
c7cf8fb35c
Import SSDs from TensorFlow by training config ( #12188 )
...
* Remove TensorFlow and protobuf dependencies from object detection scripts
* Create text graphs for TensorFlow object detection networks from sample
2018-09-03 17:08:40 +03:00
Peter Jozsa
8b0e1c7fcb
Fix https://github.com/opencv/opencv/issues/12301
2018-09-03 14:56:38 +02:00
Alexander Alekhin
e3af72bb68
Merge pull request #12376 from alalek:issue_12337
2018-09-03 10:17:56 +00:00
Alexander Alekhin
ec3492a22a
Merge pull request #12374 from alalek:issue_12368
2018-09-03 10:17:09 +00:00
Alexander Alekhin
07808c8d5d
Merge pull request #12373 from alalek:issue_12365
2018-09-03 10:16:51 +00:00
Wu Zhiwen
a11d944f51
dnn: Remove a duplicated code snippet for flatten layer
...
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2018-09-03 10:57:33 +08:00
Alexander Alekhin
af883e88e1
ts: support QEMU launcher
2018-09-02 21:48:01 +00:00
Alexander Alekhin
3dddf703a9
ts: re-apply OpenCV-specific patch on googletest 1.8.1
2018-09-02 13:45:48 +00:00
cyy
09837928d9
Merge pull request #12357 from DEEPIR:master
...
* fix some static analyzer warnings
* fix some static analyzer warnings
* fix race condition of workthread control
2018-09-02 16:34:43 +03:00
Alexander Alekhin
f7ccc74e09
ts: update Google Test 1.8.1
...
Helper script from googletest: ./scripts/fuse_gtest_files.py
2018-09-02 12:21:29 +00:00
Alexander Alekhin
546fcd990e
ts: restore Google Test 1.8.0 (capture OpenCV specific patch)
2018-09-02 12:07:15 +00:00
Alexander Alekhin
5eb295adf3
Merge pull request #12379 from alalek:fix_warning_win32
2018-09-02 11:50:32 +00:00
Alexander Alekhin
20bf7b6a79
imgcodecs(webp): use safe cast to size_t on Win32
2018-09-02 10:00:52 +00:00
Alexander Alekhin
af769e4ec8
Merge pull request #12362 from alalek:fix_js_headers
2018-09-02 04:15:16 +00:00
Hamdi Sahloul
ee6415bd1c
Improves a UMat unit test
2018-09-02 00:34:35 +09:00
Alexander Alekhin
70a27c7dd6
core: add solveLP type checks for output
...
to forbid Mat1f
Checks are not reliable: empty uninitialized `cv::Mat` has `CV_8UC1` type
2018-09-01 14:51:44 +00:00
Alexander Alekhin
701760dbeb
calib3d: use Mat::reserveBuffer()
instead of .create()
...
to allocate memory >2Gb
2018-09-01 13:18:08 +00:00
Alexander Alekhin
0f9f2696be
imgproc: small code refactoring (findContours -> l_cinfo)
2018-09-01 12:58:40 +00:00
Alexander Alekhin
65a0587ce8
imgproc(segmentation): don't increase mask NULL pointer
...
Avoid manual address arithmetic
2018-09-01 12:38:57 +00:00
Hamdi Sahloul
78835ad87a
Support enum arguments for Java binding
2018-09-01 15:04:55 +09:00
Hamdi Sahloul
4e6be21a44
Support enum arguments for Python binding
2018-09-01 15:04:55 +09:00
Hamdi Sahloul
f89e4e7dd0
Support parsing C++11 enum struct
and enum class
2018-09-01 15:04:54 +09:00
Alexander Alekhin
dfa8467a08
Merge pull request #12180 from cv3d:cleanup/python_umat
2018-08-31 20:25:30 +00:00
Hamdi Sahloul
669ee0415a
Rewrite the UMat Python wrapper
2018-09-01 01:36:10 +09:00
Vadim Pisarevsky
f9c8bb40b1
Merge pull request #12350 from dkurt:dnn_ie_caffe_faster_rcnn
2018-08-31 14:57:14 +00:00
Vitaly Tuzov
0f2b535fcc
Bit-exact GaussianBlur reworked to use wide intrinsics ( #12073 )
...
* Bit-exact GaussianBlur reworked to use wide intrinsics
* Added v_mul_hi universal intrinsic
* Removed custom SSE2 branch from bit-exact GaussianBlur
* Removed loop unrolling for gaussianBlur horizontal smoothing
2018-08-31 17:04:59 +03:00
Vitaly Tuzov
e345cb03d5
Bit-exact resize reworked to use wide intrinsics ( #12038 )
...
* Bit-exact resize reworked to use wide intrinsics
* Reworked bit-exact resize row data loading
* Added bit-exact resize row data loaders for SIMD256 and SIMD512
* Fixed type punned pointer dereferencing warning
* Reworked loading of source data for SIMD256 and SIMD512 bit-exact resize
2018-08-31 16:54:05 +03:00
Alexander Alekhin
94dea84915
Merge pull request #12361 from alalek:fix_12359
2018-08-31 13:27:56 +00:00
Alexander Alekhin
f33cbe94dd
Merge pull request #12142 from alalek:dnn_ocl_fix_convolution_perf_tests
2018-08-31 13:27:14 +00:00
Jakub Golinowski
9f1218b00b
Merge pull request #11897 from Jakub-Golinowski:hpx_backend
...
* Add HPX backend for OpenCV implementation
Adds hpx backend for cv::parallel_for_() calls respecting the nstripes chunking parameter. C++ code for the backend is added to modules/core/parallel.cpp. Also, the necessary changes to cmake files are introduced.
Backend can operate in 2 versions (selectable by cmake build option WITH_HPX_STARTSTOP): hpx (runtime always on) and hpx_startstop (start and stop the backend for each cv::parallel_for_() call)
* WIP: Conditionally include hpx_main.hpp to tests in core module
Header hpx_main.hpp is included to both core/perf/perf_main.cpp and core/test/test_main.cpp.
The changes to cmake files for linking hpx library to above mentioned test executalbles are proposed but have issues.
* Add coditional iclusion of hpx_main.hpp to cpp cpu modules
* Remove start/stop version of hpx backend
2018-08-31 16:23:26 +03:00
berak
e13f6ded7f
ml: fix adjusting K in KNearest ( #12358 )
2018-08-31 16:07:53 +03:00
Vadim Pisarevsky
4b03a4a841
Merge pull request #12353 from alalek:imgcodecs_fix_webp
2018-08-31 13:03:10 +00:00
Vadim Pisarevsky
bab4f4f5d8
Merge pull request #12348 from take1014:subdiv_getTriangleList_5788
2018-08-31 13:01:16 +00:00
Vadim Pisarevsky
a08c6e49b3
Merge pull request #12341 from terfendail:countnonzero_wintr
2018-08-31 12:58:25 +00:00
Dmitry Kurtaev
50bceea038
Include preprocessing nodes to object detection TensorFlow networks ( #12211 )
...
* Include preprocessing nodes to object detection TensorFlow networks
* Enable more fusion
* faster_rcnn_resnet50_coco_2018_01_28 test
2018-08-31 15:41:56 +03:00
Alexander Alekhin
c557193b8c
dnn(test): use dnnBackendsAndTargets() param generator
2018-08-31 15:11:58 +03:00
Alexander Alekhin
3e6b3a6856
dnn(perf): fix and merge Convolution tests
...
- OpenCL tests didn't run any OpenCL kernels
- use real configuration from existed models (the first 100 cases)
- batch size = 1
2018-08-31 15:02:19 +03:00
Alexander Alekhin
d52cef1719
js: use generated list of OpenCV headers
...
- replaces hand-written list
2018-08-31 14:48:44 +03:00
Alexander Alekhin
fcfa488250
build: fix js build (make video->calib3d dependency optional)
...
- estimateRigidTransform() is excluded from JS bindings
2018-08-31 14:29:25 +03:00
Alexander Alekhin
0d4fd20a73
imgcodecs: add null pointer check
2018-08-31 12:56:02 +03:00
Hamdi Sahloul
2bbe31a8f6
Support non-static phantom methods for binding generator
2018-08-31 05:44:50 +09:00
Hamdi Sahloul
7cdb0eafeb
Enable the binding generator to parse shadow files
2018-08-31 05:44:02 +09:00
Alexander Alekhin
0515f930e8
imgcodecs(webp): multiple fixes
...
- don't reallocate passed 'img' (test fixed - must use IMREAD_UNCHANGED / IMREAD_ANYCOLOR)
- avoid memory DDOS
- avoid reading of whole file during header processing
- avoid data access after allocated buffer during header processing (missing checks)
- use WebPFree() to free allocated buffers (libwebp >= 0.5.0)
- drop unused & undefined `.close()` method
- added checks for channels >= 5 in encoder
2018-08-30 20:42:33 +00:00
Alexander Alekhin
90f47eb952
Merge pull request #12234 from cv3d:python/cuda/wrapping_functionalities
2018-08-30 20:23:38 +00:00
Vitaly Tuzov
c894fc5bae
countNonZero function reworked to use wide universal intrinsics instead of SSE2 intrinsics
2018-08-30 20:43:39 +03:00
take1014
e1ee744e15
resolve #5788
2018-08-31 00:59:00 +09:00
Alexander Alekhin
e86287d8ae
cleanup: IPP Async (IPP_A)
...
except header file with conversion routines (will be removed in OpenCV 4.0)
2018-08-30 18:53:07 +03:00
Alexander Alekhin
15e57d28f5
Merge pull request #12293 from alalek:cleanup_stl_string_replacement
2018-08-30 15:43:57 +00:00
Alexander Alekhin
4c7d521413
Merge pull request #12346 from mshabunin:test-data-check
2018-08-30 15:36:58 +00:00
Dmitry Kurtaev
ea43e28a37
Replace Slice layer to Crop in Faster-RCNN networks from Caffe
2018-08-30 17:57:08 +03:00
Hamdi Sahloul
532eace7d6
Extensive wrapping of CUDA functionalities for Python
2018-08-30 22:50:33 +09:00
Hamdi Sahloul
d4ac4fcde1
Python binding: METH_STATIC instead of METH_CLASS for static functions
2018-08-30 22:50:33 +09:00
Vadim Pisarevsky
258a769567
Merge pull request #12327 from take1014:distanceTransform_type
2018-08-30 13:12:08 +00:00
Alexander Alekhin
7845f6d95c
Merge pull request #12345 from berak:fix_java_list_string
2018-08-30 13:04:19 +00:00
Maksim Shabunin
cecf84410c
Added option to fail on missing testdata
2018-08-30 15:15:08 +03:00
Alexander Alekhin
596a0125ed
Merge pull request #12336 from dkurt:dnn_ie_fix_net_lifetime
2018-08-30 11:09:18 +00:00
berak
72f422c7dc
java: fix LIST_GET macro
2018-08-30 13:06:02 +02:00
Wu Zhiwen
ca51bbb7ff
dnn: fix variance setting bug for PriorBoxLayer
...
- The size of second channel should be size[2] of output tensor,
- The Scalar should be {variance[0], variance[0], variance[0], variance[0]}
for _variance.size() == 1 case.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
2018-08-30 11:05:38 +08:00
Alexander Alekhin
c1db75e0c7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-29 16:24:56 +03:00
Dmitry Kurtaev
4062ef5fcb
Fix lifetime of networks which are loaded from Model Optimizer IRs
2018-08-29 13:34:26 +03:00
take1014
1ae477a46d
fix typo
2018-08-28 22:14:47 +09:00
Alexander Alekhin
d13db35f31
Merge tag '3.4.3'
2018-08-28 16:03:08 +03:00
Alexander Alekhin
b38c50b3d0
OpenCV 3.4.3
2018-08-28 15:58:21 +03:00
Alexander Alekhin
50b61668e2
Merge pull request #12326 from alalek:issue_12325
2018-08-28 12:51:33 +00:00
Alexander Alekhin
1df84f7246
Merge pull request #12319 from dkurt:dnn_enable_ie_tests
2018-08-28 12:50:32 +00:00
Alexander Alekhin
af0c930e77
ts: don't pass NULL for std::string() constructor
2018-08-28 14:19:56 +03:00
Alexander Alekhin
4e0d2a3e6c
Merge pull request #12193 from alalek:fix_vaapi_sample
2018-08-27 20:56:20 +00:00
Alexander Alekhin
da6d8961fc
Merge pull request #12286 from logic1988:master
2018-08-27 19:05:23 +00:00
Dmitry Kurtaev
3e027df583
Enable more deep learning tests using Intel's Inference Engine backend
2018-08-27 18:37:35 +03:00
Alexander Alekhin
acfdd0e1fc
core: fix MSVS "unreachable code" warnings
2018-08-27 16:23:25 +03:00
Alexander Alekhin
9fb8f6347f
core: don't call std::string(NULL)
2018-08-27 16:23:25 +03:00
Alexander Alekhin
7f73b105ca
core: std::string more changes
2018-08-27 15:41:01 +03:00
Vladislav Sovrasov
ae8dcdf40d
core: get rid of built-in String type
2018-08-27 14:42:18 +03:00
Suleyman TURKMEN
6d165dae5e
related moved enums
2018-08-27 00:43:04 +03:00
Alexander Alekhin
6477262e63
Merge pull request #12306 from berak:python_nmsboxes
2018-08-25 16:35:00 +00:00
Maxim Smirnov
c94d75874b
CV_Assert
s changed
...
Some `CV_Assert`s changed to `CV_Assert_N`s according to https://github.com/opencv/opencv/issues/12304
2018-08-25 14:52:27 +03:00
berak
21f3987d53
python: add support for NMSBoxes
2018-08-25 08:44:45 +02:00
Alexander Alekhin
335e61dc47
Merge pull request #12269 from cv3d:improvements/binding_python
2018-08-24 19:38:12 +00:00
Hamdi Sahloul
b5eb65e53e
Improve Python binding generator with mappable types and phantom headers
2018-08-25 01:58:42 +09:00
Hamdi Sahloul
f1ca05c822
Extend python exception cv.error
...
to provide `file`, `func`, `line`, `code`, `msg`, and `err` attributes
2018-08-25 01:58:42 +09:00
Hamdi Sahloul
900df21b7d
Support enum-type detection for binding generator
2018-08-25 01:58:42 +09:00
Hamdi Sahloul
93bad514a8
Easy binding for python code generator
2018-08-25 01:58:42 +09:00
Alexander Alekhin
d10a219833
Merge pull request #12298 from berak:java_matofrotatedrect
2018-08-24 15:54:27 +00:00
berak
bd7bf39b4b
java: change MatOfRotatedRect to CV_32FC5
2018-08-24 14:20:36 +02:00
Dmitry Kurtaev
472b71ecef
Merge pull request #12243 from dkurt:dnn_tf_mask_rcnn
...
* Support Mask-RCNN from TensorFlow
* Fix a sample
2018-08-24 14:47:32 +03:00
Alexander Alekhin
e8d45a9cdd
Merge pull request #12274 from alalek:fix_10945
2018-08-24 08:30:52 +00:00
Suleyman TURKMEN
d8cd1d8fcc
Merge pull request #12246 from sturkmen72:move_enums
...
* Update core.hpp
* Update imgproc.hpp
* Update ImgprocTest.java
* Update CameraCalibrator.java
* Update OnCameraFrameRender.java
* Update FindContoursDemo.java
* Update IntroductionToSVMDemo.java
* Update NonLinearSVMsDemo.java
* Update IntroductionToPCADemo.java
* Update Smoothing.java
* Update MainActivity.java
* Update CalcBackProjectDemo1.java
* Update CornerSubPixDemo.java
* Update CornerDetectorDemo.java
* Update GoodFeaturesToTrackDemo.java
2018-08-24 11:11:34 +03:00
Alexander Alekhin
ff2eface19
Merge pull request #12126 from alalek:reproducer_12121
2018-08-24 08:08:17 +00:00
Alexander Alekhin
29ce348c4d
Merge pull request #12287 from berak:java_matofrotatedrect
2018-08-24 07:03:13 +00:00
Hamdi Sahloul
4d78342919
Closes #12281 - a bug in cuda::pow with negative base values
2018-08-24 05:12:14 +09:00
logic1988
b47c9ac643
Update aff_trans.cpp
...
When the fullAffine parameter is set to false, the estimateRigidTransform function maybe return empty, then the _localAffineEstimate function will be called, but the bug in it will result in incorrect results.
2018-08-23 21:52:27 +08:00
berak
1c20a7f008
java: add a MatOfRotatedRect class
2018-08-23 12:01:36 +02:00
Alexander Alekhin
6356403964
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-22 17:38:51 +03:00
Alexander Alekhin
096366738b
dnn(build): fix CV_Assert() usage
2018-08-22 16:04:40 +03:00
Alexander Alekhin
6a6506b02d
viz: call "mapper->Update()" before and after SetInputData()
2018-08-22 15:40:51 +03:00
Alexander Alekhin
2c42361ecd
build: fix build with defined CV_STATIC_ANALYSIS
2018-08-22 14:19:21 +03:00
Alexander Alekhin
e8a14a775e
Merge pull request #12268 from cv3d:fix/cuda/meanShiftSegmentation
2018-08-22 09:49:36 +00:00
Hamdi Sahloul
7b90a1e85a
Closes #6349 - a bug in cuda::meanShiftSegmentation
2018-08-22 02:08:10 +09:00
Jiri Horner
49283ec035
Merge pull request #12248 from hrnr:video_remove_ransac
...
* video: remove duplicate RANSAC code
* remove RANSAC code video module. The module now uses RANSAC estimators from calib3d.
* deprecate estimateRigidTransform
* replace internal usage of deprecated estimateRigidTransform
* remove from wrappers
* replace usage in shape module. shape module now links to calib3d instead of video module.
* reprecate also C API version
* remove cvEstimateRigidTransform
* supress deprecated warnings in estimateRigidTransform test
* the function is now deprecated
2018-08-21 17:08:27 +03:00
Alexander Alekhin
f25450791b
dnn(test): mark unstable OpenCL tests
2018-08-21 16:31:41 +03:00
Alexander Alekhin
c9faa09d55
Merge pull request #12266 from mshabunin:fix-windows-ie-build
2018-08-21 13:07:44 +00:00
Alexander Alekhin
1deeca985f
Merge pull request #12262 from sivaraam:v4l2_mainloop
2018-08-21 12:47:29 +00:00
Alexander Alekhin
6acabd1fd8
Merge pull request #12256 from alalek:core_intrin_fp16_fix
2018-08-21 12:47:08 +00:00
Alexander Alekhin
5ac9a2a7d0
Merge pull request #12219 from alalek:fix_assert_messages
2018-08-21 12:46:35 +00:00
Maksim Shabunin
808c89adc1
Fixed windows build with InferenceEngine
2018-08-21 14:59:13 +03:00
Kaartic Sivaraam
a527e8cc73
cap-v4l: remove unwanted loop in V4L2 mainloop
...
The while loop would run only once making it useless and leading
to confusion.
So, remove the unwanted while loop and just keep an infinite for
loop.
2018-08-21 16:41:01 +05:30
Colin Smith
76f47548b3
Add export macro for ios conversion functions
2018-08-20 14:10:54 -07:00
Alexander Alekhin
7d4bb9428b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-20 19:30:18 +03:00
Alexander Alekhin
67d46dfc6c
core(intrin): restrict FP16 operations
...
Intrinsics must be effective, so don't declare FP16 type/operations if there is no native support.
- CV_FP16: supports load/store into/from float32
- CV_SIMD_FP16: declares FP16 types and native FP16 operations
2018-08-20 19:24:33 +03:00
Rostislav Vasilikhin
378cf2ab63
fixed filename slash processing
2018-08-20 18:02:49 +03:00
Alexander Alekhin
c6f5b013ec
Merge pull request #12242 from alalek:fix_12236
2018-08-20 13:53:27 +00:00
Alexander Alekhin
e593d5bbc5
Merge pull request #12255 from csukuangfj:patch_5
2018-08-20 13:47:41 +00:00
Kuang Fangjun
ab8ba047a5
fix a typo.
2018-08-20 15:52:18 +08:00
Kuang Fangjun
cecc19381f
fix an error in the formula for cv::cornerSubPix
2018-08-20 15:49:35 +08:00
Alexander Alekhin
6e84abc746
ml: don't use "getSubVector()" with 2D matrix
...
It is designed for 1D vectors only
2018-08-18 20:50:36 +00:00
Alexander Alekhin
322c6b1ba4
Merge pull request #12235 from alalek:core_perf_scalar_tests
2018-08-18 20:45:47 +00:00
pasbi
76eb389761
Merge pull request #12240 from pasbi:pfm_fix
...
* fixed 64-float pfm auto conversion
* removed trailing whitespace
2018-08-17 18:53:09 +03:00
Alexander Alekhin
73d44c7881
Merge pull request #12172 from alalek:core_move_const_table
2018-08-17 14:03:01 +00:00
Alexander Alekhin
31fef14d76
Merge pull request #12136 from sturkmen72:update_documentation
2018-08-17 14:02:20 +00:00
Alexander Alekhin
7ee69740e8
ml(test): test different samples layout of TrainData
2018-08-17 16:57:20 +03:00
Suleyman TURKMEN
c61bc3a0cb
Update documentation and samples
2018-08-17 14:21:29 +03:00
Hamdi Sahloul
db262fa76a
Avoid multi-inheritance in the cuda::features2d classes
2018-08-17 17:32:51 +09:00
Alexander Alekhin
b24fc6954d
core(perf): fix addScalar test
...
keep the same type for passed Scalar values
2018-08-16 19:36:28 +03:00
Alexander Alekhin
828cb4286d
Merge pull request #12220 from sturkmen72:update_seamless_cloning
2018-08-16 16:26:27 +00:00
Alexander Alekhin
ee5e0e16d9
Merge pull request #12233 from mshabunin:fix-world-install-headers
2018-08-16 16:03:10 +00:00
Alexander Alekhin
b907bfe3e7
Merge pull request #12222 from NCBee:master
2018-08-16 16:02:39 +00:00
Maksim Shabunin
f84eb3dde6
Fixed core headers installation in world builds
2018-08-16 17:16:02 +03:00
Alexander Alekhin
b996b618e0
Merge pull request #12228 from tomoaki0705:fixTypoCalib3d
2018-08-16 12:29:10 +00:00
Alexander Alekhin
98c5ce9347
imgproc(test): refactor test_intersection.cpp
...
don't use legacy test API
2018-08-16 15:27:24 +03:00
Alexander Alekhin
f89defad5d
imgproc: fix rotatedRectangleIntersection()
2018-08-16 15:27:24 +03:00
Bahram Dahi
96f92c6705
imgproc(tests): intersetion calculation of RotatedRect
2018-08-16 15:00:01 +03:00
Tomoaki Teshima
f0c46a4c74
fix typo
2018-08-16 19:11:40 +09:00
Suleyman TURKMEN
860ae77ec9
Update seamless_cloning
2018-08-15 22:59:18 +03:00
Alexander Alekhin
d2e08a524e
core: repair CV_Assert() messages
...
Multi-argument CV_Assert() is accessible via CV_Assert_N() (with malformed messages).
2018-08-15 17:43:10 +03:00
Alexander Alekhin
94758c18de
Merge pull request #12156 from cv3d:master
2018-08-14 14:29:17 +00:00
Alexander Alekhin
c1df9ad456
OpenCV version++
...
OpenCV 3.4.3
2018-08-14 14:10:37 +03:00
Alexander Alekhin
781721ca50
experimental version++
2018-08-14 14:10:37 +03:00
Alexander Alekhin
b9b66ca437
Merge pull request #12205 from dkurt:dnn_update_tf_face_detection
2018-08-14 10:53:12 +00:00
Alexander Alekhin
e76b375a31
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-13 18:57:57 +03:00
Dmitry Kurtaev
f056c0f137
UINT8 face detection network using Intel's Inference Engine backend
2018-08-13 18:38:47 +03:00
pasbi
9f5f64e14e
Merge pull request #12192 from pasbi:pfm
...
* created new decoder and encoder for PFM
pfm file format stores binary RGB or grayscale float images.
* added test for pfm codec
* replaced large with short licence header
* little/big-endian-check is now compile time
* fixed width/height confusion, improved big/little endian recognition, fixed scaling issue and Improved signature check
* adapted tests to handle float images well
* removed data-dependency: lena.pfm
the lena image is now loaded is pam and converted to pfm.
* fixed bug in endianess detection macro
* Added endianess detection for android and win
* removed fancy endianess detection
endianess detection will be implemented in cmake scripts soonish.
* fixed minor warnings
* fixed stupid elif defined bug
* silenced some implicit cast warnings
* replaced std::to_string with std::stringstream solution
std::to_string variant did not build on android.
* replaced new endianess macros with existing ones
* improved readability
2018-08-13 13:14:12 +03:00
Alexander Alekhin
615883977f
Merge pull request #12128 from dkurt:dnn_fix_12066
2018-08-10 14:14:16 +00:00
Alexander Alekhin
4910f16f16
core(libva): support YV12 too
...
Added to CPU path only.
OpenCL code path still expects NV12 only (according to Intel OpenCL extension)
2018-08-10 16:02:05 +03:00
Alexander Alekhin
8b2122e12f
Merge pull request #12174 from alalek:dnn_move_range_ostream_operator
2018-08-08 20:51:26 +00:00
Alexander Alekhin
f16f818f5f
Merge pull request #12184 from alalek:issue_12163
2018-08-08 20:50:54 +00:00
Alexander Alekhin
5b3ac112fe
core: move const tables outside of dispatched code
...
To avoid duplicates in binaries
2018-08-08 17:54:54 +03:00
Alexander Alekhin
a0cff0be94
imgproc(cvtColor): slightly improve error messages
...
Do not try to process empty inputs.
2018-08-08 17:16:42 +03:00
Alexander Alekhin
b00758babe
imgproc(cvtColor): temporary disable IPP for 8U GRAY2BGR mode
...
Details 12176
2018-08-08 13:58:45 +03:00
Alexander Alekhin
4eb2966559
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-07 20:12:10 +03:00
Alexander Alekhin
a56b221559
core: cv::Range() ostream write operator
...
remove from DNN module headers
2018-08-07 20:03:21 +03:00
yom
fb2b26c419
photo: Decolor corrections
...
* Keep image aspect ratio in resize called in grad_system and
weak_order
* Bug correction in loop inside Decolor::gradvector
2018-08-07 19:08:57 +03:00
Alexander Alekhin
377e51df83
Merge pull request #12169 from berak:photo_decolor
2018-08-07 16:01:42 +00:00
Alexander Alekhin
7453a6938a
core(test): extra tests/fixes for merge/split ( #12171 )
...
* core(test): merge hang test
* core(merge/split): fix intrin optimization
2018-08-07 18:11:05 +03:00
Maksim Shabunin
39f5e57321
Merge pull request #12159 from zarelaky:master
2018-08-07 13:15:19 +00:00
berak
f49f6d52b4
photo: avoid resizing a const Mat in decolor()
2018-08-07 15:14:22 +02:00
zarelaky
715f23127c
Update cap_gstreamer.cpp
...
fixed call open(int id) failed
2018-08-07 15:21:46 +03:00
Maksim Shabunin
f0f652f9e9
Merge pull request #12161 from alalek:cache_dump_neighbor_directories_for_cleanup
2018-08-07 12:09:39 +00:00
Maksim Shabunin
731aa963bd
Merge pull request #12166 from berak:fix_mjpeg_decoder
2018-08-07 12:09:13 +00:00
berak
7e353a1ec5
videoio: check iterator in mjpeg_encoder.cpp
2018-08-07 11:43:37 +02:00
Hamdi Sahloul
293facbae7
Support Python binding for CUDA functionalities
2018-08-07 15:48:12 +09:00
Alexander Alekhin
5c3880d302
core(intrin): avoid symbols duplication from SIMD128/256 cases
...
All vx_call() must be wrapped into own simd128/simd256/simd512 namespace
```
namespace CV__SIMD_NAMESPACE {
... vx_call declaration is here ...
}
```
2018-08-06 19:29:46 +00:00
Alexander Alekhin
9eaa583bfb
core: dump neighbour cache directories (from old OpenCV versions)
...
- use '3.4.x' cache name for current maintenance series (there are no serious changes between releases)
- message is shown only once during creation of new cache directory
- use OPENCV_CACHE_SHOW_CLEANUP_MESSAGE=0 to hide this warning
2018-08-06 19:05:35 +03:00
Vadim Pisarevsky
6500700d6f
Merge pull request #12157 from allnes:detect_qr_code
2018-08-06 14:50:28 +00:00
Alexander Nesterov
f95a411ba3
Update binarization
2018-08-06 12:10:45 -03:00
Vadim Pisarevsky
7c8ab271fc
Merge pull request #12125 from dkurt:dnn_mobilenet_ppn
2018-08-06 14:40:50 +00:00
Vadim Pisarevsky
70b893333d
Merge pull request #12130 from dkurt:dnn_ie_mvn
2018-08-06 14:37:46 +00:00
Dmitry Kurtaev
449696f1e5
Enable reshape-as-shape layer from TensorFlow
2018-08-06 17:35:06 +03:00
Vadim Pisarevsky
e0c93bcf6c
Merge pull request #12082 from dkurt:dnn_ie_faster_rcnn
2018-08-06 14:28:58 +00:00
Vadim Pisarevsky
23022f3ffb
Merge pull request #12121 from maver1:amatyuko/sse2_convert_with_saturation_fix
2018-08-06 14:26:37 +00:00
Alexander Alekhin
ac4a6aad15
Merge pull request #12050 from alalek:dnn_ocl_avoid_memory_access_violation
2018-08-05 14:47:01 +00:00
Alexander Alekhin
7d7767ba42
Merge pull request #12134 from mshabunin:add-yuv420-v4l
2018-08-04 13:48:34 +00:00
Alexander Alekhin
9cb3e9abf0
Merge pull request #12135 from tompollok:3.4
...
imgproc: update cornerSubPix documentation
2018-08-04 16:02:21 +03:00
Alexander Alekhin
b4cea8d6d1
Merge pull request #12120 from alalek:core_test_intrin_dispatched
2018-08-03 17:07:17 +00:00
Alexander Alekhin
8f57fc93ec
Merge pull request #12123 from allnes:detect_qr_code
2018-08-03 16:52:26 +00:00
Alexander Alekhin
1c73e66edf
Merge pull request #12131 from alalek:issue_12083
2018-08-02 16:50:51 +00:00
tompollok
061149cbbd
imgproc: update cornerSubPix documentation
2018-08-02 18:00:43 +02:00
Maksim Shabunin
a2daf0c83c
videoio: added YUV420 format (UV order) support to v4l capture
2018-08-02 18:34:11 +03:00
Dmitry Kurtaev
be08730cd6
MVN layer using Intel's Inference Engine backend
2018-08-02 17:49:03 +03:00
Alexander Alekhin
3082ea82f9
core(merge): fix SIMD loop head processing
2018-08-02 17:23:19 +03:00
Pierre Jeambrun
5131619a1a
feat(stitching): Add Sift support for the FeaturesFinder
2018-08-02 17:22:13 +03:00
Alexander Alekhin
f2e1710dd5
core(test): regression test for 12121
2018-08-01 19:42:54 +03:00
Alexander Nesterov
05830874d7
Refactor code
2018-08-01 12:15:40 -03:00
Dmitry Kurtaev
4fb086d6c3
MobileNet-SSD v1 from TensorFlow with shared convolution weights
2018-08-01 16:16:48 +03:00
amatyuko
3ea2586a5a
Fix for SSE2 intrinsics problem in the part of saturation arithmetic processing during 32s->16u packed conversion -
...
for some big negative values less than -INT_MAX+32767 the sign of the numbers is lost due to overflow that leads to
incorrect saturation to MAX value, instead of zero.
The issue is not reproduced with CV_ENABLED_INTRINSICS=OFF
2018-08-01 16:04:08 +03:00
CJ Smith
da41ac9e60
Merge pull request #12106 from CJSmith-0141:warpPerspective_typofix
...
* Fixes typo in function name hal::warpPerspective.
* Fixes remaining typos in word Perspective (was Perspectve).
2018-08-01 14:41:20 +03:00
Alexander Alekhin
3f302cabb8
core(test): intrinsic tests for all dispatched CPU optimizations
...
- tests for both SIMD128 / SIMD256
- different dispatched + baseline(SIMD128) intrinsics
2018-08-01 13:50:42 +03:00
Dmitry Kurtaev
8e034053af
Faster-RCNN from TensorFlow on CPU with Intel's Inference Engine backend
2018-08-01 11:29:58 +03:00
Alexander Alekhin
82c477c9f7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-31 21:35:00 +03:00
luz.paz
1e1a1855ae
Source typo fixes
2018-07-31 18:44:23 +03:00
luz.paz
2003eb1b9b
Misc. typos
...
Found via `codespell -q 3 -I ../opencv-whitelist.txt --skip="./3rdparty"`
2018-07-31 18:44:23 +03:00
Alexander Alekhin
7e71b1079e
Merge pull request #12103 from alalek:ocl_fix_crash
2018-07-31 14:55:43 +00:00
Alexander Alekhin
814ebe39ae
Merge pull request #12113 from dkurt:dnn_fix_ssd_on_myriad
2018-07-31 14:55:18 +00:00
Alexander Alekhin
61c870ae09
Merge pull request #12080 from mshabunin:fix-static-3
2018-07-31 14:53:28 +00:00
Maksim Shabunin
7cf52de47e
dnn: modified IE search, R2 compatibility fixed
2018-07-31 14:48:06 +03:00
Dmitry Kurtaev
ed0e79cb61
Add missing parameter to DetectionOutput layer from Intel's Inference Engine
2018-07-31 11:37:45 +03:00
Sayed Adel
bb82cdc928
core:test Fix fp16 build if AVX2 sets as baseline
2018-07-31 10:02:20 +02:00
Alexander Alekhin
28d0e97c09
Merge pull request #12004 from mshabunin:more-asserts
2018-07-30 16:42:09 +00:00
Alexander Alekhin
5bde800ee3
Merge pull request #12088 from alalek:ocl_callback_catch_exceptions
2018-07-30 16:33:41 +00:00
Alexander Alekhin
29a1dc5719
Merge pull request #12087 from alalek:docs_videowriter_write_bgr_input
2018-07-30 16:33:23 +00:00
Alexander Alekhin
dbf3362c4d
Merge pull request #12056 from seiko2plus:coreExpandTests
2018-07-30 16:23:11 +00:00
Alexander Alekhin
c4e0f4b2b5
Merge pull request #12102 from csukuangfj:patch_3
2018-07-30 12:48:06 +00:00
Alexander Alekhin
e90e398e7a
core(ocl): do not split refcount operations / compare
...
- check result from CV_XADD() directly
- decrease urefcount after unmap() call only
2018-07-30 15:42:09 +03:00
miaow1988
2988260107
Fixed the int size overflow bug of cv::Mat.push_back().
...
Changed the type of variable *r* from int to size_t.
This change makes sure that a valid result of std::max(r + delta,
(r*3+1)/2) can be passed into the reserve function.
2018-07-30 18:36:19 +08:00
Kuang Fangjun
83039c8752
fix a typo.
2018-07-30 18:18:18 +08:00
Sayed Adel
6499263b41
core:test Expand hal_intrin tests to support SIMD256
2018-07-30 08:50:50 +02:00
Sayed Adel
47202b3349
core:avx2 fix unaligned store for v_store_interleave v_uint32x8-3ch
2018-07-29 18:22:46 +02:00
Alexander Alekhin
9076bb6089
Merge pull request #12081 from mshabunin:fix-ie-build
2018-07-28 20:34:19 +00:00
Alexander Alekhin
89528d7c3a
core(ocl): don't expose exceptions from OpenCL callback
...
to avoid silent crashes of OpenCL worker threads.
2018-07-28 10:29:26 +00:00
Alexander Alekhin
0bef42ba12
videoio: add note about image BGR format VideoWriter::write()
2018-07-28 09:08:09 +00:00
Alexander Alekhin
b41bc0ae59
Merge pull request #12067 from mshabunin:clean-test-case-list
2018-07-28 06:21:53 +00:00
Maksim Shabunin
fb1f12021b
Fixed build with latest IE version
2018-07-27 19:56:35 +03:00
Maksim Shabunin
dd8e990451
Fixed several issues found by static analysis, GStreamer backend
2018-07-27 18:41:39 +03:00
Maksim Shabunin
e031bada7d
Fixed several issues found by static analysis, Windows-specific
2018-07-27 18:25:55 +03:00
Alexander Alekhin
b597c87bed
dnn(ocl): avoid memory access violation
2018-07-27 15:35:11 +03:00
Maksim Shabunin
0aded5aae6
cmake: fixed builds in directories containing plus sign
2018-07-27 15:05:56 +03:00
Alexander Alekhin
d044ac1c66
imgproc(getPerspectiveTransform): add solveMethod parameter
...
drop compatibility workaround via runtime parameter
2018-07-26 18:22:59 +03:00
Alexander Alekhin
2f0fc920dd
Merge pull request #12061 from alalek:dnn_test_skip_checks_only
2018-07-26 15:15:32 +00:00
Alexander Alekhin
9137e2d635
Merge pull request #12060 from alalek:dnn_debug_layers
2018-07-26 15:14:32 +00:00
Alexander Alekhin
c37d1a53b5
Merge pull request #12025 from Triplesalt:tfimport-relu
2018-07-26 15:08:05 +00:00
Maksim Shabunin
1165fdd0f5
Added more strict checks for empty inputs to compare, meanStdDev and RNG::fill
2018-07-26 18:06:38 +03:00
Maksim Shabunin
597db69151
ts: test case list is printed after cmd line parsing, refactored
2018-07-26 16:43:43 +03:00
Triplesalt
9eb79926df
Allow a different input order for Mul+Maximum.
...
Squashed : ReLU operand order tests.
2018-07-26 14:19:11 +02:00
Vadim Pisarevsky
fa466b022d
Merge pull request #12052 from dkurt:dnn_ie_torch_tests
2018-07-26 09:09:35 +00:00
Vadim Pisarevsky
43820d89b4
further improvements in split & merge; started using non-temporary store instructions ( #12063 )
...
* 1. changed static const __m128/256 to const __m128/256 to avoid wierd instructions and calls inserted by compiler.
2. added universal intrinsics that wrap MOVNTPS and other such (non-temporary or "no cache" store) instructions. v_store_interleave() and v_store() got respective flags/overloaded variants
3. rewrote split & merge to use the "no cache" store instructions. It resulted in dramatic performance improvement when processing big arrays
* hopefully, fixed some test failures where 4-channel v_store_interleave() is used
* added missing implementation of the new universal intrinsics (v_store_aligned_nocache() etc.)
* fixed silly typo in the new intrinsics in intrin_vsx.hpp
* still trying to fix VSX compiler errors
* still trying to fix VSX compiler errors
* still trying to fix VSX compiler errors
* still trying to fix VSX compiler errors
2018-07-26 12:04:28 +03:00
Dmitry Kurtaev
faa6c4e1e1
Faster-RCNN anf RFCN models on CPU using Intel's Inference Engine backend.
...
Enable Torch layers tests with Intel's Inference Engine backend.
2018-07-25 19:04:55 +03:00
Alexander Alekhin
dd8701c1a0
dnn(test): skip checks only for unstable tests
...
but execute tested functions in Layer_Test_Halide/Convolution.Accuracy
2018-07-25 16:55:21 +03:00
Alexander Alekhin
74cf48b5d7
dnn(test): use Backend/Target enums
...
instead of 'int'
2018-07-25 16:55:21 +03:00
Alexander Alekhin
45b5b3c13a
dnn: check layer output for NaN/Inf
2018-07-25 16:25:18 +03:00
Alexander Alekhin
9787ab598b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-24 22:48:54 +03:00
Alexander Alekhin
5336b9ad19
Merge pull request #12048 from mshabunin:fix-static-2
2018-07-24 19:45:27 +00:00
Alexander Alekhin
a16254de2b
Merge pull request #12047 from alalek:issue_12045
2018-07-24 19:44:25 +00:00
Alexander Alekhin
8a2ce75d96
Merge pull request #12020 from alalek:videoio_backends_query_api
2018-07-24 19:43:49 +00:00
Vadim Pisarevsky
9c7040802c
converted split() & merge() to wide univ intrinsics ( #12044 )
...
* fixed/updated v_load_deinterleave and v_store_interleave intrinsics; modified split() and merge() functions to use those intrinsics
* fixed a few compile errors and bug in v_load_deinterleave(ptr, v_uint32x4& a, v_uint32x4& b)
* fixed few more compile errors
2018-07-24 17:27:56 +03:00
Maksim Shabunin
cbb1e867e5
More issues found by static analysis
2018-07-24 16:04:42 +03:00
Alexander Alekhin
8de08e0463
Merge pull request #12021 from dkurt:dnn_ie_tf_ssd
2018-07-24 13:03:41 +00:00
Alexander Alekhin
236f383969
Merge pull request #12037 from dkurt:test_openvino_models
2018-07-24 12:34:04 +00:00
Alexander Alekhin
8f80565d9c
objdetect(qr): update test code
...
improve error checks
2018-07-24 13:56:55 +03:00
Alexander Alekhin
4283309daa
dnn: update tests for OpenVINO models
2018-07-24 09:41:14 +03:00
Alexander Alekhin
6e767e2376
ts: add findDataDirectory() function
2018-07-24 09:40:58 +03:00
Dmitry Kurtaev
28e08ae0bd
Add a sample which tests OpenVINO models
2018-07-23 19:08:51 +03:00
Maksim Shabunin
e0603bb45f
Fixed several issues found by static analysis tools
2018-07-23 17:22:47 +03:00
Alexander Alekhin
7d40fcead5
Merge pull request #12031 from alalek:dnn_ocl_eliminate_getUMat_with_bad_lifetime
2018-07-23 07:52:42 +00:00
Alexander Alekhin
b117302bca
Merge pull request #12016 from tyl12:fix_videoio_static_para
2018-07-21 03:50:58 +00:00
Alexander Alekhin
e1205d046a
Merge pull request #12003 from mshabunin:avi-error-messages
2018-07-21 03:30:55 +00:00
Teng Yiliang
dadde75ef0
use struct member width_set/height_set to replace static width/height.
...
the static variables will cause race-condition when operating in
multithread scenarios.
Signed-off-by: Teng Yiliang <ylteng@outlook.com>
Signed-off-by: Teng Yiliang <yiliang.teng@weimob.com>
2018-07-21 07:27:17 +08:00
Alexander Alekhin
ee743afebe
dnn(ocl): don't use getUMat() for long live objects
2018-07-20 17:53:55 +03:00
Alexander Alekhin
767b31cfbf
Merge pull request #12029 from tomoaki0705:fixBuildVS2013BinarySuffix
2018-07-20 11:27:27 +00:00
Tomoaki Teshima
18abe54497
fix build error on Visual Studio 2013
...
* replace binary literal prefix to hexadecimal literal prefix
2018-07-20 18:09:17 +09:00
Alexander Alekhin
05f0cb16de
Merge pull request #12022 from mshabunin:fix-ie-build
2018-07-19 20:50:42 +00:00
Maksim Shabunin
a4060e15a4
dnn, IE backend: updated to match new interface
2018-07-19 19:22:23 +03:00
Alexander Alekhin
7198b9e461
Merge pull request #12019 from mshabunin:static-debug-assert
2018-07-19 15:50:33 +00:00
Alexander Alekhin
ab9b6e806c
Merge pull request #11781 from dkurt:dnn_uint8_inputs
2018-07-19 14:38:46 +00:00
Alexander Alekhin
270cc3bcbc
videoio: add routines to query information about backends API
...
into cv::videoio_registry namespace
2018-07-19 17:27:37 +03:00
Dmitry Kurtaev
c213a3823e
Run entire SSDs from TensorFlow using Intel's Inference Engine
2018-07-19 17:05:56 +03:00
Alexander Alekhin
51074b9743
Merge pull request #12007 from alalek:fix_ts_perf_test_macro
2018-07-19 12:09:48 +00:00
Dmitry Kurtaev
070393dfda
uint8 inputs for deep learning networks
2018-07-19 14:37:33 +03:00
Alexander Alekhin
f4df537e27
ts: fix PERF_TEST() macro to allow test_case name reusing
...
Example (reuse 'Transform' test case):
PERF_TEST(Transform, getPerspectiveTransform_1000) { ... }
PERF_TEST(Transform, getPerspectiveTransform_QR_1000) { ... }
2018-07-19 13:20:54 +03:00
Alexander Alekhin
7e9b5d9e30
Merge pull request #12006 from mshabunin:static-debug-assert
2018-07-19 09:36:36 +00:00
Alexander Alekhin
e526c4bfe4
core(test): remove verbose messages
2018-07-18 16:09:27 +03:00
Maksim Shabunin
fe806878be
Enable debug assertions for static analysis builds
2018-07-18 15:53:16 +03:00
Maksim Shabunin
a2a9a01e05
AVI container: verbose error messages
2018-07-18 15:22:42 +03:00
Tomoaki Teshima
9df7517dea
fix build error on Visual Studio 2013 and earlier
2018-07-18 12:56:02 +03:00
Alexander Alekhin
4560909a5e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-17 19:27:48 +03:00
Alexander Alekhin
6c4f618db5
Merge pull request #11104 from asciian:reading_from_stream
2018-07-17 16:24:06 +00:00
Alexander Alekhin
f3ee07ca11
Merge pull request #11986 from alalek:build_eliminate_gcc8_warnings
2018-07-17 15:41:36 +00:00
Alexander Alekhin
7cc84ce8ab
Merge pull request #11984 from mshabunin:fix-static-1
2018-07-17 15:40:48 +00:00
Alexander Alekhin
40b8ca2eed
Merge pull request #11968 from allnes:detect_qr_code
2018-07-17 15:38:46 +00:00
Alexander Alekhin
4dcef28023
Merge pull request #11964 from mshabunin:avi-container-fixes
2018-07-17 15:35:07 +00:00
Alexander Alekhin
0a41b3df45
Merge pull request #11990 from alalek:clone_nodiscard_attribute
2018-07-17 15:34:08 +00:00
Maksim Shabunin
c473718bc2
Check for empty Mat in compare, operator= and RNG::fill, fixed related tests
2018-07-17 17:50:50 +03:00
Maksim Shabunin
1da46fe6fb
Fixed issues found by static analysis (mostly DBZ)
2018-07-17 16:14:54 +03:00
Alexander Alekhin
78d07e841d
Merge pull request #11959 from pengli:3.4
2018-07-17 11:20:02 +00:00
Dmitry Kurtaev
f38808a39f
Add Java overloads for each default argument ( #11940 )
...
* Add Java overloads for each default argument
* Add "fisheye_" prefix for cv::fisheye:: functions and enums
2018-07-17 13:41:46 +03:00
Pavel Rojtberg
3f65924c45
core: FileStorage - add support for writing vector<String> with bindings ( #11883 )
...
* core: FileStorage - add support for writing vector<String> with bindings
* python: extend persistence test for string sequences
2018-07-17 13:38:48 +03:00
Alexander Alekhin
540415dc5e
Merge pull request #11989 from csukuangfj:patch_2
2018-07-17 10:27:21 +00:00
Li Peng
f0cadaa6e3
enable concat layer fuse for OCL target
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-07-17 12:46:16 +08:00
Vadim Pisarevsky
f058b5fb1e
Wide univ intrinsics ( #11953 )
...
* core:OE-27 prepare universal intrinsics to expand (#11022 )
* core:OE-27 prepare universal intrinsics to expand (#11022 )
* core: Add universal intrinsics for AVX2
* updated implementation of wide univ. intrinsics; converted several OpenCV HAL functions: sqrt, invsqrt, magnitude, phase, exp to the wide universal intrinsics.
* converted log to universal intrinsics; cleaned up the code a bit; added v_lut_deinterleave intrinsics.
* core: Add universal intrinsics for AVX2
* fixed multiple compile errors
* fixed many more compile errors and hopefully some test failures
* fixed some more compile errors
* temporarily disabled IPP to debug exp & log; hopefully fixed Doxygen complains
* fixed some more compile errors
* fixed v_store(short*, v_float16&) signatures
* trying to fix the test failures on Linux
* fixed some issues found by alalek
* restored IPP optimization after the patch with AVX wide intrinsics has been properly tested
* restored IPP optimization after the patch with AVX wide intrinsics has been properly tested
2018-07-16 18:57:24 +03:00
Alexander Alekhin
481829a81b
Merge pull request #11957 from alalek:issue_11956
2018-07-16 15:54:34 +00:00
Alexander Alekhin
c9439476da
Merge pull request #11970 from dkurt:dnn_enable_tf_tests
2018-07-16 15:51:27 +00:00
Alexander Alekhin
b0ee5d9023
core: CV_NODISCARD macro with semantic of [[nodiscard]] attr
...
[[nodiscard]] is defined in C++17.
There is fallback alias for modern GCC / Clang compilers.
2018-07-16 18:03:32 +03:00
Kuang Fangjun
84f2f37680
remove a useless statement.
2018-07-16 22:44:11 +08:00
Alexander Alekhin
d5951bc033
build: eliminate GCC8 warnings
2018-07-16 17:24:12 +03:00
Alexander Alekhin
a5e8ae2183
Merge pull request #11969 from alalek:core_Matx_inv_solve_templates
2018-07-16 14:18:12 +00:00
Alexander Alekhin
d6c669f5cf
Merge pull request #11963 from dkurt:dnn_cl_fix_matmul
2018-07-16 11:10:32 +00:00
Maksim Shabunin
53eb27f508
AVI container: use C++ streams for file operations, check some operations for overflow
2018-07-16 13:46:28 +03:00
Alexander Alekhin
4a3dfffd46
Merge pull request #11965 from alalek:issue_11944
2018-07-16 09:48:33 +00:00
Alexander Alekhin
50751ae6ff
Merge pull request #11967 from catree:add_tutorial_ml_java_python
2018-07-16 09:24:32 +00:00
Alexander Alekhin
5e31c82b5b
Merge pull request #11980 from berak:core_lda_dataAsRow
2018-07-15 14:32:15 +00:00
berak
4382bdc859
core: remove unused dataAsRow flag from LDA
2018-07-15 11:32:00 +02:00
Alexander Nesterov
dee5f9a67b
Update qrcode algorithm: fix seg. fault with kmeans
2018-07-14 21:51:21 +03:00
Kuang Fangjun
2b6aa50b81
avoid negative index.
2018-07-14 16:05:29 +08:00
Alexander Alekhin
3c74fde349
core: eliminate 'if' logic from Matx::inv()/solve()
...
- 'if' logic is moved into templates.
- removed unnecessary cv::Mat objects creation.
- fixed inv() test (invA * A == eye)
- added more Matx tests to cover all defined template specializations
2018-07-13 20:09:01 +03:00
Dmitry Kurtaev
6eb8faea85
Enable TensorFlow networks tests for different backends and targets
2018-07-13 19:58:56 +03:00
Alexander Alekhin
23fc96e98f
Merge pull request #11955 from terfendail:matx_solve_fix2
2018-07-13 15:15:03 +00:00
Vadim Pisarevsky
abceae1ac0
Merge pull request #11921 from allnes:detect_qr_code
2018-07-13 14:26:17 +00:00
Alexander Alekhin
eed1130327
Merge pull request #11966 from alalek:core_solve_method_check
2018-07-13 14:25:42 +00:00
Dmitry Kurtaev
de6f0a537d
Fix fully-connected layer in case of number of rows less than 4
2018-07-13 16:35:37 +03:00
catree
4dc7e617a4
Add overloaded cv::PCACompute() that returns also the eigenvalues. Useful for Java and Python OpenCV where PCA is not available.
2018-07-13 15:05:54 +02:00
Alexander Alekhin
0155851929
imgproc(getPerspectiveTransform): add configuration parameter
2018-07-13 15:31:33 +03:00
Alexander Alekhin
71c6cb9c22
imgproc(getPerspectiveTransform): solve(DECOMP_SVD -> LU)
2018-07-13 15:31:33 +03:00
Alexander Alekhin
2170811e48
imgproc(perf): update getPerspectiveTransform perf test
...
Function is very fast, so 0.000 ms results are useless.
1000 runs requires 25ms on i7-6700K.
2018-07-13 15:31:33 +03:00
Alexander Alekhin
5385086fef
core: solve(): add check for passed 'method' values
2018-07-13 15:15:48 +03:00
Dmitry Kurtaev
dcc1beb1f8
Clip kernel for OpenCL PriorBox layer
2018-07-13 14:49:13 +03:00
Alexander Nesterov
e38ea3a888
Update detect QRCode algorithm
2018-07-12 18:18:57 -03:00
Alexander Alekhin
33b7028be2
core: use "explicit" for Matx() ctor
2018-07-12 19:50:56 +00:00
Vitaly Tuzov
850a8577b2
Fixed unreachable code warnings for Matx::solve()
2018-07-12 19:19:51 +03:00
Alexander Alekhin
9c3ec05825
Merge pull request #11941 from alalek:dnn_ocl_fix_verify_umat_mapping
2018-07-12 07:37:55 +00:00
Vitaly Tuzov
d0a3686812
Merge pull request #11904 from terfendail/matx_solve_fix
...
Fixed Matx::solve function for non-square matrixes (#11904 )
2018-07-11 22:00:57 +03:00
Alexander Alekhin
2508f7f971
dnn(ocl): fix wrong usage of stalled .getMat() pointers
...
Temporary object lifetime must be greater than pointer usage.
2018-07-11 19:11:36 +03:00
Dmitry Kurtaev
8b5f061dae
Replace std::vector<char> to std::vector<uchar> for Java bindings of dnn importers
2018-07-11 18:58:56 +03:00
Alexander Alekhin
999aba3807
Merge pull request #11936 from berak:dnn_shufflelayer_name
2018-07-11 12:01:31 +00:00
Alexander Alekhin
fa66c6b797
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-11 12:35:10 +03:00
Alexander Alekhin
82c7ab0231
Merge pull request #11927 from pengli:3.4
2018-07-11 09:33:24 +00:00
Li Peng
4c5a86828a
Fix gemmlike convolution input reading
...
use vload3 for half3 or float3 input vector reading,
also check read position to see if it exceed input width
Signed-off-by: Li Peng <peng.li@intel.com>
2018-07-11 15:25:21 +08:00
berak
a7b502f04a
dnn: preserve name, type strings for ShuffleLayer
2018-07-11 08:19:23 +02:00
Alexander Alekhin
e4b5e9b9c9
Merge pull request #11931 from catree:add_doc_eye_ones
2018-07-10 15:43:32 +00:00
catree
d7bd662c95
Add a note in the documentation about Mat::ones and mat::eye. With multi-channels type (e.g. CV_8UC3), only the first channel is treated.
2018-07-10 15:35:46 +02:00
Alexander Alekhin
452fa3011c
dnn(test): drop CV_ENUM for DNNBackend / DNNTarget
2018-07-10 15:12:01 +03:00
Dmitry Kurtaev
d57e5406f0
Add readNet* functions which parse models from byte arrays
2018-07-10 11:12:01 +03:00
Alexander Alekhin
2da96be217
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-09 19:44:51 +03:00
Alexander Alekhin
7fe0727930
Merge pull request #11924 from alalek:dnn_ocl_fix_max_pool_forward
2018-07-09 16:25:34 +00:00
Alexander Alekhin
529d38613b
Merge pull request #11923 from alalek:dnn_external_protobuf
2018-07-09 16:07:42 +00:00
Alexander Alekhin
88d56dc700
Merge pull request #11922 from alalek:dnn_test_myriad_check
2018-07-09 16:07:18 +00:00
Alexander Alekhin
7ba66a1682
Merge pull request #11703 from alalek:c_api_calib3d_chessboard_detector
2018-07-09 15:37:26 +00:00
Alexander Alekhin
b6255ab9e7
dnn(ocl4dnn): fix args for 'max_pool_forward' kernel
2018-07-09 18:02:20 +03:00
Alexander Alekhin
924ff903ad
Merge pull request #11903 from alalek:issue_9002
2018-07-09 14:49:37 +00:00
Alexander Alekhin
e2b5d11290
dnn: allow to use external protobuf
...
"custom layers" feature will not work properly in these builds.
2018-07-09 17:28:45 +03:00
Alexander Alekhin
e41f19d2f3
Merge pull request #11919 from dkurt:dnn_replace_convert_fp16
2018-07-09 14:07:37 +00:00
Alexander Alekhin
52b151dceb
dnn(test): use checkMyriadTarget() in Test_Caffe_layers.Conv_Elu test
2018-07-09 16:20:46 +03:00
Dmitry Kurtaev
362d4f5395
Replace convertFp16 from dnn::Net::setInput()
2018-07-09 14:35:54 +03:00
Alexander Alekhin
a29d11240e
Merge pull request #11906 from berak:fix_qrcode
2018-07-09 09:36:41 +00:00
asciian
61d8719b8d
Reading net from std::ifstream
...
Remove some assertions
Replace std::ifstream to std::istream
Add test for new importer
Remove constructor to load file
Rename cfgStream and darknetModelStream to ifile
Add error notification to inform pathname to user
Use FileStorage instead of std::istream
Use FileNode instead of FileStorage
Fix typo
2018-07-09 10:02:05 +03:00
Alexander Alekhin
0fd74fa177
Merge pull request #11911 from berak:core_fix_autobuffer_opengl
2018-07-08 13:50:35 +00:00
berak
45677819e8
core: fix autobuffer usage in opengl.cpp
2018-07-08 09:51:06 +02:00
berak
e14b2ba43c
objdetect: validate input in qrcode
2018-07-07 16:56:40 +02:00
Arnaud Brejeon
43f821afb9
Merge pull request #11899 from arnaudbrejeon:moveable_types
...
Add missing constructors and operator= (#11899 )
2018-07-06 23:36:08 +03:00
Alexander Alekhin
81325a3fa0
highgui(gtk): use recursive cv::Mutex for 'window_mutex' variable
2018-07-06 17:35:47 +03:00
Alexander Alekhin
aa0c6ddb4c
highgui: fix GTK issues with external UI thread
2018-07-06 17:35:47 +03:00
Alexander Alekhin
5e6a3f1f6c
Merge pull request #11901 from alalek:fix_cuda_build
2018-07-06 14:07:50 +00:00
Vadim Pisarevsky
523b6f32ba
Merge pull request #11867 from dkurt:dnn_ie_layers
2018-07-06 13:13:20 +00:00
Alexander Alekhin
fc59498b2b
cuda: fix build
...
use cv::AutoBuffer::data() to get data pointer
2018-07-06 15:32:36 +03:00
Alexander Alekhin
3b01777c98
Merge pull request #11895 from alalek:fix_fn_types
2018-07-06 12:01:31 +00:00
Alexander Alekhin
06fc77610b
core(hal): eliminate build warnings
2018-07-06 13:00:41 +03:00
Dmitry Kurtaev
019c2f2115
Enable more deep learning tests
2018-07-05 14:23:15 +03:00
Alexander Alekhin
4bc080dc50
fix function signatures, drop invalid casts
2018-07-05 13:55:26 +03:00
Alexander Alekhin
c7fc563dc0
calib3d: chessboard detector - replace OpenCV C API
2018-07-05 13:09:10 +03:00
Alexander Alekhin
0bb2c115aa
Merge pull request #11719 from alalek:update_autobuffer_api
2018-07-05 10:01:15 +00:00
Alexander Alekhin
ccd2370bb7
Merge pull request #11890 from dkurt:keras_resize_nearest
2018-07-05 09:57:24 +00:00
Alexander Alekhin
c0d0cf5e74
Merge pull request #11893 from dkurt:fix_11884
2018-07-05 09:56:50 +00:00
Alexander Alekhin
b09a4a98d4
opencv: Use cv::AutoBuffer<>::data()
2018-07-04 19:11:29 +03:00
Alexander Alekhin
135ea264ef
core: align cv::AutoBuffer API with std::vector/std::array
...
- added .data() methods
- added operator[] (int i)
- extend checks support to generic and debug-only cases
- deprecate existed operator* ()
2018-07-04 19:10:38 +03:00
Dmitry Kurtaev
f25a01bb5a
Disable fusion to output layers
2018-07-04 15:53:47 +03:00
Alexander Alekhin
bd8c8e720e
Merge tag '3.4.2'
2018-07-04 14:08:11 +03:00
Alexander Alekhin
9e1b1e5389
OpenCV 3.4.2
2018-07-04 14:05:47 +03:00
Dmitry Kurtaev
36288eebe7
Nearest neighbor resize from Keras
2018-07-04 11:53:24 +03:00
Vadim Pisarevsky
a0baae8a55
Merge pull request #11875 from dkurt:dnn_fix_reshape
2018-07-04 08:08:04 +00:00
Alexander Alekhin
9a66331984
Merge pull request #11882 from alalek:videoio_vfw_lower_priority
2018-07-03 14:54:54 +00:00
Alexander Alekhin
f545aee66d
videoio(VFW): lower priority (after DSHOW)
2018-07-03 15:54:45 +03:00
Alexander Alekhin
b3578710cf
videoio(MSMF): fix 32-bit build crash
2018-07-03 15:28:55 +03:00
ilovezfs
0c4328fbf3
Python 3.7 compatability
...
The result of PyUnicode_AsUTF8() is now of type const char * rather of
char *.
2018-07-03 00:38:59 -07:00
Dmitry Kurtaev
7ed5d85f25
Add Reshape layer tests
2018-07-03 08:26:43 +03:00
Alexander Alekhin
3165baa1f1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-02 14:58:29 +03:00
Alexander Alekhin
5557474467
imgcodecs(sunras): avoid buffer overrun
...
`src_pitch` may be large than data `step`
2018-07-02 12:56:50 +03:00
Alexander Alekhin
5a27f7c81f
Merge pull request #11856 from alalek:videoio_msmf_fix_check
2018-06-30 04:52:36 +00:00
Alexander Alekhin
6ce26b72b1
Merge pull request #11860 from alalek:videoio_msmf_remove_cxx11_code
2018-06-30 04:51:20 +00:00
Alexander Alekhin
2dbaba077a
videoio(msmf): avoid using of C++11 code
...
build fails with MSVS 2012 without additional flags
2018-06-29 20:48:58 +00:00
Alexander Alekhin
7a2448672c
videoio(MSMF): avoid OpenCV load failure on Win7 machines
...
OpenCV binaries are compiled on Win10 environment
2018-06-29 20:22:26 +00:00
Alexander Alekhin
9be3f7d41a
Merge pull request #11854 from dkurt:dnn_tf_data_layouts_v2
2018-06-29 15:02:22 +00:00
Alexander Alekhin
f40231af5d
Merge pull request #11851 from pengli:3.4
2018-06-29 15:01:20 +00:00
Alexander Alekhin
c3a90ccbad
videoio(MSMF): remove "always true" check
2018-06-29 15:23:48 +03:00
Li Peng
145eae321e
pooling ocl kernel optimization
...
set global size with real output size, also optimize
max pooling index computation if necessary.
Signed-off-by: Li Peng <peng.li@intel.com>
2018-06-29 15:22:49 +08:00
Dmitry Kurtaev
d971678add
Add a planar data layout tracking for TensorFlow importer
2018-06-29 09:50:14 +03:00
Dmitry Kurtaev
346871e27f
Set output layers names and types for models in DLDT's intermediate representation
2018-06-28 10:21:45 +03:00
Vadim Pisarevsky
67259d7082
Merge pull request #11768 from alalek:videoio_msmf_async_live_capture
2018-06-27 18:12:10 +00:00
Vadim Pisarevsky
75ee536d6d
Filter homography decomp: updated PR #7153 ( #11846 )
...
* Add functionality to filter homography decompositions
* documentation + small refactor
* fix comparing int to size_t (compiler warning)
* fix whitespace issues
* clarification of function return values in documentation
* refactor of function parameters and change in loop nesting
* cleanup useless .h, fix size_t to int compare, small refactor
* fix documentation and whitespace
* change output from return value to outputarray parameter
* update function docs to reflect changes in parameters
* whitespace
* failing test
* fixed warnings related to extended initialisers and improper types
* initialize vectors from arrays
* initialize vectors from arrays part 2
* fix whitespace
* fix trailing whitespace
* Include <inttypes.h> in test_filter_homography_decomp.cpp, should fix 'uint8_t' : undeclared identifier error
* updated the test (made it shorter and providing better diagnostic) and significantly improved implementation (get rid of heavy repeated and/or unnecessary operations)
* fixed compile warning; removed trailing whitespace
2018-06-27 16:47:35 +03:00
Nesterov Alexander
0081dc478f
Init qrcode algo ( #11829 )
2018-06-27 16:37:10 +03:00
Florian Echtler
17888ce0fd
add support for 8-bit greyscale format
2018-06-27 15:31:53 +02:00
Vadim Pisarevsky
5dc0e51682
Merge pull request #11839 from dkurt:dnn_ie_r2
2018-06-27 09:56:02 +00:00
Vadim Pisarevsky
ba1a6ad4cc
Merge pull request #11840 from dkurt:dnn_tf_nchw
2018-06-26 19:27:25 +00:00
Vadim Pisarevsky
051b40f956
a part of PR #11364 (extended findNonZero & PSNR) ( #11837 )
...
* a part of https://github.com/opencv/opencv/pull/11364 by Tetragramm. Rewritten and extended findNonZero & PSNR to support more types, not just 8u.
* fixed compile & doxygen warnings
* fixed small bug in findNonZero test
2018-06-26 17:10:00 +03:00
branka-plateiq
34ad9b8a42
Pass RANSAC parameters as function input ( #10569 )
...
* Pass RANSAC parameters as function input
* Clean up unnecessary code
* Keep the original function signature
* Clean up based on PR comments
Replace array with vector.
Correct naming convention for input variables.
Add checks on input variables.
* Use vector instead of array for dynamic size
* Revert change.
* Use dynamic array
* Fix wrong syntax in array allocation
* Undo change
* Fix variable name
* Use vector and not array
* fixed compile warning on Windows
2018-06-26 16:40:28 +03:00
Dmitry Kurtaev
dbeb4a11be
Parse strides and convolution kernel shapes considering data layout
2018-06-26 16:18:21 +03:00
Dmitry Kurtaev
b11e22c25b
Update Inference Engine tests
2018-06-26 15:38:08 +03:00
Vadim Pisarevsky
53a475d63c
Merge pull request #11836 from terfendail:msmf_camfallback
2018-06-26 12:17:55 +00:00
Vadim Pisarevsky
e87425f047
Merge pull request #11835 from dkurt:dnn_tf_two_inputs
2018-06-26 12:12:24 +00:00
Vitaly Tuzov
67b67003c5
Disable MSMF VideoCapture fallback to existing camera in case provided index is out of range.
2018-06-26 14:04:02 +03:00
Dmitry Kurtaev
9510551c63
Multiple inputs for TensorFlow models
2018-06-26 14:03:59 +03:00
Vadim Pisarevsky
b80c7bca0d
Merge pull request #11826 from dkurt:dnn_tf_data_layouts
2018-06-26 06:36:27 +00:00
Vadim Pisarevsky
dc27d52221
temporarily disabled OpenCL use in DNN module on Mac ( #11828 )
...
* temporarily disabled OpenCL use in DNN module on Mac, since some of the tests fail
* disable OpenCL in DNN on Mac at CMake level, not source level (thanks to alalek for the advice)
2018-06-26 09:35:18 +03:00
Alexander Alekhin
b39cd06249
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-06-25 22:03:17 +03:00
Dmitry Kurtaev
715f40a48d
Use layers consumers to predict data layout
2018-06-25 18:25:40 +03:00
Li, Peng
ab8022f74e
update convolution opencl kernels in dnn module ( #11762 )
...
* optimize ocl kernel enqueue in fc layer
Signed-off-by: Li Peng <peng.li@intel.com>
* use CV_LOG_INFO in convolution auto tuning
Signed-off-by: Li Peng <peng.li@intel.com>
* update convolution IDLF kernel
extend parameter tuning range, also cleanup
ocl kernel implementation
Signed-off-by: Li Peng <peng.li@intel.com>
* update in-memory convolution cache config
fp16 and fp32 cache config are stored separately
Signed-off-by: Li Peng <peng.li@intel.com>
2018-06-25 17:06:18 +03:00
Vadim Pisarevsky
46def2fdc1
Merge pull request #11757 from freiling:master
2018-06-25 12:53:07 +00:00
Rostislav Vasilikhin
18bc2a1a93
Kinect2 support added to OpenNI2 backend ( #11794 )
...
* Kinect2 support added to OpenNI2 backend
* more fixes for OpenNI2 backend
* whitespace fixed
* libfreenect2 support added
* const cast added
* mutable removed
2018-06-25 13:19:20 +03:00
Alexander Alekhin
2195f0cc62
Merge pull request #11795 from paroj:realsensev2
2018-06-23 18:50:43 +00:00
Dmitry Kurtaev
e8e9d1d021
Implement Interp layer using Resize layer
2018-06-22 19:26:47 +03:00
Alexander Alekhin
1894f1a37f
Merge pull request #11773 from alalek:dnn_ocl_update_force_tuning_flag
2018-06-22 05:23:55 +00:00
Alexander Alekhin
50c607d206
dnn(ocl): fix external / predefined builtin configuration behavior
...
OPENCV_OCL4DNN_FORCE_AUTO_TUNING should ignore existed configuration from:
- builtin predefined configurations (for Intel OpenCL iGPUs)
- external configuration (via OPENCV_OCL4DNN_CONFIG_PATH)
Prefer external configuration over builtin.
2018-06-21 20:59:03 +03:00
Dmitry Kurtaev
4626246087
Add ShuffleChannel layer
2018-06-21 19:10:42 +03:00
Alexander Alekhin
387e92353c
Merge pull request #11772 from PhilLab:patch-5
2018-06-21 11:57:24 +00:00
Dmitry Kurtaev
40b85c1cd9
Remove undocumented feature to retreive layers outputs by indices
2018-06-20 14:44:21 +03:00
Pavel Rojtberg
2047abd9c3
videoio: realsense - add cvtColor as the pixel-format is only a hint
2018-06-19 17:55:09 +02:00
Alexander Alekhin
64f2b1b250
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-06-17 16:26:48 +03:00
Alexander Alekhin
eed43a231b
Merge pull request #11775 from alalek:issue_11771
2018-06-17 13:25:44 +00:00
Alexander Alekhin
8622b1254e
Merge pull request #11774 from adamrankin:cap_dshow_autofocus
2018-06-16 14:11:44 +00:00
Alexander Alekhin
5e2c112697
photo: remove redundant broken check
...
`dest(roi_d)` operation contains similar check inside.
2018-06-16 11:36:51 +03:00
Adam Rankin
ecf4b639e1
Adding the ability to toggle autofocus on/off for DirectShow webcams
2018-06-15 12:32:12 -04:00
Philipp Hasper
577546ccd9
Added Size_::aspectRatio
2018-06-15 14:59:54 +02:00
Alexander Alekhin
9629af1aa9
videoio: MSMF async reader for camera stream
...
Synchronized reading from camera with heavy frame processing
provides bad effects (huge frame latency, processing frames from the past).
Generally, there is no way to process each frame and some frames will be dropped.
Allow preventive frame dropping to reduce lag of processed frames.
This mode is applied to cameras only (opened by 'index').
2018-06-14 18:37:05 +03:00
Alexander Alekhin
30d4e0261a
Merge pull request #11766 from dkurt:dnn_darknet_avgpool_softmax
2018-06-14 13:18:30 +00:00
Alexander Alekhin
001f5faa0d
Merge pull request #11763 from dkurt:dnn_keras_relu6_v2
2018-06-14 13:17:54 +00:00
Dmitry Kurtaev
bd87eb6e66
Import average pooling and softmax layers from Darknet
2018-06-14 15:22:08 +03:00
Alexander Alekhin
2bb5d1bca3
videoio(msmf): cleanup unused methods from ComPtr wrapper
...
Use Win32 TRUE/FALSE in SetUINT32() calls for bool parameters
2018-06-14 14:15:09 +03:00
Dmitry Kurtaev
693a7663e7
Import ClipByValue from Keras
2018-06-14 13:30:30 +03:00
Alexander Alekhin
8f24db048c
Merge pull request #11735 from alalek:videoio_msmf_fix_configureHW_reopen_condition
2018-06-14 09:57:39 +00:00
Forrest Reiling
e858c21e1f
Fix system.cpp includes on Fuchsia.
2018-06-13 12:14:53 -07:00
Alexander Alekhin
fd46684bf8
[move sift.cpp] opencv: use cv::AutoBuffer<>::data()
...
original commit: fc69aa57bc
2018-06-13 19:11:18 +00:00
Alexander Alekhin
0d6518aaa0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
2018-06-13 19:34:44 +03:00
Alexander Alekhin
5fd7cfbcad
dnn: add runtime parameter OPENCV_DNN_BACKEND_DEFAULT
...
to control DNN_BACKEND_DEFAULT enumeration value behavior
2018-06-13 19:00:04 +03:00
Alexander Alekhin
1c2ee8a5f1
Merge pull request #11737 from alalek:videoio_msmf_replace_debug_print
2018-06-13 13:31:31 +00:00
Alexander Alekhin
09c63e4f00
videoio(msmf): fix reopen condition in configureHW()
...
`camid` value is always -1 after close().
2018-06-13 16:29:45 +03:00
Alexander Alekhin
f040282bf8
Merge pull request #11739 from dkurt:more_ie_models
2018-06-13 13:26:50 +00:00
yuki takehara
4fe648b15c
Merge pull request #11706 from take1014:setTo_Nan_10507
...
* setTo_#10507
* setTo_Nan_10507
* setTo: update check / test for NaNs
2018-06-12 18:05:44 +00:00
Alexander Alekhin
d69a327d6d
OpenCV version++
...
OpenCV 3.4.2
2018-06-10 10:20:38 +03:00
Alexander Alekhin
ab11b17d4b
experimental version++
2018-06-10 10:20:38 +03:00
Dmitry Kurtaev
7d727ac2fb
Fuse top layers to batch normalization
2018-06-09 18:06:53 +03:00
Alexander Alekhin
0d249c7448
videoio(msmf): replace custom debug print function
2018-06-09 17:38:32 +03:00
Dmitry Kurtaev
2c291bc2fb
Enable FastNeuralStyle and OpenFace networks with IE backend
2018-06-09 15:57:12 +03:00
Alexander Alekhin
34fc8e9260
Merge pull request #11714 from alalek:win32_waitKey_accuracy
2018-06-09 12:10:24 +00:00
Alexander Alekhin
929d39f69a
Merge pull request #11728 from dkurt:dnn_update_tf_ssd
2018-06-08 19:04:28 +00:00
Alexander Alekhin
f72633b9f5
Merge pull request #11727 from alalek:videoio_msmf_use_Lock2D
2018-06-08 19:01:40 +00:00
Alexander Alekhin
c05180ccce
Merge pull request #11702 from terfendail:msmf_sizefix
2018-06-08 18:56:31 +00:00
Pavel Rojtberg
bfc227b8d4
videoio: update librealsense to API 2.0
...
this enables the usage of current sensors, while dropping support for
legacy devices, see:
https://github.com/IntelRealSense/librealsense#overview
Given limited resources, and that the legacy sensors where not that
great, I think we should focus on v2.
2018-06-08 18:23:00 +02:00
Vitaly Tuzov
cb4b6bb2dc
Fixed setting of frame size properties for MSMF-based VideoCapture
2018-06-08 18:55:06 +03:00
Alexander Alekhin
c64f6b3c22
videoio(MSMF): refactor grabFrame() / retrieveFrame() methods
...
- no behavior changes in grabFrame()
- added Lock2D() support into retrieveFrame()
2018-06-08 17:20:47 +03:00
Dmitry Kurtaev
40765c5f8d
Enable SSD models from TensorFlow with OpenCL plugin of Intel's Inference Engine
2018-06-08 16:55:21 +03:00
gnthibault
b46fef327e
Fixed Assertin error due to Size.area() overflowing
2018-06-08 11:22:36 +02:00
Alexander Alekhin
8620bd5a84
highgui(win32): improve waitKey() timeout condition
...
- use cv::getTickCount() instead of Win32 GetTickCount()
- process message queue before timeout exit
2018-06-07 19:31:08 +03:00
rockzhan
1187a7fa34
Merge pull request #11649 from rockzhan:dnn_dw_prelu
...
dnn: Fix output mismatch when forward dnn model contain [depthwise conv(group=1) + bn + prelu] (#11649 )
* this can make sure [depthwise conv(group=1) + bn + prelu] output not shift
* add TEST to show the output mismatch in [DWconv+Prelu]
* fix typo
* change loading image to init cvMat directly
* build runtime model, without loading external model
* remove whitespace
* change way to create a cvmat
* add bias_term, add target output
* fix [dwconv + prelu] value mismatch when no optimizations
* fix Test error when change output channels
* add parametric test
* change num_output to group value
* change conv code and change test back
2018-06-07 13:45:54 +00:00
David
7175f257b5
Added ResizeBilinear op for tf ( #11050 )
...
* Added ResizeBilinear op for tf
Combined ResizeNearestNeighbor and ResizeBilinear layers into Resize (with an interpolation param).
Minor changes to tf_importer and resize layer to save some code lines
Minor changes in init.cpp
Minor changes in tf_importer.cpp
* Replaced implementation of a custom ResizeBilinear layer to all layers
* Use Mat::ptr. Replace interpolation flags
2018-06-07 16:29:04 +03:00
Maksim Shabunin
60fa6bea70
Merge pull request #11711 from alalek:python_standalone
2018-06-07 13:27:19 +00:00
Alexander Alekhin
dd7f88bd68
python: support standalone Python bindings build
...
- requires OpenCV source directory
- requires OpenCV binary directory with built modules and 'python_bindings_generator' target
2018-06-07 15:16:39 +03:00
Vadim Pisarevsky
5e5d997dff
Merge pull request #11620 from terfendail:hmmorph_fix
2018-06-07 11:19:21 +00:00
Sayed Adel
e0d28aa893
core:ppc Fix java CoreTest/testMahalanobis ( #11677 )
...
* core:ppc Fix java CoreTest/testMahalanobis
* core:ppc Fix warning unused variable on clang
2018-06-07 14:16:48 +03:00
Vadim Pisarevsky
828f33311f
Merge pull request #11700 from dkurt:dnn_ie_try_catch
2018-06-07 11:09:00 +00:00
Dmitry Kurtaev
f3a6ae5f00
Wrap Inference Engine init to try-catch
2018-06-07 12:55:52 +03:00
Vitaly Tuzov
2e22f8e790
Fix for morphologyEx MORPH_HITMISS mode
2018-06-06 21:04:17 +03:00
Vadim Pisarevsky
7c3090ddcf
Merge pull request #11683 from alalek:videoio_ffmpeg_cleanup_dead_code
2018-06-06 12:21:00 +00:00
Vadim Pisarevsky
3cbd2e2764
Merge pull request #11650 from dkurt:dnn_default_backend
2018-06-06 09:30:39 +00:00
Alexander Alekhin
afaf5f940e
Merge pull request #11695 from alalek:dnn_test_fix_sa_warnings
2018-06-05 20:07:39 +00:00
Alexander Alekhin
31a1df0fae
Merge pull request #11692 from alalek:default_log_level_warnings
2018-06-05 20:07:15 +00:00
Alexander Alekhin
b0ae357cfb
Merge pull request #11687 from alalek:gstreamer_write_pipeline
2018-06-05 20:06:55 +00:00
Alexander Alekhin
4091ced5ab
core: set default logger level to 'warning' in Release builds
...
should hide unnecessary 'info' messages
2018-06-05 18:39:47 +03:00
Alexander Alekhin
6816495bee
dnn(test): reuse test/test_common.hpp, eliminate dead code warning
2018-06-05 12:52:53 +03:00
Alexander Alekhin
277e9279cc
videoio(gstreamer): support dumping of VideoWriter pipeline
2018-06-04 18:39:20 +00:00
Alexander Alekhin
d041b0a599
videoio: fix capture modes
2018-06-04 19:48:51 +03:00
Alexander Alekhin
45dd575ed2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb
.
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489
.
2018-06-04 19:26:10 +03:00
Alexander Alekhin
b2cff44084
Merge pull request #11682 from alalek:fix_pylint
2018-06-04 16:16:08 +00:00
Alexander Alekhin
2628662586
videoio(ffmpeg): cleanup, remove dead code
2018-06-04 19:07:22 +03:00
Dmitry Kurtaev
b781ac7346
Make Intel's Inference Engine backend is default if no preferable backend is specified.
2018-06-04 18:31:46 +03:00
Alexander Alekhin
15130f4f43
Merge pull request #11646 from alalek:gtest_support_params_from_anonymous_namespace
2018-06-04 15:27:33 +00:00
Alexander Alekhin
dcb9bc2544
python: eliminate pylint warnings
...
Tested with:
- pylint 1.9.1
2018-06-04 17:58:06 +03:00
Alexander Alekhin
ec30b1294f
Merge pull request #11636 from alalek:cmake_ffmpeg_find_package
2018-06-04 14:37:36 +00:00
Rostislav Vasilikhin
fc35c77f00
Merge pull request #11610 from savuor:fix/stereobm_simd_fixed_float
...
* StereoBM: fixed SIMD processing for fixed-type output arrays
* changed norm type and threshold, added assertion
* fixed disp_shift
2018-06-04 13:03:12 +00:00
Alexander Alekhin
04802e41e9
gtest: support parameters with types from anonymous namespace
2018-06-04 13:30:24 +03:00
Vadim Pisarevsky
ccbc0b91ea
Merge pull request #11654 from alalek:issue_11648
2018-06-04 10:22:44 +00:00
Vadim Pisarevsky
80709697e5
Merge pull request #11643 from savuor:fix/viz_const
2018-06-04 10:20:19 +00:00
Vadim Pisarevsky
3030594665
Merge pull request #11644 from alalek:docs_avoid_master_links_in_3.4-2
2018-06-04 10:19:44 +00:00
Vadim Pisarevsky
055f33ec46
Merge pull request #11657 from dkurt:dnn_ie_multiple_networks
2018-06-04 10:12:46 +00:00
Alexander Alekhin
c7183775db
Merge pull request #11678 from csukuangfj:fix-doc
2018-06-03 11:00:38 +00:00
Kuang Fangjun
9ae28415ec
fix doc.
2018-06-03 17:44:24 +08:00
Kuang Fangjun
ec42d87204
fix #11673 .
2018-06-03 07:58:23 +08:00
Alexander Alekhin
40a61ec64e
Merge pull request #11647 from sanchom:3.4
2018-06-02 20:52:17 +00:00
Fangjun Kuang
4bb220bb90
fix #11668 .
2018-06-02 16:17:32 +08:00
Alexander Alekhin
6912c20380
Merge pull request #11659 from take1014:snippet_11597
2018-06-01 16:48:10 +00:00
Alexander Alekhin
993981428f
Merge pull request #11656 from pauljurczak:patch-1
2018-06-01 16:39:54 +00:00
Alexander Alekhin
b229107f8e
Merge pull request #11641 from alalek:videoio_test_fixup
2018-06-01 16:39:11 +00:00
take1014
4ec9afac57
add imgproc snippets
2018-06-01 23:42:00 +09:00
Rostislav Vasilikhin
e1b3cf5c14
Viz3d::getViewerPose() made const
2018-06-01 15:53:05 +03:00
Dmitry Kurtaev
ab389142af
Fix multiple networks with Intel's Inference Engine backend
2018-06-01 14:10:32 +03:00
Paul Jurczak
bd7bad02a0
convertFp16 documentation edit (2)
...
If this seems too wordy, take into account a new user who tries to find out extent of FP16 support in OpenCV.
2018-06-01 04:15:21 -06:00
Alexander Alekhin
03edddba47
core: drop unnecessary duplicate check
2018-06-01 12:31:48 +03:00
Sancho McCann
dbab7ecac8
Refactored out a dead code path.
2018-05-31 21:09:26 +00:00
Alexander Alekhin
1822e85f4a
Merge pull request #11642 from alalek:calib3d_chess_board_avoid_clone
2018-05-31 19:17:48 +00:00
Vadim Pisarevsky
d734e83af0
Hsv2rgb univ intrin ( #11637 )
...
* add universal intrinsics for HSV2RGB_b
* rewritten HSV2RGB_b without using extra universal intrinsics
* removed unused variable
* undo changes in v_load_deinterleave
2018-05-31 21:59:45 +03:00
Alexander Alekhin
0349e8c9af
Merge pull request #11608 from take1014:hist_11544
2018-05-31 16:44:02 +00:00
Vadim Pisarevsky
7d19bd6c19
Merge pull request #11634 from vpisarev:empty_mat_with_types_2
...
fixes handling of empty matrices in some functions (#11634 )
* a part of PR #11416 by Yuki Takehara
* moved the empty mat check in Mat::copyTo()
* fixed some test failures
2018-05-31 16:36:39 +00:00
Alexander Alekhin
da75e463a8
Merge pull request #11639 from alalek:fix_precomp_hpp
2018-05-31 16:35:21 +00:00
Alexander Alekhin
1bc96e3ed0
calib3d: cv::findContours() doesn't require to clone input
2018-05-31 19:34:23 +03:00
Alexander Alekhin
f185802489
documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)
...
Other links:
- https://raw.githubusercontent.com/opencv/opencv/master
- https://github.com/opencv/opencv/blob/master
2018-05-31 19:30:56 +03:00
Alexander Alekhin
46c508b84f
Merge pull request #11638 from alalek:docs_avoid_master_links_in_3.4
2018-05-31 16:22:03 +00:00
Alexander Alekhin
5d68c8dbe7
videoio(test): fixup information dump
2018-05-31 18:54:43 +03:00
Alexander Alekhin
b934702c7f
cmake: support find_package(FFMPEG)
...
Use "OPENCV_FFMPEG_USE_FIND_PACKAGE" variable to specify find_package() parameters
2018-05-31 18:27:01 +03:00
Alexander Alekhin
58d47ae9c8
Merge pull request #11633 from alalek:issue_10546
2018-05-31 15:08:45 +00:00
take1014
229e8b1b18
Correct handling when IPP is enabled
2018-05-31 22:54:32 +09:00
Alexander Alekhin
799b4f48e7
fix missing precomp.hpp
2018-05-31 16:53:44 +03:00
Alexander Alekhin
9ba9358ecb
documentation: avoid links to 'master' branch from 3.4 maintenance branch
2018-05-31 16:45:18 +03:00
Dmitry Kurtaev
32bab45f81
Fix Inference Engine graphs with fused output layers
2018-05-31 16:21:08 +03:00
Alexander Alekhin
c94fe0c7e7
videoio(v4l): eliminate global variable
2018-05-31 15:11:20 +03:00
Alexander Alekhin
83d915eca1
videoio(v4l): don't pre-scan or cache list of available cameras
2018-05-31 15:11:20 +03:00
Alexander Alekhin
22f435ff4d
videoio(v4l): fix code indentation, tabs
2018-05-31 15:11:20 +03:00
Alexander Alekhin
49321a233c
Merge pull request #11632 from alalek:videoio_fixes
2018-05-31 12:09:14 +00:00
Alexander Alekhin
1b27351f45
Merge pull request #11627 from alalek:fix_python_cast_method_with_kw
2018-05-31 11:38:39 +00:00
Vadim Pisarevsky
c58cc4c2ff
Merge pull request #11255 from dkurt:dnn_tf_faster_rcnn
2018-05-31 11:07:39 +00:00
Alexander Alekhin
ddba772297
videoio: fix isOpened() method for legacy APIs, fix "index" API list
2018-05-31 14:07:22 +03:00
Dmitry Kurtaev
f96f934426
Update Intel's Inference Engine deep learning backend ( #11587 )
...
* Update Intel's Inference Engine deep learning backend
* Remove cpu_extension dependency
* Update Darknet accuracy tests
2018-05-31 14:05:21 +03:00
Alexander Alekhin
133e9f2012
Merge pull request #11618 from alalek:ffmpeg_debug_log
2018-05-30 15:36:42 +00:00
Alexander Alekhin
5c80763a71
Merge pull request #11601 from alalek:calib3d_replace_findContours
2018-05-30 15:35:49 +00:00
Alexander Alekhin
c2d40b465d
python: fix arg types of cv2_UMatWrapperObject functions
2018-05-30 18:07:03 +03:00
Alexander Alekhin
1207300e01
python: avoid direct cast PyCFunctionWithKeywords->PyCFunction
2018-05-30 17:24:43 +03:00
Dmitry Kurtaev
bf87a43185
Faster-RCNN object detection models from TensorFlow
2018-05-30 17:12:36 +03:00
Alexander Alekhin
44572fac44
Merge pull request #11557 from tomoaki0705:relaxIntelOnlyOCL4DNN
2018-05-29 15:25:22 +00:00
Alexander Alekhin
c27b1d93e3
Merge pull request #11614 from dkurt:dnn_fix_keras_dilated_conv
2018-05-29 15:21:30 +00:00
Alexander Alekhin
8f28817373
Merge pull request #11617 from alalek:ffmpeg_fix_time_base
2018-05-29 15:19:13 +00:00
Alexander Alekhin
d70e01b635
calib3d: chess board - replace to cv::findContours()
2018-05-29 14:16:20 +00:00
Alexander Alekhin
83ec0f526c
videoio(ffmpeg): add option to enable debug logs
2018-05-29 12:40:52 +00:00
Alexander Alekhin
cd9e43704e
videoio: backends priority list
2018-05-29 12:06:45 +00:00
Alexander Alekhin
5128c1ff1f
videoio(ffmpeg): specify stream->time_base
...
Using codec->time_base is deprecated to specify muxer settings.
Resolves issue with FPS value for AVI files with FFmpeg 4.0.
Related FFmpeg commits:
- 194be1f43e
- 91736025b2
2018-05-29 11:42:50 +00:00
Tomoaki Teshima
2e9e71ab9e
make ocl4dnn available to run on other platform than Intel GPU
2018-05-29 19:18:10 +09:00
Dmitry Kurtaev
085be6a445
Fix dilated convolution from Keras
2018-05-29 12:15:47 +03:00
Alexander Alekhin
06c1890639
Merge pull request #11607 from dkurt:dnn_scale_shift_layer
2018-05-28 18:19:22 +00:00
Dmitry Kurtaev
2c3c59d018
Remove Shift deep learning layer
2018-05-28 18:18:56 +03:00
Alexander Alekhin
549b5df225
build: workaround issues with C compilation mode
...
- cvdef.h + cvRound (double only)
- highgui_c.h
2018-05-28 18:07:23 +03:00
Alexander Alekhin
58d28061a4
Merge pull request #11591 from alalek:calib3d_chessboard_fix3
2018-05-28 12:48:11 +00:00
Alexander Alekhin
faae5edf72
Merge pull request #11590 from alalek:calib3d_chessboard_fix2
2018-05-28 12:44:46 +00:00
Alexander Alekhin
0f298a4203
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-28 11:22:55 +00:00
Alexander Alekhin
29421d7def
Merge pull request #11589 from alalek:calib3d_chessboard_fix
2018-05-28 10:13:43 +00:00
Alexander Alekhin
4384036108
Merge pull request #11576 from alalek:avoid_copyTo_with_getMat
2018-05-25 16:52:58 +00:00
Alexander Alekhin
f3cbb0f941
calib3d: chess board - perform full range (with 0) histogram smooth
2018-05-25 15:35:36 +03:00
Alexander Alekhin
ad57750d25
calib3d: chess board - properly detect/handle iCntMaxima=0 case
2018-05-25 15:32:07 +03:00
Alexander Alekhin
1dfc742f27
calib3d: chess board - avoid image modification via cvFindContours
2018-05-25 15:01:34 +03:00
Alexander Alekhin
0a6d190095
Merge pull request #11396 from terfendail:msmf_icapture
2018-05-24 18:30:09 +00:00
yuki takehara
ed207d79e7
Merge pull request #11108 from take1014:hough_4303
...
* Added accumulator value to the output of HoughLines and HoughCircles
* imgproc: refactor Hough patch
- eliminate code duplication
- fix type handling, fix OpenCL code
- fix test data generation
- re-generated test data in debug mode via plain CPU code path
2018-05-23 20:42:12 +00:00
yuki takehara
2d5d98ec0f
Merge pull request #11551 from take1014:filter2d_10683
...
* Add arguments to dftFilter2D
* test: add expected test values
2018-05-23 20:25:11 +00:00
Alexander Alekhin
1923916929
Merge pull request #11581 from mdfirman:rectify3Collinear_bugfix
2018-05-23 20:19:12 +00:00
Alexander Alekhin
3654fb10d7
Merge pull request #11567 from alalek:code_quality
2018-05-23 15:47:11 +00:00
Michael Firman
e8cb67572a
Bugfix to allow adjust3rdMatrix to be run
2018-05-23 16:03:21 +01:00
Alexander Alekhin
5a706eee8a
Merge pull request #11578 from alalek:build_warnings
2018-05-23 15:02:32 +00:00
Alexander Alekhin
9b173d317f
Merge pull request #11573 from mshabunin:fix-gst-leak
2018-05-23 15:00:37 +00:00
Vitaly Tuzov
9622ca0e37
MSMF-based VideoCapture and VideoWriter backend changed to C++ interface
2018-05-23 17:54:08 +03:00
Alexander Alekhin
39b60f9b17
fix build warnings
2018-05-23 16:04:41 +03:00
Alexander Alekhin
8307e06c1a
Merge pull request #11575 from mshabunin:fix-ie-win
2018-05-23 13:00:23 +00:00
Alexander Alekhin
b3ff29fcf5
avoid copyTo(outputarray.getMat()) pattern
...
- leads to errors due 'const' modifier of getMat() method
- may be non-optimal with non-CPU data storage
2018-05-23 13:56:34 +03:00
Maksim Shabunin
895e10c317
dnn: fixed IE support on Windows
2018-05-23 12:46:14 +03:00
Maksim Shabunin
1a15136536
GStreamer backend: fixed memory leak and version check
2018-05-23 10:48:13 +03:00
Namgoo Lee
79af0bfccf
NPP : NppStreamHandler fix
2018-05-23 15:54:39 +09:00
Alexander Alekhin
5e68f35500
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-22 19:02:01 +03:00
Alexander Alekhin
2f9b4439af
Merge pull request #11565 from alalek:issue_11545
2018-05-22 16:00:37 +00:00
Alexander Alekhin
099eb40ba1
Merge pull request #11564 from alalek:ts_run_py_passthrough_test_args
2018-05-22 15:58:51 +00:00
Alexander Enaldiev
84584002f2
Merge pull request #11417 from Turim:imgcodecs_cmake_decoders_customize_formats
...
* imgcodecs cmake: the option to customize supported formats list (WITH_IMGCODEC_HDR, WITH_IMGCODEC_SUNRASTER, WITH_IMGCODEC_PXM)
* imgcodecs: fixes
- fixed CMake scripts (=OFF doesn't really work)
- restore dropped GDCM block
- added _IMGCODEC_ prefix
- fixed tests
- include PAM format under WITH_IMGCODEC_PXM option
2018-05-22 15:10:15 +00:00
Alexander Alekhin
2fc713bb94
Merge pull request #11566 from mshabunin:allow-ie-force
2018-05-22 14:12:32 +00:00
Alexander Alekhin
471c17321f
improve code quality
...
- eliminate rand() calls
- non initialized members/ variables
- unused return values
- missing/useless NULL checks
2018-05-22 17:08:31 +03:00
Maksim Shabunin
53a68783a5
dnn: support later IE versions
2018-05-22 15:18:18 +03:00
Maksim Shabunin
020ad1ac76
dnn: allow setting IE paths via command line
2018-05-22 14:40:03 +03:00
Alexander Alekhin
35a4551609
imgcodecs: fix imwrite handling of different OutputArray types
2018-05-22 13:57:51 +03:00
Alexander Alekhin
76ac7ab4ef
imgcodecs: added test for imwrite parameter types
...
issue 11545
2018-05-22 13:55:14 +03:00
Alexander Alekhin
a00182db8e
ts: run.py passthrough --test_* args "as is"
...
to allow pass `--test_bigdata` via run.py
2018-05-22 13:40:09 +03:00
Alexander Alekhin
58c8aefe03
dnn(text): update check threshols
...
- make green Linux debug/Linux32/Win32 builders
2018-05-22 13:29:31 +03:00
Alexander Alekhin
ba1bd64bf9
Merge pull request #11532 from paroj:realsense
2018-05-21 15:59:46 +00:00
Alexander Alekhin
db88cd1b25
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-21 16:20:14 +03:00
Alexander Alekhin
085b27fc3d
Merge pull request #11390 from dkurt:east_text_detection
2018-05-21 13:02:29 +00:00
Alexander Alekhin
e21c01708a
videoio: fix lifetime management of data of input frames
2018-05-21 12:29:24 +03:00
Alexander Alekhin
faafb3152a
Merge pull request #11550 from tomoaki0705:fixCudaAsync
2018-05-20 20:59:34 +00:00
Tomoaki Teshima
e2c787884d
fix the test failure of CUDA_Arithm/MeanStdDev
2018-05-20 19:38:02 +09:00
shengyu
72d3e14e8f
fix wrong indentation on github page (tab to space)
2018-05-19 11:23:51 +08:00
Dmitry Kurtaev
07dc6d2b45
Return a convex hull from rotatedRectangleIntersection
2018-05-18 14:20:17 +03:00
Alexander Alekhin
ab2c21e7c1
Merge pull request #11531 from alalek:issue_11518
2018-05-18 10:59:27 +00:00
Alexander Alekhin
d6279bfff8
fix build warnings
2018-05-17 18:29:21 +03:00
Alexander Alekhin
1ba25c5569
Merge pull request #11520 from terfendail:ffmpeg_icapture
2018-05-17 15:28:58 +00:00
Alexander Alekhin
45b92aebe5
Merge pull request #11523 from alalek:bigdata_tests
2018-05-17 14:53:19 +00:00
Alexander Alekhin
491e3627b6
photo: initialize cos() table with double type
...
This avoids MSVC 19.14.26428.1 to call vectorized __vdecl_cosf4() function with less precision.
2018-05-17 15:30:11 +03:00
Pavel Rojtberg
936d2963a2
videoio: add rudimentary librealsense 1.x support
...
it is reusing CAP_INTELPERC* enums as Intel PerC is deprecated and
librealsense replaces it.
2018-05-17 11:56:52 +02:00
Alexander Alekhin
4378b4d03d
Merge pull request #11516 from berak:java_features2d
2018-05-16 15:40:51 +00:00
Alexander Alekhin
1983991d2f
photo(test): update test checks
...
- allow 5% of changed pixels with intensity difference <= 1
2018-05-16 17:58:46 +03:00
Li Peng
1b517a45ae
add fp16 accuracy and perf test
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-05-16 22:45:07 +08:00
Li Peng
ba5e8befa9
fp16 ocl support for more layers
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-05-16 22:45:04 +08:00
Li Peng
3dd916882a
fp16 ocl support for googlenet
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-05-16 22:45:02 +08:00
Li Peng
329abb5b64
dnn fp16 support
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-05-16 22:44:39 +08:00
Vitaly Tuzov
aeed43ec90
FFMPEG-based VideoCapture and VideoWriter backend changed to C++ interface
2018-05-16 17:19:18 +03:00
berak
6ddef3b7a9
features2d: remove deprecated java wrappers
2018-05-16 16:13:18 +02:00
Alexander Alekhin
bb8ff2c463
Merge pull request #11494 from tomoaki0705:fixOpenCLDnn
2018-05-16 14:11:36 +00:00
Alexander Alekhin
336841fa1b
Merge pull request #11525 from alalek:issue_11511
2018-05-16 12:14:11 +00:00
Tomoaki Teshima
3f5347dd7a
work around of the test failure of opencv_test_dnn
...
* let OpenCL kernel run only on Intel GPU
* brush up the workaround based on 9a2b028 from alalek
2018-05-16 19:23:19 +09:00
Namgoo Lee
2c1ce8c0e9
cuda_meanStdDev : bug fix
2018-05-16 03:31:47 +09:00
Alexander Alekhin
f42fca9f49
cuda: avoid unnecessary cudaStreamSynchronize() call
...
resolves #11511
2018-05-15 18:38:22 +03:00
Alexander Alekhin
703f79b757
tests: add "bigdata" tests
2018-05-15 15:56:26 +03:00
Alexander Alekhin
6582afcdbb
ts: add BigData tests category (skipped by default)
...
Pass --test_bigdata to allow launching of "BigData" tests.
2018-05-15 15:55:56 +03:00
Vadim Pisarevsky
e0dbe5cfcc
handle huge matrices correctly ( #11505 )
...
* make sure that the matrix with more than INT_MAX elements is marked as non-continuous, and thus all the pixel-wise functions process it correctly (i.e. row-by-row, not as a single row, where integer overflow may occur when computing the total number of elements)
2018-05-14 15:29:14 +03:00
Alexander Alekhin
68c92908d5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-14 15:17:35 +03:00
Alexander Alekhin
c6a9de812b
Merge pull request #11497 from alalek:libjpeg-turbo
2018-05-14 12:17:10 +00:00
Alexander Alekhin
f8252702a8
3rdparty: integrate libjpeg-turbo build scripts into OpenCV
2018-05-11 18:29:57 +03:00
Alexander Alekhin
78f205ffa5
python: better Python 3 support
2018-05-11 17:32:04 +03:00
Alexander Alekhin
df02fe0615
Merge pull request #11445 from cclauss:file-long-raw_input-xrange
2018-05-11 13:28:53 +00:00
Alexander Alekhin
24bb7b7679
Merge pull request #11444 from cclauss:patch-2
2018-05-11 13:28:27 +00:00
Alexander Alekhin
8356a6b6ab
Merge pull request #11442 from cclauss:print-function
2018-05-11 13:26:04 +00:00
Dmitry Kurtaev
8488f2e265
EAST: An Efficient and Accurate Scene Text Detector ( https://arxiv.org/abs/1704.03155v2 )
2018-05-11 14:55:42 +03:00
Alexander Alekhin
d1d7408a20
Merge pull request #11502 from berak:fix_knearest
2018-05-11 11:47:13 +00:00
berak
9b0ef7bb17
ml: fix caching of internal state when changing the impl in KNearest
2018-05-11 12:20:17 +02:00
Alexander Alekhin
ed150bd97a
Merge pull request #11461 from dkurt:dnn_reduce_mem_consumption
2018-05-11 09:47:03 +00:00
Dmitry Kurtaev
c99c3e761e
Fuse multipliers but not convolution layers weights
2018-05-10 19:24:38 +03:00
Alexander Alekhin
51e543050c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-10 18:19:56 +03:00
Vadim Pisarevsky
9e3b6a228a
Merge pull request #11418 from K-Shinotsuka:issue42
2018-05-10 15:15:04 +00:00
Vadim Pisarevsky
566cb5e3d8
Merge pull request #11430 from K-Shinotsuka:issue43
2018-05-10 15:14:39 +00:00
Alexander Alekhin
6f24b81079
Merge pull request #11490 from shengyu7697:tab_to_space
2018-05-10 14:41:07 +00:00
Alexander Alekhin
d2bc7b5a95
Merge pull request #11489 from alalek:fix_arm_build
2018-05-10 14:37:51 +00:00
Alexander Alekhin
9dc2005251
Merge pull request #11476 from tomoaki0705:fixCudaSampleBuildError
2018-05-09 20:48:33 +00:00
Namgoo Lee
ed86bd34b1
Merge pull request #11483 from nglee:dev_cudaCannyStreamIssue
...
cuda_canny : multi stream safety (#11483 )
* CUDA_ImgProc/Canny Asynchronous test
* cuda_canny : multi stream safety (1/3)
- Convert global variable canny::counter to class local variable
* cuda_canny : multi stream safety (2/3)
- Use texture objects rather than texture reference for cc >= 3.0,
since texture reference must be declared as a static global variable
which results in race condition when ran concurrently
* cuda_canny : multi stream safety (3/3)
- Refrain from using global variable in row_filter and column_filter
(converts column_filter::c_kernel and row_filter::c_kernel to local
variables)
* Fixes #11193
2018-05-09 23:44:34 +03:00
Alexander Alekhin
352510cc19
core: fix ARM intrinsincs
...
'0' is specific case (make no sence as a standalone operation),
but it can be useful in template-based programming.
reverts commit: a58c9d4d63
2018-05-09 23:31:02 +03:00
shengyu
70455a959d
tab to space
2018-05-09 21:15:51 +08:00
Tomoaki Teshima
f7ea6b12ea
cuda: fix build error of sample
2018-05-09 00:23:49 +09:00
Damien Picard
ba000bf8ea
Fixes 11480 : allow to force the video codec used to read videos
...
with the ffmpeg backend
2018-05-08 15:02:01 +02:00
Tomoaki Teshima
a58c9d4d63
arm: fix build error of v_rotate_left
...
* remove meaningless tests
2018-05-08 00:35:18 +09:00
Sayed Adel
115b10ed32
photo:ppc fix MergeRobertson test
2018-05-05 09:38:55 +00:00
Sayed Adel
ed19da21ab
core:ppc Several improvements on VSX(2)
...
* add v_float64x2 support to v_rotate_*
* treat float vector in v_check_any, vec_any_lt as int vector
* add test case for v_rotate_left
2018-05-04 23:09:38 +00:00
cDc
f2fbfd7a10
fix bug in Matx::inv()
2018-05-05 10:30:58 +03:00
Dmitry Kurtaev
777d77848c
Free Convolution and MatMul weights after TensorFlow layers import
2018-05-04 11:20:14 +03:00
Dmitry Kurtaev
9ffe4694db
Reduce memory consumption at Caffe importer
2018-05-04 09:24:13 +03:00
k-shinotsuka
ecb4ea8f76
add universal intrinsics for RGB2HSV_f
2018-05-04 00:58:46 +09:00
k-shinotsuka
a5f68e98f4
add universal intrinsics for HLS2RGB_f
2018-05-03 23:50:38 +09:00
Alexander Alekhin
000a13b6a3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-03 14:30:38 +00:00
zuoshaobo
4ff6a1bc7b
Merge pull request #11425 from zuoshaobo:relu_negative_slope
...
* FIX INF_ENGINE RELU ERROR
* set slope to variable
* tab in indentwq
2018-05-03 13:36:49 +03:00
cclauss
8a79b167b8
Define execfile, file, long, raw_input, xrange for Python 3
2018-05-03 09:19:05 +02:00
cclauss
de99f53e94
Don't forget self in table_formatter.py
...
__ridx__ is an _undefined name_ in this context but __self.ridx__ is used three other times in this method and nine times in this class. Undefined names may raise [NameError](https://docs.python.org/3/library/exceptions.html#NameError ) at runtime.
flake8 testing of https://github.com/opencv/opencv
$ __flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics__
```
./modules/ts/misc/table_formatter.py:50:23: F821 undefined name 'ridx'
self.rows[ridx + 1].props = properties
^
```
2018-05-03 08:24:24 +02:00
cclauss
05c1a3d160
print() is a function in Python 3
2018-05-03 07:12:12 +02:00
Alexander Alekhin
083b08742d
Merge pull request #11406 from alalek:core_matsize_dims
2018-04-28 14:38:42 +00:00
Alexander Alekhin
65b0b319eb
eliminate MSVS2017 build warning
...
modules\dnn\src\layers\prior_box_layer.cpp(208): warning C4834: discarding return value of function with 'nodiscard' attribute
2018-04-28 15:14:41 +03:00
yuki takehara
4934f7c5a4
Merge pull request #11285 from take1014:core_6125
...
* Resolves 6125
* Fix test code
* Delete unnecessary code
2018-04-28 14:14:10 +03:00
Alexander Alekhin
e7adce851c
Merge pull request #11314 from terfendail:msmf_camera
2018-04-27 19:34:29 +03:00
Alexander Alekhin
7e43a0c2b7
Merge pull request #11394 from dkurt:dnn_custom_layers_py
2018-04-27 15:19:46 +00:00
Alexander Alekhin
8c349ff8ff
core: added MatSize::dims() method
...
to avoid accessing of 'p[-1]' (static code analysers dislike this)
2018-04-27 16:57:29 +03:00
Alexander Alekhin
8d7ccd29fe
Merge pull request #11401 from exoson:livestitch
2018-04-27 13:47:42 +00:00
Tomoaki Teshima
87a4f4ab3a
Merge pull request #11409 from tomoaki0705/fixCLAHEfailure
...
Arm: fix the test failure of OCL_Imgproc/CLAHETest.Accuracy on ODROID-XU4 (#11409 )
* fix the test failure of OCL_Imgproc/CLAHETest.Accuracy on ODROID-XU4
* avoid the race condition in the reduce
* imgproc(ocl): simplify CLAHE code
* remove unused class
2018-04-27 16:41:56 +03:00
Alexander Alekhin
856a07711b
core: disabled IPP AVX512 normL1(a, b, mask)
...
for cv::Mat with type=16UC3 and width < 16
2018-04-27 12:57:53 +03:00
exoson
058299cc66
Optimize MultiBandBlender to run faster
2018-04-27 10:48:13 +03:00
Alexander Alekhin
1031dfe4e8
Merge pull request #11402 from alalek:build_warnings
2018-04-26 19:04:37 +00:00
Alexander Alekhin
39e2d64b84
core: fix icc std::exception_ptr detection
...
std::exception_ptr requires enabled C++11 mode
2018-04-26 17:46:25 +03:00
Vitaly Tuzov
1dc73281f8
Added precise seek to MSMF-based VideoCapture::set(CAP_PROP_POS_FRAMES)
2018-04-26 16:15:23 +03:00
Alexander Alekhin
8e15c6fd78
videoio(openni2): fix CV_CAP_PROP_OPENNI2_SYNC property
2018-04-26 14:16:03 +03:00
Alexander Alekhin
f708a11f0f
build: fix warnings
2018-04-26 14:13:01 +03:00
Alexander Alekhin
57dad685d1
core: disabled IPP AVX2 normL1(a, b, mask)
...
for cv::Mat with width < 16
2018-04-26 13:35:25 +03:00
Alexander Alekhin
dfa04a11bb
core: norm with mask 16UC3 regression test
2018-04-26 13:35:25 +03:00
Dmitry Kurtaev
d5b9563263
Custom deep learning layers in Python
2018-04-26 09:25:18 +03:00
Alexander Alekhin
9166e6052b
imgproc: fixed fixedpoint coding style
...
- fixed wrong condition (always true)
- replaced unnecessary shift operation: '>> 63' to '< 0'
- used CV_BIG_INT()/CV_BIG_UINT() macros
2018-04-25 17:33:57 +03:00
Alexander Alekhin
469dc6ac42
imgproc: fix fixed point build
...
avoid using of templated 'operator T ()'
2018-04-25 16:34:44 +03:00
Alexander Alekhin
4e83f4c579
core: drop cv::errorNoReturn()
...
replaced to cv::error()
2018-04-25 15:07:18 +03:00
Alexander Alekhin
cd2b188c9a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-24 18:13:06 +03:00
Alexander Alekhin
ca1975cada
Merge pull request #11385 from shengyu7697:tab_to_space
2018-04-24 18:11:14 +03:00
shengyu
7773b2b4d6
tab to space
2018-04-24 17:45:16 +03:00
Alexander Alekhin
84db82a329
build: fix warnings
2018-04-24 16:15:22 +03:00
Alexander Alekhin
ef2548778c
build: -Wimplicit-fallthrough warning for GCC 7+ only
2018-04-24 16:03:40 +03:00
Alexander Alekhin
6b581c4e51
build: unreachable code after CV_Error() (part 2)
2018-04-24 16:03:40 +03:00
Alexander Alekhin
576d2dbac0
refactor: don't use CV_ErrorNoReturn() internally
2018-04-24 15:38:42 +03:00
Dmitry Kurtaev
4ec456f0a0
Custom layers for deep learning networks ( #11129 )
...
* Custom deep learning layers support
* Stack custom deep learning layers
2018-04-24 14:59:59 +03:00
Alexander Alekhin
909a25571e
Merge pull request #11332 from alalek:v_select_x86
2018-04-24 11:44:33 +00:00
Vadim Pisarevsky
5c57e6bdb0
Merge pull request #11380 from vpisarev:faster_interleave_deinterleave
2018-04-24 11:30:18 +00:00
berak
fc5bba66af
ml: refactor non-virtual methods
2018-04-24 13:23:27 +02:00
Vitaly Tuzov
80600e5cdc
Added DXVA hardware acceleration to MSMF-based VideoCapture
2018-04-24 13:42:49 +03:00
Vitaly Tuzov
916f094ce6
Integrated camera and file MSMF-based VideoCaptures and implemented configuration properties get/set
2018-04-24 12:13:20 +03:00
Vitaly Tuzov
b0b2d8de44
Remove unused code
2018-04-24 12:13:19 +03:00
Maksim Shabunin
5ae550c622
Merge pull request #11320 from mshabunin:gstreamer-cpp
2018-04-24 08:23:28 +00:00
Alexander Alekhin
4d7d630e92
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-23 18:45:02 +03:00
Vadim Pisarevsky
4001e310f5
improved performance of v_load_deinterleave(8uC3) & v_store_interleave(8uC3) intrinsics when using SSSE3 instructions.
2018-04-23 18:06:06 +03:00
Alexander Alekhin
e82af627ed
Merge pull request #11376 from alalek:cv_error_set_terminate
2018-04-23 14:51:55 +00:00
Vitaly Tuzov
44848d3241
MSMF-based CameraCapture reworked to use SourceReader
2018-04-23 17:04:54 +03:00
Vitaly Tuzov
65c46d0cc6
Removed WINRT related code
2018-04-23 17:04:53 +03:00
Alexander Alekhin
4cbec82ac1
build: unreachable code after CV_Error()
2018-04-23 15:45:57 +03:00
Alexander Alekhin
10c9227136
core: CV_Error with set_terminate() on Windows
...
To dump contents of the last OpenCV error
2018-04-23 15:09:41 +03:00
Maksim Shabunin
5309832308
VideoIO: prettier test console output, gstreamer capture backend changed to C++ interface
2018-04-23 13:21:37 +03:00
Alexander Alekhin
65726e4244
core(hal): improve v_select() SSE4.1+
...
v_select 'mask' is restricted to these values only: 0 or ~0 (0xff/0xffff/etc)
mask in accuracy test is updated.
2018-04-23 13:17:53 +03:00
Vadim Pisarevsky
9615f8c994
Merge pull request #11358 from mshabunin:enable-xine
2018-04-23 10:09:29 +00:00
Vadim Pisarevsky
b8a6bfb54e
Merge pull request #11350 from alalek:fix_11348
2018-04-23 10:08:10 +00:00
Vadim Pisarevsky
a312380367
Merge pull request #11357 from alalek:disable_errors_dump
2018-04-23 10:06:43 +00:00
Alexander Alekhin
29b4fd2774
Merge pull request #11351 from dkurt:dnn_enable_inf_engine_tests
2018-04-23 09:16:39 +00:00
Alexander Alekhin
f659f80c7f
Merge pull request #11374 from lupustr3:pvlasov/morph_big_fix
2018-04-23 09:14:23 +00:00
Pavel Vlasov
a42789f330
IPP morphology with big images hotfix.
2018-04-23 10:50:20 +03:00
berak
d89fb163c6
core: add a check for empty input in inRange()
2018-04-21 12:54:52 +02:00
Alexander Alekhin
7b36e57551
Merge pull request #11362 from dkurt:dnn_keras_deconv
2018-04-20 16:53:38 +00:00
Ryan Wong
6f675ae75b
Merge pull request #11304 from kinchungwong:issue_11242_intrin_cv34x_nocpp11
...
* Issue 11242 intrinsics v_extract, v_rotate improvement, branch 3.4, without C++11 (remove type restrictions for SSE2, use PALIGNR on SSSE3, compile to no-op when imm is 0 or nlanes).
* fix whitespace
* Fix #11242 (NEON intrinsics v_rotate...) branch 3.4
Separate macro expansion OPENCV_HAL_IMPL_NEON_SHIFT_OP for bitwise shifts for integers, from macro expansion OPENCV_HAL_IMPL_NEON_ROTATE for lane rotations. Bitwise shifts do not apply to floats, but lane-rotations can apply to both.
* fix whitespace
* Fix #11242 compile error (VSX intrinsics v_rotate(a)) branch 3.4 no-c++11
2018-04-20 18:43:47 +03:00
Alexander Alekhin
c8b515ea69
Merge pull request #11315 from tomoaki0705:featureComparePixelCount
2018-04-20 14:50:40 +00:00
Alexander Alekhin
52172e6f92
Merge pull request #11361 from alalek:ocl_use_host_mem_ptr_workaround
2018-04-20 14:49:37 +00:00
Dmitry Kurtaev
d959d7b9f0
Fuse deconvolution layer subgraphs from Keras
2018-04-20 16:51:38 +03:00
Simon Que
705464258e
Merge pull request #11353 from eecsninja:3.4
...
* Fix CV_Asserts with negation of strings
{!"string"} causes some compilers to throw a warning.
The value of the string is not that important -- it's only for printing
the assertion message.
Replace these calls with:
CV_Error(Error::StsError, "string")
to suppress the warning.
* remove unnecessary 'break' after CV_Error()
2018-04-20 15:31:47 +03:00
Maksim Shabunin
a9bdf75c5b
videoio: refactored XINE backend
2018-04-20 15:20:46 +03:00
Alexander Alekhin
d76b41b50e
ocl: CL_MEM_USE_HOST_PTR workaround test
2018-04-20 14:58:42 +03:00
Alexander Alekhin
2f9cbc2e57
core: disable errors dump
...
Error messages are available via exceptions
2018-04-20 12:33:20 +03:00
Dmitry Kurtaev
bd77d100e1
Enable some tests for clDNN plugin from Intel's Inference Engine
2018-04-20 10:47:46 +03:00
Alexander Alekhin
12e8e33144
build: enable -Wimplicit-fallthrough warning for OpenCV modules
2018-04-19 19:54:03 +03:00
Alexander Alekhin
21026bf7cd
python: fix support of UI callbacks
2018-04-19 18:42:01 +03:00
Alexander Alekhin
647eb243ae
core: CV_Error is marked as 'noreturn'
2018-04-19 18:04:12 +03:00
Vadim Pisarevsky
7ea5029ae5
Grabcut with frozen models ( #11339 )
...
* model is not learned when grabcut is called with GC_EVAL
* fixed test, was writing to wrong file.
* modified patch by Iwan Paolucci; added GC_EVAL_FREEZE_MODEL in addition to GC_EVAL (which semantics is retained)
2018-04-19 15:23:50 +03:00
Vadim Pisarevsky
64a6b12114
Merge pull request #11340 from dkurt:dnn_inf_engine_switch_target
2018-04-19 12:23:15 +00:00
Vadim Pisarevsky
4e31015715
Merge pull request #11341 from alalek:v_min_max_sse41
2018-04-19 12:21:50 +00:00
Alexander Alekhin
ad2127765f
Merge pull request #11309 from K-Shinotsuka:issue41
2018-04-19 10:58:00 +00:00
Tomoaki Teshima
98d9369a38
add new comparison to tolerate with rounding error
...
* restore resize of carotene
* clean up the source code
* remove unused member function (Near)
* add strict test on the border
2018-04-19 17:31:42 +09:00
Dmitry Kurtaev
3b4a292ca9
Let switch CPU/OpenCL targets for models from Intel's Model Optimizer
2018-04-19 10:23:57 +03:00
Alexander Alekhin
fa3cb03f62
core(hal): v_min()/v_max() use SSE4.1 intrinsics
2018-04-18 19:43:20 +03:00
Alexander Alekhin
0477284b0a
Merge pull request #11338 from alalek:fix_fp16_with_disabled_optimizations
2018-04-18 13:34:34 +00:00
Vadim Pisarevsky
b290bdafb9
Merge pull request #11322 from dkurt:dnn_yolov3
2018-04-18 12:11:13 +00:00
Alexander Alekhin
97882d03cc
core: fix FP16 conversion with CV_DISABLE_OPTIMIZATION option
...
Reproducer:
cmake -DCPU_BASELINE=AVX2 -DCV_DISABLE_OPTIMIZATION=ON ...
2018-04-18 14:13:03 +03:00
Alexander Alekhin
28d4157ea7
Merge pull request #11331 from dkurt:fix_11318
2018-04-17 16:41:29 +00:00
Dmitry Kurtaev
66ce8cd7ea
Fix bugs found by valgrind
2018-04-17 17:53:51 +03:00
Vadim Pisarevsky
b8b7ca7302
Rewite polar transforms ( #11323 )
...
* Rewrite polar transformations
- A new wrapPolar function encapsulate both linear and semi-log remap
- Destination size is a parameter or calculated automatically to keep objects size between remapping
- linearPolar and logPolar has been deprecated
* Fix build warning and error in accuracy test
* Fix function name to warpPolar
* Explicitly specify the mapping mode, so we retain all the parameters as non-optional.
Introduces WarpPolarMode enum to specify the mapping mode in flags
* resolves performance warning on windows build
* removed duplicated logPolar and linearPolar implementations
2018-04-17 15:50:52 +03:00
k-shinotsuka
b3755ae670
add universal intrinsics for RGB2HLS_f
2018-04-17 19:37:36 +09:00
Dmitry Kurtaev
97fec07d96
Support YOLOv3 model from Darknet
2018-04-16 18:44:12 +03:00
Alexander Alekhin
e0fef2bca1
Merge pull request #11319 from alalek:issue_11293
2018-04-16 15:39:22 +00:00
Alexander Alekhin
ee90a6cbde
dnn(test): update error tolerance for RCNN/RFCN tests
2018-04-16 14:24:41 +03:00
Alexander Alekhin
59b413c8a1
imgproc(ipp): disable parallel GaussianBlur
2018-04-16 13:31:52 +03:00
Alexander Alekhin
4b2d1aaeea
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-16 12:41:47 +03:00
Alexander Alekhin
225c75e4a1
Merge pull request #11306 from alalek:opencl_trace_messages
2018-04-14 11:36:19 +00:00
Alexander Alekhin
7e5581cd86
Merge pull request #11286 from sturkmen72:update_rectangle
2018-04-13 13:38:50 +00:00
Alexander Alekhin
cfaca4327b
Merge pull request #11169 from tomoaki0705:universalRemap
2018-04-13 13:24:06 +00:00
Alexander Alekhin
a2d6ee2d31
Merge pull request #11305 from tomoaki0705:typoNVIDIA
2018-04-13 12:56:42 +00:00
Tomoaki Teshima
a82e70cd40
remove raw SSE2/NEON implementation from imgwarp.cpp
...
* use universal intrinsic instead of raw intrinsic
* add 2 channels de-interleave on x86 platform
* add v_int32x4 version of v_muladd
* add accumulate version of v_dotprod based on the commit from seiko2plus on bf1852d
* remove some verify check in performance test
* avoid the out of boundary access and keep the performance
2018-04-13 21:19:16 +09:00
Alexander Alekhin
670ef403b0
ocl: improve trace messages of OpenCL calls
2018-04-13 14:54:27 +03:00
Alexander Alekhin
46d85fb558
Merge pull request #11302 from dkurt:dnn_inf_engine_extra_layers
2018-04-13 11:49:38 +00:00
Tomoaki Teshima
a40354d16f
use correct name for NVIDIA
...
* remove NVidia and Nvidia
* replace Cuda with CUDA
* keep the letters for API
2018-04-13 20:33:19 +09:00
Dmitry Kurtaev
b92c3182ab
Blank and L2-normalization layers from Intel's Inference Engine
2018-04-12 15:21:08 +03:00
Suleyman TURKMEN
8b6a6d4546
Update the function rectangle
2018-04-12 14:55:04 +03:00
Alexander Alekhin
2129db6e91
Merge pull request #11297 from seiko2plus:VSXImprovements_1
2018-04-12 10:57:39 +00:00
Sayed Adel
56ec10bfa2
core:ppc Several improvements on VSX(1)
...
* remove unnecessary defines from vsx_utils
* fix v_load_expand, load lower 64bit
* use vec_ld, vec_st with alignment load/store on all types except 64bit
* map v_extract to v_rotate_right
* update license header
* enable VSX by default on clang since #11167
2018-04-11 19:21:22 +00:00
Vadim Pisarevsky
0b9d075958
Merge pull request #11295 from dkurt:dnn_repeated_conv_params
2018-04-11 15:25:24 +00:00
Vadim Pisarevsky
59221296c0
Merge pull request #10978 from alalek:cv_check_macros
2018-04-11 15:17:27 +00:00
Vadim Pisarevsky
533bb89800
Merge pull request #11236 from dkurt:dnn_fuse_l2_norm
2018-04-11 15:09:55 +00:00
Vitaly Tuzov
c80a168d9d
Updated warpAffine test to ensure bit-exactness for CV_8U ( #10921 )
...
* Updated warpAffine test to ensure bit-exactness for CV_8U
* Updated invertAffineTransform to bit-exact evaluation
2018-04-11 18:08:29 +03:00
Vitaly Tuzov
62cf71002e
Bit-exact GaussianBlur performance update ( #10898 )
...
* Added custom implementation for NxN bit-exact GaussianBlur
* Reworked fixedpoint interface a bit
* Reworked horizontal line estimation for bit-exact GaussianBlur
* Reworked vertical line estimation for bit-exact GaussianBlur
* Updated range estimation for vectorized part of bit-exact GaussianBlur evaluation
2018-04-11 18:07:48 +03:00
Vadim Pisarevsky
30175594e9
Merge pull request #11062 from dkurt:dnn_inf_engine_cldnn
2018-04-11 15:06:18 +00:00
Dmitry Kurtaev
512632e574
Parse repeated values of ConvolutionParameter
2018-04-11 14:38:05 +03:00
Dmitry Kurtaev
4ef6c91583
Fix multiple inputs for models from Intel's Model Optimizer
2018-04-11 13:28:07 +03:00
Tomoaki Teshima
779a42678d
fix CUDA build crash
...
* add --std=c++11 flag to nvcc definition
* remove not used abs functions
2018-04-11 17:19:09 +09:00
Alexander Alekhin
c917be2189
next(core): use C++11 classes for cv::Mutex/cv::AutoLock
2018-04-10 18:09:54 +03:00
Alexander Alekhin
c6aa97c9aa
next(android): java3 -> java4
2018-04-10 18:09:54 +03:00
Alexander Alekhin
250941bd47
next: drop WITH_CSTRIPES
2018-04-10 18:09:54 +03:00
Alexander Alekhin
5b17a60dde
next: drop HAVE_TEGRA_OPTIMIZATION/TADP
2018-04-10 18:09:54 +03:00
Alexander Alekhin
ca922443db
next(calib3d): eliminate CirclesGridFinderParameters2
2018-04-10 18:09:54 +03:00
Alexander Alekhin
2385a5870e
next(ml): eliminate dummy interface class ANN_MLP_ANNEAL
2018-04-10 18:09:54 +03:00
Alexander Alekhin
e567135ed3
next: force C++11 features unconditionally: CV_CXX_MOVE_SEMANTICS/CV_CXX_STD_ARRAY
2018-04-10 18:09:54 +03:00
Alexander Alekhin
98c8584b88
next: drop CV_CXX11 conditions
...
define itself is still here for compatibility
2018-04-10 18:09:54 +03:00
Alexander Alekhin
2b2fa58f97
next: drop DISABLE_OPENCV_24_COMPATIBILITY
2018-04-10 18:09:53 +03:00
Alexander Alekhin
2d54fed3cc
next: OPENCV_ABI_COMPATIBILITY
...
drop change:
template<typename _Tp2> operator Vec<_Tp2, 3>() const;
because it break builds due ambiguous errors
2018-04-10 18:09:53 +03:00
Alexander Alekhin
964a4d75b4
next: version.hpp
2018-04-10 18:09:53 +03:00
Alexander Alekhin
070ec313f2
Merge pull request #11282 from alalek:fix_msvs_build_issues
2018-04-10 14:36:51 +00:00
Alexander Alekhin
d2d9fd6945
build: fix MSVS build problems
...
with 'CL=/permissive-'
2018-04-10 14:50:56 +03:00
Alexander Alekhin
fa4b9e80e2
Merge pull request #11275 from alalek:issue_11274
2018-04-10 11:28:21 +00:00
Dmitry Kurtaev
1ba72ca0d3
Fuse tf.nn.l2_normalize layer
2018-04-10 10:12:44 +03:00
shimat
68db42e9be
fix LSD test (wrong detector kind)
2018-04-10 11:38:35 +09:00
Alexander Alekhin
567ae61e78
core: add "check" macros
2018-04-09 21:24:02 +03:00
Alexander Alekhin
86488ac1bc
Merge pull request #11130 from allnes:gst_test_pipeline
2018-04-09 18:21:11 +00:00
Alexander Nesterov
c0d6f3d23e
Added tests for gstreamer pipeline
2018-04-10 02:33:26 +03:00
Alexander Alekhin
b76ce0e0a4
Merge pull request #11253 from mshabunin:decrease-tbb-dependency
2018-04-09 16:03:34 +00:00
Alexander Alekhin
b82bec88d9
Merge pull request #11271 from alalek:tbb_build_warning
2018-04-09 15:53:26 +00:00
Alexander Alekhin
7dc162cb42
core: fix mm_pause() for non-SSE i386 builds
...
replaced to safe binary compatible 'rep; nop' asm instruction
2018-04-09 18:37:35 +03:00
Vadim Pisarevsky
474a23bda5
Merge pull request #11170 from alalek:test_fixed_type
2018-04-09 14:53:43 +00:00
tlanclos
a2c7afad77
V4L Buffer: Support CV_CAP_PROP_BUFFERSIZE in cap_v4l ( #11047 )
2018-04-09 17:34:00 +03:00
shimat
e172935658
LSD: support vector<Vec4i> lines ( #11042 )
...
* add LSD supportsVec4iResult
* LineSegmentDetector.drawSegments: support vector<Vec4i>
* test_lsd.cpp: replace detect()
* test_lsd.cpp: add compareSegments tests
* lsd.cpp: LSD.compareSegments support Vec4i
* test_lsd.cpp: fix trailing whitespace
2018-04-09 17:31:56 +03:00
Dmitry Kurtaev
709cf5d038
OpenCL GPU target for Inference Engine deep learning backend
...
Enable FP16 GPU target for DL Inference Engine backend.
2018-04-09 17:21:35 +03:00
Vadim Pisarevsky
72cb06abf0
Merge pull request #11231 from saskatchewancatch:tiff-dpi-feature
2018-04-09 13:28:08 +00:00
Vadim Pisarevsky
fa5a6bfa02
Merge pull request #11251 from mshabunin:add-runtime-version
2018-04-09 13:24:29 +00:00
Vladislav Sovrasov
0d9c63744e
Add CPU default extensions loading in IE dnn backend ( #11252 )
...
* Add CPU default extensions loading in IE dnn backend
* Load cpu_extensions for the future Intel's Inference Engine
2018-04-09 16:22:19 +03:00
Vadim Pisarevsky
20334e3f09
Merge pull request #11264 from K-Shinotsuka:issue39
2018-04-09 13:20:48 +00:00
Vadim Pisarevsky
19de675a4e
Merge pull request #11270 from alalek:parallel_for_exception_fix_android
2018-04-09 13:18:39 +00:00
Alexander Alekhin
a22ee76b45
imgcodecs: exclude rle8.bmp from GDAL tests
...
GDAL message:
- ERROR 1: The BMP file is probably corrupted or too large. Image width = 480
2018-04-09 13:18:33 +03:00
Alexander Alekhin
854ab48de0
tbb: fix build warnings -Wshadow
2018-04-09 12:58:09 +03:00
Alexander Alekhin
8dacbe7584
android: std::exception_ptr is not available on some platforms (even with enabled C++11)
2018-04-09 12:54:57 +03:00
Vadim Pisarevsky
6a15910f0f
Merge pull request #11208 from terfendail:seamless_1
2018-04-09 09:52:28 +00:00
Vadim Pisarevsky
4617758053
Merge pull request #11247 from lopespt:fix_issue_10506
2018-04-09 09:39:17 +00:00
Vadim Pisarevsky
f0d22dabea
Merge pull request #11254 from terfendail:msmf_sourcereader
2018-04-09 09:34:15 +00:00
Vadim Pisarevsky
26a8ab5719
Merge pull request #11262 from alalek:fix_houghCircles_sync
2018-04-09 09:32:37 +00:00
Maksim Shabunin
d2cff38db6
Added interface to check library version during runtime
2018-04-09 12:30:39 +03:00
Alexander Alekhin
3c936ddcf9
Merge pull request #11259 from dkurt:fix_10965
2018-04-09 08:39:41 +00:00
Alexander Alekhin
47e476c9cd
Merge pull request #11217 from dan-masek:fix_issue_11206
2018-04-08 15:12:12 +00:00
Alexander Alekhin
814b78dad8
Merge pull request #11230 from tkonolige:master
2018-04-08 15:11:17 +00:00
k-shinotsuka
fbdcc0e8e4
add universal intrinsics for HSV2RGB_f
2018-04-08 01:47:22 +09:00
Alexander Alekhin
15837b43ca
imgproc: don't call .unlock() on non-holded mutex in houghCircles()
2018-04-07 13:00:17 +00:00
Dmitry Kurtaev
73ca194313
Fix convertFp16 in JavaScript build
2018-04-07 09:44:43 +03:00
Alexander Alekhin
23d866ad40
Merge pull request #11237 from alalek:cuda_refactor_memorypool
2018-04-06 15:37:37 +00:00
Vitaly Tuzov
24bd44f088
MSMF-based VideoCapture reworked to use SourceReader
2018-04-06 17:39:56 +03:00
Maksim Shabunin
b88609a921
Reduced direct TBB dependencies
2018-04-06 14:21:15 +03:00
lopespt
c17ce1a0af
Solves issue #10506
2018-04-05 20:25:32 -03:00
Alexander Alekhin
875b4e212a
Merge pull request #11200 from alalek:android_refactor_sdk_detection
2018-04-05 20:44:59 +00:00
Alexander Alekhin
a87a5dfdb3
Merge pull request #11192 from terfendail:setto_fix
2018-04-05 20:25:34 +00:00
Alexander Alekhin
e20fb7f429
Merge pull request #11197 from alalek:parallel_propagate_exception
2018-04-05 20:24:22 +00:00
Alexander Alekhin
e27ae6483a
Merge pull request #11221 from dkurt:dnn_fix_proposal_layer
2018-04-05 20:23:49 +00:00
Alexander Alekhin
6abfc6761e
android: refactor Android SDK detection
...
- properly detect Android SDK support of Ant/Gradle projects
- divide processing of And/Gradle based projects
2018-04-05 19:19:31 +00:00
Alexander Alekhin
7818071ba2
cuda: eliminate part of build warnings
2018-04-05 17:53:22 +03:00
Alexander Alekhin
82ba3ac894
cuda: refactor MemoryPool
...
- make non-copyable (aligns inner mutex semantic to std::mutex)
- getMemoryPool() returns reference instead of pointer (NULL is not expected here)
2018-04-05 16:04:37 +03:00
Alexander Alekhin
f93c1b942a
Merge pull request #11222 from lopespt:add_binary_search_knearest
2018-04-05 11:00:00 +00:00
Vitaly Tuzov
628f04ae96
Merge pull request #11092 from terfendail:msmf_videocapture
...
Update for MSMF-based VideoCapture and VideoWriter (#11092 )
* MSMF based VideoCapture updated to handle video stream formats different from RGB24
* MSMF based VideoWriter updated to handle video frame top-bottom line ordering regardless of output format
* Fixed race condition in MSMF based VideoCapture
* Refactored MSMF based VideoCapture and VideoWriter
* Disabled frame rate estimation for MP43
* Removed test for unsupported avi container from MSMF VideoWriter tests
* Enabled MSMF-based VideoIO by default
2018-04-05 13:55:42 +03:00
Alexander Alekhin
c2fb4debc5
Merge pull request #11224 from alalek:fix_core_min_avx2
2018-04-05 10:37:31 +00:00
Alexander Alekhin
8f7e7cd343
Merge pull request #11071 from alalek:issue_11061_fix_error_message
2018-04-05 10:15:04 +00:00
Rajkiran Natarajan
4668836071
Support for setting TIFF DPI info in imwrite
2018-04-04 21:20:16 -07:00
Tristan Konolige
9d589379ec
don't reset camera in setViewerPose
2018-04-04 13:00:50 -06:00
Alexander Alekhin
d294e9d62a
Merge pull request #11216 from dan-masek:fix_issue_11205
2018-04-04 15:37:57 +00:00
yuki takehara
d57e5c31c0
Merge pull request #11214 from take1014:core_9720
...
* fix #9720
* Add regression test
* Fix calculation method for scale
2018-04-04 18:36:02 +03:00
Alexander Alekhin
45a69ebec8
core: fix AVX2 min implementation
2018-04-04 17:38:58 +03:00
Vitaly Tuzov
eb2c9f1519
Fixed mask reduction in seamless_clone
2018-04-04 16:33:28 +03:00
Vitaly Tuzov
ccd16f107d
Fixed IPP based implementation of setTo() for infinity value
2018-04-04 16:05:22 +03:00
lopespt
65d816c3b5
Adds efficient sort algorithm to KNearest
2018-04-04 09:35:58 -03:00
Dmitry Kurtaev
ef1aaf12c9
Fix Proposal deep learning layer
2018-04-04 14:48:29 +03:00
Alexander Alekhin
7bc980edaf
Merge pull request #10983 from dkurt:dnn_face_detection_uint8
2018-04-03 18:19:43 +00:00
Dan Mašek
8c1d8eccdd
Merge pull request #11207 from dan-masek:add_redirect_error
...
* Add Python support for error message handlers.
* Move the static variable to the only function that uses it.
* Remove the optional param (user data), since this can already be handled by closures.
* Correct the help string.
* python: added redirectError test
2018-04-03 21:16:34 +03:00
Alexander Alekhin
f95e91e2bc
Merge pull request #11199 from dkurt:update_torch_testdata
2018-04-03 18:02:58 +00:00
Dan Mašek
f6e299b58b
Fix #11206
2018-04-03 03:24:49 +02:00
Dan Mašek
eae3ed0c08
Fix a leak described in issue #11205
2018-04-03 03:02:21 +02:00
Dmitry Kurtaev
8d8f3bca6f
Update links to OpenCV's face detection network
2018-04-02 13:02:56 +03:00
Arkadiusz Raj
619e4c94d5
Protection to not run Eth config when USB camera is connected
2018-04-01 15:37:10 +02:00
Dmitry Kurtaev
818a91f4f7
Update Torch testdata
2018-03-31 12:04:44 +03:00
Dmitry Kurtaev
598039c0ed
Fix embedded Torch's nn.ConcatTable
2018-03-31 11:11:10 +03:00
Alexander Alekhin
dbcb454917
Merge pull request #11195 from alalek:fix_qt_build
2018-03-30 14:52:11 +00:00
Alexander Alekhin
6f69800d0c
core: propagate parallel_for() exceptions
2018-03-30 16:24:31 +03:00
Alexander Alekhin
e8a67de0d2
Merge pull request #11182 from dkurt:fix_11102_part_2
2018-03-30 13:11:01 +00:00
Alexander Alekhin
82fd00af99
fix build issues with QT/OpenGL
2018-03-30 12:49:09 +03:00
Vadim Pisarevsky
8fce25d788
Merge pull request #11187 from alalek:respect_threading_settings
2018-03-30 09:39:04 +00:00
Alexander Alekhin
2fb4812f6d
Merge pull request #11194 from ltqusst:fix_10557
2018-03-30 09:30:43 +00:00
ltqusst
0d646490f5
Fix #10557
...
Fix overflow bugs in conversion from NV12 VA-surface/D3D11texture2D to OpenCL UMat
2018-03-30 16:32:15 +08:00
catree
a885480c9e
Remove temporary file used for test.
2018-03-29 18:34:30 +02:00
Alexander Alekhin
1b7aa92eb6
Merge pull request #11188 from mshabunin:fix-clang-warnings
2018-03-29 14:34:30 +00:00
Alexander Alekhin
8c4b5b6a70
core(test): parallel_for test with exception
2018-03-29 16:59:51 +03:00
Alexander Alekhin
177be2adda
Merge pull request #11174 from corleypc:master
2018-03-29 13:50:44 +00:00
RAJKIRAN NATARAJAN
6d83a80385
Merge pull request #11176 from saskatchewancatch:issue-11165
...
* fix cv::imwrite to allow cv::UMat and vectors of it to be written
* cv::imwrite failure handling improvements
* Unit test for regression testing imwrite support for and fix whitespace
2018-03-29 16:47:31 +03:00
Maksim Shabunin
439072a2a6
Fixed two warnings produced by clang
2018-03-29 13:24:04 +03:00
Alexander Alekhin
7f63b31ca8
avoid calling of setNumThreads() to respect user settings
2018-03-29 13:04:26 +03:00
Alexander Alekhin
87498bc6d4
cmake: workaround CPATH ipp_iw issue
...
CPATH entries are processed before any -isystem:
https://gcc.gnu.org/onlinedocs/cpp/Environment-Variables.html
2018-03-28 18:43:28 +03:00
Alexander Alekhin
8a0cc5009e
build: eliminate MSVC warning
2018-03-28 18:43:28 +03:00
Alexander Alekhin
25be4186bc
python: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:28 +03:00
Alexander Alekhin
6c8014e7d1
cmake: disable checks for protobuf generated files
2018-03-28 18:43:28 +03:00
Alexander Alekhin
d7e9201434
misc: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:28 +03:00
Alexander Alekhin
2bd4f2c3a6
videostab: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:28 +03:00
Alexander Alekhin
a8eb3e1b29
superres: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
4a0fa57614
shape: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
4df4a37b11
flann: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
1ca7ae9630
video: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
e741b71dac
photo: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
225bae1387
stitching: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
4d0dd3e509
ml: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
3314966acb
objdetect: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
1060c0f439
dnn: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
Alexander Alekhin
bdbd0129af
calib3d: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
Alexander Alekhin
0854dc3320
features2d: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
Alexander Alekhin
8f0669c300
videoio: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
Alexander Alekhin
a91953b15c
imgcodecs: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
Alexander Alekhin
5d36ee2fe7
imgproc: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
Alexander Alekhin
9111538bfb
core: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
Alexander Alekhin
0587f92d96
cmake: disable override warnings in 3rdparty code and viz
2018-03-28 17:57:59 +03:00
Alexander Alekhin
773877cd12
ts: apply CV_OVERRIDE/CV_FINAL
...
- disable "-Wsuggest-override" in tests
2018-03-28 17:57:59 +03:00
Alexander Alekhin
84980741a8
core: add CV_OVERRIDE/CV_FINAL macros
2018-03-28 17:57:58 +03:00
Alexander Alekhin
167034fb04
Merge pull request #11098 from dkurt:dnn_native_inf_engine
2018-03-28 14:52:08 +00:00
Dmitry Kurtaev
e039fc3a63
Replace protobuf's ReleaseLast to RemoveLast to deallocate memory.
...
Change an order of PriorBox layer operations.
2018-03-28 17:27:36 +03:00
Alexander Alekhin
9badb0d903
[move sift.cpp] xfeatures2d: apply CV_OVERRIDE/CV_FINAL
...
original commit: ec65e5b29c
2018-03-28 16:50:00 +03:00
Dmitry Kurtaev
2f3a9ba1d4
Update OpenCVDetectInferenceEngine.cmake
2018-03-28 16:34:37 +03:00
Vadim Pisarevsky
1097d0e810
Merge pull request #11072 from alalek:explicit_autobuffer
2018-03-28 12:57:25 +00:00
Vadim Pisarevsky
284e5231c5
Merge pull request #11171 from codingforfun:fix_11143
2018-03-28 12:47:37 +00:00
Vadim Pisarevsky
6b041c8aeb
Merge pull request #11137 from alalek:core_fix_mat_ctor
2018-03-28 12:39:49 +00:00
Alexander Alekhin
8388b630ac
Merge pull request #11167 from alalek:cmake_compiler_vars
2018-03-28 12:38:31 +00:00
LaurentBerger
03eb463f1c
Solves #11156 ( #11160 )
...
* Solves #11156
* Check file size for all file format. Disable APPEND if file is empty
* Add test for APPEND mode
2018-03-28 15:35:38 +03:00
Alexander Alekhin
75b5e3fa64
Merge pull request #11175 from collenjones:hotfix/coreLinkFix
2018-03-28 12:21:11 +00:00
Tomoaki Teshima
c14578649d
fix build error on Jetson
2018-03-28 18:21:53 +09:00
Collen Jones
687ccdf8db
Fix link to Hershey fonts
2018-03-27 20:11:48 -07:00
corley
a4b9ce764c
Fixed silent failures in getting and setting properties
2018-03-28 00:05:54 +03:00
Alexander Alekhin
7d8f1dde26
core(persistence): disable checks for base64 streams
2018-03-27 17:02:04 +03:00
codingforfun
24e2e0d3f9
#11143 [FIX] Normalize node risk with sample weight sum
...
In case of regression trees, node risk is computed as sum of squared
error. To get a meaningfull value to compare with it needs to be
normalized to the number of samples in the node (or more generally to
the sum of sample weights in this node). Otherwise the sum of squared
error is highly dependend on the number of samples in the node and
comparision with `regressionAccuracy` parameter is not very meaningful.
After normalization `node_risk` means in fact sample variance for all
samples in the node, which makes much more sence and seams to be what
was originaly intended by the code given that node risk is later used as
a split termination criteria by
```
sqrt(node.node_risk) < params.getRegressionAccuracy()
```
2018-03-27 15:39:36 +02:00
Alexander Alekhin
017c217bb0
Merge pull request #11162 from kinchungwong:master
2018-03-27 13:27:43 +00:00
Alexander Alekhin
f4c4b01455
core: added checks and "fixit" items for persistence parsers
...
To raise errors with proper messages of the problems.
2018-03-27 16:19:43 +03:00
Alexander Alekhin
08941b7890
cmake: avoid amending of CMAKE_COMPILER_IS_[GNUCXX|CLANGCXX|CCACHE] vars
...
- Recommended compiler checks:
- GCC: CV_GCC
- Clang: CV_CLANG
- fixed problem with CMAKE_CXX_COMPILER_ID=Clang/AppleClang mess on MacOSX
Details: cmake --help-policy CMP0025
- do not declare Clang as GCC compiler
2018-03-27 16:16:59 +03:00
Alexander Alekhin
7ee217285b
Merge pull request #11089 from terfendail:stereocalibrate_f32
2018-03-27 13:08:06 +00:00
Alexander Alekhin
9e0dee1259
Merge pull request #11112 from alalek:cmake_src_include_fix
2018-03-27 13:06:48 +00:00
Alexander Alekhin
d1311518a3
core: test-sample for FIXED_TYPE demonstration
...
with implementation of functions with multiple output formats
2018-03-27 15:41:41 +03:00
Vadim Pisarevsky
6e13ffe162
Merge pull request #11159 from alalek:samples_avoid_legacy_api
2018-03-27 10:05:35 +00:00
corley
f441515357
Fixed a couple of memory leaks in videoInput::getDevice() when multiple devices are present in the system
2018-03-27 00:54:48 +03:00
kinchungwong
333e53eee8
Minor improvement to SSE code in HOGDescriptor::computeGradient, replace emulation of _mm_mullo_epi32 with constant multiplicand 3 with two _mm_add_epi32. OpenCV issue #11161
2018-03-26 09:24:03 -07:00
Alexander Alekhin
7f9253ea0a
samples: avoid using of legacy C-like API
...
- CV_RGB() macro is moved into opencv2/imgproc.hpp from imgproc_c.h
- samples/cpp/filestorage_base64.cpp is dropped
2018-03-26 13:42:35 +03:00
Alexander Alekhin
24acbecd33
Merge pull request #11151 from AndreiCostinescu:patch-1
2018-03-26 10:22:38 +00:00
Dmitry Kurtaev
7972f47ed4
Load networks from intermediate representation of Intel's Deep learning deployment toolkit.
2018-03-26 07:24:21 +03:00
Namgoo Lee
a8f86af633
Update GpuMat, GpuMat::download, GpuMat::upload documentation
2018-03-26 10:59:05 +09:00
Andrei Costinescu
38d73123c1
#include <math.h> in cv2.cpp
...
My build fails with the error:
"C:/PROGRA~1/MINGW-~1/X86_64~1.0-P/mingw64/lib/gcc/x86_64-w64-mingw32/7.2.0/include/c++/cmath:1136:11: error: '::hypot' has not been declared".
I have tried to fix it by adding "#include <cmath>" before the line "#include <Python.h>" but then the build has failed with the error:
"C:/PROGRA~1/MINGW-~1/X86_64~1.0-P/mingw64/lib/gcc/x86_64-w64-mingw32/7.2.0/include/c++/math.h:91:12:: error: 'std::_hypot' has not been declared".
Adding "#include <math.h>" allowed me to build opencv.
2018-03-25 20:39:29 +02:00
Alexander Alekhin
e06d1e8083
Merge pull request #11141 from dkurt:dnn_no_aspect_ratios
2018-03-24 20:38:55 +00:00
Anthony Wertz
c6cf7f8080
Sets a higher limit on videoio's AVI container's maximum chunk size, and adds an explanation of the assertion. Closes #11126
2018-03-23 12:03:46 -04:00
Alexander Alekhin
cd4b748b44
Merge pull request #11064 from tomoaki0705:fixCudaStreamAsync
2018-03-23 13:04:18 +00:00
Dmitry Kurtaev
e8fe6ee4e3
Fix prior box generation in case of squared proposals.
...
Fix batch norm in training phase.
2018-03-23 09:44:59 +03:00
Alexander Alekhin
4378e8fcc0
core: fix cv::Mat constructor
2018-03-22 15:35:54 +03:00
Tomoaki Teshima
06babf90a5
let the test OCL_ImgprocWarp/Resize.Mat pass on ARM/Aarch64
...
* disable carotenete when calling resize on ARM/Aarch64
* loosen eps on Aarch64
2018-03-22 21:35:34 +09:00
Tomoaki Teshima
f4e5d777e8
follow histogram
2018-03-22 21:33:51 +09:00