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
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 [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
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: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 14:18:21 +0000 (14:18 +0000)]
Merge pull request #13160 from dkurt:fix_13159
Dmitry Kurtaev [Wed, 14 Nov 2018 10:42:06 +0000 (13:42 +0300)]
Fix a bug with OpenVINO backend
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
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
Dmitry Kurtaev [Mon, 12 Nov 2018 10:38:18 +0000 (13:38 +0300)]
Add a test for FileNode::keys()
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 [Sat, 10 Nov 2018 21:38:24 +0000 (21:38 +0000)]
core(test): extend divideByZero test
to verify SIMD code path
Alexander Alekhin [Sat, 10 Nov 2018 19:11:06 +0000 (19:11 +0000)]
Merge pull request #13102 from alalek:issue_13101
Alexander Alekhin [Sat, 10 Nov 2018 13:36:06 +0000 (13:36 +0000)]
Merge pull request #13097 from alalek:backport_13086
Alexander Alekhin [Sat, 10 Nov 2018 13:34:47 +0000 (16:34 +0300)]
Merge pull request #13103 from alalek:fix_doc_links_3.4
Alexander Alekhin [Sat, 10 Nov 2018 12:00:02 +0000 (12:00 +0000)]
docs: fix links
- cv::at => cv::Mat::at()
- removed unnecessary @ref
Alexander Alekhin [Sat, 10 Nov 2018 10:17:34 +0000 (10:17 +0000)]
core: rework getContinuousSize() for vector-col/row support
Vadim Pisarevsky [Fri, 9 Nov 2018 09:57:27 +0000 (12:57 +0300)]
backport: refined QRCodeDetector API for OpenCV 4.0
Alexander Alekhin [Fri, 9 Nov 2018 19:54:16 +0000 (19:54 +0000)]
Merge pull request #12878 from tompollok:3.4
Alexander Alekhin [Fri, 9 Nov 2018 19:15:49 +0000 (19:15 +0000)]
Merge pull request #12962 from paroj:manualwb
Pavel Rojtberg [Fri, 26 Oct 2018 14:54:00 +0000 (16:54 +0200)]
videoio: add manual white-balance and implement it for V4L2
Vitaly Tuzov [Fri, 9 Nov 2018 13:17:58 +0000 (16:17 +0300)]
bilateralFilter implementation moved to separate file
Alexander Alekhin [Fri, 9 Nov 2018 13:20:27 +0000 (13:20 +0000)]
Merge pull request #13080 from alalek:issue_13078
Vitaly Tuzov [Fri, 9 Nov 2018 12:27:30 +0000 (15:27 +0300)]
Updated bilateralFilter implementations to use wide universal intrinsics
Alexey Nikolaev [Thu, 8 Nov 2018 18:27:45 +0000 (21:27 +0300)]
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
Alexander Alekhin [Thu, 8 Nov 2018 15:42:53 +0000 (18:42 +0300)]
core: fix processing of vector-rows
tompollok [Fri, 19 Oct 2018 20:21:20 +0000 (22:21 +0200)]
refactoring catching all exceptions as const ref
Alexander Alekhin [Thu, 8 Nov 2018 16:46:25 +0000 (19:46 +0300)]
Revert CV_TRY/CV_CATCH macros
This reverts commit
7349b8f5cecfc6eb649b224e58da16d137c3c578 (partially).
Alexander Alekhin [Thu, 8 Nov 2018 16:31:38 +0000 (16:31 +0000)]
Merge pull request #13065 from dkurt:dnn_update_tf_faster_rcnn
Alexander Alekhin [Thu, 8 Nov 2018 16:30:41 +0000 (16:30 +0000)]
Merge pull request #13076 from berak:fix_digits_video_py
Alexander Alekhin [Thu, 8 Nov 2018 14:07:50 +0000 (14:07 +0000)]
Merge pull request #11680 from alalek:videoio_deprecate_dshow_vfw
Alexander Alekhin [Thu, 8 Nov 2018 14:05:22 +0000 (14:05 +0000)]
Merge pull request #12454 from jveitchmichaelis:y16_dshow_windows
Alexander Alekhin [Thu, 8 Nov 2018 14:02:40 +0000 (14:02 +0000)]
Merge pull request #12064 from seiko2plus:coreUnvintrinArithm2
Alexander Alekhin [Thu, 8 Nov 2018 12:21:37 +0000 (12:21 +0000)]
Merge pull request #12901 from alalek:cmake_unsupported_option_warning
Alexander Alekhin [Mon, 4 Jun 2018 09:09:06 +0000 (12:09 +0300)]
videoio: deprecate Video for Windows (VFW)
consider using MSMF backend
berak [Thu, 8 Nov 2018 08:17:41 +0000 (09:17 +0100)]
samples: fix digits_video.py
unknown [Tue, 4 Sep 2018 01:32:05 +0000 (02:32 +0100)]
Add support for changing fourcc and support mono formats (e.g. Y8, Y16)
Vitaly Tuzov [Wed, 7 Nov 2018 20:59:36 +0000 (23:59 +0300)]
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
Alexander Alekhin [Wed, 7 Nov 2018 20:54:40 +0000 (20:54 +0000)]
Merge pull request #13043 from alalek:compatibility_12623
Alexander Alekhin [Wed, 7 Nov 2018 20:54:10 +0000 (20:54 +0000)]
Merge pull request #13037 from alalek:cmake_build_3rdparty_flag
Alexander Alekhin [Wed, 7 Nov 2018 20:53:18 +0000 (20:53 +0000)]
Merge pull request #12897 from alalek:cmake_deprecate_pkgconfig_3.4
Alexander Alekhin [Wed, 7 Nov 2018 19:21:42 +0000 (19:21 +0000)]
Merge pull request #12891 from marcoag:master
Alexander Alekhin [Wed, 7 Nov 2018 17:13:20 +0000 (17:13 +0000)]
Merge pull request #13067 from catree:fix_getPerfProfile_overflow
Dmitry Kurtaev [Wed, 7 Nov 2018 08:16:15 +0000 (11:16 +0300)]
Update a script to generate text graphs for Faster-RCNN networks from TensorFlow
catree [Wed, 7 Nov 2018 10:54:51 +0000 (11:54 +0100)]
Fix integer overflow when accumulating timing values.
Marco A. Gutierrez [Mon, 22 Oct 2018 04:31:23 +0000 (12:31 +0800)]
minor typo corrections to python tutorials
Alexander Alekhin [Tue, 6 Nov 2018 20:52:49 +0000 (23:52 +0300)]
Merge pull request #13034 from alalek:ffmpeg_update_3.4
Alexander Alekhin [Tue, 6 Nov 2018 20:52:00 +0000 (23:52 +0300)]
Merge pull request #13006 from alalek:cmake_setup_vars
cmake: introduce setup_vars scripts
Alexander Alekhin [Tue, 6 Nov 2018 20:28:45 +0000 (20:28 +0000)]
Merge pull request #13036 from berak:java_MatOfRotatedRect_utils
Alexander Alekhin [Tue, 6 Nov 2018 20:22:08 +0000 (20:22 +0000)]
Merge pull request #13023 from terfendail:medianBlur_sep
Alexander Alekhin [Tue, 6 Nov 2018 18:41:28 +0000 (18:41 +0000)]
Merge pull request #13005 from alalek:samples_gpu_drop_legacy
Alexander Alekhin [Tue, 6 Nov 2018 18:40:55 +0000 (18:40 +0000)]
Merge pull request #12999 from fegorsch:improve-circle-detector
Alexander Alekhin [Tue, 6 Nov 2018 17:00:47 +0000 (20:00 +0300)]
Merge pull request #13045 from LaurentBerger:kmeansdoc
typo in kmeans doc
Alexander Alekhin [Tue, 6 Nov 2018 16:51:47 +0000 (19:51 +0300)]
Merge pull request #13040 from alalek:docs_cleanup_3.4
Alexander Alekhin [Tue, 6 Nov 2018 16:18:11 +0000 (16:18 +0000)]
Merge pull request #13053 from berak:highgui_win32_waitkey
lqy123000 [Tue, 6 Nov 2018 16:13:48 +0000 (00:13 +0800)]
Merge pull request #12916 from lqy123000:bugfix_templmatch
* avoid rounding errors
* imgproc: replace condition in matchTemplate
Alexander Alekhin [Tue, 6 Nov 2018 15:56:57 +0000 (15:56 +0000)]
Merge pull request #13033 from alalek:videoio_fix_ffmpeg_3.4
berak [Sat, 3 Nov 2018 08:15:27 +0000 (09:15 +0100)]
java: add converters, tests for MatOfRotatedRect
berak [Tue, 6 Nov 2018 10:43:58 +0000 (11:43 +0100)]
highgui: fix broken waitKey() condition in window_w32
LaurentBerger [Sun, 4 Nov 2018 20:30:31 +0000 (21:30 +0100)]
typo in kmeans doc
Alexander Alekhin [Sun, 4 Nov 2018 17:27:05 +0000 (17:27 +0000)]
videoio: backport "VideoCapture(int index, int apiPreference)" interface
Alexander Alekhin [Sun, 4 Nov 2018 01:41:06 +0000 (01:41 +0000)]
docs: intro formatting update, minor cleanup