Merge pull request #1938 from stweil/coverity

Fix two reports from CoverityScan and clean related code
tesseract-ocr · Oct 2, 2018 · 4237987 · 4237987
2 parents 7dbf5a0 + 04703ca
commit 4237987
Show file tree

Hide file tree

Showing 9 changed files with 467 additions and 495 deletions.
diff --git a/src/ccstruct/Makefile.am b/src/ccstruct/Makefile.am
@@ -16,7 +16,6 @@ noinst_HEADERS = \
     ccstruct.h coutln.h crakedge.h \
     debugpixa.h detlinefit.h dppoint.h fontinfo.h \
     imagedata.h \
-    ipoints.h \
     linlsq.h matrix.h mod128.h normalis.h \
     ocrblock.h ocrpara.h ocrrow.h otsuthr.h \
     pageres.h params_training_featdef.h \

diff --git a/src/ccstruct/blobbox.cpp b/src/ccstruct/blobbox.cpp
@@ -31,7 +31,7 @@
 #include "environ.h"     // for l_uint32
 #include "helpers.h"     // for UpdateRange, IntCastRounded
 #include "host.h"        // for NearlyEqual, TRUE
-#include "ipoints.h"     // for operator+=, ICOORD::rotate
+#include "points.h"      // for operator+=, ICOORD::rotate
 
 struct Pix;
 

diff --git a/src/ccstruct/coutln.h b/src/ccstruct/coutln.h
@@ -23,7 +23,6 @@
 #include <cstdint>      // for int16_t, int32_t
 #include "bits16.h"     // for BITS16
 #include "elst.h"       // for ELIST_ITERATOR, ELISTIZEH, ELIST_LINK
-#include "ipoints.h"    // for operator+=
 #include "mod128.h"     // for DIR128, DIRBITS
 #include "platform.h"   // for DLLSYM
 #include "points.h"     // for ICOORD, FCOORD