Thomas Gabrowski
63dbeeaac5
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
...
Conflicts:
modules/contrib/include/opencv2/contrib/retina.hpp
2015-04-26 12:22:41 +02:00
Mansour Moufid
b99f7a29df
Cast some image coordinates and sizes to double.
...
Conflicts:
modules/gpu/perf/perf_imgproc.cpp
Cast a long integer to double explicitly.
Conflicts:
modules/python/src2/cv2.cpp
Cast some matrix sizes to type int.
Change some vector mask types to unsigned.
Conflicts:
modules/core/src/arithm.cpp
2015-04-25 18:54:53 +02:00
Boris Daskalov
3b5530fb67
Fix a bad free space check in icvGrowSeq.
...
A difference of two pointers was casted to unsigned which can lead to
overflow on 64-bit systems.
2015-04-25 18:54:51 +02:00
Vadim Pisarevsky
7dd19f6d97
Merge pull request #3939 from paroj:fmtfix
2015-04-22 12:15:17 +00:00
Vadim Pisarevsky
063e4004ba
Merge pull request #3935 from vpisarev:extending_hal_part1
2015-04-21 14:02:02 +00:00
Pavel Rojtberg
78eac67a01
clean up cvTriangulatePoints by using C++ primitives directly.
...
- fixes the Calib3d_StereoCalibrate_C testcase.
update comment regarding cv::SVD::MODIFY_A
2015-04-21 11:29:26 +02:00
Pavel Rojtberg
b02fc039cd
fix python and numpy output formatters
2015-04-17 17:42:24 +02:00
Vadim Pisarevsky
ee11a2d266
fully implemented SSE and NEON cases of intrin.hpp; extended the HAL with some basic math functions
2015-04-16 23:00:26 +03:00
Vadim Pisarevsky
a2bba1b9e6
HAL extensions: added initial version of universal intrinsics (C implementation and SSE2, NEON - TBD). added empty files where some functionality from core and imgproc will be moved to
2015-04-15 00:36:27 +03:00
Ilya Lavrenov
17bedd72f0
workaround for stange internal compiler error when cross-compiling with 4.6
2015-04-14 16:55:11 +03:00
Vadim Pisarevsky
5b3f89df0a
Merge pull request #3911 from vpisarev:core_tweaks
2015-04-07 19:03:48 +00:00
Vadim Pisarevsky
259e41da73
reverted "typedef _InputArray InputArray", fixed warning from doxygen
2015-04-07 19:34:51 +03:00
Maksim Shabunin
35b2139929
Basic HAL module
2015-04-07 18:16:22 +03:00
Vadim Pisarevsky
052593c760
1. Input/OutputArray optimizations;
...
2. Algorithm::load/save added (moved from StatModel)
3. copyrights updated; added copyright/licensing info for ffmpeg
4. some warnings from Xcode 6.x are fixed
2015-04-07 16:44:26 +03:00
Dmitry-Me
75a65542ba
Reduce variables scope
2015-03-25 17:17:06 +03:00
Vadim Pisarevsky
5501cfd809
Merge pull request #3814 from erikrk:denoising-16bit-master
2015-03-24 15:23:58 +00:00
Vadim Pisarevsky
f7f10a7d2c
Merge pull request #3854 from Dmitry-Me:reduceVariableScope8
2015-03-24 15:13:34 +00:00
Vadim Pisarevsky
70ff448067
Merge pull request #3859 from NewProggie:fix-doc-typo
2015-03-24 15:08:03 +00:00
Vadim Pisarevsky
54deb5ed5a
Merge pull request #3860 from theodr:document_hconcat_vconcat
2015-03-24 15:07:34 +00:00
theodore
02c3d8d792
documentation for the hconcat and vconcat functions
2015-03-24 13:59:09 +01:00
Vadim Pisarevsky
5a0c7a1330
Merge pull request #3853 from alalek:ocl_fix_bufferpool_cleanup
2015-03-23 08:10:22 +00:00
Vadim Pisarevsky
7ab7322915
Merge pull request #3848 from yxiong:fix-4125
2015-03-23 08:04:41 +00:00
Vadim Pisarevsky
daa99514fa
Merge pull request #3846 from mshabunin:fix-headers
2015-03-23 08:01:25 +00:00
Kai Wolf
f815bbab24
Fix typo in types_c.h
2015-03-22 10:55:54 +01:00
Dmitry-Me
ce167e233b
Reduce variable scope
2015-03-20 13:27:08 +03:00
Alexander Alekhin
b5529aef9c
ocl/bufferpool: fix cleanup
2015-03-20 13:21:10 +03:00
Ying Xiong
decbdd1abb
Fix compiler error on std::swap (CUDA7.0/clang/OSX)
2015-03-19 14:23:44 -04:00
Vadim Pisarevsky
9683f93a76
Merge pull request #3840 from MSOpenTech:concurrency-contrib
2015-03-19 15:11:01 +00:00
Vadim Pisarevsky
9997e6d337
Merge pull request #3823 from lupustr3:pvlasov/implementation_detector_update
2015-03-19 12:47:22 +00:00
Maksim Shabunin
d5b954c2d4
Moved property implementation macros to private header
2015-03-18 17:33:12 +03:00
Maksim Shabunin
7335a40a61
Replaced CV_PURE_PROPERTY macros with corresponding code
2015-03-18 17:23:42 +03:00
Maxim Kostin
d1a8171011
Added WinRT concurrency support.
2015-03-18 15:13:08 +03:00
Philipp Hasper
e0efda7145
Fixed persistent.hpp documentation
...
Small error - object fs does not exist in this code example
2015-03-17 15:28:37 +01:00
Vadim Pisarevsky
c6e9280373
Merge pull request #3816 from ilya-lavrenov:il/cvround
2015-03-16 09:09:55 +00:00
Dmitry-Me
8ed4bae4dd
Reduce variable scope, make formatting consistent with surrounding code
2015-03-14 12:50:42 +03:00
Pavel Vlasov
085409340e
Implementation collector update;
...
Moved out of TLS to properly collect data from different threads;
Concurrent access guards were added to collection functions;
2015-03-12 17:58:03 +03:00
Ilya Lavrenov
6f8b3fc633
cvRound
2015-03-11 16:14:39 +03:00
Roman Donchenko
6274e1fc5f
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
...
... before any exceptions occur.
(cherry picked from commit 08da247a87
2015-03-10 12:38:45 +03:00
Roman Donchenko
6b8ebf3e94
Fix memory leaks appearing when cvOpenFileStorage throws
...
(cherry picked from commit 16ce114e0c
2015-03-10 12:38:45 +03:00
Vadim Pisarevsky
baf191fab2
Merge pull request #3771 from mshabunin:arm-round
2015-03-09 21:49:15 +00:00
Vadim Pisarevsky
64bd77cf4d
Merge pull request #3794 from vpisarev:ubuntu_x86_fixes
2015-03-09 21:34:17 +00:00
Erik Karlsson
5a7118a88b
Merging in master
2015-03-09 22:00:58 +01:00
Maksim Shabunin
451972f3cf
Added ARM implementation in cvRound function
...
- note: uses VFPv3 instructions
- also added overloaded cvRound variants with float and int parameters
- thanks to Marina Kolpakova from Itseez for idea
- thanks to developers from #llvm IRC channel for help with inline asm
2015-03-06 16:14:37 +03:00
Vadim Pisarevsky
5d8a1bf813
explained reason why IPP is disabled on 32-bit Linux. disable IPP's minMaxLoc_32f on 32-bit OSes only
2015-03-06 15:02:22 +03:00
Dmitry-Me
2fb4178f7c
Reduce variable scope
2015-03-06 10:17:37 +03:00
Vadim Pisarevsky
7a52c3d9f1
1) make sure Python 2.7 is detected on Ubuntu (including libs) when it's there.
...
2) disable IPP on 32-bit Linux when OpenCV is built as shared libs. Otherwise we get linker errors
3) disable IPP's minMaxIdx 32-bit floating-point flavor in a hope that it fixes some test failures
2015-03-05 18:58:54 +03:00
Vadim Pisarevsky
aa113c5a85
Merge pull request #3787 from Dmitry-Me:fixNullPointerDereference2
2015-03-05 12:19:02 +00:00
Dmitry-Me
d164d51380
Fix potential null pointer dereference
2015-03-05 10:31:51 +03:00
Vadim Pisarevsky
f9b8ce1d25
Merge pull request #3784 from ilya-lavrenov:nvidia_android
2015-03-05 06:43:03 +00:00
Vadim Pisarevsky
0b99f6bcd6
Merge pull request #3777 from ilya-lavrenov:nvidia_cvtcolor_eps
2015-03-04 13:53:41 +00:00
