berak [Wed, 21 Nov 2018 10:05:24 +0000 (11:05 +0100)]
highgui: restore convertscale semantics in window_w32.cpp
Alexander Alekhin [Sun, 18 Nov 2018 01:36:44 +0000 (01:36 +0000)]
Merge pull request #13195 from alalek:legacy_constants
Alexander Alekhin [Sat, 17 Nov 2018 10:59:23 +0000 (10:59 +0000)]
move legacy C-API constants into separate files
Alexander Alekhin [Sat, 17 Nov 2018 13:50:04 +0000 (13:50 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 17 Nov 2018 13:00:01 +0000 (13:00 +0000)]
Merge tag '3.4.4'
OpenCV 3.4.4
Alexander Alekhin [Thu, 26 Jul 2018 10:16:22 +0000 (13:16 +0300)]
OpenCV version++ (3.4.4)
OpenCV 3.4.4
Alexander Alekhin [Thu, 26 Jul 2018 10:08:08 +0000 (13:08 +0300)]
experimental version++
Alexander Alekhin [Sat, 17 Nov 2018 10:21:37 +0000 (13:21 +0300)]
Merge pull request #13194 from alalek:samples_fix_python_search_win32
Alexander Alekhin [Sat, 17 Nov 2018 10:20:33 +0000 (13:20 +0300)]
Merge pull request #13192 from alalek:fix_valgrind_3.4
berak [Sat, 17 Nov 2018 10:19:42 +0000 (11:19 +0100)]
Merge pull request #13193 from berak:core_copyMakeBorder
Alexander Alekhin [Sat, 17 Nov 2018 09:42:51 +0000 (09:42 +0000)]
samples(run_python): fix registry values querying
Alexander Alekhin [Sat, 17 Nov 2018 07:32:06 +0000 (07:32 +0000)]
core: fix issues from valgrind builder
Alexander Alekhin [Fri, 16 Nov 2018 21:36:15 +0000 (00:36 +0300)]
Merge pull request #13189 from alalek:cmake_options_warnings_update
Alexander Alekhin [Fri, 16 Nov 2018 21:35:05 +0000 (00:35 +0300)]
Merge pull request #13188 from alalek:samples_rename
* samples: rename starter_imagelist.cpp
* samples: rename intelperc_capture.cpp => videocapture_intelperc.cpp
* samples: rename openni_capture.cpp => videocapture_openni.cpp
* samples: rename image_sequence.cpp => videocapture_image_sequence.cpp
* samples: rename gstreamer_pipeline.cpp => videocapture_gstreamer_pipeline.cpp
* samples: rename autofocus.cpp => videocapture_gphoto2_autofocus.cpp
* samples: rename live_detect_qrcode.cpp => qrcode.cpp
Alexander Alekhin [Fri, 16 Nov 2018 20:42:54 +0000 (20:42 +0000)]
Merge pull request #12908 from alexevans:Issue11855
Dmitry Matveev [Fri, 16 Nov 2018 20:38:10 +0000 (23:38 +0300)]
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
Alexander Alekhin [Fri, 16 Nov 2018 20:35:51 +0000 (23:35 +0300)]
Merge pull request #13183 from tomoaki0705:fixCaroteneColorConvert2Gray
Alexander Alekhin [Fri, 16 Nov 2018 20:34:22 +0000 (20:34 +0000)]
Merge pull request #13184 from paroj:imshow_cvtscale
Alexander Alekhin [Fri, 16 Nov 2018 20:23:10 +0000 (20:23 +0000)]
cmake: emit warnings about unsupported options if turned ON only
Christopher Gundler [Fri, 16 Nov 2018 19:50:40 +0000 (20:50 +0100)]
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
Alexander Alekhin [Fri, 16 Nov 2018 19:46:22 +0000 (22:46 +0300)]
Merge pull request #13178 from alalek:fix_samples_python_video_params
Alexander Alekhin [Fri, 16 Nov 2018 19:45:57 +0000 (22:45 +0300)]
Merge pull request #13177 from alalek:update_win32_scripts
Alexander Alekhin [Fri, 16 Nov 2018 19:45:33 +0000 (22:45 +0300)]
Merge pull request #12977 from alalek:python_package
Alexander Alekhin [Fri, 16 Nov 2018 19:40:49 +0000 (22:40 +0300)]
Merge pull request #12354 from alalek:samples_find_file
Alexander Alekhin [Fri, 16 Nov 2018 19:22:43 +0000 (19:22 +0000)]
features2d(test): add crossCheck=true test
Alexander Alekhin [Fri, 16 Nov 2018 18:36:12 +0000 (18:36 +0000)]
Merge pull request #12913 from dkurt:dnn_fix_ie_hyperparams
Alexander Alekhin [Wed, 14 Nov 2018 15:56:21 +0000 (18:56 +0300)]
samples: use findFile() in "python"
Alexander Alekhin [Sun, 11 Nov 2018 13:26:24 +0000 (13:26 +0000)]
samples: use findFile() in T-API samples
Alexander Alekhin [Sun, 11 Nov 2018 13:18:09 +0000 (13:18 +0000)]
samples: use findFile() in dnn
Alexander Alekhin [Wed, 31 Oct 2018 12:48:56 +0000 (15:48 +0300)]
samples: use findFile() in "cpp"
Alexander Alekhin [Fri, 16 Nov 2018 17:20:48 +0000 (17:20 +0000)]
Merge pull request #13151 from paroj:nocapmodes
Pavel Rojtberg [Fri, 16 Nov 2018 15:13:05 +0000 (16:13 +0100)]
highgui: Qt - restore convertscale semantics
broken in
11eafca3e2a4cbc62f1309d25db0ea3ed9a6ea8e
Tomoaki Teshima [Fri, 16 Nov 2018 14:31:01 +0000 (23:31 +0900)]
fix test failure of ColorCvtRGB2Gray
- update parameter in carotene
Alexander Alekhin [Sun, 28 Oct 2018 13:32:27 +0000 (13:32 +0000)]
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
Alexander Alekhin [Fri, 16 Nov 2018 00:47:10 +0000 (00:47 +0000)]
Merge pull request #12965 from terfendail:medianBlur_wintr
Alexander Alekhin [Sun, 12 Mar 2017 04:49:07 +0000 (04:49 +0000)]
core: add utils::findDataFile() / samples::findFile()
Alexander Alekhin [Fri, 16 Nov 2018 00:23:26 +0000 (00:23 +0000)]
samples(python): fix drive handling in source path
Alexander Alekhin [Thu, 15 Nov 2018 22:43:23 +0000 (22:43 +0000)]
samples: update Python launcher (winpack)
Alexander Alekhin [Thu, 15 Nov 2018 21:17:56 +0000 (21:17 +0000)]
samples: update build script (winpack)
- drop EnableDelayedExpansion
Alexander Alekhin [Thu, 15 Nov 2018 21:00:26 +0000 (21:00 +0000)]
win32: update setupvars.cmd
- drop EnableDelayedExpansion
- pause on failed commands (non-interactive mode)
Alexander Alekhin [Thu, 15 Nov 2018 23:10:46 +0000 (23:10 +0000)]
Merge pull request #13168 from alalek:cmake_dnn_warnings
Alexander Alekhin [Thu, 15 Nov 2018 23:10:18 +0000 (02:10 +0300)]
Merge pull request #13175 from paddy74:patch-1
Patrick Cox [Thu, 15 Nov 2018 15:36:04 +0000 (10:36 -0500)]
samples(python): Updated use of model.load instances
The load() function returns a new object, and as such does not use the one it is called on.
This commit updates the uses of model.load in this program so it will work as intended and not throw an error.
Dmitry Kurtaev [Mon, 22 Oct 2018 16:23:50 +0000 (19:23 +0300)]
Extra hyperparameters for Intel's Inference Engine layers
Evgeny Latkin [Thu, 15 Nov 2018 15:14:27 +0000 (18:14 +0300)]
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)
Dmitry Matveev [Thu, 15 Nov 2018 15:12:36 +0000 (18:12 +0300)]
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
Alexander Alekhin [Thu, 15 Nov 2018 12:56:10 +0000 (12:56 +0000)]
Merge pull request #13173 from dkurt:dnn_fix_vulkan_pool
Dmitry Kurtaev [Thu, 15 Nov 2018 11:10:24 +0000 (14:10 +0300)]
Fix Vulkan's max pooling in case of no output indices
Alexander Alekhin [Wed, 14 Nov 2018 20:25:23 +0000 (20:25 +0000)]
dnn: reduce set of ignored warnings
Alexander Alekhin [Wed, 14 Nov 2018 19:41:09 +0000 (19:41 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 14 Nov 2018 19:32:32 +0000 (19:32 +0000)]
Merge pull request #13164 from alalek:ocl_morph
Alexander Alekhin [Wed, 14 Nov 2018 19:02:17 +0000 (19:02 +0000)]
Merge pull request #13166 from catree:fix_batch_norm_layer_missing_intrin
catree [Wed, 14 Nov 2018 18:00:59 +0000 (19:00 +0100)]
Fix code and missing intrin header. Remove useless header.
Alexander Alekhin [Wed, 14 Nov 2018 17:14:30 +0000 (20:14 +0300)]
imgproc(ocl): fix morph generic filter checks
'ksize' is not updated with 'kernel'
Alexander Alekhin [Wed, 14 Nov 2018 15:59:01 +0000 (15:59 +0000)]
Merge pull request #13096 from alalek:gapi_tests_checks
Alexander Alekhin [Wed, 14 Nov 2018 14:22:58 +0000 (14:22 +0000)]
Merge pull request #13153 from savuor:fix/filenodeit_member_ptr
Alexander Alekhin [Wed, 14 Nov 2018 14:18:21 +0000 (14:18 +0000)]
Merge pull request #13160 from dkurt:fix_13159
Alexander Alekhin [Wed, 14 Nov 2018 13:19:30 +0000 (13:19 +0000)]
Merge pull request #13157 from elatkin:el/gapi_perf_sobel_3
Dmitry Kurtaev [Wed, 14 Nov 2018 10:42:06 +0000 (13:42 +0300)]
Fix a bug with OpenVINO backend
Alexander Alekhin [Fri, 9 Nov 2018 11:11:13 +0000 (14:11 +0300)]
gapi(test): more reliable checks
avoid `countNonZero()`, use `norm()`
Alexander Alekhin [Fri, 9 Nov 2018 09:46:39 +0000 (12:46 +0300)]
gapi(test): use relative error check for Norm/Sum tests
Latkin, Yevgeny I [Wed, 14 Nov 2018 07:17:40 +0000 (10:17 +0300)]
GAPI (fluid): Sobel 3x3 optimization: remove needless file
Alexander Alekhin [Tue, 13 Nov 2018 19:05:25 +0000 (22:05 +0300)]
Merge pull request #13152 from ssnover95:docfix/fourier-transform-py-tutorial
ssnover95 [Tue, 13 Nov 2018 15:23:10 +0000 (10:23 -0500)]
doc(tutorial_py_fourier_transform): Correct errors in tutorial for integer division and filter symmetry
Rostislav Vasilikhin [Tue, 13 Nov 2018 17:18:53 +0000 (20:18 +0300)]
removed FileNodeIterator::operator->()
Pavel Rojtberg [Tue, 13 Nov 2018 14:53:35 +0000 (15:53 +0100)]
videoio: drop VideoCaptureModes enum in favour of fourcc
Alexander Alekhin [Tue, 13 Nov 2018 16:18:32 +0000 (16:18 +0000)]
Merge pull request #13150 from dmatveev:update_ade011d
Evgeny Latkin [Tue, 13 Nov 2018 14:48:10 +0000 (17:48 +0300)]
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
Dmitry Matveev [Tue, 13 Nov 2018 13:44:29 +0000 (16:44 +0300)]
Update ADE to version 0.1.1d
Evgeny Latkin [Tue, 13 Nov 2018 12:04:37 +0000 (15:04 +0300)]
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
Alexander Alekhin [Mon, 12 Nov 2018 21:42:02 +0000 (21:42 +0000)]
Merge tag '4.0.0-rc'
OpenCV 4.0.0-rc
Alexander Alekhin [Mon, 12 Nov 2018 09:42:13 +0000 (12:42 +0300)]
release: OpenCV 4.0.0-rc (version++)
Alexander Alekhin [Mon, 12 Nov 2018 19:34:10 +0000 (22:34 +0300)]
Merge pull request #13140 from alalek:opencv3_opencv4
Alexander Alekhin [Mon, 12 Nov 2018 19:33:47 +0000 (22:33 +0300)]
Merge pull request #13124 from alalek:workaround_13121
Alexander Alekhin [Mon, 12 Nov 2018 19:15:00 +0000 (22:15 +0300)]
Merge pull request #13137 from alalek:videoio_v4l_disable_normalization
Alexander Alekhin [Mon, 12 Nov 2018 19:11:40 +0000 (22:11 +0300)]
Merge pull request #13127 from alalek:fix_13114
Alexander Alekhin [Mon, 12 Nov 2018 19:10:49 +0000 (22:10 +0300)]
Merge pull request #13126 from mshabunin:remove_libv4l
Alexander Alekhin [Mon, 12 Nov 2018 19:05:58 +0000 (19:05 +0000)]
build: fix version 3->4
Alexander Alekhin [Mon, 12 Nov 2018 18:53:19 +0000 (18:53 +0000)]
videoio: remove using of HAVE_CAMV4L
Alexander Alekhin [Mon, 12 Nov 2018 10:19:01 +0000 (13:19 +0300)]
stitching(test): workaround ParallelFeaturesFinder.IsSameWithSerial
Maksim Shabunin [Mon, 12 Nov 2018 17:04:33 +0000 (20:04 +0300)]
Repair V4L backend
Alexander Alekhin [Mon, 12 Nov 2018 16:08:07 +0000 (19:08 +0300)]
videoio(v4l): turn off normalization of V4L properties
Alexander Alekhin [Mon, 12 Nov 2018 14:49:04 +0000 (17:49 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 12 Nov 2018 14:46:49 +0000 (17:46 +0300)]
Merge pull request #13123 from dkurt:fs_keys
Alexander Alekhin [Mon, 12 Nov 2018 14:44:12 +0000 (17:44 +0300)]
Merge pull request #13115 from catree:fix_dis_flow_intrin
Alexander Alekhin [Mon, 12 Nov 2018 14:33:14 +0000 (14:33 +0000)]
Merge pull request #13125 from dkurt:fs_keys_test
Alexander Alekhin [Mon, 12 Nov 2018 14:32:51 +0000 (14:32 +0000)]
Merge pull request #13112 from alalek:fix_coverity_reports_3.4
Alexander Alekhin [Mon, 12 Nov 2018 14:32:29 +0000 (14:32 +0000)]
Merge pull request #12983 from allnes:parallel_qrcode_pipeline
Alexander Alekhin [Mon, 12 Nov 2018 14:17:56 +0000 (14:17 +0000)]
Merge pull request #13128 from alalek:fix_13114_3.4
Alexander Nesterov [Mon, 12 Nov 2018 12:55:22 +0000 (11:55 -0100)]
Added bugfix and some tests
Alexander Alekhin [Mon, 12 Nov 2018 11:09:57 +0000 (14:09 +0300)]
cmake: fix supporting of legacy flags
Alexander Alekhin [Mon, 12 Nov 2018 10:51:52 +0000 (13:51 +0300)]
cmake: fix Android features detection
avoid using of ENABLE_* flags
Pavel Rojtberg [Wed, 16 Dec 2015 15:05:56 +0000 (16:05 +0100)]
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
Dmitry Kurtaev [Mon, 12 Nov 2018 10:38:18 +0000 (13:38 +0300)]
Add a test for FileNode::keys()
Dmitry Kurtaev [Mon, 12 Nov 2018 10:29:38 +0000 (13:29 +0300)]
Add FileNode::keys() missed during refactoring
catree [Sun, 11 Nov 2018 19:14:04 +0000 (20:14 +0100)]
Fix missing intrin.hpp header in dis_flow.cpp.
Fix #ifdef CV_SIMD128, should be #if CV_SIMD128.
Alexander Alekhin [Sun, 11 Nov 2018 22:12:41 +0000 (22:12 +0000)]
Merge pull request #12896 from alalek:cmake_deprecate_pkgconfig
Alexander Alekhin [Sun, 11 Nov 2018 22:01:50 +0000 (22:01 +0000)]
Merge pull request #13107 from alalek:core_divzero_simd_test
Alexander Alekhin [Sun, 11 Nov 2018 13:51:47 +0000 (13:51 +0000)]
fix coverity reports
Alexander Alekhin [Mon, 22 Oct 2018 14:46:54 +0000 (14:46 +0000)]
cmake: OPENCV_GENERATE_PKGCONFIG