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
655b28ee0c
Use the CMake find_library command to find the FFmpeg libraries.
...
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
2015-04-25 19:00:33 +02:00
5455e38e15
cap_msmf.hpp: fix a warning about nNull being unused
...
The two functions featuring nNull are not particularly needed, so
I simply removed them.
Conflicts:
modules/highgui/src/cap_msmf.hpp
2015-04-25 18:54:54 +02:00
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
b599774e30
Fix a bug that impede to set the trackbar pos using the Qt control panel
...
Conflicts:
modules/highgui/src/window_QT.cpp
2015-04-25 18:54:53 +02:00
e6f7e96ff4
Fixing the bug #4244 that I just reported in code.opencv.org
2015-04-25 18:54:52 +02:00
b4c7c011b7
In cvAddText, construct QString from "text" using fromUtf8.
2015-04-25 18:54:51 +02:00
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
2c73e49dac
Not block PDB file in multithreaded build on Windows.
...
If used cl compiler, but generator is not Visual Studio e.g. Ninja,
enable FS option to prevent blocking PDB file in multithreaded build.
2015-04-25 18:54:50 +02:00
6a5f413f27
Merge tag '3.0.0-rc1'
2015-04-24 14:56:47 +03:00
755527a90a
Merge pull request #3958 from ilya-lavrenov:cuda_aarch64
2015-04-23 17:16:52 +00:00
1e90b2f51d
Merge pull request #3957 from dhood:fm-8pt-bug
2015-04-23 17:16:25 +00:00
f57063efa2
port of aarch64 cuda changes from 2.4
2015-04-23 17:57:29 +03:00
b057a62c8b
Set status to rc
2015-04-23 17:29:40 +03:00
12a3156aff
Merge pull request #3955 from vpisarev:fixed_mjpeg_encoder
2015-04-23 14:21:32 +00:00
eee210f3b5
Fix Bug #3441 , #4072 , #4173 : 8-point fundamental matrix calculation error
2015-04-23 10:09:48 -04:00
34bc3b8595
Don't relax error level for particular fundamental matrix calculation methods
2015-04-23 10:08:42 -04:00
d825b7ee9a
fixed mjpeg encoder so that libjpeg-based decoder does not complain on extra bytes in the end of stream
2015-04-23 14:40:44 +03:00
dcf177e372
Merge pull request #3952 from vpisarev:fix_libav_case
2015-04-23 06:25:25 +00:00
30912b49f3
fixed compile warnings; hopefully fixed test failures
2015-04-23 00:39:44 +03:00
882dc0a7f6
Merge pull request #3950 from paroj:fix-gftt_ocl
2015-04-22 19:08:15 +00:00
d8f62673d7
Merge pull request #3951 from kalistratovag:mjpeg_dec_uninitialized
2015-04-22 19:03:20 +00:00
2b2e3ee93c
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
2015-04-22 21:57:29 +03:00
08925330e0
mjpec_decoder initialize m_movi_start variable
2015-04-22 19:49:11 +03:00
1ea41e7246
fix gftt opencv kernel when using mask
2015-04-22 16:13:50 +02:00
7dd19f6d97
Merge pull request #3939 from paroj:fmtfix
2015-04-22 12:15:17 +00:00
415a212d09
Merge pull request #3936 from dhood:fitEllipse-bug
2015-04-22 11:22:35 +00:00
bac4999ae4
Merge pull request #3948 from PhilLab:markdownPatch
2015-04-22 11:02:50 +00:00
0b20ce696a
Fixed markdown: **Note** -> @note
2015-04-22 08:08:10 +02:00
a69b435c92
Merge pull request #3909 from Nuzhny007:master
2015-04-21 14:02:59 +00:00
063e4004ba
Merge pull request #3935 from vpisarev:extending_hal_part1
2015-04-21 14:02:02 +00:00
dce0405c4d
Merge pull request #3947 from tcavallari:patch-1
2015-04-21 14:01:22 +00:00
8e493ef370
Merge pull request #3925 from ttagu99:findcontour_example2
2015-04-21 12:21:36 +00:00
887fe932cc
Merge pull request #3926 from stoneyang:stone
2015-04-21 12:20:42 +00:00
0f13208d81
Merge pull request #3929 from daeyun:findEssentialMat_doc
2015-04-21 12:20:02 +00:00
737d866197
Merge pull request #3930 from berak:python_docs_stereobm
2015-04-21 12:19:37 +00:00
4c875dc393
Merge pull request #3932 from nisargthakkar:Bug4243
2015-04-21 12:18:37 +00:00
60a51b82d7
Merge pull request #3921 from sergarrido:master
2015-04-21 12:11:57 +00:00
99d0fcf49d
Merge pull request #3938 from paroj:triangulatecpp
2015-04-21 12:02:26 +00:00
faf84e7100
Merge pull request #3937 from mshabunin:android-engine3
2015-04-21 11:47:26 +00:00
d01ee09fd6
Merge pull request #3945 from nisargthakkar:DocBugFix4282
2015-04-21 11:46:30 +00:00
926754a66e
another attempt to resolve ABI checker complains
2015-04-21 12:42:46 +03:00
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
fa41653420
trying to avoid ABI checker failures
2015-04-21 11:30:41 +03:00
cca78e0601
Null Pointer check in vizimpl.cpp
...
Should fix #4191 (http://code.opencv.org/issues/4191 )
2015-04-21 10:08:17 +02:00
0fd1203b3b
Fixed Doc Errors Bug#4282
2015-04-21 10:37:50 +05:30
b27467d9f9
Merge pull request #3931 from mshabunin:fix-svm-train
2015-04-20 20:00:36 +00:00
b4aa37aa30
Merge pull request #3933 from BKNio:putText_3_0
2015-04-20 20:00:11 +00:00
6916a1438f
fixed some newly introduced compile errors and warnings
2015-04-20 21:34:37 +03:00
ca9a2887fc
extended universal intrinsics: added 64-bit integers, improved shift operators, renamed "pack" operations; changed semantics of extended integer multiplication, added v_dotprod.
...
also, split intrinsics into separate files. C implementation is compiled only when none of SSE2 or NEON is available.
2015-04-20 20:27:03 +03:00
Thomas Gabrowski