Skip to content

Commit 02c6b5e

Browse files
committed
Merge pull request #3219 from vrabaud:34_remove_unused
2 parents 7a8c959 + 1276bb8 commit 02c6b5e

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

modules/ximgproc/src/edge_drawing.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ class EdgeDrawingImpl : public EdgeDrawing
229229
static void DeallocateMatrix(double** m, int noRows);
230230
static void AperB_T(double** A_, double** B_, double** _res, int _righA, int _colA, int _righB, int _colB);
231231
static void AperB(double** A_, double** B_, double** _res, int _righA, int _colA, int _righB, int _colB);
232-
static void jacobi(double** a, int n, double d[], double** v, int nrot);
232+
static void jacobi(double** a, int n, double d[], double** v);
233233
static void ROTATE(double** a, int i, int j, int k, int l, double tau, double s);
234234
static double computeEllipsePerimeter(EllipseEquation* eq);
235235
static double ComputeEllipseError(EllipseEquation* eq, double* px, double* py, int noPoints);
@@ -5340,7 +5340,6 @@ bool EdgeDrawingImpl::EllipseFit(double* x, double* y, int noPoints, EllipseEqua
53405340
double** V = AllocateMatrix(7, 7);
53415341
double** sol = AllocateMatrix(7, 7);
53425342
double tx, ty;
5343-
int nrot = 0;
53445343

53455344
memset(d, 0, sizeof(double) * 7);
53465345

@@ -5384,7 +5383,7 @@ bool EdgeDrawingImpl::EllipseFit(double* x, double* y, int noPoints, EllipseEqua
53845383
AperB_T(Const, invL, temp, 6, 6, 6, 6);
53855384
AperB(invL, temp, C, 6, 6, 6, 6);
53865385

5387-
jacobi(C, 6, d, V, nrot);
5386+
jacobi(C, 6, d, V);
53885387

53895388
A_TperB(invL, V, sol, 6, 6, 6, 6);
53905389

@@ -5634,7 +5633,7 @@ void EdgeDrawingImpl::AperB(double** A_, double** B_, double** _res, int _righA,
56345633
}
56355634
}
56365635

5637-
void EdgeDrawingImpl::jacobi(double** a, int n, double d[], double** v, int nrot)
5636+
void EdgeDrawingImpl::jacobi(double** a, int n, double d[], double** v)
56385637
{
56395638
int j, iq, ip, i;
56405639
double tresh, theta, tau, t, sm, s, h, g, c;
@@ -5655,7 +5654,6 @@ void EdgeDrawingImpl::jacobi(double** a, int n, double d[], double** v, int nrot
56555654
b[ip] = d[ip] = a[ip][ip];
56565655
z[ip] = 0.0;
56575656
}
5658-
nrot = 0;
56595657
for (i = 1; i <= 50; i++)
56605658
{
56615659
sm = 0.0;
@@ -5719,7 +5717,6 @@ void EdgeDrawingImpl::jacobi(double** a, int n, double d[], double** v, int nrot
57195717
{
57205718
ROTATE(v, j, ip, j, iq, tau, s);
57215719
}
5722-
++nrot;
57235720
}
57245721
}
57255722
}

0 commit comments

Comments
 (0)