Alexander Alekhin
4635356435
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-13 20:00:54 +00:00
Alexander Alekhin
a0a1fb5fec
python: discover tests from module/misc/python/test paths
2019-04-10 18:35:35 +00:00
Alexander Alekhin
785a540ebd
Merge pull request #14175 from paroj:copyto
2019-04-02 16:18:00 +00:00
Pavel Rojtberg
62775660d1
core: python - test cv::copyTo with pre-allocated dst
2019-03-29 13:56:26 +01: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
470dfba96c
python: update CMake install rules
2019-03-15 13:11:00 +03:00
Alexander Alekhin
6e2ede8c56
pre: OpenCV 4.1.0 (version++)
2019-03-12 13:01:44 +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 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
c3cf35ab63
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-26 17:34:42 +03: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
Alexander Alekhin
dfef04b325
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-12 17:54:40 +03:00
Pavel Rojtberg
f0ef4b2246
python: sys.path[0] is reserved for the main script
2019-02-08 17:24:31 +01:00
Alexander Alekhin
c9ad5779f2
release: OpenCV 4.0.1 (version++)
2018-12-22 07:03:30 +00: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
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
bb8c19aad3
cmake: fix python install paths
2018-12-17 14:32:29 +03: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
Alexander Alekhin
8f4e5c2fb8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-26 15:37:45 +03: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
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
b321851e53
Merge pull request #12977 from alalek:python_package
2018-11-16 22:45:33 +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
2fa9bd221d
core: add utils::findDataFile() / samples::findFile()
2018-11-16 00:25:06 +00:00
Alexander Alekhin
96c71dd3d2
dnn: reduce set of ignored warnings
2018-11-15 13:15:59 +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
cfb02b5370
shape: move sample to opencv_contrib
2018-11-06 16:52:17 +03:00
Alexander Alekhin
687fa6a8ca
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-02 05:33:35 +00:00
LaurentBerger
936523ae52
Add python test for copyto with mask
2018-10-30 13:25:38 +01:00
Diego Barrios Romero
7a884ab6a5
Fix closing input file
2018-10-29 13:05:46 +01: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
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
f731515628
cmake: fix Python detection for standalone bindings
2018-10-10 22:59:42 +03:00
Alexander Alekhin
404893810c
cmake: fix Python detection for standalone bindings
2018-10-10 16:58:23 +00:00
Alexander Alekhin
ea92c2b1a6
Merge pull request #12663 from sturkmen72:patch-12
2018-09-29 12:52:27 +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
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
Hamdi Sahloul
e104fcc000
Generate enum bindings automatically
2018-09-28 15:39:51 +09: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
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
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
Dmitry Kurtaev
d259eb28bb
Add python tests for dnn module
2018-09-17 15:22:47 +03:00