Alexander Alekhin [Fri, 9 Nov 2018 22:52:41 +0000 (22:52 +0000)]
Merge pull request #13072 from gineshidalgo99:Pendantic_warning
Alexander Alekhin [Fri, 9 Nov 2018 19:16:39 +0000 (19:16 +0000)]
Merge pull request #13024 from rgarnov:gapi_fix_lut_test
Matt Bennett [Fri, 9 Nov 2018 17:05:59 +0000 (17:05 +0000)]
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.
Alexander Alekhin [Fri, 9 Nov 2018 16:44:10 +0000 (16:44 +0000)]
Merge pull request #13094 from alalek:ocl_reduce_sync
Alexander Alekhin [Fri, 9 Nov 2018 14:36:37 +0000 (17:36 +0300)]
core(ocl): run "reduce" kernels in synchronous mode
Vadim Pisarevsky [Fri, 9 Nov 2018 14:52:06 +0000 (17:52 +0300)]
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
Vadim Pisarevsky [Fri, 9 Nov 2018 14:39:29 +0000 (17:39 +0300)]
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)
Vadim Pisarevsky [Fri, 9 Nov 2018 13:12:22 +0000 (16:12 +0300)]
mostly removed obsolete C API from calib3d (at least at the interface level) (#13081)
Vadim Pisarevsky [Fri, 9 Nov 2018 09:57:27 +0000 (12:57 +0300)]
refined QRCodeDetector API for OpenCV 4.0 (#13086)
* refined QRCodeDetector API for OpenCV 4.0
* expanded and tested QRCodeDetector::detectAndDecode()
Alexander Alekhin [Fri, 9 Nov 2018 09:25:52 +0000 (12:25 +0300)]
Merge pull request #13088 from alalek:gapi_fix_arm_build
Ruslan Garnov [Fri, 2 Nov 2018 12:42:25 +0000 (15:42 +0300)]
Fixed uniniitialized mats in tests, added operator<< for compare_f
Alexander Alekhin [Fri, 9 Nov 2018 06:37:48 +0000 (06:37 +0000)]
gapi: fix ARM build
Vadim Pisarevsky [Thu, 8 Nov 2018 21:52:09 +0000 (00:52 +0300)]
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
Dmitry Budnikov [Thu, 8 Nov 2018 19:14:53 +0000 (22:14 +0300)]
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
Alexander Alekhin [Thu, 8 Nov 2018 16:09:32 +0000 (19:09 +0300)]
Merge pull request #13074 from alalek:cleanup_videoio
Alexander Alekhin [Thu, 8 Nov 2018 16:08:33 +0000 (19:08 +0300)]
Merge pull request #13073 from alalek:cleanup_carbon
Alexander Alekhin [Thu, 8 Nov 2018 16:04:31 +0000 (19:04 +0300)]
Merge pull request #13069 from alalek:move_viz_contrib
Alexander Alekhin [Thu, 8 Nov 2018 16:03:14 +0000 (19:03 +0300)]
Merge pull request #13029 from alalek:move_videostab_contrib
Alexander Alekhin [Thu, 8 Nov 2018 10:26:56 +0000 (10:26 +0000)]
Merge pull request #12985 from wzw-intel:vkcom_refine
Alexander Alekhin [Wed, 7 Nov 2018 21:00:14 +0000 (21:00 +0000)]
Merge pull request #13057 from sturkmen72:Mat_to_IOArray
Alexander Alekhin [Wed, 7 Nov 2018 19:59:41 +0000 (19:59 +0000)]
Merge pull request #13061 from alalek:ffmpeg_update
Alexander Alekhin [Wed, 7 Nov 2018 16:49:09 +0000 (19:49 +0300)]
videoio: drop obsolete backends
- VFW
- QuickTime/QtKit
- Unicap - GPL, no active support: https://github.com/unicap/unicap
- DC1394 (1st version) / CMU1394
gineshidalgo99 [Wed, 7 Nov 2018 16:23:21 +0000 (11:23 -0500)]
Fixed pendantic warnings
Alexander Alekhin [Wed, 7 Nov 2018 16:21:33 +0000 (19:21 +0300)]
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.
Alexander Alekhin [Wed, 7 Nov 2018 15:12:29 +0000 (15:12 +0000)]
Merge pull request #13001 from rgarnov:gapi_standalone_cmake
Alexander Alekhin [Wed, 7 Nov 2018 13:18:00 +0000 (16:18 +0300)]
viz: move samples/tutorials to opencv_contrib
Alexander Alekhin [Wed, 7 Nov 2018 13:14:10 +0000 (16:14 +0300)]
viz: move to opencv_contrib
Alexander Alekhin [Wed, 7 Nov 2018 12:49:35 +0000 (15:49 +0300)]
videostab: move sample to opencv_contrib
Alexander Alekhin [Fri, 2 Nov 2018 13:44:48 +0000 (16:44 +0300)]
videostab: move to opencv_contrib
Alexander Alekhin [Wed, 7 Nov 2018 12:36:55 +0000 (12:36 +0000)]
Merge pull request #13026 from alalek:move_superres_contrib
Alexander Alekhin [Wed, 7 Nov 2018 12:36:30 +0000 (12:36 +0000)]
Merge pull request #13025 from alalek:move_shape_contrib
Alexander Alekhin [Tue, 6 Nov 2018 21:23:29 +0000 (21:23 +0000)]
ffmpeg: update 4.1 (OpenCV 4.x branch)
ffmpeg 4.0.2 -> 4.1
Ruslan Garnov [Wed, 31 Oct 2018 12:53:01 +0000 (15:53 +0300)]
Added Standalone.cmake
Wu Zhiwen [Tue, 6 Nov 2018 12:24:00 +0000 (20:24 +0800)]
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.
Alexander Alekhin [Tue, 6 Nov 2018 20:04:31 +0000 (20:04 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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
Evgeny Latkin [Tue, 6 Nov 2018 20:08:50 +0000 (23:08 +0300)]
Merge pull request #13052 from elatkin:yl/gapi_sobel3x3_f32_v2
* GAPI: Sobel 3x3 with FP32 input
* GAPI: Sobel 3x3 with FP32 input, v2
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 18:36:09 +0000 (18:36 +0000)]
Merge pull request #13010 from dkurt:fix_cl_eye_fp16
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:26:56 +0000 (16:26 +0000)]
Merge pull request #13032 from ijean:mingw-w64-build
Alexander Alekhin [Tue, 6 Nov 2018 16:19:51 +0000 (19:19 +0300)]
Merge pull request #13041 from berak:docs_highgui
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 16:01:28 +0000 (16:01 +0000)]
Merge pull request #13055 from vpisarev:remove_old_haar
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
Alexander Alekhin [Tue, 6 Nov 2018 13:13:37 +0000 (16:13 +0300)]
shape: move sample to opencv_contrib
Vadim Pisarevsky [Tue, 6 Nov 2018 12:39:37 +0000 (15:39 +0300)]
removed the old C API for Haar-based object detection; use CascadeClassifier from now on
berak [Tue, 6 Nov 2018 10:43:58 +0000 (11:43 +0100)]
highgui: fix broken waitKey() condition in window_w32
Suleyman TURKMEN [Sun, 4 Nov 2018 23:16:07 +0000 (02:16 +0300)]
Update imgproc.hpp
LaurentBerger [Sun, 4 Nov 2018 20:30:31 +0000 (21:30 +0100)]
typo in kmeans doc
berak [Sun, 4 Nov 2018 08:58:58 +0000 (09:58 +0100)]
docs: remove NULL strings from highgui.hpp
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 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
Jean Carass [Fri, 2 Nov 2018 15:51:57 +0000 (08:51 -0700)]
Replaced strcpy_s, strcat_s for MinGW builds.
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
Alexander Alekhin [Fri, 2 Nov 2018 13:06:16 +0000 (16:06 +0300)]
superres: move to opencv_contrib
Vadim Pisarevsky [Fri, 2 Nov 2018 12:36:06 +0000 (12:36 +0000)]
Merge pull request #13013 from berak:java_MatOfRotatedRect
Alexander Alekhin [Fri, 2 Nov 2018 12:23:05 +0000 (15:23 +0300)]
shape: move to opencv_contrib
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 [Fri, 2 Nov 2018 05:31:07 +0000 (05:31 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Dmitry Kurtaev [Thu, 1 Nov 2018 09:57:21 +0000 (12:57 +0300)]
Fix https://github.com/opencv/opencv/issues/12824
Vadim Pisarevsky [Thu, 1 Nov 2018 21:27:06 +0000 (00:27 +0300)]
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
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
Alexander Alekhin [Thu, 1 Nov 2018 11:30:37 +0000 (11:30 +0000)]
Merge pull request #13007 from dkurt:fix_12970
Dmitry Kurtaev [Thu, 1 Nov 2018 08:22:28 +0000 (11:22 +0300)]
Fix https://github.com/opencv/opencv/issues/12970
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
Alexander Alekhin [Wed, 31 Oct 2018 15:11:32 +0000 (15:11 +0000)]
Merge pull request #12889 from alalek:drop_untested_flann_hdf5_header
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 14:23:08 +0000 (14:23 +0000)]
Merge pull request #12988 from LaurentBerger:test_copyto_py
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.
Wu Zhiwen [Mon, 29 Oct 2018 07:58:54 +0000 (15:58 +0800)]
dnn/Vulkan: support log softmax
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Wu Zhiwen [Mon, 29 Oct 2018 06:32:09 +0000 (14:32 +0800)]
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>
Alexander Alekhin [Tue, 30 Oct 2018 18:55:21 +0000 (18:55 +0000)]
Merge pull request #12951 from catree:easy_fixes_const_viz
Alexander Alekhin [Tue, 30 Oct 2018 18:41:23 +0000 (18:41 +0000)]
Merge pull request #12982 from eldruin:python-gen-close-file
Ruslan Garnov [Tue, 30 Oct 2018 18:12:36 +0000 (21:12 +0300)]
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
AsyaPronina [Tue, 30 Oct 2018 18:10:47 +0000 (21:10 +0300)]
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
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