Remove code for _MSC_VER < 1900

Tesseract does not support Visual C++ older than Visual Studio 2015. Signed-off-by: Stefan Weil <sw@weilnetz.de>
tesseract-ocr · Oct 9, 2018 · f94b3fd · f94b3fd
1 parent c375f4f
commit f94b3fd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/src/ccutil/platform.h b/src/ccutil/platform.h
@@ -32,11 +32,6 @@
 #define ultoa _ultoa
 #endif  /* __GNUC__ */
 #define SIGNED
-#if defined(_MSC_VER)
-#if (_MSC_VER < 1900)
-#define snprintf _snprintf
-#endif
-#endif /* defined(_MSC_VER) */
 #else
 #include <climits>
 #ifndef PATH_MAX

diff --git a/src/lstm/weightmatrix.cpp b/src/lstm/weightmatrix.cpp
@@ -27,11 +27,11 @@
 
 namespace tesseract {
 
-#if (defined(_MSC_VER) && _MSC_VER < 1900) || defined(ANDROID)
+#if defined(ANDROID)
 static inline double log2(double n) {
   return log(n) / log(2.0);
 }
-#endif  // _MSC_VER
+#endif // ANDROID
 
 // Number of iterations after which the correction effectively becomes unity.
 const int kAdamCorrectionIterations = 200000;

diff --git a/src/viewer/svutil.h b/src/viewer/svutil.h
@@ -25,16 +25,8 @@
 #define TESSERACT_VIEWER_SVUTIL_H_
 
 #ifdef _WIN32
-#ifndef __GNUC__
 #include <windows.h>
 #include "platform.h"
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#define snprintf _snprintf
-#endif
-#else
-#include "platform.h"
-#include <windows.h>
-#endif
 #else
 #include <pthread.h>
 #include <semaphore.h>

diff --git a/src/wordrec/language_model.cpp b/src/wordrec/language_model.cpp
@@ -43,11 +43,11 @@ namespace tesseract {
 class LMPainPoints;
 struct FontInfo;
 
-#if (defined(_MSC_VER) && _MSC_VER < 1900) || defined(ANDROID)
+#if defined(ANDROID)
 static inline double log2(double n) {
   return log(n) / log(2.0);
 }
-#endif  // _MSC_VER
+#endif // ANDROID
 
 const float LanguageModel::kMaxAvgNgramCost = 25.0f;