Skip to content

Commit 800da72

Browse files
JazmannJazmann
committed
Fix Transposed eigenvals and vecs. Didn't notice at first
1 parent 0136711 commit 800da72

File tree

2 files changed

+28
-22
lines changed

2 files changed

+28
-22
lines changed

‎modules/imgproc/src/shapedescr.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -544,27 +544,27 @@ cv::RotatedRect cv::fitEllipseAMS( InputArray _points )
544544
// Select the eigen vector {a,b,c,d,e} which has the lowest eigenvalue
545545
int minpos = 0;
546546
double normi, normEVali, normMinpos, normEValMinpos;
547-
normMinpos = sqrt(eVec.at<double>(0,minpos)*eVec.at<double>(0,minpos) + eVec.at<double>(1,minpos)*eVec.at<double>(1,minpos) + \
548-
eVec.at<double>(2,minpos)*eVec.at<double>(2,minpos) + eVec.at<double>(3,minpos)*eVec.at<double>(3,minpos) + \
549-
eVec.at<double>(4,minpos)*eVec.at<double>(4,minpos) );
550-
normEValMinpos = eVal.at<double>(0,minpos) * normMinpos;
547+
normMinpos = sqrt(eVec.at<double>(minpos,0)*eVec.at<double>(minpos,0) + eVec.at<double>(minpos,1)*eVec.at<double>(minpos,1) + \
548+
eVec.at<double>(minpos,2)*eVec.at<double>(minpos,2) + eVec.at<double>(minpos,3)*eVec.at<double>(minpos,3) + \
549+
eVec.at<double>(minpos,4)*eVec.at<double>(minpos,4) );
550+
normEValMinpos = eVal.at<double>(minpos,0) * normMinpos;
551551
for (i=1; i<5; i++) {
552-
normi = sqrt(eVec.at<double>(0,i)*eVec.at<double>(0,i) + eVec.at<double>(1,i)*eVec.at<double>(1,i) + \
553-
eVec.at<double>(2,i)*eVec.at<double>(2,i) + eVec.at<double>(3,i)*eVec.at<double>(3,i) + \
554-
eVec.at<double>(4,i)*eVec.at<double>(4,i) );
555-
normEVali = eVal.at<double>(0,i) * normi;
552+
normi = sqrt(eVec.at<double>(i,0)*eVec.at<double>(i,0) + eVec.at<double>(i,1)*eVec.at<double>(i,1) + \
553+
eVec.at<double>(i,2)*eVec.at<double>(i,2) + eVec.at<double>(i,3)*eVec.at<double>(i,3) + \
554+
eVec.at<double>(i,4)*eVec.at<double>(i,4) );
555+
normEVali = eVal.at<double>(i,0) * normi;
556556
if (normEVali < normEValMinpos) {
557557
minpos = i;
558558
normMinpos=normi;
559559
normEValMinpos=normEVali;
560560
}
561561
};
562562

563-
pVec(0) =eVec.at<double>(0,minpos) / normMinpos;
564-
pVec(1) =eVec.at<double>(1,minpos) / normMinpos;
565-
pVec(2) =eVec.at<double>(2,minpos) / normMinpos;
566-
pVec(3) =eVec.at<double>(3,minpos) / normMinpos;
567-
pVec(4) =eVec.at<double>(4,minpos) / normMinpos;
563+
pVec(0) =eVec.at<double>(minpos,0) / normMinpos;
564+
pVec(1) =eVec.at<double>(minpos,1) / normMinpos;
565+
pVec(2) =eVec.at<double>(minpos,2) / normMinpos;
566+
pVec(3) =eVec.at<double>(minpos,3) / normMinpos;
567+
pVec(4) =eVec.at<double>(minpos,4) / normMinpos;
568568

569569
coeffs(0) =pVec(0) ;
570570
coeffs(1) =pVec(1) ;
@@ -715,19 +715,19 @@ cv::RotatedRect cv::fitEllipseDirect( InputArray _points )
715715

716716
// Select the eigen vector {a,b,c} which satisfies 4ac-b^2 > 0
717717
double cond[3];
718-
cond[0]=(4.0 * eVec.at<double>(0,0) * eVec.at<double>(2,0) - eVec.at<double>(1,0) * eVec.at<double>(1,0));
719-
cond[1]=(4.0 * eVec.at<double>(0,1) * eVec.at<double>(2,1) - eVec.at<double>(1,1) * eVec.at<double>(1,1));
720-
cond[2]=(4.0 * eVec.at<double>(0,2) * eVec.at<double>(2,2) - eVec.at<double>(1,2) * eVec.at<double>(1,2));
718+
cond[0]=(4.0 * eVec.at<double>(0,0) * eVec.at<double>(0,2) - eVec.at<double>(0,1) * eVec.at<double>(0,1));
719+
cond[1]=(4.0 * eVec.at<double>(1,0) * eVec.at<double>(1,2) - eVec.at<double>(1,1) * eVec.at<double>(1,1));
720+
cond[2]=(4.0 * eVec.at<double>(2,0) * eVec.at<double>(2,2) - eVec.at<double>(2,1) * eVec.at<double>(2,1));
721721
if (cond[0]<cond[1]) {
722722
i = (cond[1]<cond[2]) ? 2 : 1;
723723
} else {
724724
i = (cond[0]<cond[2]) ? 2 : 0;
725725
}
726-
double norm = std::sqrt(eVec.at<double>(0,i)*eVec.at<double>(0,i) + eVec.at<double>(1,i)*eVec.at<double>(1,i) + eVec.at<double>(2,i)*eVec.at<double>(2,i));
727-
if (((eVec.at<double>(0,i)<0.0 ? -1 : 1) * (eVec.at<double>(1,i)<0.0 ? -1 : 1) * (eVec.at<double>(2,i)<0.0 ? -1 : 1)) <= 0.0) {
726+
double norm = std::sqrt(eVec.at<double>(i,0)*eVec.at<double>(i,0) + eVec.at<double>(i,1)*eVec.at<double>(i,1) + eVec.at<double>(i,2)*eVec.at<double>(i,2));
727+
if (((eVec.at<double>(i,0)<0.0 ? -1 : 1) * (eVec.at<double>(i,1)<0.0 ? -1 : 1) * (eVec.at<double>(i,2)<0.0 ? -1 : 1)) <= 0.0) {
728728
norm=-1.0*norm;
729729
}
730-
pVec(0) =eVec.at<double>(0,i)/norm; pVec(1) =eVec.at<double>(1,i)/norm;pVec(2) =eVec.at<double>(2,i)/norm;
730+
pVec(0) =eVec.at<double>(i,0)/norm; pVec(1) =eVec.at<double>(i,1)/norm;pVec(2) =eVec.at<double>(i,2)/norm;
731731

732732
// Q = (TM . pVec)/Ts;
733733
Q(0,0) = (TM(0,0)*pVec(0) +TM(0,1)*pVec(1) +TM(0,2)*pVec(2) )/Ts;

‎samples/cpp/fitellipse.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,15 +282,21 @@ void processImage(int /*h*/, void*)
282282
}
283283
if (fitEllipseQ) {
284284
box = fitEllipse(pts);
285-
if( MAX(box.size.width, box.size.height) > MIN(box.size.width, box.size.height)*30 ){continue;};
285+
if( MAX(box.size.width, box.size.height) > MIN(box.size.width, box.size.height)*30 ||
286+
MAX(box.size.width, box.size.height) <= 0 ||
287+
MIN(box.size.width, box.size.height) <= 0){continue;};
286288
}
287289
if (fitEllipseAMSQ) {
288290
boxAMS = fitEllipseAMS(pts);
289-
if( MAX(boxAMS.size.width, boxAMS.size.height) > MIN(boxAMS.size.width, boxAMS.size.height)*30 ){continue;};
291+
if( MAX(boxAMS.size.width, boxAMS.size.height) > MIN(boxAMS.size.width, boxAMS.size.height)*30 ||
292+
MAX(box.size.width, box.size.height) <= 0 ||
293+
MIN(box.size.width, box.size.height) <= 0){continue;};
290294
}
291295
if (fitEllipseDirectQ) {
292296
boxDirect = fitEllipseDirect(pts);
293-
if( MAX(boxDirect.size.width, boxDirect.size.height) > MIN(boxDirect.size.width, boxDirect.size.height)*30 ){continue;};
297+
if( MAX(boxDirect.size.width, boxDirect.size.height) > MIN(boxDirect.size.width, boxDirect.size.height)*30 ||
298+
MAX(box.size.width, box.size.height) <= 0 ||
299+
MIN(box.size.width, box.size.height) <= 0 ){continue;};
294300
}
295301

296302
if (fitEllipseQ) {

0 commit comments

Comments
 (0)