mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-12-11 23:19:04 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #1816 from noahmetzger/winfix

Browse Source 
Fix issues detected by Coverity Scan
This commit is contained in:
zdenop 2018-08-01 14:45:00 +02:00 committed by GitHub
commit b23568f3d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/classify/mfoutline.cpp
View File

@ -379,54 +379,62 @@ void ComputeDirection(MFEDGEPT *Start,
MFEDGEPT *Finish, MFEDGEPT *Finish,
float MinSlope, float MinSlope,
float MaxSlope) { float MaxSlope) {
FVECTOR Delta; FVECTOR Delta;
Delta.x = Finish->Point.x - Start->Point.x; Delta.x = Finish->Point.x - Start->Point.x;
Delta.y = Finish->Point.y - Start->Point.y; Delta.y = Finish->Point.y - Start->Point.y;
if (Delta.x == 0) if (Delta.x == 0) {
if (Delta.y < 0) { if (Delta.y < 0) {
Start->Slope = -FLT_MAX; Start->Slope = -FLT_MAX;
Start->Direction = south; Start->Direction = south;
} } else {
else { Start->Slope = FLT_MAX;
Start->Slope = FLT_MAX; Start->Direction = north;
Start->Direction = north; }
} } else {
else { Start->Slope = Delta.y / Delta.x;
Start->Slope = Delta.y / Delta.x; if (Delta.x > 0) {
if (Delta.x > 0) if (Delta.y > 0) {
if (Delta.y > 0) if (Start->Slope > MinSlope) {
if (Start->Slope > MinSlope) if (Start->Slope < MaxSlope) {
if (Start->Slope < MaxSlope) Start->Direction = northeast;
Start->Direction = northeast; } else {
else Start->Direction = north;
Start->Direction = north; }
else } else {
Start->Direction = east; Start->Direction = east;
else if (Start->Slope < -MinSlope) }
if (Start->Slope > -MaxSlope) }
Start->Direction = southeast; else if (Start->Slope < -MinSlope) {
else if (Start->Slope > -MaxSlope) {
Start->Direction = south; Start->Direction = southeast;
else } else {
Start->Direction = east; Start->Direction = south;
else if (Delta.y > 0) }
if (Start->Slope < -MinSlope) } else {
if (Start->Slope > -MaxSlope) Start->Direction = east;
Start->Direction = northwest; }
else } else if (Delta.y > 0) {
Start->Direction = north; if (Start->Slope < -MinSlope) {
else if (Start->Slope > -MaxSlope) {
Start->Direction = west; Start->Direction = northwest;
else if (Start->Slope > MinSlope) } else {
if (Start->Slope < MaxSlope) Start->Direction = north;
Start->Direction = southwest; }
else } else {
Start->Direction = south; Start->Direction = west;
else }
Start->Direction = west; } else if (Start->Slope > MinSlope) {
} if (Start->Slope < MaxSlope) {
Finish->PreviousDirection = Start->Direction; Start->Direction = southwest;
} else {
Start->Direction = south;
}
} else {
Start->Direction = west;
}
}
Finish->PreviousDirection = Start->Direction;
} }
/** /**