1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00

Corrections for compiling issues in Win, And and Doc

This commit is contained in:
Juan Manuel Perez
2013-09-23 21:24:27 +02:00
committed by Vadim Pisarevsky
parent 61c27ac81e
commit fe7bab499f
14 changed files with 37 additions and 43 deletions
+2 -2
View File
@@ -104,7 +104,7 @@ protected:
String name_;
};
static double distance(Point2f p, Point2f q)
static float distance(Point2f p, Point2f q)
{
Point2f diff = p - q;
float norma = diff.x*diff.x + diff.y*diff.y;// - 2*diff.x*diff.y;
@@ -237,7 +237,7 @@ void ThinPlateSplineShapeTransformerImpl::estimateTransformation(InputArray _pts
{
if (i==j)
{
matK.at<float>(i,j)=regularizationParameter;
matK.at<float>(i,j)=float(regularizationParameter);
}
else
{