Fix windows build.

api/baseapi.cpp

@@ -34,8 +34,6 @@
 // workaround for stdlib.h with -std=c++11 for _splitpath and _MAX_FNAME
 #undef __STRICT_ANSI__
 #endif  // _MSC_VER
-#include <stdlib.h>
-#include <windows.h>
 #include <fcntl.h>
 #include <io.h>
 #else

api/tesseractmain.cpp

@@ -36,7 +36,6 @@
 #if defined(HAVE_TIFFIO_H) && defined(_WIN32)
 
 #include <tiffio.h>
-#include <windows.h>
 
 static void Win32WarningHandler(const char* module, const char* fmt,
                                 va_list ap) {

ccmain/pagesegmain.cpp

@@ -18,9 +18,6 @@
  **********************************************************************/
 
 #ifdef _WIN32
-#ifndef __GNUC__
-#include <windows.h>
-#endif  // __GNUC__
 #ifndef unlink
 #include <io.h>
 #endif

ccmain/tesseract_cube_combiner.cpp

@@ -21,8 +21,6 @@
 // the recognition results of Tesseract and Cube at the word level
 
 #include <algorithm>
-#include <string>
-#include <vector>
 #include <wctype.h>
 
 #include "tesseract_cube_combiner.h"

ccmain/tesseract_cube_combiner.h

@@ -27,16 +27,6 @@
 #include <vector>
 #include "pageres.h"
 
-#ifdef _WIN32
-#include <windows.h>
-using namespace std;
-#endif
-
-#ifdef USE_STD_NAMESPACE
-using std::string;
-using std::vector;
-#endif
-
 namespace tesseract {
 
 class CubeObject;
@@ -72,27 +62,27 @@ class TesseractCubeCombiner {
   // output parameter will be true if both answers are identical,
   // false otherwise. Modifies the cube_alt_list, so no assumptions
   // should be made about its state upon return.
-  bool ComputeCombinerFeatures(const string &tess_res,
+  bool ComputeCombinerFeatures(const std::string &tess_res,
                                int tess_confidence,
                                CubeObject *cube_obj,
                                WordAltList *cube_alt_list,
-                               vector<double> *features,
+                               std::vector<double> *features,
                                bool *agreement);
 
   // Is the word valid according to Tesseract's language model
-  bool ValidWord(const string &str);
+  bool ValidWord(const std::string &str);
 
   // Loads the combiner neural network from file, using cube_cntxt_
   // to find path.
   bool LoadCombinerNet();
  private:
   // Normalize a UTF-8 string. Converts the UTF-8 string to UTF32 and optionally
   // strips punc and/or normalizes case and then converts back
-  string NormalizeString(const string &str, bool remove_punc, bool norm_case);
+    std::string NormalizeString(const std::string &str, bool remove_punc, bool norm_case);
 
   // Compares 2 strings after optionally normalizing them and or stripping
   // punctuation
-  int CompareStrings(const string &str1, const string &str2, bool ignore_punc,
+  int CompareStrings(const std::string &str1, const std::string &str2, bool ignore_punc,
                      bool norm_case);
 
   NeuralNet *combiner_net_;  // pointer to the combiner NeuralNet object

ccstruct/imagedata.cpp

@@ -24,14 +24,14 @@
 
 #include "imagedata.h"
 
-#include <unistd.h>
-
 #include "allheaders.h"
 #include "boxread.h"
 #include "callcpp.h"
 #include "helpers.h"
 #include "tprintf.h"
 
+#include <thread>
+
 // Number of documents to read ahead while training. Doesn't need to be very
 // large.
 const int kMaxReadAhead = 8;
@@ -449,7 +449,7 @@ const ImageData* DocumentData::GetPage(int index) {
     if (needs_loading) LoadPageInBackground(index);
     // We can't directly load the page, or the background load will delete it
     // while the caller is using it, so give it a chance to work.
-    sleep(1);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
   }
   return page;
 }

ccutil/ccutil.h

@@ -26,9 +26,7 @@
 #include "params.h"
 #include "unicharset.h"
 
-#ifdef _WIN32
-#include <windows.h>
-#else
+#ifndef _WIN32
 #include <pthread.h>
 #include <semaphore.h>
 #endif

ccutil/host.h

@@ -64,7 +64,8 @@
 /* _WIN32 */
 #ifdef _WIN32
 #include <windows.h>
-#include <winbase.h>             // winbase.h contains windows.h
+#undef min
+#undef max
 #endif
 
 #include <stdint.h>              // int32_t, ...

ccutil/ocrclass.h

@@ -29,7 +29,6 @@
 
 #ifndef __GNUC__
 #ifdef _WIN32
-#include          <windows.h>
 #include          "gettimeofday.h"
 #endif
 #else

ccutil/platform.h

@@ -24,6 +24,8 @@
 
 #define DLLSYM
 #ifdef _WIN32
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
 #ifdef __GNUC__
 #define ultoa _ultoa
 #endif  /* __GNUC__ */

cmake/SourceGroups.cmake

@@ -23,13 +23,15 @@ set(H_CPP "(${H}|${CPP})")
 source_group("Resource files" ".*\\.(rc|ico)")
 
 source_group("api"          "${SSRC}/api/${H_CPP}")
+source_group("arch"         "${SSRC}/arch/${H_CPP}")
 source_group("ccmain"       "${SSRC}/ccmain/${H_CPP}")
 source_group("ccstruct"     "${SSRC}/ccstruct/${H_CPP}")
 source_group("ccutil"       "${SSRC}/ccutil/${H_CPP}")
 source_group("classify"     "${SSRC}/classify/${H_CPP}")
 source_group("cube"         "${SSRC}/cube/${H_CPP}")
 source_group("cutil"        "${SSRC}/cutil/${H_CPP}")
 source_group("dict"         "${SSRC}/dict/${H_CPP}")
+source_group("lstm"         "${SSRC}/lstm/${H_CPP}")
 source_group("neural"       "${SSRC}/neural_networks/runtime/${H_CPP}")
 source_group("opencl"       "${SSRC}/opencl/${H_CPP}")
 source_group("textord"      "${SSRC}/textord/${H_CPP}")

cppan.yml

@@ -1,8 +1,12 @@
 local_settings:
     cppan_dir: cppan
+    use_shared_libs: true
+
+type: library
 
 files:
   - api/.*\.cpp
+  - arch/.*\.cpp
   - ccmain/.*\.cpp
   - ccstruct/.*\.cpp
   - ccutil/.*\.cpp
@@ -18,6 +22,7 @@ files:
   - wordrec/.*\.cpp
 
   - api/.*\.h
+  - arch/.*\.h
   - ccmain/.*\.h
   - ccstruct/.*\.h
   - ccutil/.*\.h
@@ -34,8 +39,13 @@ files:
 
   - vs2010/port/.*
 
+exclude_from_build:
+  - api/tesseractmain.cpp
+  - viewer/svpaint.cpp
+
 include_directories:
   private:
+    - arch
     - classify
     - cube
     - cutil

lstm/weightmatrix.cpp

@@ -23,7 +23,7 @@
 #define NONX86_BUILD 1
 #endif
 
-#ifndef NONX86_BUILD
+#if defined(__linux__) && !defined(NONX86_BUILD)
 #include <cpuid.h>
 #endif
 #include "dotproductavx.h"

opencl/openclwrapper.cpp

@@ -9,8 +9,6 @@
 // limitations under the License.
 #ifdef _WIN32
 #include <io.h>
-#include <windows.h>
-
 #else
 #include <sys/types.h>
 #include <unistd.h>

training/CMakeLists.txt

@@ -67,13 +67,11 @@ project_group               (tessopt "Training Tools")
 
 set(common_training_src
     commandlineflags.cpp
-    commontraining.cpp
-)
-set(common_training_hdr
     commandlineflags.h
+    commontraining.cpp
     commontraining.h
 )
-add_library                 (common_training ${common_training_src} ${common_training_hdr})
+add_library                 (common_training ${common_training_src})
 target_link_libraries       (common_training tesseract tessopt)
 project_group               (common_training "Training Tools")
 
@@ -159,25 +157,42 @@ target_link_libraries       (wordlist2dawg tesseract)
 project_group               (wordlist2dawg "Training Tools")
 
 
-########################################
-# EXECUTABLE set_unicharset_properties
-########################################
-
 if (ICU_FOUND)
 
 include_directories(${ICU_INCLUDE_DIRS})
 
-add_executable              (set_unicharset_properties
-    set_unicharset_properties.cpp
-    unicharset_training_utils.cpp
-    unicharset_training_utils.h
+########################################
+# LIBRARY unicharset_training
+########################################
+
+set(unicharset_training_src
     fileio.cpp
     fileio.h
+    icuerrorcode.h
     normstrngs.cpp
     normstrngs.h
-    icuerrorcode.h
+    unicharset_training_utils.cpp
+    unicharset_training_utils.h
 )
-target_link_libraries       (set_unicharset_properties common_training ${ICU_LIBRARIES})
+add_library                 (unicharset_training ${unicharset_training_src})
+target_link_libraries       (unicharset_training common_training ${ICU_LIBRARIES})
+project_group               (unicharset_training "Training Tools")
+
+
+########################################
+# EXECUTABLE lstmtraining
+########################################
+
+add_executable              (lstmtraining lstmtraining.cpp)
+target_link_libraries       (lstmtraining unicharset_training)
+project_group               (lstmtraining "Training Tools")
+
+########################################
+# EXECUTABLE set_unicharset_properties
+########################################
+
+add_executable              (set_unicharset_properties set_unicharset_properties.cpp)
+target_link_libraries       (set_unicharset_properties unicharset_training)
 project_group               (set_unicharset_properties "Training Tools")
 
 
@@ -199,8 +214,6 @@ set(text2image_src
     boxchar.h
     degradeimage.cpp
     degradeimage.h
-    fileio.cpp
-    fileio.h
     ligature_table.cpp
     ligature_table.h
     normstrngs.cpp

training/fileio.cpp

@@ -15,7 +15,6 @@
  *
  **********************************************************************/
 #ifdef _WIN32
-#include <windows.h>
 #ifndef unlink
 #include <io.h>
 #endif

viewer/svutil.cpp

@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #ifdef _WIN32
+#include <windows.h>
 struct addrinfo {
   struct sockaddr* ai_addr;
   int ai_addrlen;

viewer/svutil.h

@@ -26,6 +26,7 @@
 
 #ifdef _WIN32
 #ifndef __GNUC__
+#include "platform.h"
 #include <windows.h>
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf

wordrec/language_model.cpp

@@ -32,7 +32,7 @@
 #include "params.h"
 #include "params_training_featdef.h"
 
-#if defined(_MSC_VER) || defined(ANDROID)
+#if (defined(_MSC_VER) && _MSC_VER < 1900) || defined(ANDROID)
 double log2(double n) {
   return log(n) / log(2.0);
 }