Skip to content

Commit

Permalink
Fix issues detected by Coverity Scan
Browse files Browse the repository at this point in the history
CID: 1164604 (Nesting level does not match indentation)

Signed-off-by: Noah Metzger <noah.metzger@bib.uni-mannheim.de>
  • Loading branch information
noahmetzger committed Aug 1, 2018
1 parent 2d96c66 commit d28631a
Showing 1 changed file with 56 additions and 48 deletions.
104 changes: 56 additions & 48 deletions src/classify/mfoutline.cpp
Expand Up @@ -379,54 +379,62 @@ void ComputeDirection(MFEDGEPT *Start,
MFEDGEPT *Finish,
float MinSlope,
float MaxSlope) {
FVECTOR Delta;

Delta.x = Finish->Point.x - Start->Point.x;
Delta.y = Finish->Point.y - Start->Point.y;
if (Delta.x == 0)
if (Delta.y < 0) {
Start->Slope = -FLT_MAX;
Start->Direction = south;
}
else {
Start->Slope = FLT_MAX;
Start->Direction = north;
}
else {
Start->Slope = Delta.y / Delta.x;
if (Delta.x > 0)
if (Delta.y > 0)
if (Start->Slope > MinSlope)
if (Start->Slope < MaxSlope)
Start->Direction = northeast;
else
Start->Direction = north;
else
Start->Direction = east;
else if (Start->Slope < -MinSlope)
if (Start->Slope > -MaxSlope)
Start->Direction = southeast;
else
Start->Direction = south;
else
Start->Direction = east;
else if (Delta.y > 0)
if (Start->Slope < -MinSlope)
if (Start->Slope > -MaxSlope)
Start->Direction = northwest;
else
Start->Direction = north;
else
Start->Direction = west;
else if (Start->Slope > MinSlope)
if (Start->Slope < MaxSlope)
Start->Direction = southwest;
else
Start->Direction = south;
else
Start->Direction = west;
}
Finish->PreviousDirection = Start->Direction;
FVECTOR Delta;

Delta.x = Finish->Point.x - Start->Point.x;
Delta.y = Finish->Point.y - Start->Point.y;
if (Delta.x == 0) {
if (Delta.y < 0) {
Start->Slope = -FLT_MAX;
Start->Direction = south;
} else {
Start->Slope = FLT_MAX;
Start->Direction = north;
}
} else {
Start->Slope = Delta.y / Delta.x;
if (Delta.x > 0) {
if (Delta.y > 0) {
if (Start->Slope > MinSlope) {
if (Start->Slope < MaxSlope) {
Start->Direction = northeast;
} else {
Start->Direction = north;
}
} else {
Start->Direction = east;
}
}
else if (Start->Slope < -MinSlope) {
if (Start->Slope > -MaxSlope) {
Start->Direction = southeast;
} else {
Start->Direction = south;
}
} else {
Start->Direction = east;
}
} else if (Delta.y > 0) {
if (Start->Slope < -MinSlope) {
if (Start->Slope > -MaxSlope) {
Start->Direction = northwest;
} else {
Start->Direction = north;
}
} else {
Start->Direction = west;
}
} else if (Start->Slope > MinSlope) {
if (Start->Slope < MaxSlope) {
Start->Direction = southwest;
} else {
Start->Direction = south;
}
} else {
Start->Direction = west;
}
}
Finish->PreviousDirection = Start->Direction;
}

/**
Expand Down

0 comments on commit d28631a

Please sign in to comment.