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
Alexander Alekhin [Fri, 9 Nov 2018 13:20:27 +0000 (13:20 +0000)]
Merge pull request #13080 from alalek:issue_13078
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
Alexander Alekhin [Sat, 3 Nov 2018 11:57:34 +0000 (11:57 +0000)]
cmake: OPENCV_FORCE_3RDPARTY_BUILD build flag
Alexander Alekhin [Sat, 3 Nov 2018 03:08:49 +0000 (03:08 +0000)]
ffmpeg: update 3.4.5 (OpenCV 3.4 branch)
ffmpeg 3.4.2 -> 3.4.5
Alexander Alekhin [Sat, 3 Nov 2018 02:17:17 +0000 (02:17 +0000)]
videoio: fix build of standalone ffmpeg plugin
fegorsch [Fri, 2 Nov 2018 14:13:46 +0000 (15:13 +0100)]
Add test for symmetric circles with clustering
Vitaly Tuzov [Fri, 2 Nov 2018 10:42:36 +0000 (13:42 +0300)]
medianBlur() implementation moved to separate file
Vadim Pisarevsky [Fri, 2 Nov 2018 12:36:06 +0000 (12:36 +0000)]
Merge pull request #13013 from berak:java_MatOfRotatedRect
fegorsch [Mon, 15 Oct 2018 16:13:03 +0000 (18:13 +0200)]
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.
Vitaly Tuzov [Fri, 2 Nov 2018 09:26:23 +0000 (12:26 +0300)]
Updated medianBlur implementations to use wide universal intrinsics
Alexander Alekhin [Thu, 1 Nov 2018 16:57:11 +0000 (16:57 +0000)]
Merge pull request #10584 from eruffaldi:F10583_videoio_ffmpeg_lossless
Alexander Alekhin [Thu, 1 Nov 2018 16:46:11 +0000 (16:46 +0000)]
Merge pull request #13003 from native-api:cross_cutting_frameworks
Ivan Pozdeev [Wed, 31 Oct 2018 20:28:18 +0000 (23:28 +0300)]
Detect cross-cutting frameworks before libraries so the latter can use them
Alexander Alekhin [Thu, 1 Nov 2018 01:37:40 +0000 (01:37 +0000)]
cmake: introduce setup_vars scripts
- CMake install COMPONENT: "scripts"
berak [Thu, 1 Nov 2018 14:37:23 +0000 (15:37 +0100)]
java: add support for MatOfRotatedRect
Alexander Alekhin [Thu, 1 Nov 2018 11:40:22 +0000 (11:40 +0000)]
Merge pull request #13002 from dkurt:onnx_padding
Ilari Venäläinen [Thu, 1 Nov 2018 11:34:34 +0000 (13:34 +0200)]
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:
cbb1e867e5141412c62ff534def7f117e28e04e8
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
Emanuele Ruffaldi [Fri, 12 Jan 2018 23:49:21 +0000 (00:49 +0100)]
ffmpeg for lossy
Alexander Alekhin [Wed, 31 Oct 2018 23:41:49 +0000 (23:41 +0000)]
samples(gpu): cleanup samples for legacy API
Alexander Alekhin [Wed, 31 Oct 2018 16:47:48 +0000 (16:47 +0000)]
Merge pull request #12991 from alalek:update_libpng_1.6.35
Dmitry Kurtaev [Wed, 31 Oct 2018 15:24:05 +0000 (18:24 +0300)]
Add ONNX's padding import
Suleyman TURKMEN [Wed, 31 Oct 2018 15:08:24 +0000 (18:08 +0300)]
Merge pull request #12971 from sturkmen72:upd_imgproc_hpp
* Update imgproc.hpp
* update color conversion codes
Alexander Alekhin [Wed, 31 Oct 2018 15:03:00 +0000 (15:03 +0000)]
Merge pull request #12997 from alalek:eliminate_gcc4_warnings
Alexander Alekhin [Wed, 31 Oct 2018 13:04:55 +0000 (16:04 +0300)]
cmake: eliminate GCC4.x warnings
Vadim Pisarevsky [Wed, 31 Oct 2018 11:13:28 +0000 (11:13 +0000)]
Merge pull request #12994 from vpisarev:fix_imshow_mac
Vadim Pisarevsky [Wed, 31 Oct 2018 07:40:58 +0000 (10:40 +0300)]
fixed imshow on mac; before that just the window titlebar was shown, without the window content.
Alexander Alekhin [Tue, 30 Oct 2018 18:41:23 +0000 (18:41 +0000)]
Merge pull request #12982 from eldruin:python-gen-close-file
Alexander Alekhin [Tue, 30 Oct 2018 16:03:14 +0000 (19:03 +0300)]
3rdparty: update libpng 1.6.35
http://www.libpng.org/pub/png/libpng.html
Rostislav Vasilikhin [Tue, 30 Oct 2018 15:36:23 +0000 (18:36 +0300)]
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
Alexander Alekhin [Tue, 30 Oct 2018 13:33:01 +0000 (13:33 +0000)]
Merge pull request #12948 from catree:add_drawFrameAxes
Sayed Adel [Wed, 25 Jul 2018 20:00:37 +0000 (22:00 +0200)]
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
Alexander Alekhin [Mon, 29 Oct 2018 17:06:44 +0000 (17:06 +0000)]
Merge pull request #12938 from dkurt:java_ndim_mat
Diego Barrios Romero [Mon, 29 Oct 2018 09:54:50 +0000 (10:54 +0100)]
Fix closing input file
Vadim Pisarevsky [Mon, 29 Oct 2018 11:35:57 +0000 (11:35 +0000)]
Merge pull request #12964 from savuor:fix/zeroupper_all
Vadim Pisarevsky [Mon, 29 Oct 2018 11:27:49 +0000 (11:27 +0000)]
Merge pull request #12966 from catree:fix_distortion_image
Vadim Pisarevsky [Mon, 29 Oct 2018 11:14:16 +0000 (11:14 +0000)]
Merge pull request #12975 from allnes:fix_russian_test
Alexander Nesterov [Sun, 28 Oct 2018 20:11:38 +0000 (19:11 -0100)]
Fix dataset: russian.jpg
Alexander Alekhin [Sun, 28 Oct 2018 14:52:31 +0000 (14:52 +0000)]
Merge pull request #12954 from seanm:MinorMac
Alexander Alekhin [Sat, 27 Oct 2018 17:04:49 +0000 (17:04 +0000)]
Merge pull request #12967 from catree:add_tutorial_video_java_python
Alexander Alekhin [Sat, 27 Oct 2018 16:28:57 +0000 (16:28 +0000)]
Merge pull request #12958 from kamino410:doc_dist_param
catree [Fri, 26 Oct 2018 20:17:18 +0000 (22:17 +0200)]
Update background subtraction tutorial with Java and Python codes.
catree [Fri, 26 Oct 2018 18:27:37 +0000 (20:27 +0200)]
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.
Alexander Alekhin [Fri, 26 Oct 2018 18:26:06 +0000 (18:26 +0000)]
Merge pull request #12946 from HenryDev:patch-1
Rostislav Vasilikhin [Fri, 26 Oct 2018 15:12:07 +0000 (18:12 +0300)]
_mm256_zeroupper replaced by zeroall
Alexander Alekhin [Fri, 26 Oct 2018 14:50:49 +0000 (14:50 +0000)]
Merge pull request #12960 from alalek:workaround_ipp_sse42_meanstddev
Alexander Alekhin [Fri, 26 Oct 2018 11:57:20 +0000 (14:57 +0300)]
core(ipp): disable SSE4.2 meanStdDev() optimization for CV_32F
kamino410 [Fri, 26 Oct 2018 10:55:46 +0000 (19:55 +0900)]
fix document about camera distortion parameters
Sean McBride [Thu, 25 Oct 2018 19:16:55 +0000 (15:16 -0400)]
Fixed a few comments related to macOS support
catree [Thu, 25 Oct 2018 15:57:18 +0000 (17:57 +0200)]
Add a function that draws frame axes. Useful for debugging purpose and to check the correctness of the output of a pose estimation method.
Alexander Alekhin [Thu, 25 Oct 2018 16:24:56 +0000 (16:24 +0000)]
Merge pull request #12905 from tomoaki0705:fixQrcodePeakyFailure
Henry [Thu, 25 Oct 2018 15:54:07 +0000 (10:54 -0500)]
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"
Alexander Alekhin [Thu, 25 Oct 2018 15:11:44 +0000 (15:11 +0000)]
Merge pull request #12935 from alalek:python_so_warning
Alexander Alekhin [Thu, 25 Oct 2018 14:17:42 +0000 (14:17 +0000)]
Merge pull request #12804 from alalek:editorconfig
Alexander Alekhin [Thu, 25 Oct 2018 14:16:55 +0000 (14:16 +0000)]
Merge pull request #12854 from allnes:detect_qr_code
Alexander Alekhin [Thu, 25 Oct 2018 14:12:16 +0000 (17:12 +0300)]
Merge pull request #12930 from aliyasineser:3.4
Update depth map for python-opencv
Alexander Alekhin [Thu, 25 Oct 2018 11:52:39 +0000 (11:52 +0000)]
Merge pull request #12925 from alalek:fix_cmake_conditions
Alexander Alekhin [Thu, 25 Oct 2018 11:28:12 +0000 (11:28 +0000)]
Merge pull request #12934 from alalek:issue_12932
Alexander Alekhin [Thu, 25 Oct 2018 11:04:59 +0000 (11:04 +0000)]
Merge pull request #12928 from alalek:fix_typo_3.4
Dmitry Kurtaev [Thu, 25 Oct 2018 07:48:23 +0000 (10:48 +0300)]
Add methods to reshape Mat in Java by array of shapes and retreive sizes of each dimension.
Alexander Alekhin [Thu, 25 Oct 2018 03:47:59 +0000 (03:47 +0000)]
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`