diff --git a/CMakeLists.txt b/CMakeLists.txt index 656cfe74bd..35f586c1ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -359,7 +359,6 @@ install(FILES src/ccutil/helpers.h src/ccutil/host.h src/ccutil/memry.h - src/ccutil/ndminx.h src/ccutil/params.h src/ccutil/ocrclass.h src/ccutil/platform.h diff --git a/src/ccmain/linerec.cpp b/src/ccmain/linerec.cpp index 858fbd6405..081bed0845 100644 --- a/src/ccmain/linerec.cpp +++ b/src/ccmain/linerec.cpp @@ -25,7 +25,6 @@ #include "lstmrecognizer.h" #include "recodebeam.h" #endif -#include "ndminx.h" #include "pageres.h" #include "tprintf.h" diff --git a/src/ccstruct/blobs.cpp b/src/ccstruct/blobs.cpp index ebe97a8e16..2136755616 100644 --- a/src/ccstruct/blobs.cpp +++ b/src/ccstruct/blobs.cpp @@ -38,7 +38,6 @@ #include "emalloc.h" #include "helpers.h" #include "linlsq.h" -#include "ndminx.h" #include "normalis.h" #include "ocrblock.h" #include "ocrrow.h" diff --git a/src/ccstruct/detlinefit.cpp b/src/ccstruct/detlinefit.cpp index 91c2f9c43c..972dba9b1a 100644 --- a/src/ccstruct/detlinefit.cpp +++ b/src/ccstruct/detlinefit.cpp @@ -19,7 +19,6 @@ #include "detlinefit.h" #include "statistc.h" -#include "ndminx.h" #include "tprintf.h" #include diff --git a/src/ccstruct/points.cpp b/src/ccstruct/points.cpp index 3efd4f9c73..dcc31124c3 100644 --- a/src/ccstruct/points.cpp +++ b/src/ccstruct/points.cpp @@ -24,7 +24,6 @@ #include #include #include "helpers.h" -#include "ndminx.h" #include "serialis.h" #include "points.h" diff --git a/src/ccstruct/rect.h b/src/ccstruct/rect.h index 3e46f4ef58..71c60ef40e 100644 --- a/src/ccstruct/rect.h +++ b/src/ccstruct/rect.h @@ -22,7 +22,6 @@ #include #include "points.h" -#include "ndminx.h" #include "scrollview.h" #include "strngs.h" #include "tprintf.h" diff --git a/src/ccutil/Makefile.am b/src/ccutil/Makefile.am index 7c1dc463b9..2624d9ae7c 100644 --- a/src/ccutil/Makefile.am +++ b/src/ccutil/Makefile.am @@ -13,7 +13,7 @@ endif pkginclude_HEADERS = \ genericvector.h helpers.h host.h memry.h \ - ndminx.h ocrclass.h platform.h serialis.h strngs.h \ + ocrclass.h platform.h serialis.h strngs.h \ tesscallback.h unichar.h noinst_HEADERS = \ diff --git a/src/ccutil/bitvector.cpp b/src/ccutil/bitvector.cpp index 072de9dfa1..4248c9e160 100644 --- a/src/ccutil/bitvector.cpp +++ b/src/ccutil/bitvector.cpp @@ -22,7 +22,6 @@ #include "bitvector.h" #include #include "helpers.h" -#include "ndminx.h" #include diff --git a/src/ccutil/genericvector.h b/src/ccutil/genericvector.h index e1b16b0fb9..d15add451a 100644 --- a/src/ccutil/genericvector.h +++ b/src/ccutil/genericvector.h @@ -27,7 +27,6 @@ #include "tesscallback.h" #include "helpers.h" -#include "ndminx.h" #include "serialis.h" #include "strngs.h" diff --git a/src/ccutil/ndminx.h b/src/ccutil/ndminx.h deleted file mode 100644 index 9eee76c028..0000000000 --- a/src/ccutil/ndminx.h +++ /dev/null @@ -1,31 +0,0 @@ -/********************************************************************** - * File: ndminx.h (Formerly ndminmax.h) - * Description: Extended ascii chars - * Author: Phil Cheatle - * Created: Mon Mar 29 14:46:01 BST 1993 - * - * (C) Copyright 1991, Hewlett-Packard Ltd. - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** http://www.apache.org/licenses/LICENSE-2.0 - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License. - * - **********************************************************************/ - -#ifndef NDMINX_H -#define NDMINX_H - -#ifndef MAX -#define MAX(x,y) (((x) >= (y))?(x):(y)) -#endif - -#ifndef MIN -#define MIN(x,y) (((x) <= (y))?(x):(y)) -#endif - -#endif diff --git a/src/classify/adaptmatch.cpp b/src/classify/adaptmatch.cpp index ec45e1e9a8..7b0b8a0323 100644 --- a/src/classify/adaptmatch.cpp +++ b/src/classify/adaptmatch.cpp @@ -42,7 +42,6 @@ #include "intfx.h" #include "intproto.h" #include "mfoutline.h" -#include "ndminx.h" #include "normfeat.h" #include "normmatch.h" #include "outfeat.h" diff --git a/src/classify/errorcounter.cpp b/src/classify/errorcounter.cpp index 5283a0e539..65b36b7f6d 100644 --- a/src/classify/errorcounter.cpp +++ b/src/classify/errorcounter.cpp @@ -18,7 +18,6 @@ #include "errorcounter.h" #include "fontinfo.h" -#include "ndminx.h" #include "sampleiterator.h" #include "shapeclassifier.h" #include "shapetable.h" diff --git a/src/classify/intfx.cpp b/src/classify/intfx.cpp index ce3801bb19..885ff8512c 100644 --- a/src/classify/intfx.cpp +++ b/src/classify/intfx.cpp @@ -29,7 +29,6 @@ #include "helpers.h" #include "intmatcher.h" #include "linlsq.h" -#include "ndminx.h" #include "normalis.h" #include "statistc.h" #include "trainingsample.h" diff --git a/src/classify/intproto.cpp b/src/classify/intproto.cpp index ced8c57983..f61290b3ce 100644 --- a/src/classify/intproto.cpp +++ b/src/classify/intproto.cpp @@ -36,7 +36,6 @@ #include "helpers.h" #include "intproto.h" #include "mfoutline.h" -#include "ndminx.h" #include "picofeat.h" #include "points.h" #include "shapetable.h" diff --git a/src/dict/permdawg.cpp b/src/dict/permdawg.cpp index 7b5f1f6ec2..1103b54db8 100644 --- a/src/dict/permdawg.cpp +++ b/src/dict/permdawg.cpp @@ -29,7 +29,6 @@ #include "cutil.h" #include "dawg.h" #include "globals.h" -#include "ndminx.h" #include "stopper.h" #include "tprintf.h" #include "params.h" diff --git a/src/textord/alignedblob.cpp b/src/textord/alignedblob.cpp index b177c7c334..63b21eff38 100644 --- a/src/textord/alignedblob.cpp +++ b/src/textord/alignedblob.cpp @@ -22,7 +22,6 @@ #endif #include "alignedblob.h" -#include "ndminx.h" #include diff --git a/src/textord/cjkpitch.cpp b/src/textord/cjkpitch.cpp index 2b948e87e6..7c2613bb62 100644 --- a/src/textord/cjkpitch.cpp +++ b/src/textord/cjkpitch.cpp @@ -19,7 +19,6 @@ /////////////////////////////////////////////////////////////////////// #include "cjkpitch.h" #include "genericvector.h" -#include "ndminx.h" #include "topitch.h" #include "tovars.h" diff --git a/src/textord/colpartition.h b/src/textord/colpartition.h index 2f0b201d81..c712adda1b 100644 --- a/src/textord/colpartition.h +++ b/src/textord/colpartition.h @@ -23,7 +23,6 @@ #include "bbgrid.h" #include "blobbox.h" // For BlobRegionType. -#include "ndminx.h" #include "ocrblock.h" #include "rect.h" // For TBOX. #include "scrollview.h" diff --git a/src/textord/colpartitionset.cpp b/src/textord/colpartitionset.cpp index cc4802dad5..f1b301e567 100644 --- a/src/textord/colpartitionset.cpp +++ b/src/textord/colpartitionset.cpp @@ -23,7 +23,6 @@ #endif #include "colpartitionset.h" -#include "ndminx.h" #include "workingpartset.h" #include "tablefind.h" diff --git a/src/textord/imagefind.cpp b/src/textord/imagefind.cpp index 142d88feb5..6c8d9e6d46 100644 --- a/src/textord/imagefind.cpp +++ b/src/textord/imagefind.cpp @@ -25,7 +25,6 @@ #include "imagefind.h" #include "colpartitiongrid.h" #include "linlsq.h" -#include "ndminx.h" #include "statistc.h" #include "params.h" diff --git a/src/textord/tabfind.cpp b/src/textord/tabfind.cpp index fb0cac8e9c..4744dd5042 100644 --- a/src/textord/tabfind.cpp +++ b/src/textord/tabfind.cpp @@ -27,7 +27,6 @@ #include "colpartitiongrid.h" #include "detlinefit.h" #include "linefind.h" -#include "ndminx.h" #include diff --git a/src/textord/tospace.cpp b/src/textord/tospace.cpp index 6b2f2a498e..96499df86d 100644 --- a/src/textord/tospace.cpp +++ b/src/textord/tospace.cpp @@ -26,7 +26,6 @@ **********************************************************************/ #include "drawtord.h" -#include "ndminx.h" #include "statistc.h" #include "textord.h" #include "tovars.h" diff --git a/src/training/boxchar.cpp b/src/training/boxchar.cpp index 62f23ef38b..2120cbeaea 100644 --- a/src/training/boxchar.cpp +++ b/src/training/boxchar.cpp @@ -28,7 +28,6 @@ #include "fileio.h" #include "genericvector.h" -#include "ndminx.h" #include "normstrngs.h" #include "tprintf.h" #include "unicharset.h" diff --git a/src/training/commontraining.cpp b/src/training/commontraining.cpp index 6aad706490..cf8031e5ad 100644 --- a/src/training/commontraining.cpp +++ b/src/training/commontraining.cpp @@ -30,7 +30,6 @@ #include "intfeaturespace.h" #include "mastertrainer.h" #include "mf.h" -#include "ndminx.h" #include "oldlist.h" #include "params.h" #include "shapetable.h" diff --git a/src/training/mergenf.cpp b/src/training/mergenf.cpp index 92562a918b..97179fd84a 100644 --- a/src/training/mergenf.cpp +++ b/src/training/mergenf.cpp @@ -22,7 +22,6 @@ #include "cluster.h" #include "oldlist.h" #include "protos.h" -#include "ndminx.h" #include "ocrfeatures.h" #include "const.h" #include "featdefs.h" diff --git a/src/training/mftraining.cpp b/src/training/mftraining.cpp index 8230222611..ec94db19ef 100644 --- a/src/training/mftraining.cpp +++ b/src/training/mftraining.cpp @@ -55,7 +55,6 @@ #include "mastertrainer.h" #include "mergenf.h" #include "mf.h" -#include "ndminx.h" #include "ocrfeatures.h" #include "oldlist.h" #include "protos.h" diff --git a/src/wordrec/gradechop.cpp b/src/wordrec/gradechop.cpp index 79a727d0a9..8dc6edb950 100644 --- a/src/wordrec/gradechop.cpp +++ b/src/wordrec/gradechop.cpp @@ -28,7 +28,6 @@ #include "gradechop.h" #include "wordrec.h" #include "chop.h" -#include "ndminx.h" #include #include diff --git a/src/wordrec/gradechop.h b/src/wordrec/gradechop.h index 01e5bf2641..efaa10ca00 100644 --- a/src/wordrec/gradechop.h +++ b/src/wordrec/gradechop.h @@ -30,7 +30,6 @@ I n c l u d e s ----------------------------------------------------------------------*/ #include "seam.h" -#include "ndminx.h" /*---------------------------------------------------------------------- M a c r o s diff --git a/src/wordrec/pieces.cpp b/src/wordrec/pieces.cpp index 8c2409fc26..76434e65c6 100644 --- a/src/wordrec/pieces.cpp +++ b/src/wordrec/pieces.cpp @@ -29,7 +29,6 @@ #include "blobs.h" #include "helpers.h" #include "matrix.h" -#include "ndminx.h" #include "ratngs.h" #include "seam.h" #include "wordrec.h"