mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
20,110 Commits 6 Branches 126 Tags 3 GiB
bdf661538d
Commit Graph

14409 Commits

Author SHA1 Message Date
Francisco Facioni
de9c0d9926 LSD: Avoid re allocating the histogram for multiple calls of LineSegmentDetector::detect in ll_angle 
This is useful when reusing the same instance of LineSegmentDetector for multiple images
 2016-09-22 12:39:47 +01:00
Francisco Facioni
ef6b696446 LSD: Avoid pre allocating a big region, std::vector allocations is quite expensive 2016-09-22 12:39:45 +01:00
Francisco Facioni
a12207c3ad LSD: Avoid using pointers directly, image could be non continuous 2016-09-22 12:39:43 +01:00
Francisco Facioni
f5a0b226f2 LSD: Optimization, avoid converting the image to double 2016-09-22 12:39:37 +01:00
Alexander Alekhin
4ccde1330d Merge pull request #7323 from lupustr3:pvlasov/rgb_to_gray_array_fix 2016-09-22 09:52:16 +00:00
Alexander Alekhin
cde9d640fe Merge pull request #7309 from K-Shinotsuka:issue22 2016-09-21 14:46:53 +00:00
Pavel Vlasov
2073af2f05 RGB2Gray array size fix; 2016-09-21 17:46:51 +03:00
Vladislav Sovrasov
ae28345ca5 Make test_texture_flow.py more robust 2016-09-21 17:11:00 +03:00
Alexander Alekhin
3f990accb0 Merge pull request #7306 from K-Shinotsuka:issue21 2016-09-21 12:47:33 +00:00
Alexander Alekhin
9b12bd915b Merge pull request #7305 from K-Shinotsuka:issue20 2016-09-21 12:47:15 +00:00
Alexander Alekhin
b2314c9ae5 Merge pull request #7304 from K-Shinotsuka:issue19 2016-09-21 12:46:30 +00:00
Alexander Alekhin
b43989bdaf Merge pull request #7303 from K-Shinotsuka:issue18 2016-09-21 12:45:16 +00:00
Alexander Alekhin
17f0c93b37 Merge pull request #7300 from K-Shinotsuka:issue17 2016-09-21 12:44:42 +00:00
daB0bby
5728795cf7 Merge pull request #7320 from daB0bby:patch-1 
* bypass makro

* syntax
 2016-09-21 14:22:58 +03:00
Francisco Facioni
31bd84de12 LSD: Removes unused code 2016-09-19 15:29:30 +01:00
Alexander Alekhin
cd6e7ac46e Merge pull request #7252 from terfendail:transparent_sobel_fix 2016-09-19 12:24:50 +00:00
k-shinotsuka
0d85d2cc0a improve RGB2HLS_b() 2016-09-18 23:36:31 +09:00
k-shinotsuka
4f22f48e63 improve HSV2RGB_b() 2016-09-18 23:07:09 +09:00
k-shinotsuka
0fc187d7a3 improve HLS2RGB_b() 2016-09-18 15:46:00 +09:00
k-shinotsuka
1f8aa4f7d3 improve Lab2RGB_b() 2016-09-18 14:48:40 +09:00
k-shinotsuka
37be868679 improve RGB2Luv_b() 2016-09-18 11:08:57 +09:00
k-shinotsuka
4540260df9 improve Luv2RGB_b() 2016-09-17 19:42:48 +09:00
Vadim Pisarevsky
dc3d0cbc22 Merge pull request #7266 from alalek:pr7159 2016-09-16 21:18:26 +00:00
Alexander Alekhin
d5c202e46b Merge pull request #7294 from tomoaki0705:fixBuildCudaAarch64 2016-09-16 14:27:18 +00:00
Alexander Alekhin
fb912e1ba7 Merge pull request #7295 from lupustr3:pvlasov/vs11_compat_fix 2016-09-16 13:20:08 +00:00
Vitaly Tuzov
48f132f35f Fix Sobel evaluation for image ROI without isolated border. 2016-09-16 16:08:37 +03:00
Alexander Alekhin
a35bec1e0a Merge pull request #7293 from Algomorph:master 2016-09-16 09:57:34 +00:00
Pavel Vlasov
0a9470bf09 Compatibility fix for Visual Studio 2012; 2016-09-16 10:03:42 +03:00
Gregory Kramida
0d626c8fef v4l2 backend: Y16 default behavior fixed & FOURCC setting added 
1) Cameras started with Y16 (V4L2_PIX_FMT_Y16) format via v4l2 backend will now exhibit default camera behavior, i.e. convert the 16-bit image to BGR as with all other formats. 16-bit 1-channel output will now only be produced for Y16 if CV_CAP_PROP_CONVERT_RGB is set to "false" using VideoCap::set method.
2) v4l2 videoio backend now supports setting CV_CAP_PROP_FOURCC explicitly (icvSetPropertyCAM_V4L function in cap_v4l.cpp), allowing users to manually set the codec on cameras that support multiple codecs.
 2016-09-15 21:02:24 -04:00
Tomoaki Teshima
0db4b7cebb fix build error on CUDA + Aarch64 
* __fp16 doesn't exist on nvcc, but it slips through ifdef guard
 2016-09-16 08:06:14 +09:00
Luis Roberto Morales Iglesias
60b33046a7
[Issue #7290] Fixes OpenNI and OpenNI2 linking conflict 2016-09-15 17:13:04 +02:00
stbnps
a4a6ee34bf Added support for V4L2_PIX_FMT_Y16 2016-09-15 11:06:15 -04:00
Alexander Alekhin
32df09c275 Merge pull request #7287 from seanm:master 2016-09-15 10:39:49 +00:00
Sean McBride
5357e28a2f Removed some extra semi-colons 
Fixes clang -Wextra-semi warnings.
 2016-09-14 16:22:35 -04:00
Alexander Alekhin
05b15943d6 Merge pull request #7188 from valeriyvan:andfutheriosfixes 2016-09-14 17:05:34 +00:00
Alexander Alekhin
d1492eefca Merge pull request #7181 from valeriyvan:ioscleanup 2016-09-14 17:04:59 +00:00
matze
975d2e4294 Enable built in counting trailing zeros function for Intel compiler and clang. 2016-09-14 18:20:47 +02:00
Vadim Pisarevsky
ab3814f9b9 Merge pull request #7191 from anirudt:docs_moments 2016-09-14 12:30:27 +00:00
Alexander Alekhin
adbf2dc9f1 Merge pull request #7193 from valeriyvan:osxcleanup 2016-09-14 11:51:25 +00:00
Valeriy Van
f1dcf71dd7 Merge pull request #7178 from valeriyvan:iosfixes 
* Changes delegate property from assign to weak

In modern Objective-C delegate should be weak. In very rare conditions you might want delegate be strong.
Assign for delegate is sign of legacy code.
This change prevents crash when you forget nil delegate in dealloc and makes rush with nilling delegate unnecessary.
This change shouldn't break any existing code.

* Adds implementation for setters and getters for weak delegate properties for non ARC Obj-C files

For whatever reason compiler can't synthesize these.
And yes, it's time to convert all Objective-C stuff to ARC.
 2016-09-14 14:48:41 +03:00
matze
a865876c0f Added CV_UNUSED to not used variable when build without SSE2 support. 2016-09-13 19:32:37 +02:00
anirudt
2879eada25 docs: truncated commit msg 2016-09-13 16:14:05 +05:30
Vadim Pisarevsky
473dba1189 Merge pull request #7208 from terfendail:openvx_hal_impl 2016-09-13 10:15:12 +00:00
Vadim Pisarevsky
ca9183d567 Merge pull request #7034 from K-Shinotsuka:issue12 2016-09-13 10:05:46 +00:00
matze
aaa255465e Renamed haveSSE2 in haveSIMD. Conditional compilation for function header removed 2016-09-11 13:15:53 +02:00
Vadim Pisarevsky
a9ab869800 seriously improved performance of blur function, especially 3x3 and 5x5 cases (#7262) 
* seriously improved performance of blur function, especially 3x3 and 5x5 cases

* trying to fix warnings and test failures

* replaced #if 0 with #if IPP_DISABLE_BLOCK
 2016-09-09 23:31:02 +04:00
Maksim Shabunin
4e918fb987 Merge pull request #7165 from PkLab:doc_videoio 2016-09-09 18:01:41 +00:00
PkLab.net
be65701908 Large update of videoio doc and samples following mshabunin comments 2016-09-09 18:46:11 +02:00
Alexander Alekhin
f85e33f4af videoio: refactor AVFoundation code integration 2016-09-09 17:42:41 +03:00
anirudt
06e0fb25e9 docs: adds doxygen @note for python in docs related to contour moments 2016-09-09 13:23:43 +05:30
Alexander Alekhin
ca4b7e1e0f Merge pull request #7171 from alalek:ocl_instrumentation 2016-09-08 16:31:22 +00:00
Vitaly Tuzov
5ec47299e2 Fixed warpings, added border mode support to warps and filter. Added morphology HAL API functions implemented as immediate mode OpenVX calls. 2016-09-08 18:55:26 +03:00
Maksim Shabunin
11a65475d8 Merge pull request #7257 from alalek:issue_7256 2016-09-08 15:28:09 +00:00
Alexander Alekhin
e5e30253ef Merge pull request #7213 from alalek:issue_7203 2016-09-08 15:25:14 +00:00
Alexander Alekhin
c7f5bc3624 viz: use ../precomp.hpp in modules/viz/src/vtk/* files 2016-09-08 16:19:44 +03:00
Alexander Alekhin
d855608e6e instrumentation: fix build on Linux 
- enable C++11
- fix macro
 2016-09-08 16:13:46 +03:00
Alexander Alekhin
10d18a315c instrumentation: minor refactoring, wrap OpenCL 
- calculate ticksTotal instead of ticksMean
- local / global width is based on ticksTotal value
- added instrumentation for OpenCL program compilation
- added instrumentation for OpenCL kernel execution
 2016-09-08 16:13:44 +03:00
Alexander Alekhin
03767340bb ffmpeg: fill avg_frame_rate 2016-09-08 15:43:34 +03:00
Alexander Alekhin
6d54abbd0f ffmpeg: fix get_fps() 2016-09-08 14:41:57 +03:00
Alexander Alekhin
4013ce570f Merge pull request #7246 from paroj:bgfg_ocl 2016-09-08 11:16:01 +00:00
Alexander Alekhin
0bb85a0ec8 Merge pull request #7253 from Finfa811:revert_borderconstant 2016-09-08 11:15:25 +00:00
Alexander Alekhin
f6208e3dea Merge pull request #7247 from valeriyvan:matrix 2016-09-08 09:49:02 +00:00
Alexander Alekhin
125e2dcbba Merge pull request #7156 from sovrasov:hal_qr_decomp 2016-09-08 09:47:52 +00:00
Finfa811
fd1370b92b Reverted BORDER_CONSTAT in stitcher.cpp 
Resolves #7251
 2016-09-08 10:49:48 +02:00
Alexander Alekhin
c8d77fd961 Merge pull request #7233 from tomoaki0705:featureUniversalIntrinsicFp16 2016-09-07 14:42:46 +00:00
Valeriy Van
c562f0ad38 Minor fix in MatAllocator::download 
Minor fix in MatAllocator::upload
Minor fix in MatAllocator::copy
Minor fix in setSize function
Minor fix in Mat::Mat
Minor fix in cvMatNDToMat function
Minor fix in _InputArray::getMatVector
Minor fix in _InputArray::getUMatVector
Minor fix in cv::hconcat
Minor fix in cv::vconcat
Minor fix in cv::setIdentity
Minor fix in cv::trace
Minor fix in transposeI_ template function
Minor fix in reduceC_ template function
Minor fix in sort_ template function
Minor fix in sortIdx_ template function
Minor fix in cvRange function
Minor fix in MatConstIterator::seek
Minor fix in SparseMat::create
Minor fix in SparseMat::copyTo
Minor fix in SparseMat::convertTo
Minor fix in SparseMat::convertTo
Minor fix in SparseMat::ptr
Minor fix in SparseMat::resizeHashTab
Fixes indentation
 2016-09-07 17:25:36 +03:00
Pavel Rojtberg
27ae1578ac BackgroundSubtractorMOG2Impl: only use OpenCL if input image is UMat 2016-09-07 15:53:35 +02:00
Maksim Shabunin
48af5e5579 Merge pull request #7202 from valeriyvan:fixUIImageToMat 2016-09-06 20:45:19 +00:00
Maksim Shabunin
c16f96cb5b Merge pull request #7221 from terfendail:sepfilter_vec_kernel 2016-09-06 20:41:28 +00:00
Alexander Alekhin
a92aed45a4 Merge pull request #7064 from DmtKats:pam 2016-09-06 16:56:27 +00:00
Maksim Shabunin
e2de96289b Merge pull request #7220 from paroj:imgproc_doxy 2016-09-06 14:33:17 +00:00
Dimitrios Katsaros
41431e11f5 Imgcodecs: Implemented simple tests for PAM format 2016-09-06 15:47:22 +02:00
Dimitrios Katsaros
4e513a3346 Imgcodecs: Fixed a bug with checkSignature in GdalDecoder 
In cases where the signaure string contains a terminating character,
the std::string member function size returns a smaller value than the
allocated string. In these cases, if you then try to use substr,
you will get an out_of_range exception. This patch remedies the problem.
 2016-09-06 15:47:22 +02:00
Dimitrios Katsaros
6172803012 imgcodecs: Implementation of PAM encoder/decoder 
This patch implements the PAM image format as defined at:
http://netpbm.sourceforge.net/doc/pam.html

The PAM format provides a generic means for storing 2 dimensional information.
This is useful for opencv since there are cases where data gets translated into
non standardized formats, which makes it difficult to store and load this information.
 2016-09-06 15:47:22 +02:00
Vladislav Sovrasov
dfe4519c07 Add QR decomposition to HAL 2016-09-05 18:20:04 +03:00
mschoeneck
9e61a28b2e Improve canny (#7227) 
* Improve Canny by using _mm_movemask_epi8 to find next pixel magnitude greater than lower threshold. Added parallelized finalPass to Canny with variable gradients. Little changes in finalPass.

* Some things fixed
 2016-09-05 13:51:36 +03:00
Sergey Alexandrov
765dd30981 Add support for GpuMat in InputArray::isContinuous() 2016-09-05 09:27:35 +02:00
Tomoaki Teshima
903789f7af use universal intrinsic for FP16 
* use v_float16x4 (universal intrinsic) instead of raw SSE/NEON implementation
  * define v_load_f16/v_store_f16 since v_load can't be distinguished when short pointer passed
  * brush up implementation on old compiler (guard correctly)
  * add test for v_load_f16 and round trip conversion of v_float16x4
  * fix conversion error
 2016-09-05 08:13:52 +09:00
matze
fd6f54c895 Bug fixed in findEndContours and icvFindContoursInInterval adjusted. 2016-09-03 20:09:39 +02:00
matze
f6451c7ae6 Varaible names renamed. Macro definitions fixed. findEndContourPoint function fixed. findContoursInInterval adjusted. 2016-09-03 14:35:09 +02:00
matze
25cf33d5c8 Warning fixed by adding a cast to char 2016-09-02 21:09:25 +02:00
matze
0acd818efc Removed #elif defined(__INTEL_COMPILER) because it is disabled at the moment 2016-09-02 20:35:08 +02:00
matze
8af8c4d0aa Improves findContours using SSE _mm_movemask_epi8 to find next contour point. Cleaned up code a little bit 2016-09-02 20:09:13 +02:00
Pavel Rojtberg
cfcf8abbb6 doxygen: imgproc - underscores should not be escaped in texttt 2016-09-02 16:41:45 +02:00
Pavel Rojtberg
62cabb58a9 doxygen: undistortPoints - replace matlab code by latex forumlae 2016-09-02 16:41:45 +02:00
Alexander Alekhin
d102ea96c0 Merge pull request #7210 from mshabunin:fix-warnings 2016-09-02 12:50:45 +00:00
Alexander Alekhin
8104db2232 Merge pull request #7130 from souch55:Fixed 2016-09-02 12:49:49 +00:00
Vitaly Tuzov
f773f45d90 Updated HAL interface for separable filters to address that both kernels are vectors. 2016-09-02 14:42:01 +03:00
Alexander Alekhin
a5dcefd50e Merge pull request #7183 from mself:LMeDS_median_optimization 2016-09-02 11:16:12 +00:00
Maksim Shabunin
28db4a2207 Merge pull request #7175 from tomoaki0705:featureIntrinsic64 2016-09-02 10:16:44 +00:00
Maksim Shabunin
dc704d77ac Fixed several GCC 5.x warnings 2016-09-01 15:44:01 +03:00
Maksim Shabunin
595fd2757c Merge pull request #7182 from mself:two_channel_universal_intrinsics 2016-08-31 10:11:43 +00:00
Valeriy Van
464d289fa9 Gets rid of magic constant 2016-08-30 23:22:49 +03:00
Tomoaki Teshima
7fef96be1e add 64F intrinsic in HAL NEON 
* use universal intrinsic for accumulate series using float/double
  * accumulate, accumulateSquare, accumulateProduct and accumulateWeighted
  * add v_cvt_f64_high in both SSE/NEON
  * add test for conversion v_cvt_f64_high in test_intrin.cpp
  * improve some existing universal intrinsic by using new instructions in Aarch64
  * add workaround for Android build in intrin_neon.hpp
 2016-08-30 17:21:02 +09:00
Valeriy Van
acb62692e4 Cleans up declarations in window_cocoa.mm removing unnecessary iVars declarations and changing retain property attribute to strong 2016-08-29 21:55:59 +03:00
anirudt
6825375694 docs: adds note for python in docs related to moments 2016-08-29 20:22:08 +05:30
Alexander Alekhin
4e8f8922e2 Merge pull request #7170 from alalek:fix_build 2016-08-29 10:15:58 +00:00
Alexander Alekhin
da0e07bc1b Merge pull request #7177 from alalek:msvs_layout 2016-08-29 09:36:49 +00:00
Maksim Shabunin
a21b8ed92c Merge pull request #7180 from mrquorr:add_dcm_test 2016-08-29 08:40:02 +00:00
Valeriy Van
5a71bde79a Changes existential NSStringFromSelector(_cmd) for straightforward __FUCNTION__ 2016-08-28 12:48:08 +03:00
Valeriy Van
517be4bfa9 Changes [error localizedDescription] for [error description] in NSLog 
There's no sense to log error messages in user’s locale.
Imagine you’re trying to guess what's going on decrypting logs in hebrew, arabic, slavic. localizedDescription is for end user messages, not for logs.
 2016-08-28 12:34:50 +03:00
Valeriy Van
31e790da33 Fixes spelling in NSLog 2016-08-28 12:29:58 +03:00
k-shinotsuka
9df8400f3d improve RGB5x52Gray() 2016-08-28 14:25:06 +09:00
Matthew Self
7de2e1e795 Improve perfomance of median calculation in LMedS algorithm 
* Use `nth_element()` to find the median instead of `sort()` in `LMeDSPointSetRegistrator::run()`

* Improves performance of this part of LMedS from `n log(n)` to `n` by avoiding doing a full sort.

* Makes LMedS 2x faster for 100 points, 4x faster for 5,000 points in `EstimateAffine2D()`.

* LMedS is now never more than 2x slower than RANSAC and is faster in some cases.
 2016-08-26 20:39:38 -07:00
Matthew Self
9678d48e1a 2-channel interleaved load/store for universal intrinsics (float only) 
* Added 2-channel ops to match existing 3-channel and 4-channel ops

* v_load_deinterleave() and v_store_interleave()

* Implements float32x4 only on SSE (but all types on NEON and CPP)

* Includes tests

* Will be used to vectorize 2D functions, such as estimateAffine2D()
 2016-08-26 18:17:08 -07:00
Valeriy Van
69c7eea694 Cleans up ios stuff declaration removing not needed ivars backing properties 2016-08-27 01:10:17 +03:00
mrquorr
a88bf4e5aa test added, only if HAVE_GDCM is on 2016-08-26 13:27:55 +00:00
Vadim Pisarevsky
40b870704e add 2 extra methods to ml::TrainData (#7169) 
* expose 2 extra methods from ml::TrainData: getNames() and getVarSymbolFlags(). The first one returns text labels from CSV (if the data has been loaded from CSV); the second one returns a matrix of boolean values; its n-th element is 1 iff the corresponding column in the CSV uses symbolic names, not numbers.

* check that the dynamic_cast succeeds
 2016-08-26 16:25:46 +04:00
Vadim Pisarevsky
5ddd25313f Add Grana's connected components algorithm for 8-way connectivity. (#6823) 
* Add Grana's connected components algorithm for 8-way connectivity. That algorithm is faster than Wu's one (currently implemented in opencv). For more details see https://github.com/prittt/YACCLAB.

* New functions signature and distance transform compatibility

* Add tests to imgproc/test/test_connectedcomponents.cpp

* Change of test_connectedcomponents.cpp for c++98 support
 2016-08-26 16:01:00 +04:00
Vadim Pisarevsky
4f0f5a24ef Merge pull request #7158 from sturkmen72:documentation_fix 2016-08-26 11:40:19 +00:00
Vadim Pisarevsky
3ed948a822 Merge pull request #7167 from alalek:modules_deps 2016-08-26 11:16:45 +00:00
Alexander Alekhin
db6d94a7b0 cmake: minimize MSVS projects layout 
Also put "object" targets to off by default (they doesn't work well)
 2016-08-26 13:40:16 +03:00
Valeriy Van
f1db065c10 Unifies Obj-C property attributes changing retain to strong 
strong and retain are synonymous but using strong along with  obsolete synonym retain in one file is negligent
 2016-08-25 21:40:16 +03:00
Alexander Alekhin
5383a625a7 fix Win build, change default WINNT macro to WinXP 
Returning to Win2k value is possible via this CMake option:

    cmake -DOPENCV_EXTRA_FLAGS="/D_WIN32_WINNT=0x0500" ...
 2016-08-25 16:21:52 +03:00
Alexander Alekhin
063ac74369 fix modules deps 2016-08-25 14:57:12 +03:00
Alexander Alekhin
da5ead2c23 Merge pull request #7166 from tomoaki0705:brushUpFp16 2016-08-25 11:49:23 +00:00
Tomoaki Teshima
c5d7791b67 brush up fp16 implementation 
* DRY
  * switch to Cv32suf and remove fp32Int32
  * add Cv16suf
 2016-08-25 05:31:25 +09:00
Vadim Pisarevsky
b03e3abd62 Merge pull request #7088 from wiryls:FileStorageJSON 2016-08-24 16:49:06 +00:00
MYLS
47f2e618ee Add two tests. 
- one test for type_id;
- another for comments in JSON;
 2016-08-24 17:01:57 +08:00
Matthew Self
0882936707 Fix buffer release issue 
CvVideoWriter_AVFoundation_Mac had a serious buffer release bug.

Also made writeFrame() block until isReadyForMoreMediaData rather than
return an error.
 2016-08-23 12:38:14 -07:00
Matthew Self
a92da54e79 Add support for CAP_PROP_MODE 
Support setting CAP_PROP_MODE to capture grayscale or YUV frames much
faster from CV_CAP_AVFOUNDATION_MAC.
 2016-08-23 12:38:10 -07:00
Suleyman TURKMEN
fcc28fecb6 Make Up 2016-08-23 22:17:30 +03:00
Valeriy Van
574f319c74 Fixes spelling in comment 2016-08-23 22:04:41 +03:00
yoffy
767780a4b2 add VideoCapture / VideoWriter AVFoundation implementation for Mac 2016-08-23 10:51:58 -07:00
Alexander Alekhin
b3b434e221 Merge pull request #7141 from lupustr3:pvlasov/instrumentation_extension 2016-08-23 16:48:25 +00:00
mpkh
01d2e7af71 fix building on FreeBSD 
resolve undeclared identifier close error
 2016-08-22 17:17:06 +04:00
Vadim Pisarevsky
5ee2051863 Merge pull request #7142 from alalek:fix_hls_test_check 2016-08-22 12:26:54 +00:00
Vadim Pisarevsky
5903c7257e Merge pull request #7122 from haikusw:UIImageAlphaToMatFix 2016-08-20 10:38:35 +00:00
Pavel Vlasov
30a6cee2fe Instrumentation for OpenCV API regions and IPP functions; 2016-08-19 18:10:03 +03:00
Alexander Alekhin
86a515fdae imgproc: fix accuracy check for HLS cvtColor 2016-08-19 17:32:17 +03:00
Alexander Alekhin
bf4c5bef7f Merge pull request #7135 from lupustr3:pvlasov/icv_restrictions_remove 2016-08-19 13:23:47 +00:00
Pavel Vlasov
680ca88ce0 Outdated ICV restrictions were removed; 2016-08-19 15:08:39 +03:00
Vadim Pisarevsky
0f716cdf33 Merge pull request #7108 from K-Shinotsuka:issue16 2016-08-19 08:10:51 +00:00
Alexander Alekhin
93e5947f55 Merge pull request #7101 from lupustr3:pvlasov/instrumentation 2016-08-18 14:56:41 +00:00
Alexander Alekhin
fd1da009a8 Merge pull request #7129 from paroj:mousecallback-dry-code 2016-08-18 14:12:46 +00:00
Vadim Pisarevsky
d22c6855c3 Merge pull request #6855 from yigitsoy:patch-1 2016-08-18 13:19:00 +00:00
Vadim Pisarevsky
ea1f885be1 Merge pull request #7055 from gylns:master 2016-08-18 13:17:18 +00:00
Vadim Pisarevsky
66e94467dc Merge pull request #7087 from terfendail/master 
Fix for incorrect calcOpticalFlowPyrLK result evaluation with ARM NEON
 2016-08-18 17:12:38 +04:00
sourin
ce818dc01f respective changes added 2016-08-18 17:24:43 +05:30
Alexander Alekhin
46bd49ef8a Merge pull request #7126 from paroj:buttonlayout 2016-08-18 10:36:47 +00:00
Alexandr Kondratev
46bfdbaf82 highgui: window_QT mousecallback code refactored using DRY 2016-08-18 11:54:33 +02:00
Alexander Alekhin
241df6c6a8 Merge pull request #6972 from vicproon:fix_6836_other_places 2016-08-18 09:33:07 +00:00
Alexander Alekhin
5d7ee48031 Merge pull request #7085 from sovrasov:hal_doc_fix 2016-08-17 15:15:08 +00:00
Alexander Alekhin
185fe7aa1b Merge pull request #7094 from terfendail:MSER_fix 2016-08-17 15:14:34 +00:00
Pavel Vlasov
a462d76a95 Implementations instrumentation framework for OpenCV performance system; 2016-08-17 16:26:03 +03:00
Pavel Rojtberg
e4cf3297c7 highgui: allow specifying that a button should create a new buttonbar 2016-08-17 14:34:33 +02:00
Alexander Alekhin
89833fa073 Merge pull request #7095 from PkLab:fix_rho&phi_doc 2016-08-17 10:46:30 +00:00
Morrison
ca318e7099 handle images with alpha better 
UIImages with alpha were ending up with garbage pixels in background (random memory values).  Need to initialize matrix pixels before drawing UIImage with alpha on it.

Note: didn’t fix Grayscale image with alpha stripping alpha in UIImage -> Mat conversion.
 2016-08-16 15:10:48 -07:00
Alexander Alekhin
45a21555c7 Merge pull request #7117 from patsp:fix_tiff_imdecode_remove_temporary_file 2016-08-16 15:40:50 +00:00
Maksim Shabunin
d1d8c7d8a6 Merge pull request #7056 from ludv1x:python-extra-bindings 2016-08-16 13:00:31 +00:00
PkLab.net
4b099e8ade Fix rho,phi exchange and amend linearPolar & logPolar docs with details and pics. 2016-08-16 12:49:33 +02:00
Vitaliy Lyudvichenko
ab8de8f506 Adding of user-defined type conversions for python bindings inside module directories 
Adding of destructor and placement new constructors for classes wrapped with CV_EXPORTS_W_SIMPLE macro
 2016-08-16 13:10:17 +03:00
Maksim Shabunin
48aa1234d9 Merge pull request #7082 from souch55:Fixmerge 2016-08-16 09:30:39 +00:00
Patrick Spettel
84e1712659 Fix temporary file removal in imdecode for tiff 
The TiffDecoder keeps an open file handle.
As a consequence the file cannot be removed
before the TiffDecoder closes the file.
 2016-08-16 10:56:00 +02:00
Alexander Alekhin
e884bbabcb Merge pull request #7110 from tomoaki0705:featureUniversalIntrinsicAccumulate 2016-08-15 14:54:10 +00:00
Vitaly Tuzov
62c1a5a152 Replaced quiet return from MSER:detectRegion function with exeption throwing to notify user in case small image is processed 2016-08-15 14:16:13 +03:00
k-shinotsuka
3faaabd6f4 improve YCrCb2RGB_i<uchar>() 2016-08-15 19:20:04 +09:00
Maksim Shabunin
cd943cc60d Merge pull request #7106 from lupustr3:pvlasov/ipp_hal_fix 2016-08-15 10:08:44 +00:00
Maksim Shabunin
031076ab93 Merge pull request #7077 from LaurentBerger:I7063 2016-08-15 09:08:44 +00:00
Maksim Shabunin
b9ea59df35 Merge pull request #6995 from PkLab:i6746_naming_videoio_enums 2016-08-15 09:01:24 +00:00
Tomoaki Teshima
4f7679cf51 use universal intrinsic in accumulate series 
* accumulate, accumulateSquare, accumulateProduct and accumulateWeighted
 2016-08-15 13:00:39 +09:00
will hunt
ac2d79fd67 MSER: all test passed. 
1. if a component's variation is a global minimum than it should be a local minimum
2. for the small image with invert and blur, the MSERs number should be 20
 2016-08-15 09:25:45 +08:00
Pavel Vlasov
3860b8db02 IPP was enabled in mathfuncs_core; 
Exp and Log IPP implementations are changed to hal interface;
 2016-08-12 18:16:04 +03:00
k-shinotsuka
020b47c41a improve RGB2Gray<ushort>() 2016-08-12 23:12:51 +09:00
Ilya Lavrenov
1b3f634843 fixed compilation warning 2016-08-12 14:23:15 +03:00
Alexander Alekhin
1fb1088b7d Merge pull request #7102 from lupustr3:pvlasov/ipp_switch_fix 2016-08-12 10:39:44 +00:00
Vitaly Tuzov
9db93d773d Fix for MSER::detectRegions crash on images with either dimension less than 3 2016-08-12 10:31:13 +03:00
Vitaly Tuzov
d8dc6caf09 Fix for incorrect calcOpticalFlowPyrLK result evaluation with ARM NEON 2016-08-12 10:14:54 +03:00
Pavel Vlasov
8bcec7d77f IPP enabling fix and typo fix; 2016-08-12 10:11:47 +03:00
PkLab.net
3ea02018b5 Naming some enumerations in videoio 2016-08-11 20:27:42 +02:00
Alexander Alekhin
74e997f15b Merge pull request #7062 from kurenai:return_if_camera_disconnected 2016-08-11 14:07:42 +00:00
Maksim Shabunin
cf30c582c6 Merge pull request #7057 from K-Shinotsuka:issue13 2016-08-11 11:46:33 +00:00
Vladislav Sovrasov
13d2154f9a Fix HAL documentation 2016-08-11 14:41:49 +03:00
Maksim Shabunin
07cffc9df2 Merge pull request #7090 from daB0bby:patch-1 2016-08-11 10:57:33 +00:00
Alexander Alekhin
c2394339a8 Merge pull request #7075 from alalek:ocl_fix_canny_perf_test 2016-08-11 09:19:44 +00:00
Maksim Shabunin
de0909e03c Merge pull request #7083 from tomoaki0705:fixAccumulateShortFloat 2016-08-11 09:00:38 +00:00
LaurentBerger
b75bac7975 Solve Issue 7063 
consequences of changes

accuracy test

Solve issue 7063
 2016-08-11 10:56:50 +02:00
daB0bby
5cc1ef9022 fix code-style consistency 2016-08-11 10:15:48 +02:00
MYLS
d99832163a solve warnings and do some cleaning. 2016-08-11 03:31:35 +08:00
MYLS
8596e82d98 Add JSON support. 
a JSON emitter, a parser, tests and some basic doc.
 2016-08-11 00:53:15 +08:00
Vadim Pisarevsky
f210602d1e Merge pull request #7071 from K-Shinotsuka:issue14 2016-08-10 10:49:05 +00:00
Alexander Alekhin
f8b185b55f Merge pull request #7070 from paroj:noculegacy 2016-08-10 10:48:31 +00:00
Alexander Alekhin
0dd00321e0 Merge pull request #7072 from alalek:ocl_fix_canny 2016-08-10 13:44:52 +03:00
Vadim Pisarevsky
df665e2386 Merge pull request #6983 from K-Shinotsuka:issue8 2016-08-10 10:31:12 +00:00
Vadim Pisarevsky
96d48331da Merge pull request #7076 from sovrasov:mkl_lapack 2016-08-10 10:25:17 +00:00
Marek Smigielski
1aa14e4929 fix tab for gen_java.py 2016-08-10 12:03:28 +02:00
Tomoaki Teshima
ba73249dc0 let the test of AccSqr_SIMD<ushort, float> pass 
* The difference becomes too large when multiply is done in int16
  * To reproduce the test failure, IPP has to be switched off
 2016-08-10 18:36:00 +09:00
Vadim Pisarevsky
8b155b1c6d Merge pull request #6955 from snosov1:fix-6836 2016-08-10 09:26:51 +00:00
Vadim Pisarevsky
5eee757658 Merge pull request #6949 from wiryls:FileStorageBase64DocsTests 2016-08-10 09:26:13 +00:00
sourin
99374598b3 Fix modified 2016-08-10 14:38:32 +05:30
Vladislav Sovrasov
a113d9bcc1 Add MKL support 2016-08-10 11:20:23 +03:00
Alexander Alekhin
44bda8fbb7 Merge pull request #7044 from wolever:master 2016-08-09 12:59:38 +00:00
Alexander Alekhin
f2e41ce391 ocl: fix input data for Canny perf test 
"declare.in(img, WARMUP_RNG)" overrides input image with random values

Also added support for different input sizes (via cv::resize)
 2016-08-09 15:49:22 +03:00
Alexander Alekhin
32c239085d Merge pull request #7067 from tomoaki0705:fixBuildErrorJetsonK1 2016-08-09 10:39:56 +00:00
k-shinotsuka
042b0a584d improve LKTrackerInvoker::operator() 2016-08-09 18:59:29 +09:00
Alexander Alekhin
b8e08d5d3c ocl: fix Canny for Intel devices 
There is an issue with processing of abs(short) function for
negative argument.

Affected OpenCL devices:
- iGPU: Intel(R) HD Graphics 520 (OpenCL 2.0 )
- CPU: Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz (OpenCL 2.0 (Build 10094))
 2016-08-09 12:48:06 +03:00
Pavel Rojtberg
677f242761 stitching: use correct ifdef to allow compilation without cudalegacy 
GraphCutSeamFinderGpu requires cudalegacy.
 2016-08-09 11:39:05 +02:00
Tomoaki Teshima
3debc78a5f fix build error on JetsonTK1 
* avoid using vld1_f16 and vst1_f16 on gcc 4 series (Ubuntu 14.04)
  * guard correctly with #if
  * use static inline
 2016-08-09 17:12:22 +09:00
k-shinotsuka
e37c53d13e improve RGB2YCrCb_i<uchar>() 2016-08-09 11:33:00 +09:00
Vadim Pisarevsky
0d8a21efd5 Merge pull request #7016 from lewgate:bugfix_2 2016-08-08 15:20:11 +00:00
Vadim Pisarevsky
28d28a2607 Merge pull request #7024 from paroj:semanticidx 2016-08-08 15:19:36 +00:00
Vadim Pisarevsky
b316aa3710 Merge pull request #7043 from alalek:add_nonfree_flag 2016-08-08 15:18:49 +00:00
Vadim Pisarevsky
a95d63dab6 Merge pull request #7042 from alalek:update_6967 2016-08-08 15:17:48 +00:00
Vadim Pisarevsky
39ebca5dbf Merge pull request #7047 from tomoaki0705:brushUpFp16Cuda 2016-08-08 14:43:57 +00:00
kurenai
c61f4e8863 return false from VideoCapture::grabFrame when camera is disconneted 2016-08-08 20:41:56 +08:00
catree
74b899d8b0 Modify the figure of the pinhole camera model with pixels starting from the uv axis. 2016-08-08 03:31:31 +02:00
will hunt
c3d2921971 MSER: grew unnecessary histories. 
the merge() calls growHistory() too many times such that:
1. some CompHistory nodes not used have been created
2. some CompHistory node's val equal their parents
 2016-08-07 08:28:23 +08:00
will hunt
c2e5418e51 MSER: off-by-one bug 2016-08-06 13:12:50 +08:00
mschoeneck
5f30a0a076 Merge pull request #6958 from mschoeneck:Common-Canny-parallelization 
* Common Canny parallelization added. TBB and single thread code removed. Final pass vectorized with SSE2 intrinsics.

* wrong #ifdef replaced with #if

* Merged to actual Canny version

* Merged common parallelized Canny with actual Canny implementation

* Remove 'Mutex *mutex' and pass 'Mutex mutex' from outside to parallelCanny

* Replaced extern Mutex with intern mutable Mutex.
 2016-08-05 17:20:56 +03:00
Marek Smigielski
723b42e0da Add namespaces and proper support of the pointers 2016-08-05 15:34:57 +02:00
Tomoaki Teshima
2db2d137ce follow the naming rule as other API 
* stop using 'CUDA' prefix
  * add explanation
 2016-08-05 22:14:55 +09:00
Alexander Alekhin
b12286329f imgproc: sepFilter: update OpenCL condition 
Problem is observed with test_loop_times=100
in corner cases like 93x1 or similar
 2016-08-05 12:27:24 +03:00
Alexander Alekhin
2812762d6b imgproc: disable IPP for GaussianBlur in case of ROI 2016-08-05 12:27:18 +03:00
matze
37cccf17c0 imgproc: Prefer OCL calculation before IPP in GaussianBlur. 2016-08-05 12:27:16 +03:00
MYLS
1da8a19af3 fixed two bugs that I caused. 2016-08-05 16:15:03 +08:00
MYLS
86238d2748 make some changes according to the code review. 
- use `std::string` instead of `new char`;
- reserve 1 MB for buffer;
 2016-08-05 15:17:21 +08:00
David Wolever
b42288c2de
Cleaner fix for crash on double-stop of CvVideoCamera 2016-08-04 12:44:07 -04:00
Alexander Alekhin
18e7afdfd9 cmake: add OPENCV_ENABLE_NONFREE option and macro 2016-08-04 19:23:49 +03:00
Vadim Pisarevsky
d67e6f5cc9 Merge pull request #7029 from wolever:master 2016-08-04 13:34:55 +00:00
k-shinotsuka
065d631f0e improve MomentsInTile_SIMD<uchar, int, int>() 2016-08-04 20:08:53 +09:00
Vadim Pisarevsky
d7ee62f03b 1. fix warning from Xcode 7.x 
2. fixed parsing of "cat[range_spec]ord[range_spec]" type specification string when using ml::TrainData::loadFromCSV(). Thanks to A. Kaehler for reporting it
 2016-08-04 12:52:10 +03:00
Alexander Alekhin
b2698f24b0 Merge pull request #7033 from tomoaki0705:brushUpFp16 2016-08-04 09:31:52 +00:00
Vadim Pisarevsky
7eee5cb724 Merge pull request #7026 from sovrasov:calib_points_number 2016-08-04 09:14:03 +00:00
Vadim Pisarevsky
b8d743bf50 Merge pull request #6970 from K-Shinotsuka:issue6 2016-08-03 18:50:00 +00:00
Vadim Pisarevsky
0a7e53da0a Merge pull request #7010 from K-Shinotsuka:issue10 2016-08-03 18:44:02 +00:00
Vadim Pisarevsky
03d6c5e473 Merge pull request #7011 from K-Shinotsuka:issue11 2016-08-03 18:34:08 +00:00
k-shinotsuka
1a18a33688 improve SumSqr_SIMD<schar, int, int>() 2016-08-03 19:17:51 +09:00
Tomoaki Teshima
87ca607fd4 brush up convertFp16 
* raise an error when wrong bit depth passed
  * raise an build error when wrong depth is specified for cvtScaleHalf_
  * remove unnecessary safe check in cvtScaleHalf_
  * use intrinsic instead of direct pointer access
  * update the explanation
 2016-08-03 17:27:45 +09:00
Juan Pablo Aveggio
ba5f9d68c4 Update bagofwords.cpp 2016-08-02 20:53:05 -03:00
David Wolever
3d19de2b58
Fix crash on double-stop of CvVideoCamera 2016-08-02 17:52:02 -04:00
k-shinotsuka
0b4e06ad3c improve SumSqr_SIMD<uchar, int, int>() 2016-08-02 23:46:03 +09:00
k-shinotsuka
5775ace5e0 improve thresh_8u() 2016-08-02 23:35:14 +09:00
Vadim Pisarevsky
fc742da6e3 Merge pull request #6959 from LeoBras:Better_StereoBM 2016-08-02 14:30:02 +00:00
Jeff McBride
562c15cbe9 Don't assume all images have the same number of calibration points 
Cast to (int) to avoid warnings

Add test for different points number case in fisheye calibration function
 2016-08-02 17:21:17 +03:00
Pavel Rojtberg
15dabc11b5 Mat: use row/ col instead of i0/ i1 for parameter names in 2D case 
this improves documentation when using an IDE and reflects that Mats are
row major.
 2016-08-02 13:57:51 +02:00
Alexander Alekhin
da2810918c Merge pull request #6991 from tomoaki0705:featureGpuMatFp16 2016-08-02 08:39:25 +00:00
catree
6e931aaab7 Add pinhole camera model illustration in calib3d documentation. 2016-08-01 02:25:45 +02:00
Tomoaki Teshima
2974b049e7 cudev: add feature to convert FP32(float) from/to FP16(half) on GPU 
* add feature of Fp16 on GPU (cudev)
  * add test
  * leave template function as unimplemented to raise error
 2016-08-01 00:55:16 +09:00
lewgate
4ae4a705d5 Fix a bug for seam_finders.cpp when computing the source and destination points of the seam 2016-07-31 17:13:23 +08:00
MYLS
3935855365 Merge remote-tracking branch 'refs/remotes/opencv/master' into FileStorageBase64DocsTests 
# Conflicts:
#	modules/core/test/test_io.cpp
 2016-07-30 01:08:27 +08:00
MYLS
08911cbfae change code to snippet and do some cleaning. 
- use `@snippet` instead of `@code` in docs.
- remove some functions that were not used.
 2016-07-30 00:35:41 +08:00
Alexander Alekhin
f2e9588c93 Merge pull request #6999 from tomoaki0705:featureCmakeFp16 2016-07-29 10:35:54 +00:00
Tomoaki Teshima
c57f8780e9 show CPU feature correctly when FP16 is available 
* make sure that CV_FP16 has the correct meaning
  * check FP16 feature correctly
 2016-07-29 14:10:33 +09:00
Vadim Pisarevsky
3b1803f6b1 Merge pull request #6989 from mself:gftt-deterministic-sort 2016-07-28 15:27:39 +00:00
Vadim Pisarevsky
f96b5652ce Merge pull request #6984 from K-Shinotsuka:issue9 2016-07-28 12:05:13 +00:00
Vadim Pisarevsky
b721269c29 Merge pull request #6996 from juliendehos:merge_debevec 2016-07-28 11:51:12 +00:00
Alexander Alekhin
8cdd91cd23 Merge pull request #7006 from derlunz:fix-qtopengl-build 2016-07-27 20:10:38 +00:00
Christian Kapeller
81e6ef2958 highgui: window QT+OpenGL mouse wheel support, another build fix 
amends work done in pull request #6976.
 2016-07-27 16:14:57 +02:00
k-shinotsuka
ecfd4ad11e improve MomentsInTile_SIMD<ushort, int, int>() 2016-07-27 20:27:30 +09:00
StevenPuttemans
64dbf6c987 fix build #6993 2016-07-27 11:21:08 +02:00