Move class tesseract::File from training to ccutil

This allows using the class for unittests, too.

Signed-off-by: Stefan Weil <sw@weilnetz.de>

src/ccutil/Makefile.am

@@ -18,7 +18,8 @@ pkginclude_HEADERS = \
 
 noinst_HEADERS = \
     ambigs.h basedir.h bits16.h bitvector.h ccutil.h clst.h doubleptr.h elst2.h \
-    elst.h errcode.h fileerr.h genericheap.h globaloc.h \
+    elst.h errcode.h fileerr.h fileio.h \
+    genericheap.h globaloc.h \
     indexmapbidi.h kdpair.h lsterr.h \
     object_cache.h params.h qrsequence.h sorthelper.h \
     scanutils.h tessdatamanager.h tprintf.h \
@@ -31,6 +32,7 @@ libtesseract_ccutil_la_SOURCES = \
     ambigs.cpp basedir.cpp bitvector.cpp \
     ccutil.cpp clst.cpp \
     elst2.cpp elst.cpp errcode.cpp \
+    fileio.cpp \
     globaloc.cpp indexmapbidi.cpp \
     mainblk.cpp \
     serialis.cpp strngs.cpp scanutils.cpp \

src/training/CMakeLists.txt

@@ -173,8 +173,6 @@ endif()
 ########################################
 
 set(unicharset_training_src
-    fileio.cpp
-    fileio.h
     icuerrorcode.h
     lang_model_helpers.cpp
     lang_model_helpers.h

src/training/Makefile.am

@@ -31,7 +31,6 @@ noinst_HEADERS = \
     commandlineflags.h \
     commontraining.h \
     degradeimage.h \
-    fileio.h \
     icuerrorcode.h \
     lang_model_helpers.h \
     ligature_table.h \
@@ -66,7 +65,6 @@ libtesseract_training_la_SOURCES = \
     commandlineflags.cpp \
     commontraining.cpp \
     degradeimage.cpp \
-    fileio.cpp \
     lang_model_helpers.cpp \
     ligature_table.cpp \
     lstmtester.cpp \