Merge pull request #1735 from stweil/pdblock

Remove blckerr.h
tesseract-ocr · Jul 3, 2018 · 4b26b8d · 4b26b8d
2 parents 04e0273 + 889f7ea
commit 4b26b8d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 49 deletions.
diff --git a/src/ccstruct/Makefile.am b/src/ccstruct/Makefile.am
@@ -12,7 +12,8 @@ endif
 
 pkginclude_HEADERS = publictypes.h
 noinst_HEADERS = \
-    blamer.h blckerr.h blobbox.h blobs.h blread.h boxread.h boxword.h ccstruct.h coutln.h crakedge.h \
+    blamer.h blobbox.h blobs.h blread.h boxread.h boxword.h \
+    ccstruct.h coutln.h crakedge.h \
     debugpixa.h detlinefit.h dppoint.h fontinfo.h genblob.h \
     imagedata.h \
     ipoints.h \

diff --git a/src/ccstruct/blckerr.h b/src/ccstruct/blckerr.h
diff --git a/src/ccstruct/ocrblock.cpp b/src/ccstruct/ocrblock.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
  * File:        ocrblock.cpp  (Formerly block.c)
  * Description: BLOCK member functions and iterator functions.
- * Author:		Ray Smith
- * Created:		Fri Mar 15 09:41:28 GMT 1991
+ * Author:      Ray Smith
+ * Created:     Fri Mar 15 09:41:28 GMT 1991
  *
  * (C) Copyright 1991, Hewlett-Packard Ltd.
  ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,6 @@
 #include "ocrblock.h"
 #include <cstdlib>
 #include <memory>  // std::unique_ptr
-#include "blckerr.h"
 #include "stepblob.h"
 #include "tprintf.h"
 

diff --git a/src/ccstruct/pdblock.cpp b/src/ccstruct/pdblock.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
- * File:        pdblock.cpp  (Formerly pdblk.c)
+ * File:        pdblock.cpp
  * Description: PDBLK member functions and iterator functions.
- * Author:					Ray Smith
- * Created:					Fri Mar 15 09:41:28 GMT 1991
+ * Author:      Ray Smith
+ * Created:     Fri Mar 15 09:41:28 GMT 1991
  *
  * (C) Copyright 1991, Hewlett-Packard Ltd.
  ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,6 @@
 #include <cstdlib>
 #include <memory>  // std::unique_ptr
 #include "allheaders.h"
-#include "blckerr.h"
 
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
@@ -30,6 +29,9 @@
 
 #define BLOCK_LABEL_HEIGHT  150  //char height of block id
 
+const ERRCODE BADBLOCKLINE = "Y coordinate in block out of bounds";
+const ERRCODE LOSTBLOCKLINE = "Can't find rectangle for line";
+
 CLISTIZE (PDBLK)
 /**********************************************************************
  * PDBLK::PDBLK

diff --git a/src/ccstruct/werd.cpp b/src/ccstruct/werd.cpp
@@ -17,7 +17,6 @@
  *
  **********************************************************************/
 
-#include "blckerr.h"
 #include "helpers.h"
 #include "linlsq.h"
 #include "werd.h"

diff --git a/src/ccstruct/werd.h b/src/ccstruct/werd.h
@@ -1,8 +1,8 @@
 /**********************************************************************
- * File:	word.h
+ * File:        werd.h
  * Description: Code for the WERD class.
- * Author:	Ray Smith
- * Created:	Tue Oct 08 14:32:12 BST 1991
+ * Author:      Ray Smith
+ * Created:     Tue Oct 08 14:32:12 BST 1991
  *
  * (C) Copyright 1991, Hewlett-Packard Ltd.
  ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,15 +17,14 @@
  *
  **********************************************************************/
 
-#ifndef           WERD_H
-#define           WERD_H
+#ifndef WERD_H
+#define WERD_H
 
-#include          "params.h"
-#include          "bits16.h"
-#include          "elst2.h"
-#include          "strngs.h"
-#include          "blckerr.h"
-#include          "stepblob.h"
+#include "params.h"
+#include "bits16.h"
+#include "elst2.h"
+#include "strngs.h"
+#include "stepblob.h"
 
 enum WERD_FLAGS
 {