Commit Graph

23177 Commits

Author SHA1 Message Date
Erik Man
37911e60d8 Allow compilation with unified include directory
This makes it possible to compile OpenCV with for instance ndk-r16
2018-01-05 04:52:17 +00:00
Alexander Alekhin
c92aa95726 android(toolchain): detailed error message 2018-01-05 04:52:17 +00:00
Alexander Alekhin
59c6661db0 cmake: eliminate ninja generator warning (CMake 3.10), refactor code 2018-01-05 04:42:24 +00:00
Alexander Alekhin
f0453bd853 build: eliminate warning
warning: 'layout.channel_layout::gchan' may be used uninitialized in this function [-Wmaybe-uninitialized]
2018-01-05 04:33:30 +00:00
Alexander Alekhin
116c8d0ddf build: eliminate warnings
warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
2018-01-05 04:30:08 +00:00
Coralie RACHEX
16821b877c 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.
2018-01-04 15:51:58 +03:00
Alexander Alekhin
45c5f0a549 Merge pull request #10488 from alalek:cmake_simplify_configure_macro 2018-01-04 08:22:27 +00:00
Alexander Alekhin
f46eff4eb0 Merge pull request #10492 from pengli:dnn 2018-01-04 04:40:02 +00:00
Li Peng
1073175c77 add opencl option for resnet_ssd_face sample
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-04 18:40:56 +08:00
Li Peng
34bfd7ef51 add ocl implementation of proposal layer
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-04 18:40:51 +08:00
Alexander Alekhin
94b236872c cmake: avoid unnecessary files creation in ocv_cmake_configure() 2018-01-02 19:16:51 +00:00
Alessandro de Oliveira Faria (A.K.A.CABELO)
7abaae39ec 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
2018-01-02 17:26:29 +03:00
Alexander Alekhin
940a90130d Merge pull request #10477 from berak:fix_bg_sub_tutorial 2018-01-02 03:21:16 +00:00
Alexander Alekhin
a42ca2eeb3 Merge pull request #10483 from dkurt:fix_dnn_ssd_cpp_sample 2018-01-02 03:18:39 +00:00
Alexander Alekhin
bf80c94125 Merge pull request #10481 from alalek:fix_10474 2018-01-02 03:17:59 +00:00
Dmitry Kurtaev
d0580df339 Update C++ MobileNet-SSD object detection sample 2018-01-01 23:01:23 +03:00
Alexander Alekhin
ea5a3e557f python: filter modules headers (from <module>/include directory) 2018-01-01 15:56:14 +00:00
Alexander Alekhin
22576f4dfe Merge pull request #10480 from alalek:fix_10479 2018-01-01 15:40:12 +00:00
Alexander Alekhin
4ca89db22d imgproc(hdr): fix bounds check in HdrDecoder::checkSignature() 2018-01-01 13:12:21 +00:00
berak
dc88a2bcf2 video: clean up bg subtraction tutorial 2017-12-31 12:23:02 +01:00
Alexander Alekhin
71f4281080 Merge pull request #10473 from alalek:cmake_version_string_timestamp 2017-12-31 10:47:33 +00:00
Alexander Alekhin
4bd1e3dcbd cmake: avoid timestamp change of version_string.inc file 2017-12-30 20:26:15 +00:00
Alexander Alekhin
30373d2566 Merge pull request #10470 from victor-ludorum:caliper 2017-12-30 18:19:39 +00:00
victor-ludorum
914d9662d3 Merge pull request #10469 from victor-ludorum:stichingbranch
Updating stiching.cpp to resolve new line issue #10461 (#10469)
2017-12-30 21:22:02 +03:00
victor-ludorum
ad23c10600
Updating rotcalipers.cpp to resolve issue #10096
Updating the documentation of the rotcalipers.cpp to resolve issue #10096
2017-12-30 10:21:46 +05:30
Alexander Alekhin
a50a355e63 Merge pull request #10463 from alalek:avx512skx 2017-12-29 15:57:57 +00:00
Alexander Alekhin
7d67d60fb1 cmake(opt): AVX512_SKX 2017-12-29 07:18:11 +00:00
Alexander Alekhin
fc1d85bf59 Merge pull request #10329 from jasjuang:master 2017-12-28 16:45:16 +00:00
Alexander Alekhin
125f9f0be1 Merge pull request #10410 from GlueCrow:master 2017-12-28 16:43:17 +00:00
Alexander Alekhin
8e7af7f089 Merge pull request #10456 from dkurt:dnn_allocate_mem_for_optimized_concat 2017-12-28 16:04:51 +00:00
Alexander Alekhin
a65b5df5da Merge pull request #10416 from fenrus75:avx512 2017-12-28 15:56:56 +00:00
Alexander Alekhin
2370c8a058
Merge pull request #10429 from wxzs5:fix-documentation 2017-12-28 18:30:43 +03:00
Alexander Alekhin
2b3c140f04
Merge pull request #10436 from alalek:test_threads 2017-12-28 18:29:30 +03:00
Alexander Alekhin
ec32022bdf
Merge pull request #10444 from alalek:fix_asan_imgcodecs 2017-12-28 18:28:29 +03:00
Alexander Alekhin
898ca38257 cmake: AVX512 -> AVX_512F 2017-12-28 15:20:27 +00:00
Vinay Sharma
5aac909046 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)
2017-12-28 17:28:34 +03:00
Tom Becker
592f8d8c1b 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)
2017-12-28 17:23:11 +03:00
Dmitry Kurtaev
a9807d8f54 Allocate new memory for optimized concat to prevent collisions.
Add a flag to disable memory reusing in dnn module.
2017-12-28 16:45:53 +03:00
Alexander Alekhin
d9c0231475 Merge pull request #10452 from mshabunin:mediasdk-device 2017-12-28 12:48:26 +00:00
Maksim Shabunin
f0b606ff77 Changed VA device in MediaSDK session initialization 2017-12-28 14:10:36 +03:00
Alexander Alekhin
3542c98d45 Merge pull request #10445 from pengli:dnn 2017-12-28 04:43:41 +00:00
Li Peng
00f03c5739 Add ocl version FasterRCNN accuracy test
Signed-off-by: Li Peng <peng.li@intel.com>
2017-12-28 19:15:15 +08:00
Alexander Alekhin
4f6c493b87 imgcodecs(png): resolve ASAN issue with vars scope and setjmp() call 2017-12-28 02:43:07 +00:00
Alexander Alekhin
73c2a12449
Merge pull request #10435 from DabatoIsCool:master 2017-12-28 05:30:59 +03:00
Alexander Alekhin
99a9c10b57 Merge pull request #10424 from dkurt:fix_concat_optim 2017-12-28 01:26:14 +00:00
Alexander Alekhin
9b131b5f7e 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
2017-12-27 15:16:41 +00:00
Alexander Alekhin
5232ea1ee6 ts(feature): add "--test_threads=<N>" command-line option 2017-12-27 15:16:41 +00:00
Arthur Williams
d8d4ea857a
Fixed #10433 2017-12-27 14:09:25 +00:00
Alexander Alekhin
f3880c60a6 Merge pull request #10428 from pengli:dnn 2017-12-27 13:18:10 +00:00
Glue Crow
6045608330 Parallelization of BackgroundSubtractorKNN 2017-12-27 19:28:09 +08:00