Skip to content

O
opencv_contrib
Commit 2888fea1 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #1582 from lamantine:fix_1580

parents a817a197 0eb1d87b
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
modules/face/src/mace.cpp
View file @ 2888fea1
...@@ -208,8 +208,8 @@ struct MACEImpl : MACE { ...@@ -208,8 +208,8 @@ struct MACEImpl : MACE {
re -= m1; re -= m1;
double value=0; double value=0;
double num=0; double num=0;
int rad1=int(floor((double)(45.0/64.0)*(double)IMGSIZE)); int rad_1=int(floor((double)(45.0/64.0)*(double)IMGSIZE));
int rad2=int(floor((double)(27.0/64.0)*(double)IMGSIZE)); int rad_2=int(floor((double)(27.0/64.0)*(double)IMGSIZE));
// cache a few pow's and sqrts // cache a few pow's and sqrts
std::vector<double> r2(IMGSIZE_2X); std::vector<double> r2(IMGSIZE_2X);
Mat_<double> radtab(IMGSIZE_2X,IMGSIZE_2X); Mat_<double> radtab(IMGSIZE_2X,IMGSIZE_2X);
...@@ -226,8 +226,8 @@ struct MACEImpl : MACE { ...@@ -226,8 +226,8 @@ struct MACEImpl : MACE {
for (int l=0; l<IMGSIZE_2X; l++) { for (int l=0; l<IMGSIZE_2X; l++) {
for (int m=0; m<IMGSIZE_2X; m++) { for (int m=0; m<IMGSIZE_2X; m++) {
double rad = radtab(l,m); double rad = radtab(l,m);
if (rad < rad1) { if (rad < rad_1) {
if (rad > rad2) { if (rad > rad_2) {
value += re(l,m); value += re(l,m);
num++; num++;
} }
...@@ -240,8 +240,8 @@ struct MACEImpl : MACE { ...@@ -240,8 +240,8 @@ struct MACEImpl : MACE {
for (int l=0; l<IMGSIZE_2X; l++) { for (int l=0; l<IMGSIZE_2X; l++) {
for (int m=0; m<IMGSIZE_2X; m++) { for (int m=0; m<IMGSIZE_2X; m++) {
double rad = radtab(l,m); double rad = radtab(l,m);
if (rad < rad1) { if (rad < rad_1) {
if (rad > rad2) { if (rad > rad_2) {
double d = (value - re(l,m)); double d = (value - re(l,m));
std2 += d * d; std2 += d * d;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment