Alexander Alekhin
4439ba09f9
test: update condition for Calib3d_StereoCalibrate
2016-10-20 16:54:40 +03:00
Alexander Alekhin
db451f20df
test: don't use points on single line for solvePnP
2016-10-20 16:54:38 +03:00
Alexander Alekhin
7a9ed39655
test: update HoughLines perf test
2016-10-20 16:54:35 +03:00
Alexander Alekhin
5bafc1db75
test: fix tolerance
...
cv::rand result is not bitexact for floating-point numbers
2016-10-20 16:54:33 +03:00
Alexander Alekhin
abad2ca76c
test: fix tolerance
...
cv::rand result is not bitexact for floating-point numbers
2016-10-20 16:54:30 +03:00
Alexander Alekhin
7793299e53
Merge pull request #7507 from vrabaud:iplimage_overflow
2016-10-20 13:04:54 +00:00
Vincent Rabaud
a89aa8c90a
Fix imageSize overflow in IplImage
2016-10-20 11:23:45 +02:00
Pavel Rojtberg
01b592c8e1
calibrateCamera: mask f_x when using FIX_ASPECT_RATIO
...
this avoids a singular Jacobian such that LM converges when DECOMP_LU is
used.
2016-10-19 14:20:39 +02:00
Jake Kesinger
bd50553149
videoio: Fix for valgrind warning in icvGetPropertyCAM_V4L
...
https://github.com/opencv/opencv/issues/7380
2016-10-18 14:18:35 -04:00
Maksim Shabunin
157a90ac46
Merge pull request #7513 from abratchik:fix.wrappers.for.video.tracking
2016-10-18 12:09:14 +00:00
abratchik
c72fbd7a14
fix for #7501
2016-10-18 09:38:57 +04:00
Guillaume Jacob
df2b591896
videoio: fix segfault if CONVERT_RGB is false (issue #7465 )
2016-10-17 23:01:30 +02:00
Alexander Alekhin
07711e404b
Merge pull request #7506 from mshabunin:x11-collide-warning
2016-10-17 19:50:30 +00:00
Alexander Alekhin
5dfb810327
video: fix optflow test: NAN results shouldn't bypass checks
2016-10-17 20:06:45 +03:00
Alexander Alekhin
8213e57f3b
Merge pull request #7494 from tomoaki0705:fixVideoLKPyramidARM
2016-10-17 17:06:26 +00:00
Alexander Alekhin
505c19bc20
Merge pull request #7505 from LukeZheZhu:filterSmall_double_support
2016-10-17 10:33:52 +00:00
Vadim Pisarevsky
27c8f8a1d4
Merge pull request #7443 from Tytan:akaze
2016-10-17 09:22:52 +00:00
mshabunin
6a66af72c8
Added warning about possible X11 macro collision
2016-10-17 12:07:27 +03:00
LukeZhu
ef47bcc88b
Fix the problem: filterSmall.cl report error with double
2016-10-17 15:12:42 +08:00
Alexander Alekhin
18327aed30
Merge pull request #7496 from abratchik:java.wrapper.fix.3.1
2016-10-16 16:49:33 +00:00
Arek
4ea27061ee
Merge pull request #7472 from ArkadiuszRaj:aravis-autoexposure
...
Aravis SDK: Basic software based autoexposure control
* Basic software based autoexposure control
* Aravis autoexposure: skip frame taken while changing exposure setup
2016-10-16 19:14:58 +03:00
abratchik
8da1303179
add vector_vector_KeyPoint support to python wrappers
2016-10-16 19:09:35 +04:00
abratchik
adbb1471fc
fix regression issues in Feature2D and DescriptorMatcher interfaces
2016-10-16 13:36:40 +04:00
Tomoaki Teshima
ea4ff91861
fix error from performance test of LK pyramid
2016-10-16 17:21:37 +09:00
Feng Zhoutian
316fece020
fix the problem: the headers of cudev module are not installed if BUILD_opencv_world
2016-10-16 02:22:28 +08:00
Alexander Alekhin
1ae27eb696
Merge pull request #7476 from abratchik:java.wrapper.fix.3.1
2016-10-15 09:21:45 +00:00
abratchik
4207ebbce7
fix for VideoCapture crash
2016-10-15 08:16:31 +04:00
Vitaly Tuzov
1d045f2731
Added test for drawing beyond 32768 column
2016-10-14 18:38:01 +03:00
Vitaly Tuzov
26c9889c6b
Fix for incorrect line drawing beyond 32768 row or column
2016-10-14 18:37:59 +03:00
Alexander Alekhin
de85680a6a
Merge pull request #7483 from paroj:addtext
2016-10-14 14:06:50 +00:00
Pavel Rojtberg
a37a6bd783
fix BGR <> RGB swap
...
we are drawing on a BGR image declared as RGB, so we should not swap
components here either.
2016-10-14 12:06:50 +02:00
Pavel Rojtberg
8cc09f1784
highgui: allow wrapping cv::addText
...
also correctly forward spacing parameter in fontQt
2016-10-14 12:06:49 +02:00
Alexander Alekhin
0d0a399a13
Merge pull request #7468 from StevenPuttemans:fix_single_scale_detection
2016-10-13 16:19:18 +00:00
Maksim Shabunin
699c25a4be
Merge pull request #7471 from alalek:fix_java_generator
2016-10-13 15:21:39 +00:00
StevenPuttemans
ca762a6ba7
allow minObjectSize==maxObjectSize for single scale detection capability
2016-10-13 16:05:23 +02:00
abratchik
084c595855
fix for legacy FeatureDetector and DescriptorMatcher classes
2016-10-13 14:45:59 +04:00
Vadim Pisarevsky
4ed40fd694
Merge pull request #7432 from abratchik:java.wrapper.fix.3.1
2016-10-12 19:54:03 +00:00
Vadim Pisarevsky
4acda3f609
Merge pull request #7428 from alalek:cmake_fix_compiler_flags_detection
2016-10-12 19:38:25 +00:00
Alexander Alekhin
c16c803fe9
java: integrate code from base modules
...
To resolve undefined "Mat_to_vector_KeyPoint" error
2016-10-12 18:01:51 +03:00
Alexander Alekhin
994815fbd4
Merge pull request #7413 from tomoaki0705:featureUniversalThreshold
2016-10-12 10:01:37 +00:00
Alexander Alekhin
994c682b77
Merge pull request #7455 from tomoaki0705:featureUniversalLkPyramid
2016-10-12 09:57:53 +00:00
Alexander Alekhin
685a050339
Merge pull request #7431 from ArkadiuszRaj:pgm-16bit
2016-10-12 09:52:04 +00:00
Juha Reunanen
0f387cda8f
Merge pull request #7451 from reunanen:issue-7409
...
Fix findContours crash for very large images (#7451 )
* Cast step to size_t in order to avoid integer overflow when processing very large images
* Change assert to CV_Assert
2016-10-12 10:34:51 +03:00
Alexander Alekhin
6373e24bd3
Merge pull request #7441 from catree:add_distortion_images
2016-10-12 07:30:52 +00:00
Tomoaki Teshima
1ef740fa2c
use universal intrinsic implementation for calcSharrDeriv
2016-10-11 20:32:33 +09:00
Tomoaki Teshima
ea6410d1e7
use universal intrinsic in threshold
...
* add performance test for 32F and 64F threshold
* requires update of opencv_extra
2016-10-11 18:00:41 +09:00
abratchik
789b35d813
improved fix for java wrapper generator (gen_java.py) to avoid generation of java methods with duplicate signatures(v3)
2016-10-11 02:47:02 +04:00
Alexander Alekhin
73a8fa8e6e
Merge pull request #7447 from alalek:ocl_fix_svm
2016-10-10 20:55:08 +00:00
Alexander Alekhin
f11715b6c3
Merge pull request #7430 from ArkadiuszRaj:aravis
2016-10-10 20:54:14 +00:00
Alexander Alekhin
fe8501c931
ocl: fix SVM code
2016-10-10 20:52:30 +03:00
Alexander Alekhin
218f7574f9
Merge pull request #7440 from mschoeneck:Prefer_OCL_befor_IPP_for_Sobel_and_Scharr
2016-10-10 10:45:27 +00:00
StevenPuttemans
947f32d2e0
add border replicate note
2016-10-10 09:55:13 +02:00
ArkadiuszRaj
19bc3f4d17
Chenge arv_camera_abort_acquisition to arv_camera_stop_acquisition
2016-10-09 20:40:00 +02:00
catree
ce7811e5dd
Add distortion example images for calib3d documentation.
2016-10-09 20:35:58 +02:00
ArkadiuszRaj
8bd595acfe
fourcc support, improved buffer handling, check if exposure, gain & fps properties are available
2016-10-09 16:58:30 +02:00
matze
d9f6a06773
Adding check for IPP if UMat and OpenCL is available in Sobel and Scharr.
2016-10-09 15:37:22 +02:00
ArkadiuszRaj
48ae99ecef
Support for MONO8 & MONO12 pixel formats
2016-10-08 13:01:01 +02:00
Alexander Alekhin
714db4cf0d
java: fix Ptr<> code generation
...
Before:
Ptr<Dictionary>((cv::aruco::Dictionary*)dictionary_nativeObj)
After:
Ptr<cv::aruco::Dictionary>((cv::aruco::Dictionary*)dictionary_nativeObj)
2016-10-08 02:19:43 +03:00
Alexander Alekhin
5da8d65371
eliminate compiler warnings
2016-10-08 02:19:43 +03:00
ArkadiuszRaj
d80fd0c85c
Missing declaration
2016-10-07 22:22:46 +02:00
abratchik
be028d0774
fix for #7420 , #7421
2016-10-07 23:58:57 +04:00
ArkadiuszRaj
70c12e5407
Basic support for GigE cameras via Aravis SDK
2016-10-07 21:55:49 +02:00
ArkadiuszRaj
797030aa90
Solution to issue #7408
2016-10-07 21:29:08 +02:00
Graham Fyffe
57be99ff18
Added getLeadingEdges function to subdivision2d
2016-10-06 18:01:34 -07:00
Quentin
9b4cf896fd
Added AKAZE features in the stitcher pipeline (issue #6474 )
2016-10-06 17:47:20 +02:00
Vadim Pisarevsky
84699e0e18
Merge pull request #7399 from K-Shinotsuka:issue27
2016-10-06 13:31:06 +00:00
Vadim Pisarevsky
294bea11a5
Merge pull request #7401 from K-Shinotsuka:issue28
2016-10-06 13:30:31 +00:00
Vadim Pisarevsky
8ee459207e
Merge pull request #7402 from K-Shinotsuka:issue29
2016-10-06 13:29:56 +00:00
Vadim Pisarevsky
285e6ad15b
Merge pull request #7404 from K-Shinotsuka:issue30
2016-10-06 13:29:00 +00:00
Vadim Pisarevsky
018485050f
Merge pull request #7415 from StevenPuttemans:fix_issue_7409
2016-10-06 13:25:28 +00:00
Jcrist99
770c69a978
fix for feature2d java wrappers as described in this post: http://ans … ( #7372 )
...
* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/
* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/
* rollback of one change as requested (similar change already merged)
2016-10-06 15:48:26 +03:00
StevenPuttemans
524c61279b
replace principle by principal
2016-10-06 14:09:26 +02:00
Vadim Pisarevsky
a799cc13d9
Merge pull request #6078 from PolarNick239:master
2016-10-05 17:27:23 +00:00
Vadim Pisarevsky
fad0598634
normHamming done with AVX 2 intrinsics (ver 2) ( #7405 )
...
* normHamming done with AVX 2 intrinsics.
* fixed compiling AVX2-optimized norm hamming with MSVC
2016-10-05 21:23:32 +04:00
Alexander Alekhin
0f03f692a9
Merge pull request #7403 from tomoaki0705:fixDuplicateInclude
2016-10-05 17:20:45 +00:00
k-shinotsuka
880ace2eb3
add simd code when dcn equals 4 at HSV2RGB_b().
2016-10-06 00:06:02 +09:00
k-shinotsuka
db8b3252bf
add simd code when scn equals 4 at RGB2HLS_b().
2016-10-05 22:01:33 +09:00
Vadim Pisarevsky
913b9cd661
Merge pull request #7398 from vpisarev:mat2umat_copy_fix
2016-10-05 12:21:42 +00:00
k-shinotsuka
c1745539c4
add simd code when dcn equals 4 at HLS2RGB_b().
2016-10-05 21:02:53 +09:00
Vadim Pisarevsky
42fbfb9be0
Merge pull request #7311 from fran6co:lsd
2016-10-05 11:27:43 +00:00
Vadim Pisarevsky
43b60f4617
Merge pull request #6961 from K-Shinotsuka:issue5
2016-10-05 11:23:35 +00:00
Vadim Pisarevsky
33ce36397c
Merge pull request #7222 from mschoeneck:Improve_findContours_with_SSE2
2016-10-05 11:21:37 +00:00
Vadim Pisarevsky
2b01e316b3
Merge pull request #7392 from K-Shinotsuka:issue25
2016-10-05 11:19:43 +00:00
k-shinotsuka
a5f493a763
add simd code when scn equals 4 at Lab2RGB_b().
2016-10-05 20:14:02 +09:00
Vadim Pisarevsky
83f2eb79f1
make sure that the empty mat is copied to UMat properly - i.e. UMat becomes empty. Before the patch such copy operation crashed
2016-10-05 14:07:50 +03:00
Tomoaki Teshima
f6350bdfa8
remove duplicated include
2016-10-05 06:53:34 +09:00
k-shinotsuka
47c792ecc0
add simd code when scn equals 4 at RGB2Luv_b().
2016-10-05 01:18:43 +09:00
Vadim Pisarevsky
eddd417d74
Merge pull request #7282 from alalek:fix_calculations
2016-10-04 15:05:42 +00:00
Vadim Pisarevsky
3bd5055af1
Merge pull request #7336 from K-Shinotsuka:issue23
2016-10-04 12:29:46 +00:00
Vadim Pisarevsky
a3d44d523d
Merge pull request #7214 from mshabunin:hal_integral
2016-10-04 12:26:58 +00:00
Vadim Pisarevsky
2e2ac54eca
Merge pull request #7374 from catree:fix_hitmiss_doc_link
2016-10-04 12:15:58 +00:00
Vadim Pisarevsky
706862d5ba
Merge pull request #7382 from alalek:ocl_build_fix_warnings
2016-10-04 12:08:22 +00:00
Vadim Pisarevsky
0ce3686a37
Merge pull request #7384 from K-Shinotsuka:issue24
2016-10-04 12:06:37 +00:00
Alexander Alekhin
cecc1857dd
Merge pull request #7373 from tomoaki0705:featureCannyUniversalIntrinsic
2016-10-04 10:52:13 +00:00
Alexander Alekhin
fef677f51a
fix defines typo
2016-10-03 18:29:11 +03:00
Tomoaki Teshima
841ccccada
use universal intrinsic in canny
...
* add v_abs for universal intrinsic
* add test of v_abs in test_intrin
* fix compile error on gcc
* fix bool OR operation
2016-10-03 13:23:43 +09:00
k-shinotsuka
e310c3f9f4
add simd code when dcn equals 4 at Luv2RGB_b().
2016-10-03 00:20:26 +09:00
Alexander Alekhin
411e551335
ocl: autogenerated code
2016-10-02 02:43:02 +03:00
Alexander Alekhin
a0add98b30
ocl: eliminate build warning
...
Templates are replaced by macro
2016-10-02 02:43:02 +03:00
Vadim Pisarevsky
39467d84bf
Merge pull request #7353 from alalek:ocl_update_canny_test_threshold
2016-10-01 15:48:21 +00:00
Vadim Pisarevsky
991c41c849
Merge pull request #7371 from mshabunin:aruco-java-wrap
2016-10-01 15:38:59 +00:00
Alexander Alekhin
1c18b1d245
Merge pull request #7370 from souch55:Fixxn
2016-10-01 10:44:56 +00:00
k-shinotsuka
1a51a96de2
fixed the difference of the calculation result for findStereoCorrespondenceBM_SSE2() and findStereoCorrespondenceBM_().
2016-10-01 16:26:35 +09:00
Alexander Alekhin
12e00827be
cuda: fix fp16 compilation
2016-09-30 23:55:39 +03:00
catree
2dd77f886a
Fix dead link for hit or miss documentation.
2016-09-30 20:34:30 +02:00
mshabunin
7a7a2749e0
Fixed java wrappers
2016-09-30 16:21:04 +03:00
sourin
a34fbf7bb1
Fixed identifiers warns
2016-09-30 15:16:29 +05:30
Alexander Alekhin
a9ab629f60
build: fix aarch64 build with aarch64-linux-gnu-g++-4.8
2016-09-29 17:26:19 +03:00
mshabunin
55e3deac46
Merge remote-tracking branch 'upstream/master' into pr7050
2016-09-29 12:57:28 +03:00
Maksim Shabunin
3d5c0f1faf
HAL interface for cv::integral
2016-09-29 12:12:10 +03:00
Alexander Alekhin
696972bf8e
ocl: update Canny test threshold
...
OpenCL Device:
- Intel(R) HD Graphics (OpenCL 2.0: r2.0.54425)
2016-09-28 13:38:02 +03:00
Alexander Alekhin
73e1d64ae0
Merge pull request #6956 from mshabunin:fix-chessboard-bug
2016-09-27 13:33:42 +00:00
Alexander Alekhin
f4b84dd45d
Merge pull request #7334 from daB0bby:patch-3
2016-09-27 13:29:50 +00:00
Alexander Alekhin
4a5b775a8d
Merge pull request #7333 from daB0bby:patch-2
2016-09-27 13:29:32 +00:00
Alexander Alekhin
d34f2cfefe
Merge pull request #7317 from tomoaki0705:fixIfdefFp16
2016-09-26 10:59:32 +00:00
daB0bby
809bbb472b
bypass macro
2016-09-23 13:01:19 +02:00
daB0bby
7840b07d2f
bypass macro
2016-09-23 13:00:30 +02:00
Tomoaki Teshima
c7cb116dc0
check FP16 build condition correctly
...
* use __GNUC_MINOR__ in correct place to check the version of GCC
* check processor support of FP16 at run time
* check compiler support of FP16 and pass correct compiler option
* rely on ENABLE_AVX on gcc since AVX is generated when mf16c is passed
* guard correctly using ifdef in case of various configuration
* use v_float16x4 correctly by including the right header file
2016-09-23 11:04:22 +09:00
Alexander Alekhin
7f14a278a7
Merge pull request #7321 from sovrasov:python_test_update
2016-09-22 16:43:28 +00:00
Maksim Shabunin
b8bce55270
Several chessboard detector improvements:
...
- fixed uninitialized memory access and memory leaks
- extracted several code blocks to separate functions
- updated part of algorithm to use cv::Mat instead of CvMat and IplImage
2016-09-22 19:25:04 +03:00
Maksim Shabunin
ee7e231e8b
Merge pull request #7322 from alalek:fix_test_crash
2016-09-22 15:55:19 +00:00
Maksim Shabunin
9e27f82ee2
Merge pull request #7328 from alalek:fix_win32_2
2016-09-22 15:52:06 +00:00
Alexander Alekhin
f50f34016e
test: fix test crash (exception in destructor)
2016-09-22 15:18:32 +03:00
Alexander Alekhin
c66efd05fa
imgproc: use target type for calculations
...
reduce scope of "i" variable
2016-09-22 15:14:59 +03:00
Vadim Pisarevsky
fbc44bcb78
Merge pull request #6845 from jbosch:master
2016-09-22 11:57:06 +00:00
Alexander Alekhin
7366be696a
imgproc: fix win32 build
2016-09-22 14:56:23 +03:00
Vadim Pisarevsky
0330322dbd
Merge pull request #6820 from grochefort:fix_backgroundsubstractormog2_master
2016-09-22 11:56:23 +00:00
Francisco Facioni
8283ddb52f
LSD: Use a fixed size array instead of using std::vector
2016-09-22 12:39:49 +01:00
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