mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
23,831 Commits 6 Branches 126 Tags 3 GiB
f708a11f0f
Commit Graph

16961 Commits

Author SHA1 Message Date
Alexander Alekhin
1b7aa92eb6 Merge pull request #11188 from mshabunin:fix-clang-warnings 2018-03-29 14:34:30 +00:00
Alexander Alekhin
8c4b5b6a70 core(test): parallel_for test with exception 2018-03-29 16:59:51 +03:00
Alexander Alekhin
177be2adda Merge pull request #11174 from corleypc:master 2018-03-29 13:50:44 +00:00
RAJKIRAN NATARAJAN
6d83a80385 Merge pull request #11176 from saskatchewancatch:issue-11165 
* fix cv::imwrite to allow cv::UMat and vectors of it to be written

* cv::imwrite failure handling improvements

* Unit test for regression testing imwrite support for and fix whitespace
 2018-03-29 16:47:31 +03:00
Maksim Shabunin
439072a2a6 Fixed two warnings produced by clang 2018-03-29 13:24:04 +03:00
Alexander Alekhin
7f63b31ca8 avoid calling of setNumThreads() to respect user settings 2018-03-29 13:04:26 +03:00
Alexander Alekhin
87498bc6d4 cmake: workaround CPATH ipp_iw issue 
CPATH entries are processed before any -isystem:
https://gcc.gnu.org/onlinedocs/cpp/Environment-Variables.html
 2018-03-28 18:43:28 +03:00
Alexander Alekhin
8a0cc5009e build: eliminate MSVC warning 2018-03-28 18:43:28 +03:00
Alexander Alekhin
25be4186bc python: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:28 +03:00
Alexander Alekhin
6c8014e7d1 cmake: disable checks for protobuf generated files 2018-03-28 18:43:28 +03:00
Alexander Alekhin
d7e9201434 misc: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:28 +03:00
Alexander Alekhin
2bd4f2c3a6 videostab: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:28 +03:00
Alexander Alekhin
a8eb3e1b29 superres: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:27 +03:00
Alexander Alekhin
4a0fa57614 shape: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:27 +03:00
Alexander Alekhin
4df4a37b11 flann: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:27 +03:00
Alexander Alekhin
1ca7ae9630 video: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:27 +03:00
Alexander Alekhin
e741b71dac photo: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:27 +03:00
Alexander Alekhin
225bae1387 stitching: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:27 +03:00
Alexander Alekhin
4d0dd3e509 ml: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:27 +03:00
Alexander Alekhin
3314966acb objdetect: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:27 +03:00
Alexander Alekhin
1060c0f439 dnn: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:27 +03:00
Alexander Alekhin
bdbd0129af calib3d: apply CV_OVERRIDE/CV_FINAL 2018-03-28 17:57:59 +03:00
Alexander Alekhin
0854dc3320 features2d: apply CV_OVERRIDE/CV_FINAL 2018-03-28 17:57:59 +03:00
Alexander Alekhin
8f0669c300 videoio: apply CV_OVERRIDE/CV_FINAL 2018-03-28 17:57:59 +03:00
Alexander Alekhin
a91953b15c imgcodecs: apply CV_OVERRIDE/CV_FINAL 2018-03-28 17:57:59 +03:00
Alexander Alekhin
5d36ee2fe7 imgproc: apply CV_OVERRIDE/CV_FINAL 2018-03-28 17:57:59 +03:00
Alexander Alekhin
9111538bfb core: apply CV_OVERRIDE/CV_FINAL 2018-03-28 17:57:59 +03:00
Alexander Alekhin
0587f92d96 cmake: disable override warnings in 3rdparty code and viz 2018-03-28 17:57:59 +03:00
Alexander Alekhin
773877cd12 ts: apply CV_OVERRIDE/CV_FINAL 
- disable "-Wsuggest-override" in tests
 2018-03-28 17:57:59 +03:00
Alexander Alekhin
84980741a8 core: add CV_OVERRIDE/CV_FINAL macros 2018-03-28 17:57:58 +03:00
Alexander Alekhin
167034fb04 Merge pull request #11098 from dkurt:dnn_native_inf_engine 2018-03-28 14:52:08 +00:00
Dmitry Kurtaev
e039fc3a63 Replace protobuf's ReleaseLast to RemoveLast to deallocate memory. 
Change an order of PriorBox layer operations.
 2018-03-28 17:27:36 +03:00
Dmitry Kurtaev
2f3a9ba1d4 Update OpenCVDetectInferenceEngine.cmake 2018-03-28 16:34:37 +03:00
Vadim Pisarevsky
1097d0e810 Merge pull request #11072 from alalek:explicit_autobuffer 2018-03-28 12:57:25 +00:00
Vadim Pisarevsky
284e5231c5 Merge pull request #11171 from codingforfun:fix_11143 2018-03-28 12:47:37 +00:00
Vadim Pisarevsky
6b041c8aeb Merge pull request #11137 from alalek:core_fix_mat_ctor 2018-03-28 12:39:49 +00:00
Alexander Alekhin
8388b630ac Merge pull request #11167 from alalek:cmake_compiler_vars 2018-03-28 12:38:31 +00:00
LaurentBerger
03eb463f1c Solves #11156 (#11160) 
* Solves #11156

* Check file size for all file format. Disable APPEND if file is empty

* Add test for APPEND mode
 2018-03-28 15:35:38 +03:00
Alexander Alekhin
75b5e3fa64 Merge pull request #11175 from collenjones:hotfix/coreLinkFix 2018-03-28 12:21:11 +00:00
Tomoaki Teshima
c14578649d fix build error on Jetson 2018-03-28 18:21:53 +09:00
Collen Jones
687ccdf8db Fix link to Hershey fonts 2018-03-27 20:11:48 -07:00
corley
a4b9ce764c Fixed silent failures in getting and setting properties 2018-03-28 00:05:54 +03:00
Alexander Alekhin
7d8f1dde26 core(persistence): disable checks for base64 streams 2018-03-27 17:02:04 +03:00
codingforfun
24e2e0d3f9 #11143 [FIX] Normalize node risk with sample weight sum 
In case of regression trees, node risk is computed as sum of squared
error. To get a meaningfull value to compare with it needs to be
normalized to the number of samples in the node (or more generally to
the sum of sample weights in this node). Otherwise the sum of squared
error is highly dependend on the number of samples in the node and
comparision with `regressionAccuracy` parameter is not very meaningful.

After normalization `node_risk` means in fact sample variance for all
samples in the node, which makes much more sence and seams to be what
was originaly intended by the code given that node risk is later used as
a split termination criteria by
```
sqrt(node.node_risk) < params.getRegressionAccuracy()
```
 2018-03-27 15:39:36 +02:00
Alexander Alekhin
017c217bb0 Merge pull request #11162 from kinchungwong:master 2018-03-27 13:27:43 +00:00
Alexander Alekhin
f4c4b01455 core: added checks and "fixit" items for persistence parsers 
To raise errors with proper messages of the problems.
 2018-03-27 16:19:43 +03:00
Alexander Alekhin
08941b7890 cmake: avoid amending of CMAKE_COMPILER_IS_[GNUCXX|CLANGCXX|CCACHE] vars 
- Recommended compiler checks:
  - GCC: CV_GCC
  - Clang: CV_CLANG
- fixed problem with CMAKE_CXX_COMPILER_ID=Clang/AppleClang mess on MacOSX
  Details: cmake --help-policy CMP0025
- do not declare Clang as GCC compiler
 2018-03-27 16:16:59 +03:00
Alexander Alekhin
7ee217285b Merge pull request #11089 from terfendail:stereocalibrate_f32 2018-03-27 13:08:06 +00:00
Alexander Alekhin
9e0dee1259 Merge pull request #11112 from alalek:cmake_src_include_fix 2018-03-27 13:06:48 +00:00
Alexander Alekhin
d1311518a3 core: test-sample for FIXED_TYPE demonstration 
with implementation of functions with multiple output formats
 2018-03-27 15:41:41 +03:00
Vadim Pisarevsky
6e13ffe162 Merge pull request #11159 from alalek:samples_avoid_legacy_api 2018-03-27 10:05:35 +00:00
corley
f441515357 Fixed a couple of memory leaks in videoInput::getDevice() when multiple devices are present in the system 2018-03-27 00:54:48 +03:00
kinchungwong
333e53eee8 Minor improvement to SSE code in HOGDescriptor::computeGradient, replace emulation of _mm_mullo_epi32 with constant multiplicand 3 with two _mm_add_epi32. OpenCV issue #11161 2018-03-26 09:24:03 -07:00
Alexander Alekhin
7f9253ea0a samples: avoid using of legacy C-like API 
- CV_RGB() macro is moved into opencv2/imgproc.hpp from imgproc_c.h
- samples/cpp/filestorage_base64.cpp is dropped
 2018-03-26 13:42:35 +03:00
Alexander Alekhin
24acbecd33 Merge pull request #11151 from AndreiCostinescu:patch-1 2018-03-26 10:22:38 +00:00
Dmitry Kurtaev
7972f47ed4 Load networks from intermediate representation of Intel's Deep learning deployment toolkit. 2018-03-26 07:24:21 +03:00
Namgoo Lee
a8f86af633 Update GpuMat, GpuMat::download, GpuMat::upload documentation 2018-03-26 10:59:05 +09:00
Andrei Costinescu
38d73123c1
#include <math.h> in cv2.cpp 
My build fails with the error:
"C:/PROGRA~1/MINGW-~1/X86_64~1.0-P/mingw64/lib/gcc/x86_64-w64-mingw32/7.2.0/include/c++/cmath:1136:11: error: '::hypot' has not been declared".
I have tried to fix it by adding "#include <cmath>" before the line "#include <Python.h>" but then the build has failed with the error:
"C:/PROGRA~1/MINGW-~1/X86_64~1.0-P/mingw64/lib/gcc/x86_64-w64-mingw32/7.2.0/include/c++/math.h:91:12:: error: 'std::_hypot' has not been declared".
Adding "#include <math.h>" allowed me to build opencv.
 2018-03-25 20:39:29 +02:00
Alexander Alekhin
e06d1e8083 Merge pull request #11141 from dkurt:dnn_no_aspect_ratios 2018-03-24 20:38:55 +00:00
Anthony Wertz
c6cf7f8080 Sets a higher limit on videoio's AVI container's maximum chunk size, and adds an explanation of the assertion. Closes #11126 2018-03-23 12:03:46 -04:00
Alexander Alekhin
cd4b748b44 Merge pull request #11064 from tomoaki0705:fixCudaStreamAsync 2018-03-23 13:04:18 +00:00
Dmitry Kurtaev
e8fe6ee4e3 Fix prior box generation in case of squared proposals. 
Fix batch norm in training phase.
 2018-03-23 09:44:59 +03:00
Alexander Alekhin
4378e8fcc0 core: fix cv::Mat constructor 2018-03-22 15:35:54 +03:00
Tomoaki Teshima
06babf90a5 let the test OCL_ImgprocWarp/Resize.Mat pass on ARM/Aarch64 
* disable carotenete when calling resize on ARM/Aarch64
  * loosen eps on Aarch64
 2018-03-22 21:35:34 +09:00
Tomoaki Teshima
f4e5d777e8 follow histogram 2018-03-22 21:33:51 +09:00
Tomoaki Teshima
6c25351049 make the asynchronous call to NPP safe 
* Stop calling nppSetStream
 2018-03-22 21:33:51 +09:00
Alexander Alekhin
2dff9f4c6d Merge pull request #11136 from tomoaki0705:fixCalib3dClang 2018-03-22 10:24:36 +00:00
Alexander Alekhin
b390e86b12 Merge pull request #11124 from terfendail:minenctriangle_fix 2018-03-22 10:23:10 +00:00
Tomoaki Teshima
08e0c69dbf apply the workaround to correct range 2018-03-22 18:28:47 +09:00
Vitaly Tuzov
91c35a7d01 Updated handling of collinear edges while searching for intersection. 2018-03-21 19:15:34 +03:00
Alexander Alekhin
0366c1b093 Merge pull request #11105 from dkurt:issue_11102 2018-03-21 09:18:14 +00:00
Alexander Alekhin
fed22f2f5c Merge pull request #11074 from alalek:android_log_messages 2018-03-20 20:40:54 +00:00
Alexander Alekhin
6c051a55e5 cmake: don't add include <module>/src directory to avoid conflicts 
during opencv_world builds
 2018-03-19 11:14:15 +03:00
Namgoo Lee
90e1e41f5a test_buffer_pool: synchronize after async copy 2018-03-19 09:30:06 +09:00
Aleksandr Tischenko
22ecdd16ef Merge pull request #11101 from lamantine:fix_11100 
* fixed bug #11100 Integer overflow in kmeans

* fixed integer overflow in other divUp-s in kmeans code
fixed warning about size_t to double conversion
 2018-03-18 15:11:42 +03:00
Dmitry Kurtaev
069f9add80 Fix an issue https://github.com/opencv/opencv/issues/11102 2018-03-18 10:49:12 +03:00
yuki takehara
41f8e788b2 Merge pull request #11083 from take1014:lsd_#9363 
* Fix #9363

* Renamed the structure and added a new function to the LineSegmentDetectorImpl class as a static member

* Added a new function to the LineSegmentDetectorImpl class as a static member
 2018-03-16 19:31:55 +03:00
Vitaly Tuzov
7afaaef0eb Allow CV_32FC3 objPoints in cv::fisheye::stereoCalibrate 2018-03-16 13:05:40 +03:00
Alexander Alekhin
dd259503c1 Merge pull request #11073 from geordi:qt-window-pixel-values 2018-03-15 14:35:29 +00:00
Rostislav Vasilikhin
64916d3d83 Merge pull request #10869 from savuor:color_cpp_split 
color.cpp split (#10869)

* initial split is done

* files renamed (these names are excluded during compilation)

* IPP code moved to corresponding files

* splineBuild, splineInterpolate -> color_lab.cpp

* Lab, Luv: little refactored

* it compiles (didn't check work); Lab OCL code moved to color_lab.cpp

* cvtcolor.cl: Lab/Luv part moved to color_lab.cl

* cvtcolor.cl: color_rgb.cl extracted

* cvtcolor.cl: color_yuv.cl separated

* cvtcolor.cl: color_hsv.cl extracted

* cvtcolor.cl: extracted to color_lab.cl and color_rgb.cl

* helper functions moved to hpp file

* Lab, Luv: moved to color_lab.cpp

* CPU XYZ: to color_lab.cpp

* OCL XYZ: to color_lab.cpp

* warning fixed

* CvtHelper added

* CPU YUV: to color_yuv.cpp, helpers to color.hpp

* CPU HLS/HSV: to color_hsv.cpp

* CPU BGR2BGR: to color_rgb.cpp

* CPU RGB: to color_rgb.cpp

* extra arg removed

* CPU YUV: to color_yuv.cpp

* color code decoded

* OclHelper added, some funcs rewritten

* color_lab.cpp: refactored to use OclHelper

* OCL RGB: to color_rgb.cpp

* OCL HLS/HSV: to color_hsv.cpp

* OCL YUV: to color_yuv.cpp

* OCL YUV planes: to color_yuv.cpp

* OCL: color code reduced

* licence to demosaicing.cpp

* IPP func tables to color_rgb.cpp

* code cleanup

* HAVE_OPENCL ifdefs added

* helpers made more common

* fixed two plane YUV with separate mats

* fixed warning in gcc7.2.0

* precomp header fixed

* color space classification functions fixed

* helpers fixed

* rename: isSRGB -> is_sRGB
 2018-03-15 14:10:40 +03:00
Alexander Alekhin
d68466bb6a Merge pull request #10940 from dkurt:dnn_tf_graph_optim 2018-03-14 14:36:25 +00:00
Alexander Alekhin
ab110c0ad1 Merge pull request #10979 from dkurt:unite_dnn_samples 2018-03-14 14:33:49 +00:00
Alexander Alekhin
8781ee971c core: write log messages via __android_log_print (logcat) too 2018-03-14 17:24:29 +03:00
Alexander Alekhin
cc06935a10 Merge pull request #11065 from vasiliev-vb:BUGFIX_KAZE_orientation 2018-03-14 14:15:47 +00:00
miqlas
f3a9f13cb4 Merge pull request #10984 from extrowerk:advanced_haiku_patches 
* Haiku supporting patches

* Revert uneeded changes

* Whitespace cleanup
 2018-03-14 17:09:10 +03:00
Jan Gaura
eb3969e244 Better text contrast of pixel brightness values in Qt window 
This offsets text brightness of pixel brightness values
by offsetting it by 127 to the curent pixel value.
The text is now readable even if pixels are black.
 2018-03-14 13:27:11 +01:00
Alexander Alekhin
ee1ac1140d core: use explicit for cv::AutoBuffer 
To avoid compilation of this code:
- buf = 0;

This code can be received after refactoring of 1D cv::Mat to cv::AutoBuffer.
- "cv_mat = 0" calls setTo().
- cv::AutoBuffer calls "allocate(0)" - this is wrong.
 2018-03-14 14:17:52 +03:00
vasiliev-vb
94c8e59bbe
Fixed bug in KAZE features orientation. 
Bug was added in f6ceeaa commit, different angle computation functions have different parameter order.
 2018-03-13 15:09:36 +00:00
Alexander Alekhin
7e9578789b Merge pull request #11057 from tomoaki0705:fixClangComplexCalib3d 2018-03-13 13:43:21 +00:00
Tomoaki Teshima
7fd53f6ca2 avoid clang weird behavior in calib3d 
* add ifdef to apply on specific situation
 2018-03-13 21:51:20 +09:00
Dmitry Kurtaev
538fd42363 Add test for Scalar arguments at CommandLineParser 2018-03-13 11:01:07 +03:00
yuki takehara
0792ef8789 Merge pull request #11049 from take1014:#10948 
* Fix #10948

* Add test code

* Fixed build error

* Add value zero

* eigen: test cleanup
 2018-03-12 21:49:10 +03:00
shimat
5bf7f09ac1 Merge pull request #11035 from shimat:refactoring_decolor 
Refactor decolor (#11035)

* decolor: modernize deprecated headers (math.h -> cmath)

* refactor contrast_preserve.cpp

* refactor contrast_preserve.hpp (add static/const)

* refactor contrast_preserve.hpp (join assignment and declaration)

* refactor contrast_preserve.hpp (format)

* refactor test_decolor.cpp (indent)

* refactor contrast_preserve.hpp (const)

* contrast_preserve.hpp : optimize by minMaxLoc

* fix trailing-whitespace

* fix warning C4267 on VC++ x64
(conversion from 'size_t' to 'int', possible loss of data)

* use cvRound instead of round_num

* decrease indentation of test_decolor.cpp

* remove pow() to optimize

* remove redundant Mat initialization
 2018-03-12 17:22:06 +03:00
Dmitry Kurtaev
ab20d2a3fc Update assertions in batch norm layer 2018-03-12 10:53:06 +03:00
Dmitry Kurtaev
69a8f110b6 Fuse subgraphs from Keras 2018-03-12 10:53:06 +03:00
Dmitry Kurtaev
9457bf10ab Fuse batch normalization and flatten TensorFlow subgraphs in runtime 2018-03-12 10:51:35 +03:00
Adam Rankin
d810c73396
Update precomp.hpp 
Enabling build of visualization module when using VTK 9 (current HEAD of d5bbb9e99bbc6d11d2196c48bfd8f33508554551)
 2018-03-11 22:28:18 -04:00
Alexander Alekhin
5b868ccd82 Merge pull request #10992 from dkurt:dnn_opencl_tests 2018-03-09 10:06:40 +00:00
Alexander Alekhin
5b6ee79cd6 Merge pull request #11033 from adamrankin:patch-1 2018-03-08 17:49:10 +00:00
Alexander Alekhin
8bb787cdf8 Merge pull request #11027 from tomoaki0705:fixImgprocPerfFailureVS2013 2018-03-08 14:28:14 +00:00
Dmitry Kurtaev
130546e1d9 Semantic segmentation sample. 2018-03-08 11:02:26 +03:00
Adam Rankin
f8061ba3c8
Enabling build of stitching when CUDA is available 
Without proposed change, module throws build error regarding missing `opencv2/cudaimgproc.hpp`
 2018-03-07 20:07:48 -05:00
Dmitry Kurtaev
0f01b40dd5 Reset OpenCL kernels if batch size changes 2018-03-07 17:06:59 +03:00
Alexander Alekhin
8edc2e5aaf Merge pull request #10928 from Mehanik:fix_timeout 2018-03-07 12:34:09 +00:00
shimat
21d9c47bd0 Optimize decolor in photo (#10997) 
* optimized cv::decolor by removing vector.push_back

* restored CV_INSTRUMENT_REGION() and original indent

* fix build warnings in contrast_preserve.hpp

* undo refactoring contrast_preserve.cpp/hpp
 2018-03-07 14:20:45 +03:00
Eugene Mikhantiev
c790299906 Fix return code in case of timeout 2018-03-07 17:26:34 +07:00
Alexander Alekhin
514f4193db Merge pull request #10959 from alalek:cmake_ocl4dnn 2018-03-07 10:26:14 +00:00
Dmitry Kurtaev
0a61ebdd66 Replace DNNTarget and DNNBackend in tests 2018-03-07 12:59:38 +03:00
Tomoaki Teshima
640d77be25 let the performance tests of WarpPerspective pass 
* avoid misuse of vzeroupper on Visual Studio 2013 Update 5
  * add ifdef to avoid unattended optimization
 2018-03-07 18:55:27 +09:00
Maksim Shabunin
49dd0305f2 Merge pull request #10946 from mshabunin:add-license-install 2018-03-07 07:15:50 +00:00
Alexander Alekhin
1393fd9e8e Merge pull request #10989 from tomoaki0705:fixOldGstreamerTest 2018-03-06 16:26:08 +00:00
Alexander Alekhin
3202062e77 Merge pull request #11005 from tomoaki0705:fixOclTestFailureVS2012 2018-03-06 15:49:08 +00:00
Maksim Shabunin
7bbe002a2f Add install component for 3rdparty libraries licenses 2018-03-06 16:32:30 +03:00
Tomoaki Teshima
9079d9ce17 let the test OCL_Filter/Bilateral pass 
* avoid aggressive optimization on Visual Studio 2012 Update 5
  * add code branch to avoid unattended optimization (keep the old code)
 2018-03-06 19:48:04 +09:00
native-api
dc1d9ae973 Include error code description into the message (#10982) 2018-03-06 09:58:19 +03:00
Namgoo Lee
c219f97f48 SSE2 : use _mm_cvtpd_epi32 when converting from CV_64F to CV_32S (#10987) 
* SSE2 : use _mm_cvtpd_epi32 when converting from CV_64F to CV_32S

* No need to define a new universal intrinsic
 2018-03-06 09:50:53 +03:00
Dmitry Kurtaev
e1c3237532 Parametric OpenCL deep learning tests 2018-03-05 20:53:18 +03:00
Tomoaki Teshima
a9f3a7de39 add workaround of old gstreamer 2018-03-05 19:27:49 +09:00
Suleyman TURKMEN
5e1a656bbb Update core.hpp 2018-03-04 23:02:47 +03:00
Dmitry Kurtaev
f2440ceae6 Update tutorials. A new cv::dnn::readNet function 2018-03-04 20:30:22 +03:00
Dmitry Kurtaev
e8d94ea87c Unite deep learning object detection samples 2018-03-03 14:47:13 +03:00
cDc
667f5b655a Merge pull request #10933 from cdcseacave:clean_npr 
* clean npr functions of useless initializations (speed-up)

* photo: remove unnecessary code
 2018-03-02 14:42:28 +03:00
Alexander Alekhin
0d2cee45e8 Merge pull request #10971 from alalek:ocl_error_code_string 2018-03-02 11:41:01 +00:00
Alexander Alekhin
f2ec7eeb37 Merge pull request #10966 from alalek:verbose_features2d_test 2018-03-02 11:39:14 +00:00
Alexander Alekhin
e869bb6b05 Merge pull request #10964 from alalek:fix_10956 2018-03-02 11:38:52 +00:00
Alexander Alekhin
fe97dc67dc Merge pull request #10962 from alalek:dnn_precomp_hpp 2018-03-02 11:38:16 +00:00
Alexander Alekhin
97c1f09961 Merge pull request #10955 from pengli:dnn 2018-03-02 11:35:59 +00:00
Alexander Alekhin
fda7bb95d0 Merge pull request #10938 from mshabunin:fix-static-issues-9 2018-03-02 11:34:53 +00:00
Alexander Alekhin
90ff900387 Merge pull request #10926 from tomoaki0705:fixTinkerBoardOpenCL 2018-03-02 11:32:51 +00:00
Alexander Alekhin
b1fc7d46a5 ocl: update getOpenCLErrorString() code 2018-03-01 13:52:43 +03:00
Alexander Alekhin
a9ebc61f2a dnn(workaround): switch to CPU target if compiled without OpenCL 2018-03-01 12:12:40 +03:00
Alexander Alekhin
1b83bc48a1 dnn: make OpenCL DNN code optional 2018-03-01 12:12:40 +03:00
Alexander Alekhin
da6dc6774b features2d: add verbose messages into tests 
To investigate sporadic failures of Features2d_FLANN_Auto.regression test.
 2018-02-28 19:47:16 +00:00
Alexander Alekhin
76c40e8f0d java: fix copy_java_files() in gen_java.py 
- missing 'module'
- fixed '\r\n' EOL handling (blocked by '$' regex)
 2018-02-28 17:58:31 +03:00
Alexander Alekhin
a838a97092 dnn: fix precomp.hpp usage 2018-02-28 17:06:26 +03:00
Wu Zhiwen
ef937dd676 ocl4dnn: Fix SAME padding mode for convolve 
Signed-off-by: Wu, Zhiwen <zhiwen.wu@intel.com>
Signed-off-by: Li Peng <peng.li@intel.com>
 2018-02-28 21:02:41 +08:00
Tomoaki Teshima
8fd1bbde76 fix test error on Tinker Board (OpenCL on Arm platform) 
* loosen some test threshold mainly for integer types
  * use relative error for floating points result
  * avoid division by zero by following the comment
  * fix the indentation
 2018-02-26 22:55:06 +09:00
Maksim Shabunin
7c855aa3e1 Fixed two issues found by static analysis 2018-02-26 00:16:02 +03:00
Alexander Alekhin
24bed38c2b Merge tag '3.4.1' 2018-02-25 16:56:57 +00:00
Alexander Alekhin
6ffc48769a OpenCV version++ 
OpenCV 3.4.1
 2018-02-23 11:38:33 +03:00
Alexander Alekhin
4a74408eee experimental version++ 2018-02-23 11:38:33 +03:00
Li Peng
608968aa83 Deconvolution ocl fix 
Signed-off-by: Li Peng <peng.li@intel.com>
 2018-02-23 18:31:30 +08:00
Li, Peng
5caf6244a3 Merge pull request #10922 from pengli:dnn 
* ave pooling ocl fix

support the padded area control in ave pooling

Signed-off-by: Li Peng <peng.li@intel.com>

* warning fix: ununitialized field
 2018-02-22 21:01:12 +03:00
Maksim Shabunin
92e9d4ec3a Fixed several issues detected by static analysis 2018-02-22 17:11:33 +03:00
Maksim Shabunin
fbb2cabe77 Use fixed size types in AVIContainer structs 2018-02-22 17:11:25 +03:00
Maksim Shabunin
3fd2384b81 Fixed mingw compilation on Windows 2018-02-22 17:11:18 +03:00
Vadim Pisarevsky
5e0f95b948 Merge pull request #9708 from dkurt:tf_face_detector 2018-02-22 12:04:26 +00:00
Vadim Pisarevsky
a11b7a8293 Merge pull request #10916 from alalek:videoio_sample_aspect_ratio 2018-02-22 12:03:39 +00:00
Li Peng
e7d35d51fa Fix for opencv face detector ocl test 
Signed-off-by: Li Peng <peng.li@intel.com>
 2018-02-22 23:37:54 +08:00
Li Peng
c524f669c7 Fallback for "SAME" padMode in ocl convolution and pooling 
It fixes tensorflow ocl testcase of MobileNetSSD and Inception_v2_SSD

Signed-off-by: Li Peng <peng.li@intel.com>
 2018-02-22 21:17:59 +08:00
Alexander Alekhin
203ac0f818 Merge pull request #10914 from alalek:issue_10815 2018-02-21 18:26:15 +00:00
Dmitry Kurtaev
eab556e1e0 OpenCV face detection network in TensorFlow 2018-02-21 19:58:24 +03:00
Alexander Alekhin
9819ebc095 videoio: add missing CAP_PROP_SAR_NUM/DEN propepties into .hpp file 
reuse av_guess_sample_aspect_ratio() if available in ffmpeg
 2018-02-21 19:14:04 +03:00
Alexander Alekhin
48b8aa51cd core: eliminate redundant cv::format() declarations 
Existed includes sequence:
- utility.hpp -> core.hpp -> operations.hpp
 2018-02-21 14:22:16 +03:00
Alexander Alekhin
6e8241b78d imgcodecs: fix RBaseStream hang on truncated inputs 2018-02-21 13:17:18 +03:00
Vadim Pisarevsky
f61076a5d8 Merge pull request #10367 from savuor:multiwrite_tiff_renew 2018-02-20 23:13:55 +00:00
Alexander Alekhin
5f5fcef962 Merge pull request #10907 from alalek:cmake_ninja_fix 2018-02-20 18:54:43 +00:00
Namgoo Lee
12ce6b5c15 Merge pull request #10906 from nglee:dev_cudaFastMultiStreamSafety 
cuda_fast : multi stream safety (#10906)

* CUDA_Features2D/FAST Asynchronous test

* cuda_fast : multi stream safety

* Use parallel_for instead of OpenMP
 2018-02-20 20:55:57 +03:00
Rostislav Vasilikhin
27b1f8f446 imwrite for multipage images implemented 2018-02-20 19:08:45 +03:00
Vadim Pisarevsky
c6e1e3acdc Merge pull request #10892 from alalek:android_sdk_build_gradle 2018-02-20 14:59:32 +00:00
Vadim Pisarevsky
53661d55ae Merge pull request #10406 from seiko2plus:coreUnvintrinCopy 2018-02-20 14:50:17 +00:00
Vadim Pisarevsky
120b7a61c3 Merge pull request #10745 from terfendail:tiff_fix 2018-02-20 14:47:13 +00:00
PalkoNazar
470d34ddbb make tmpRow proper size before copyTo to avoid reallocated tmpCol (#10860) 
* make tmpRow proper size before copyTo to avoid reallocated tmpCol

* do the transposition without creating temporary array; replace TAB with spaces.

* revert the previous commit
 2018-02-20 16:55:25 +03:00
Vadim Pisarevsky
a0c2718adb Merge pull request #10902 from alalek:port_10695 2018-02-20 13:26:59 +00:00
Vadim Pisarevsky
a836892edb Merge pull request #10903 from alalek:ml_ann_test 2018-02-20 13:25:58 +00:00
Alexander Alekhin
2aa15ab3ff ffmpeg: fix 'uchar' error 
> cap_ffmpeg_impl.hpp:1710:11: error: 'uchar' does not name a type
 2018-02-20 13:15:41 +03:00
Alexander Alekhin
807ec00b85 cmake: fix Ninja warning 
about BYPRODUCTS bin/opencv-340.jar
 2018-02-20 13:13:31 +03:00
Alexander Alekhin
53305d4a7e Merge pull request #10891 from pengli:dnn 2018-02-20 08:59:07 +00:00
Li Peng
2863f950d6 ReLU6 layer ocl support 
include relu6 ocl kernel and layer fusion support

Signed-off-by: Li Peng <peng.li@intel.com>
 2018-02-20 15:11:09 +08:00
Alexander Alekhin
12d2bd4adb ml: refactor ML_ANN test 2018-02-19 21:35:48 +03:00
Vitaly Tuzov
24ee7b5080 Fix for vertically flipped tiff files reading 2018-02-19 18:49:19 +03:00
mworchel
aab390c51d Add mask support to SimpleBlobDetector 2018-02-19 17:54:27 +03:00
Dmitry Kurtaev
8b4871a28d Use only absolute prior boxes explicit sizes. Remove scales attributes. (#10874) 
* Use only absolute prior boxes explicit sizes. Remove scales attributes.

* Simplified PriorBox layer forward pass
 2018-02-19 17:25:18 +03:00
Alexander Alekhin
cf31243c74 android: add build.grade into Android SDK 
For using 'OpenCV for Android SDK' with Android Studio projects.
 2018-02-19 17:19:26 +03:00
Vadim Pisarevsky
7da6e9086c Merge pull request #10893 from alalek:fix_cpu_disable_flags 2018-02-19 14:11:11 +00:00
Vadim Pisarevsky
68043f4de9 Merge pull request #10896 from dkurt:tensorflow_tests_generator 2018-02-19 14:08:58 +00:00
Tomoaki Teshima
bcce25900b read in gray scale mode when writing a gray scale video 2018-02-19 18:33:05 +09:00
Dmitry Kurtaev
34ba32ff27 Fix DNN flatten test 2018-02-18 12:45:43 +03:00
Alexander Alekhin
857007372d Merge pull request #10895 from tomoaki0705:fixBuildVS2013sprintf 2018-02-18 07:45:01 +00:00
Tomoaki Teshima
6a661e1e28 fix test error on VS2013 2018-02-18 09:29:38 +09:00
Alexander Alekhin
cc5a6f3b86 core: remove '-' from separators list of disabled CPU flags 
To allow runtime disabling of AVX512-SKX via 'OPENCV_CPU_DISABLE' parameter
 2018-02-18 00:03:04 +00:00
Alexander Alekhin
73a8369631 Merge pull request #10890 from Reputeless:patch-1 2018-02-17 12:02:48 +00:00
Florian Echtler
6a8f57e5d7 Merge pull request #10081 from floe:java-camera2-view 
* add (untested) JavaCamera2View class

* initial fixes

* minor cleanup

* exclude JavaCamera2View from build for older SDK version

* fix method name typo

* add asserts + sanity checks

* fix preview format checks

* fix the memory leak

* export cvtTwoPlaneYUVtoBGR for Java usage

* add handling for two-plane YUV frames (C wrapper still missing)

* add two-plane cvtColor helper function

* fix warnings

* actually use the new cvtColorTwoPlane helper func

* fix wrong output matrix size

* fix wrong conversion type

* simplify method signature, add error condition

* minor fixes to Mat types

* remove leftover semaphore from camera api 1

* android: JavaCamera2View minor refactoring

- re-apply Java code style
- imports cleanup
- dump exceptions information

* android: JavaCamera2View: pause/resume fixes

* android: JavaCamera2View: fix mScale
 2018-02-17 15:01:24 +03:00
Alexander Alekhin
eb94dfb442 Merge pull request #10885 from alalek:issue_10881 2018-02-17 11:58:51 +00:00
Patrik Huber
7be0c78533 Merge pull request #10589 from patrikhuber:patch-1 
* Make <array> #ifdef true for MSVC

I think MSVC had `std::array` for quite a while (possibly going back as far as VS 2012, but it's definitely there in 2015 and 2017. So I think `_MSC_VER` `1900` is a safe bet. Probably `1800` and maybe even `1700` could work as well but I can't test that locally.

* fix test
 2018-02-17 14:53:30 +03:00
Ryo Suzuki
97d9ea00fe
Fix typo in core/base.hpp 2018-02-17 19:35:25 +09:00
Alexander Alekhin
491502a349 core: fix parallel_for data race 2018-02-16 21:13:48 +03:00
Alexander Alekhin
0e4eed0ba1 Merge pull request #10867 from dkurt:dnn_fix_ave_pooling_area 2018-02-16 11:17:32 +00:00
Alexander Alekhin
c020a7bb67 build: portable integer types 2018-02-15 23:43:02 +03:00
Alexander Alekhin
e268fdc0ed Merge pull request #10793 from denmatfoton:master 2018-02-15 15:52:52 +00:00
Alexander Nesterov
df8f61877e Added avi-container with tests 2018-02-15 17:34:49 +03:00
Alexander Alekhin
f378f1d585 calib3d: add regression test for stereoCalibrate 2018-02-15 15:24:09 +03:00
Dmitry Kurtaev
f8d0d6365e Add a flag to manage average pooling with padding 2018-02-14 16:56:31 +03:00
Alexander Alekhin
cff79609c8 Merge pull request #10854 from pengli:dnn 2018-02-14 12:49:53 +00:00
Vadim Pisarevsky
ef70b0baa4 Merge pull request #10865 from dkurt:dnn_inf_engine_getInputsInfo 2018-02-14 12:25:18 +00:00
Vadim Pisarevsky
b4ddf3d8c5 Merge pull request #10678 from terfendail:OutputArray_recreate 2018-02-14 11:36:51 +00:00
Vadim Pisarevsky
42b25d747b Merge pull request #10856 from tomoaki0705:fixVisualStudioFixedWidthInt 2018-02-14 11:33:15 +00:00
Dmitry Kurtaev
a66b5e2c13 Add const getInputsInfo 2018-02-14 14:17:44 +03:00
Vadim Pisarevsky
8f0b72be9e Merge pull request #10861 from nglee:dev_cudaDftAlgorithmTest 2018-02-14 10:50:05 +00:00
Vadim Pisarevsky
6dfd7e3da2 Merge pull request #10850 from dkurt:dnn_tf_deconv_tests 2018-02-14 10:35:14 +00:00