Alexander Alekhin [Tue, 9 Jan 2018 14:48:55 +0000 (17:48 +0300)]
imgcodecs: remove assert() usage
tobycollins [Tue, 9 Jan 2018 12:54:36 +0000 (13:54 +0100)]
Merge pull request #10522 from tobycollins:issue10519
Alessandro de Oliveira Faria (A.K.A.CABELO) [Mon, 8 Jan 2018 19:30:28 +0000 (17:30 -0200)]
Merge pull request #10502 from cabelo/save-dnn-yolo
Save video file (#10502)
Alexander Alekhin [Mon, 8 Jan 2018 19:18:59 +0000 (19:18 +0000)]
Merge pull request #10550 from dkurt:replace_psroi_pooling_tag
Alexander Alekhin [Mon, 8 Jan 2018 13:22:44 +0000 (13:22 +0000)]
Merge pull request #10545 from alalek:dnn_blob_manager_runtime_option
Dmitry Kurtaev [Mon, 8 Jan 2018 10:27:57 +0000 (13:27 +0300)]
Replace Caffe's psroi_pooling_param tag from 10001 to 10002
Alexander Alekhin [Sun, 7 Jan 2018 18:38:14 +0000 (18:38 +0000)]
dnn: add OPENCV_DNN_DISABLE_MEMORY_OPTIMIZATIONS runtime option
replaces REUSE_DNN_MEMORY compile-time option
Alexander Alekhin [Sun, 7 Jan 2018 12:53:22 +0000 (12:53 +0000)]
Merge pull request #10537 from pnemonic78:master_false
Moshe [Sun, 7 Jan 2018 08:12:53 +0000 (10:12 +0200)]
Bitwise "and false"
Bitwise "and false" is always false.
Alexander Alekhin [Sun, 7 Jan 2018 06:50:49 +0000 (06:50 +0000)]
Merge pull request #10536 from Sahloul:bug_fix/BLOB
Alexander Alekhin [Sun, 7 Jan 2018 06:48:05 +0000 (06:48 +0000)]
Merge pull request #10534 from ericrwx:videoio-psnr-typo-fix
Alexander Alekhin [Sun, 7 Jan 2018 06:46:45 +0000 (06:46 +0000)]
Merge pull request #10527 from csukuangfj:local
Hamdi Sahloul [Sun, 7 Jan 2018 05:30:40 +0000 (14:30 +0900)]
BLOB - Support RGBA
Eric Wang [Sun, 7 Jan 2018 00:15:43 +0000 (16:15 -0800)]
Fix typo in video_input_psnr_ssim
LaurentBerger [Sat, 6 Jan 2018 20:44:47 +0000 (21:44 +0100)]
Merge pull request #10529 from LaurentBerger:ExampleGoogleNet
* Add a parameter labels to command line
* default value
* samples: caffe_googlenet.cpp minor refactoring
Alexander Alekhin [Fri, 5 Jan 2018 20:54:01 +0000 (20:54 +0000)]
Merge pull request #10514 from alalek:build_warnings
Alexander Alekhin [Fri, 5 Jan 2018 20:56:07 +0000 (23:56 +0300)]
Merge pull request #10521 from DabatoIsCool:master
Fangjun Kuang [Fri, 5 Jan 2018 18:35:38 +0000 (19:35 +0100)]
Improve the documentation for cv::Affine3.
Arthur Williams [Fri, 5 Jan 2018 12:49:42 +0000 (12:49 +0000)]
Fixed missing #include "../precomp.hpp"
Alexander Alekhin [Fri, 5 Jan 2018 14:16:16 +0000 (14:16 +0000)]
Merge pull request #10432 from GlueCrow:bgfg_knn_fix
Alexander Alekhin [Fri, 5 Jan 2018 10:27:24 +0000 (10:27 +0000)]
Merge pull request #10517 from alalek:perf_video_bgfg
Alexander Alekhin [Fri, 5 Jan 2018 09:24:33 +0000 (09:24 +0000)]
Merge pull request #10421 from cezheng:patch-1
Alexander Alekhin [Fri, 5 Jan 2018 06:50:19 +0000 (06:50 +0000)]
video(perf): add Mog2/KNN tests, fixed bug in prepareData()
prepareData() bug feeds the same image (the latest)
OCL perf test doesn't pass accuracy(!) check now, so this check is disabled.
Alexander Alekhin [Fri, 5 Jan 2018 04:42:24 +0000 (04:42 +0000)]
cmake: eliminate ninja generator warning (CMake 3.10), refactor code
Alexander Alekhin [Fri, 5 Jan 2018 04:33:30 +0000 (04:33 +0000)]
build: eliminate warning
warning: 'layout.channel_layout::gchan' may be used uninitialized in this function [-Wmaybe-uninitialized]
Alexander Alekhin [Fri, 5 Jan 2018 04:30:08 +0000 (04:30 +0000)]
build: eliminate warnings
warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
Coralie RACHEX [Thu, 4 Jan 2018 12:51:58 +0000 (13:51 +0100)]
Merge pull request #10493 from RachexCoralie:tiff32FC1Codec
* Load and save tiff images in CV_32FC1 format (1 channel of floats).
* Add test
* Fix error handling and resources leak. Improve test.
Alexander Alekhin [Thu, 4 Jan 2018 08:22:27 +0000 (08:22 +0000)]
Merge pull request #10488 from alalek:cmake_simplify_configure_macro
Alexander Alekhin [Thu, 4 Jan 2018 04:40:02 +0000 (04:40 +0000)]
Merge pull request #10492 from pengli:dnn
Li Peng [Wed, 3 Jan 2018 15:54:11 +0000 (23:54 +0800)]
add opencl option for resnet_ssd_face sample
Signed-off-by: Li Peng <peng.li@intel.com>
Li Peng [Wed, 3 Jan 2018 13:43:48 +0000 (21:43 +0800)]
add ocl implementation of proposal layer
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Tue, 2 Jan 2018 19:16:51 +0000 (19:16 +0000)]
cmake: avoid unnecessary files creation in ocv_cmake_configure()
Alessandro de Oliveira Faria (A.K.A.CABELO) [Tue, 2 Jan 2018 14:26:29 +0000 (12:26 -0200)]
Merge pull request #10446 from cabelo:style-dnn-yolo
* add style draw in yolo
* fix sintaxe whitespace
* fix conversion from float to int
* sample refactoring
- minor code style fixes
- avoid confusing "bottom" names
- use cv::format
- always draw object detection/roi
Alexander Alekhin [Tue, 2 Jan 2018 03:21:16 +0000 (03:21 +0000)]
Merge pull request #10477 from berak:fix_bg_sub_tutorial
Alexander Alekhin [Tue, 2 Jan 2018 03:18:39 +0000 (03:18 +0000)]
Merge pull request #10483 from dkurt:fix_dnn_ssd_cpp_sample
Alexander Alekhin [Tue, 2 Jan 2018 03:17:58 +0000 (03:17 +0000)]
Merge pull request #10481 from alalek:fix_10474
Dmitry Kurtaev [Mon, 1 Jan 2018 20:01:23 +0000 (23:01 +0300)]
Update C++ MobileNet-SSD object detection sample
Alexander Alekhin [Mon, 1 Jan 2018 15:56:14 +0000 (15:56 +0000)]
python: filter modules headers (from <module>/include directory)
Alexander Alekhin [Mon, 1 Jan 2018 15:40:12 +0000 (15:40 +0000)]
Merge pull request #10480 from alalek:fix_10479
Alexander Alekhin [Mon, 1 Jan 2018 13:12:21 +0000 (13:12 +0000)]
imgproc(hdr): fix bounds check in HdrDecoder::checkSignature()
berak [Sun, 31 Dec 2017 11:23:02 +0000 (12:23 +0100)]
video: clean up bg subtraction tutorial
Alexander Alekhin [Sun, 31 Dec 2017 10:47:33 +0000 (10:47 +0000)]
Merge pull request #10473 from alalek:cmake_version_string_timestamp
Alexander Alekhin [Sat, 30 Dec 2017 19:58:57 +0000 (19:58 +0000)]
cmake: avoid timestamp change of version_string.inc file
Alexander Alekhin [Sat, 30 Dec 2017 18:19:39 +0000 (18:19 +0000)]
Merge pull request #10470 from victor-ludorum:caliper
victor-ludorum [Sat, 30 Dec 2017 18:22:02 +0000 (23:52 +0530)]
Merge pull request #10469 from victor-ludorum:stichingbranch
Updating stiching.cpp to resolve new line issue #10461 (#10469)
victor-ludorum [Sat, 30 Dec 2017 04:51:46 +0000 (10:21 +0530)]
Updating rotcalipers.cpp to resolve issue #10096
Updating the documentation of the rotcalipers.cpp to resolve issue #10096
Alexander Alekhin [Fri, 29 Dec 2017 15:57:57 +0000 (15:57 +0000)]
Merge pull request #10463 from alalek:avx512skx
Alexander Alekhin [Fri, 29 Dec 2017 05:06:52 +0000 (05:06 +0000)]
cmake(opt): AVX512_SKX
Alexander Alekhin [Thu, 28 Dec 2017 16:45:16 +0000 (16:45 +0000)]
Merge pull request #10329 from jasjuang:master
Alexander Alekhin [Thu, 28 Dec 2017 16:43:17 +0000 (16:43 +0000)]
Merge pull request #10410 from GlueCrow:master
Alexander Alekhin [Thu, 28 Dec 2017 16:04:51 +0000 (16:04 +0000)]
Merge pull request #10456 from dkurt:dnn_allocate_mem_for_optimized_concat
Alexander Alekhin [Thu, 28 Dec 2017 15:56:56 +0000 (15:56 +0000)]
Merge pull request #10416 from fenrus75:avx512
Alexander Alekhin [Thu, 28 Dec 2017 15:30:43 +0000 (18:30 +0300)]
Merge pull request #10429 from wxzs5:fix-documentation
Alexander Alekhin [Thu, 28 Dec 2017 15:29:30 +0000 (18:29 +0300)]
Merge pull request #10436 from alalek:test_threads
Alexander Alekhin [Thu, 28 Dec 2017 15:28:29 +0000 (18:28 +0300)]
Merge pull request #10444 from alalek:fix_asan_imgcodecs
Alexander Alekhin [Thu, 28 Dec 2017 02:16:42 +0000 (02:16 +0000)]
cmake: AVX512 -> AVX_512F
Vinay Sharma [Thu, 28 Dec 2017 14:28:34 +0000 (19:58 +0530)]
Merge pull request #10352 from vinay0410:write_pbm
* added write as pbm
* add tests for pbm
* imgcodecs: PBM support
- drop additional PBM parameters
- write: fix P1/P4 mode (no maxval 255 value after width/height)
- write: invert values for P1/P4
- write: P1: compact ASCII mode (no spaces)
- simplify pbm test
- drop .pxm extension (http://netpbm.sourceforge.net/doc/ doesn't know such extension)
Tom Becker [Thu, 28 Dec 2017 14:23:11 +0000 (06:23 -0800)]
Merge pull request #10232 from TomBecker-BD:hough-many-circles
Hough many circles (#10232)
* Add Hui's optimization. Merge with latest changes in OpenCV.
* Use conditional compilation instead of a runtime flag.
* Whitespace.
* Create the sequence for the nonzero edge pixels only if using that approach.
* Improve performance for finding very large numbers of circles
* Return the circles with the larger accumulator values first, as per API documentation.
Use a separate step to check distance between circles. Allows circles to be sorted by strength first. Avoids locking in EstimateRadius which was slowing it down.
Return centers only if maxRadius == 0 as per API documentation.
* Sort the circles so results are deterministic. Otherwise the order of circles with the same strength depends on parallel processing completion order.
* Add test for HoughCircles.
* Add beads test.
* Wrap the non-zero points structure in a common interface so the code can use either a vector or a matrix.
* Remove the special case for skipping the radius search if maxRadius==0.
* Add performance tests.
* Use NULL instead of nullptr.
OpenCV should compile with C++98 compiler.
* Put test suite name first.
Use different test suite names for each test to avoid an error from the test runner.
* Address build bot errors and warnings.
* Skip radius search if maxRadius < 0.
* Dynamically switch to NZPointList when it will be faster than NZPointSet.
* Fix compile error: missing 'typename' prior to dependent type name.
* Fix compile error: missing 'typename' prior to dependent type name.
This time fix it the non C++ 11 way.
* Fix compile error: no type named 'const_reference' in 'class cv::NZPointList'
* Disable ManySmallCircles tests. Failing on Mac.
* Change beads image to JPEG for smaller file size.
Try enabling the ManySmallCircles tests again.
* Remove ManySmallCircles tests. They are failing on the Mac build.
* Fix expectations to check all circles.
* Changing case on a case-insensitive file system
Step 1: remove the old file names
* Changing case on a case-insensitive file system
Step 2: add them back with the new names
* Fix cmpAccum function to be strictly weak ordered.
* Add tests for many small circles.
* imgproc(perf): fix HoughCircles tests
* imgproc(houghCircles): refactor code
- simplify NZPointList
- drop broken (de-synchronization of 'current'/'mi' fields) NZPointSet iterator
- NZPointSet iterator is replaced to direct area scan
- use SIMD intrinsics
- avoid std exceptions (build for embedded systems)
Dmitry Kurtaev [Thu, 28 Dec 2017 13:04:09 +0000 (16:04 +0300)]
Allocate new memory for optimized concat to prevent collisions.
Add a flag to disable memory reusing in dnn module.
Alexander Alekhin [Thu, 28 Dec 2017 12:48:26 +0000 (12:48 +0000)]
Merge pull request #10452 from mshabunin:mediasdk-device
Maksim Shabunin [Thu, 28 Dec 2017 10:43:35 +0000 (13:43 +0300)]
Changed VA device in MediaSDK session initialization
Alexander Alekhin [Thu, 28 Dec 2017 04:43:41 +0000 (04:43 +0000)]
Merge pull request #10445 from pengli:dnn
Li Peng [Wed, 27 Dec 2017 15:15:50 +0000 (23:15 +0800)]
Add ocl version FasterRCNN accuracy test
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Wed, 27 Dec 2017 18:24:43 +0000 (18:24 +0000)]
imgcodecs(png): resolve ASAN issue with vars scope and setjmp() call
Alexander Alekhin [Thu, 28 Dec 2017 02:30:59 +0000 (05:30 +0300)]
Merge pull request #10435 from DabatoIsCool:master
Alexander Alekhin [Thu, 28 Dec 2017 01:26:14 +0000 (01:26 +0000)]
Merge pull request #10424 from dkurt:fix_concat_optim
Alexander Alekhin [Wed, 27 Dec 2017 14:56:29 +0000 (14:56 +0000)]
dnn(test): avoid calling of cv::setNumThreads() in tests directly
It is not necessary by default.
Also it breaks test system command-line parameters: --perf_threads / --test_threads
Alexander Alekhin [Wed, 27 Dec 2017 14:51:03 +0000 (14:51 +0000)]
ts(feature): add "--test_threads=<N>" command-line option
Arthur Williams [Wed, 27 Dec 2017 14:09:25 +0000 (14:09 +0000)]
Fixed #10433
Alexander Alekhin [Wed, 27 Dec 2017 13:18:10 +0000 (13:18 +0000)]
Merge pull request #10428 from pengli:dnn
Glue Crow [Mon, 25 Dec 2017 18:46:22 +0000 (02:46 +0800)]
Parallelization of BackgroundSubtractorKNN
wxzs5 [Wed, 27 Dec 2017 03:57:58 +0000 (11:57 +0800)]
Use class' method to set attribute value
wxzs5 [Wed, 27 Dec 2017 03:57:17 +0000 (11:57 +0800)]
Fix functions‘ class attribution error
Arjan van de Ven [Mon, 25 Dec 2017 21:08:22 +0000 (21:08 +0000)]
Provide a few AVX512 optimized functions for the DNN module
This patch adds AVX512 optimized fastConv as well as the hookups
needed to get these called in the convolution_layer.
AVX512 fastConv is code-identical on a C level to the AVX2 one,
but is measurably faster due to AVX512 having more registers available
to cache results in.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Alexander Alekhin [Tue, 26 Dec 2017 14:26:58 +0000 (17:26 +0300)]
Merge pull request #10419 from shortcipher3:master
Alexander Alekhin [Tue, 26 Dec 2017 14:21:59 +0000 (14:21 +0000)]
Merge pull request #10418 from mypopydev:master
Dmitry Kurtaev [Tue, 26 Dec 2017 13:49:33 +0000 (16:49 +0300)]
Limit Concat layer optimization
Li Peng [Tue, 26 Dec 2017 09:41:48 +0000 (17:41 +0800)]
dnn(ocl4dnn): update pre-tuned kernel config
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Tue, 26 Dec 2017 05:51:16 +0000 (05:51 +0000)]
Merge pull request #10404 from alalek:build_fix_msvs2010
Jun Zhao [Tue, 26 Dec 2017 02:25:36 +0000 (10:25 +0800)]
opencl/cvtclr_dx: fix not compile-time constants issue.
fix the "initializing global variables with values that are not
compile-time constants" issue in Intel SDK for OpenCL. The root cause
is when initializing global variables with value, the variable need is
compile-time constants.
Thanks Zheng, Yang <yang.zheng@intel.com>,
Chodor, Jaroslaw <jaroslaw.chodor@intel.com> give a help.
Signed-off-by: Liu,Kaixuan <kaixuan.liu@intel.com>
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Chris Hall [Tue, 26 Dec 2017 05:01:48 +0000 (22:01 -0700)]
JS examples - FFT didn't work for non-square images because rows/cols were switched, Histogram example misspelled point
Arjan van de Ven [Mon, 25 Dec 2017 21:06:52 +0000 (21:06 +0000)]
Add basic plumbing for AVX512 support
The opencv infrastructure mostly has the basics for supporting avx512 math functions,
but it wasn't hooked up (likely due to lack of users)
In order to compile the DNN functions for AVX512, a few things need to be hooked up
and this patch does that
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
GlueCrow [Sat, 23 Dec 2017 13:57:17 +0000 (21:57 +0800)]
Optimize OpenCL BackgroundSubstractionMOG2
Alexander Alekhin [Sat, 23 Dec 2017 00:06:34 +0000 (00:06 +0000)]
build: fix MSVS2010 build error
Alexander Alekhin [Fri, 22 Dec 2017 23:22:50 +0000 (23:22 +0000)]
Merge tag '3.4.0'
Alexander Alekhin [Fri, 22 Dec 2017 19:46:21 +0000 (19:46 +0000)]
OpenCV version++
3.4.0
Alexander Alekhin [Fri, 22 Dec 2017 19:43:59 +0000 (22:43 +0300)]
Merge pull request #10398 from alalek:ml_simplify_simulated_annealing
Alexander Alekhin [Fri, 22 Dec 2017 18:50:04 +0000 (18:50 +0000)]
ml(ANN_MLP): ensure that train() call is always successful
Alexander Alekhin [Fri, 22 Dec 2017 16:18:50 +0000 (16:18 +0000)]
Merge pull request #10401 from terfendail:resize_linear_revert
Alexander Alekhin [Fri, 22 Dec 2017 15:58:56 +0000 (15:58 +0000)]
Merge pull request #10402 from dkurt:dnn_tf_quantized
Alexander Alekhin [Fri, 22 Dec 2017 15:48:40 +0000 (15:48 +0000)]
Merge pull request #10385 from pengli:dnn
Dmitry Kurtaev [Thu, 21 Dec 2017 14:15:48 +0000 (17:15 +0300)]
TensorFlow weights dequantization
Vitaly Tuzov [Fri, 22 Dec 2017 14:10:03 +0000 (17:10 +0300)]
Reverted calls to linear resize back to generic version for floating point matrices
Alexander Alekhin [Fri, 22 Dec 2017 14:07:02 +0000 (14:07 +0000)]
Merge pull request #10397 from mshabunin:fix-incorrect-assert
Li Peng [Fri, 22 Dec 2017 10:49:47 +0000 (18:49 +0800)]
add one more convolution kernel tuning candidate
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Fri, 22 Dec 2017 12:33:23 +0000 (15:33 +0300)]
ml: simplify interfaces of SimulatedAnnealingSolver
Vadim Pisarevsky [Fri, 22 Dec 2017 13:35:36 +0000 (13:35 +0000)]
Merge pull request #10396 from berak:fix_superres_sample
Vadim Pisarevsky [Fri, 22 Dec 2017 13:29:37 +0000 (13:29 +0000)]
Merge pull request #10265 from dkurt:nms_for_region_layer
Vadim Pisarevsky [Fri, 22 Dec 2017 13:26:31 +0000 (13:26 +0000)]
Merge pull request #10394 from alalek:cmake_fix_pch_pic_pie
Vadim Pisarevsky [Fri, 22 Dec 2017 13:26:05 +0000 (13:26 +0000)]
Merge pull request #10387 from terfendail:resize23_perftest