Commit Graph

21589 Commits

Author SHA1 Message Date
Alexander Alekhin
63b30554ad 3rdparty: protobuf 3.1.0 sources
without tests, testdata, .proto files
2017-06-22 16:39:18 +03:00
Maksim Shabunin
d27009c775 Merge pull request #8856 from mshabunin:media-tests-upgrade 2017-06-22 11:45:52 +00:00
Maksim Shabunin
4eb5242e16 Merge pull request #8965 from mshabunin:fix-vs-issue-tiff 2017-06-22 11:40:07 +00:00
Maksim Shabunin
5770b961a1 Fix possible uninitialized memory in libtiff 2017-06-22 14:04:30 +03:00
Alexander Alekhin
0303fa0a19 Merge pull request #8958 from alalek:update_download 2017-06-22 09:28:16 +00:00
likan999
74127d44d0 More accurate condition to detect emulator
Previous commit, 6f39f9a, tries to fix the color issue for emulator. But the condition for detecting emulator is incomplete, e.g. it stops working for emulators using Google Play, whose Build.BRAND=="google". https://stackoverflow.com/a/21505193 shows a more accurate condition for this.
2017-06-22 00:47:15 -07:00
Alexander Alekhin
92c0709c49 Merge pull request #8960 from dkurt:halide_support_opencl 2017-06-21 19:56:40 +00:00
dkurt
e74fed5c84 Catch SkipTestException in performance tests 2017-06-21 21:30:52 +03:00
Alexander Alekhin
d29c299cdb cmake: additional messages on download errors 2017-06-21 19:04:27 +03:00
Alexander Alekhin
f0e3431bc7 .gitignore: added ".cache" directory back
It is necessary for proper work of "git clean" command
2017-06-21 19:03:17 +03:00
Dmitry Kurtaev
16368a275b cmake: add Halide support (#8794) 2017-06-21 14:33:47 +03:00
Jiri Horner
5f20e802d2 Merge pull request #8869 from hrnr:akaze_part1
[GSOC] Speeding-up AKAZE, part #1 (#8869)

* ts: expand arguments before stringifications in CV_ENUM and CV_FLAGS

added protective macros to always force macro expansion of arguments. This allows using CV_ENUM and CV_FLAGS with macro arguments.

* feature2d: unify perf test

use the same test for all detectors/descriptors we have.

* added AKAZE tests

* features2d: extend perf tests

* add BRISK, KAZE, MSER
* run all extract tests on AKAZE keypoints, so that the test si more comparable for the speed of extraction

* feature2d: rework opencl perf tests

use the same configuration as cpu tests

* feature2d: fix descriptors allocation for AKAZE and KAZE

fix crash when descriptors are UMat

* feature2d: name enum to fix build with older gcc

* Revert "ts: expand arguments before stringifications in CV_ENUM and CV_FLAGS"

This reverts commit 19538cac1e.

This wasn't a great idea after all. There is a lot of flags implemented as #define, that we don't want to expand.

* feature2d: fix expansion problems with CV_ENUM in perf

* expand arguments before passing them to CV_ENUM. This does not need modifications of CV_ENUM.
* added include guards to `perf_feature2d.hpp`

* feature2d: fix crash in AKAZE when using KAZE descriptors

* out-of-bound access in Get_MSURF_Descriptor_64
* this happened reliably when running on provided keypoints (not computed by the same instance)

* feature2d: added regression tests for AKAZE

* test with both MLDB and KAZE keypoints

* feature2d: do not compute keypoints orientation twice

* always compute keypoints orientation, when computing keypoints
* do not recompute keypoint orientation when computing descriptors

this allows to test detection and extraction separately

* features2d: fix crash in AKAZE

* out-of-bound reads near the image edge
* same as the bug in KAZE descriptors

* feature2d: refactor invariance testing

* split detectors and descriptors tests
* rewrite to google test to simplify debugging
* add tests for AKAZE and one test for ORB

* stitching: add tests with AKAZE feature finder

* added basic stitching cpu and ocl tests
* fix bug in AKAZE wrapper for stitching pipeline causing lots of
! OPENCV warning: getUMat()/getMat() call chain possible problem.
!                 Base object is dead, while nested/derived object is still alive or processed.
!                 Please check lifetime of UMat/Mat objects!
2017-06-21 14:33:09 +03:00
Vadim Pisarevsky
437ca0b62a Merge pull request #8949 from alalek:fix_sortIdx 2017-06-21 11:23:10 +00:00
Matt Bennett
05acf40aff remove ARC and auto synthesize assumptions in cocoa_window.mm 2017-06-21 12:00:26 +01:00
Alexander Alekhin
3e3e2dd512 android: make optional "cpufeatures", build fixes for NDK r15 2017-06-21 13:34:19 +03:00
Vadim Pisarevsky
2c30f358dc Merge pull request #8947 from alalek:vs_version 2017-06-21 09:33:52 +00:00
Vadim Pisarevsky
6f3d881d74 Merge pull request #8950 from alalek:cmake_mkl_detection 2017-06-21 09:32:02 +00:00
Alexander Alekhin
d3ebe665e0 core: fix IPP optimization for sortIdx 2017-06-21 03:04:16 +00:00
Alexander Alekhin
9067310166 core(test): added cv::sortIdx accuracy tests 2017-06-21 03:04:16 +00:00
Alexander Alekhin
9496fe40ec cmake: guard scanning of default MKL system-wide paths
- WITH_MKL option is enabled
- user doesn't specify MKLROOT/MKL_ROOT_DIR variables
2017-06-21 02:44:48 +00:00
Maksim Shabunin
87b569d812 Rewritten some tests in videoio and imgcodecs modules
general:
- all iterative tests have been replaced with parameterized tests
- old-style try..catch tests have been modified to use EXPECT_/ASSERT_ gtest macros
- added temporary files cleanup
- modified MatComparator error message formatting

imgcodecs:
- test_grfmt.cpp split to test_jpg.cpp, test_png.cpp, test_tiff.cpp, etc.

videoio:
- added public HAVE_VIDEO_INPUT, HAVE_VIDEO_OUTPUT definitions to cvconfig.h
- built-in MotionJPEG codec could not be tested on some platforms (read_write test was disabled if ffmpeg is off, encoding/decoding was handled by ffmpeg otherwise).
- image-related tests moved to imgcodecs (Videoio_Image)
- several property get/set tests have been combined into one
- added MotionJPEG test video to opencv_extra
2017-06-20 18:20:41 +03:00
Maksim Shabunin
8b664d6122 Merge pull request #8825 from mshabunin:media-sdk-support 2017-06-20 15:15:51 +00:00
Alexander Alekhin
43b03b6517 Merge pull request #8864 from sovrasov:calib_flags_update 2017-06-20 15:12:50 +00:00
Alexander Alekhin
a9cc87636f build: update modules descriptions 2017-06-20 15:45:23 +03:00
Alexander Alekhin
db35e13b46 build: added VERSIONINFO resource 2017-06-20 15:45:21 +03:00
Alexander Alekhin
594652cac1 Merge pull request #8942 from zwsu:master 2017-06-20 10:57:17 +00:00
Maksim Shabunin
c06f3d63e8 Initial version of MediaSDK integration:
- cmake dependencies search (WITH_MFX option)
- raw H264, H265, MPEG2 encoding and decoding
- tests for supported formats
2017-06-20 12:15:10 +03:00
Maksim Shabunin
68d01972fe Merge pull request #8883 from abratchik:DNN.java.wrappers.fix 2017-06-20 09:05:53 +00:00
Zhiwei Su
8bf3f6bfcb Fixed gray window for gpu stereo BP and CSBP
compute() for BP and CSBP output 32-bit floating-point mat, and in cv::imshow() 32-bit floating-point is recognized as [0,1] and maped to [0,255], that causes gray window for BP and CSBP.
2017-06-19 20:30:28 +08:00
Maksim Shabunin
1f4067112f Merge pull request #8920 from sovrasov:video_vriter_ext 2017-06-19 10:52:34 +00:00
Vladislav Sovrasov
f1c16f42b4 video: add one more constructor for VideoWriter 2017-06-19 12:11:14 +03:00
abratchik
037d8fbdcd Refactor OpenCV Java Wrapping 2017-06-15 20:35:12 +04:00
Alexander Alekhin
3ea02e4fcc Merge pull request #8925 from savuor:fix/softfloat_comments 2017-06-15 16:12:30 +00:00
Alexander Alekhin
b21b694444 Merge pull request #8924 from tomoaki0705:fixWarningResize 2017-06-15 16:11:18 +00:00
Alexander Alekhin
7580db09ad Merge pull request #8922 from tomoaki0705:fixWarningJetsonTK1 2017-06-15 16:09:35 +00:00
Rostislav Vasilikhin
939c8e8a99 float constant replaced by int hex representations 2017-06-15 15:10:41 +03:00
Tomoaki Teshima
5ad3ddc1b6 suppress warning
- check if compiler is Intel compiler
 - remove not referenced variables
2017-06-15 18:59:48 +09:00
Tomoaki Teshima
bd215fbf33 suppress warning on Jetson TK1 2017-06-15 18:28:13 +09:00
Alexander Alekhin
26e9b42a44 Merge pull request #8915 from sovrasov:deniose_add_assert 2017-06-14 19:17:28 +00:00
Alexander Alekhin
4f35a592a1 Merge pull request #8912 from alalek:fix_cxx11_mac_flann 2017-06-14 19:15:21 +00:00
Alexander Alekhin
9b902adea6 Merge pull request #8832 from terfendail:perf_accumulate_fix 2017-06-14 18:49:09 +00:00
Rostislav Vasilikhin
29593635ed licence updated 2017-06-14 21:20:10 +03:00
Rostislav Vasilikhin
2ad612f475 removed MSVC warning suppression 2017-06-14 21:00:06 +03:00
Alexander Alekhin
cf86f88c71 Merge pull request #8911 from alalek:fix_vsum4 2017-06-14 12:00:58 +00:00
Vladislav Sovrasov
234ad8fbee photo: add assertion on empty image in denoising 2017-06-14 13:57:07 +03:00
Alexander Alekhin
e23b59da5c build: fix v_reduce_sum4 (requires SSE3) 2017-06-14 09:37:06 +00:00
Vadim Pisarevsky
12a1c127a9 Merge pull request #8890 from alalek:remove_3rdparty_jinja2_sources 2017-06-14 07:30:14 +00:00
lewisjb
078b4cc971 Added Python Docstrings 2017-06-14 16:46:08 +10:00
Alexander Alekhin
9fa90c8851 Merge pull request #8899 from tomoaki0705:fixSuppressWarningsUnreachable 2017-06-14 01:07:47 +00:00
Alexander Alekhin
cc52523375 flann: add normal assignment operator for cvflann::any 2017-06-14 00:55:52 +00:00