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
This commit is contained in:
Mansour Moufid
2015-02-24 12:21:34 -05:00
committed by Dikay900
parent b599774e30
commit b99f7a29df
6 changed files with 26 additions and 10 deletions

View File

@@ -138,7 +138,12 @@ protected:
{
InT d = disp(y, x);
double from[4] = { x, y, d, 1 };
double from[4] = {
static_cast<double>(x),
static_cast<double>(y),
static_cast<double>(d),
1.0,
};
Mat_<double> res = Q * Mat_<double>(4, 1, from);
res /= res(3, 0);