Vadim Pisarevsky
07e07655d4
Merge pull request #3967 from Belev:fix-typo
2015-04-28 14:47:05 +00:00
Vadim Pisarevsky
e60dcc9b3b
Merge pull request #3966 from Dikay900:master_diff_to_2_4_2
2015-04-28 11:00:57 +00:00
Vadim Pisarevsky
7245803405
Merge pull request #3954 from martin-ueding:master
2015-04-28 10:55:05 +00:00
Vadim Pisarevsky
ce7812fcb0
Merge pull request #3962 from apavlenko:fix_polylines_empty
2015-04-28 10:47:36 +00:00
Belev
2200e0fb7e
Fix typo
...
Fixed difference in the given arguments to the ellipse function and the description after that
Fixed two more typos
Replaced unnecessary the with to
2015-04-28 13:10:08 +03:00
Maksim Shabunin
9efc57f24b
Increased perf_imgproc.moments max error
2015-04-27 17:05:55 +03:00
kalistratovag
20156d1eeb
Adding 1 to moments to avoid tests fails
2015-04-27 15:36:40 +03:00
Maksim Shabunin
1138a38dbe
Use explicit no-sse flags when SSE is off
...
Also:
- Silence clang warnings about unsupported command line arguments
- Add diagnostic print to calib3d test
- Fixed perf test relative error check
- Fix iOS build problem
2015-04-27 15:36:10 +03:00
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
Roman Donchenko
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
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
Luis Díaz Más
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
Luis Díaz Más
e6f7e96ff4
Fixing the bug #4244 that I just reported in code.opencv.org
2015-04-25 18:54:52 +02:00
Craig Reynolds
b4c7c011b7
In cvAddText, construct QString from "text" using fromUtf8.
2015-04-25 18:54:51 +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
Andrey Pavlenko
d2409d12c6
porting polylines with empty vector<Point>
from 2.4 to master
2015-04-24 17:11:51 +03:00
Vadim Pisarevsky
1e90b2f51d
Merge pull request #3957 from dhood:fm-8pt-bug
2015-04-23 17:16:25 +00:00
Deanna Hood
eee210f3b5
Fix Bug #3441 , #4072 , #4173 : 8-point fundamental matrix calculation error
2015-04-23 10:09:48 -04:00
Deanna Hood
34bc3b8595
Don't relax error level for particular fundamental matrix calculation methods
2015-04-23 10:08:42 -04:00
Vadim Pisarevsky
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
Martin Ueding
5ffb53f229
Add example data types for calibrateCamera call
...
It took me a while to figure out what was meant with
OpenCV Error: Assertion failed (i < 0) in getMat
While searching for this error message I found [a list of error
messages](https://adventuresandwhathaveyou.wordpress.com/2014/03/14/opencv-error-messages-suck/ )
which also explained what the problem was: The data type for `rvecs` was
not a simple `cv::Mat` but a `std::vector<cv::Mat>`.
After I fixed that, I got the next error message:
OpenCV Error: Assertion failed (ni > 0 && ni == ni1) in
collectCalibrationData, file
/build/buildd/opencv-2.4.9+dfsg/modules/calib3d/src/calibration.cpp,
line 3193
The problem here was that my data type for the `objectPoints` was just
`vector<Vec3f>` and not `vector<vector<Vec3f>>`.
In order to save other people the time looking for this, I added
explicit examples of the needed data types into the documentation of the
function. I had to re-read the current version a couple of times until I
can read the needed levels of `vector<>`. Having this example would have
really helped me there.
2015-04-23 13:30:14 +02:00
Vadim Pisarevsky
dcf177e372
Merge pull request #3952 from vpisarev:fix_libav_case
2015-04-23 06:25:25 +00:00
Vadim Pisarevsky
30912b49f3
fixed compile warnings; hopefully fixed test failures
2015-04-23 00:39:44 +03:00
Vadim Pisarevsky
882dc0a7f6
Merge pull request #3950 from paroj:fix-gftt_ocl
2015-04-22 19:08:15 +00:00
Vadim Pisarevsky
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
kalistratovag
08925330e0
mjpec_decoder initialize m_movi_start variable
2015-04-22 19:49:11 +03:00
Pavel Rojtberg
1ea41e7246
fix gftt opencv kernel when using mask
2015-04-22 16:13:50 +02:00
Vadim Pisarevsky
7dd19f6d97
Merge pull request #3939 from paroj:fmtfix
2015-04-22 12:15:17 +00:00
Vadim Pisarevsky
415a212d09
Merge pull request #3936 from dhood:fitEllipse-bug
2015-04-22 11:22:35 +00:00
Philipp Hasper
0b20ce696a
Fixed markdown: **Note** -> @note
2015-04-22 08:08:10 +02:00
Vadim Pisarevsky
a69b435c92
Merge pull request #3909 from Nuzhny007:master
2015-04-21 14:02:59 +00:00
Vadim Pisarevsky
063e4004ba
Merge pull request #3935 from vpisarev:extending_hal_part1
2015-04-21 14:02:02 +00:00
Vadim Pisarevsky
dce0405c4d
Merge pull request #3947 from tcavallari:patch-1
2015-04-21 14:01:22 +00:00
Vadim Pisarevsky
0f13208d81
Merge pull request #3929 from daeyun:findEssentialMat_doc
2015-04-21 12:20:02 +00:00
Vadim Pisarevsky
4c875dc393
Merge pull request #3932 from nisargthakkar:Bug4243
2015-04-21 12:18:37 +00:00
Vadim Pisarevsky
99d0fcf49d
Merge pull request #3938 from paroj:triangulatecpp
2015-04-21 12:02:26 +00:00
Vadim Pisarevsky
faf84e7100
Merge pull request #3937 from mshabunin:android-engine3
2015-04-21 11:47:26 +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
tcavallari
cca78e0601
Null Pointer check in vizimpl.cpp
...
Should fix #4191 (http://code.opencv.org/issues/4191 )
2015-04-21 10:08:17 +02:00
Nisarg Thakkar
0fd1203b3b
Fixed Doc Errors Bug#4282
2015-04-21 10:37:50 +05:30
Vadim Pisarevsky
b27467d9f9
Merge pull request #3931 from mshabunin:fix-svm-train
2015-04-20 20:00:36 +00:00
Vadim Pisarevsky
6916a1438f
fixed some newly introduced compile errors and warnings
2015-04-20 21:34:37 +03:00
Vadim Pisarevsky
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
Deanna Hood
37f77e7397
Change condition on parallel ellipse case so can only calculate t if necessary
2015-04-18 13:51:32 -04:00
Deanna Hood
5a552b6d8d
Regression test for Bug #3989 : check fitEllipse with rotation angles of n*pi/2
2015-04-18 13:51:26 -04:00
Pavel Rojtberg
b02fc039cd
fix python and numpy output formatters
2015-04-17 17:42:24 +02:00
Maksim Shabunin
a362aca783
Rename manager package to OpenCV3 Manager
2015-04-17 16:59:52 +03:00
Maksim Shabunin
316d76bdb6
Rename OpenCV Engine to org.opencv.engine3 for release candidate
2015-04-17 16:00:33 +03:00
Vadim Pisarevsky
92f2ad0a11
trying to fix test failures (take 2)
2015-04-17 11:32:20 +03:00
Vadim Pisarevsky
17675b4cb8
trying to fix test failures
2015-04-17 10:51:49 +03:00