Merge pull request #1691 from stweil/api

Remove public API file ndminx.h

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

src/ccmain/linerec.cpp

@@ -25,7 +25,6 @@
 #include "lstmrecognizer.h"
 #include "recodebeam.h"
 #endif
-#include "ndminx.h"
 #include "pageres.h"
 #include "tprintf.h"
 

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"

src/ccstruct/detlinefit.cpp

@@ -19,7 +19,6 @@
 
 #include "detlinefit.h"
 #include "statistc.h"
-#include "ndminx.h"
 #include "tprintf.h"
 
 #include <algorithm>

src/ccstruct/points.cpp

@@ -24,7 +24,6 @@
 #include <algorithm>
 #include <stdlib.h>
 #include "helpers.h"
-#include "ndminx.h"
 #include "serialis.h"
 #include "points.h"
 

src/ccstruct/rect.h

@@ -22,7 +22,6 @@
 
 #include <cmath>
 #include "points.h"
-#include "ndminx.h"
 #include "scrollview.h"
 #include "strngs.h"
 #include "tprintf.h"

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 = \

src/ccutil/bitvector.cpp

@@ -22,7 +22,6 @@
 #include "bitvector.h"
 #include <string.h>
 #include "helpers.h"
-#include "ndminx.h"
 
 #include <algorithm>
 

src/ccutil/genericvector.h

@@ -27,7 +27,6 @@
 
 #include "tesscallback.h"
 #include "helpers.h"
-#include "ndminx.h"
 #include "serialis.h"
 #include "strngs.h"
 

src/ccutil/ndminx.h

@@ -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

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"

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"

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"

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"

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"

src/textord/alignedblob.cpp

@@ -22,7 +22,6 @@
 #endif
 
 #include "alignedblob.h"
-#include "ndminx.h"
 
 #include <algorithm>
 

src/textord/cjkpitch.cpp

@@ -19,7 +19,6 @@
 ///////////////////////////////////////////////////////////////////////
 #include "cjkpitch.h"
 #include "genericvector.h"
-#include "ndminx.h"
 #include "topitch.h"
 #include "tovars.h"
 

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"

src/textord/colpartitionset.cpp

@@ -23,7 +23,6 @@
 #endif
 
 #include "colpartitionset.h"
-#include "ndminx.h"
 #include "workingpartset.h"
 #include "tablefind.h"
 

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"
 

src/textord/tabfind.cpp

@@ -27,7 +27,6 @@
 #include "colpartitiongrid.h"
 #include "detlinefit.h"
 #include "linefind.h"
-#include "ndminx.h"
 
 #include <algorithm>
 

src/textord/tospace.cpp

@@ -26,7 +26,6 @@
  **********************************************************************/
 
 #include "drawtord.h"
-#include "ndminx.h"
 #include "statistc.h"
 #include "textord.h"
 #include "tovars.h"

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"

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"

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"

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"

src/wordrec/gradechop.cpp

@@ -28,7 +28,6 @@
 #include "gradechop.h"
 #include "wordrec.h"
 #include "chop.h"
-#include "ndminx.h"
 #include <algorithm>
 #include <cmath>
 

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

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"