From 1cf8fe51a080f231984885b597515c376925925f Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 5 Jun 2017 20:26:25 +0200 Subject: [PATCH] Remove mathfix.h It was only needed for MS Visual Studio 2012 and older. Those compilers are not supported for Tesseract. Signed-off-by: Stefan Weil --- api/baseapi.cpp | 1 - api/pdfrenderer.cpp | 4 ---- ccmain/equationdetect.cpp | 5 ----- classify/featdefs.cpp | 4 ---- vs2010/port/mathfix.h | 38 -------------------------------------- 5 files changed, 52 deletions(-) delete mode 100644 vs2010/port/mathfix.h diff --git a/api/baseapi.cpp b/api/baseapi.cpp index 883061f0f..54833d8fa 100644 --- a/api/baseapi.cpp +++ b/api/baseapi.cpp @@ -29,7 +29,6 @@ #if defined(_WIN32) #ifdef _MSC_VER #include "vcsversion.h" -#include "mathfix.h" #elif MINGW // workaround for stdlib.h with -std=c++11 for _splitpath and _MAX_FNAME #undef __STRICT_ANSI__ diff --git a/api/pdfrenderer.cpp b/api/pdfrenderer.cpp index e97d9dd6a..36383c29e 100644 --- a/api/pdfrenderer.cpp +++ b/api/pdfrenderer.cpp @@ -28,10 +28,6 @@ #include "strngs.h" #include "tprintf.h" -#ifdef _MSC_VER -#include "mathfix.h" -#endif - /* Design notes from Ken Sharp, with light editing. diff --git a/ccmain/equationdetect.cpp b/ccmain/equationdetect.cpp index 7e1d2a232..3c73418ae 100644 --- a/ccmain/equationdetect.cpp +++ b/ccmain/equationdetect.cpp @@ -17,11 +17,6 @@ // /////////////////////////////////////////////////////////////////////// -#ifdef _MSC_VER -#pragma warning(disable:4244) // Conversion warnings -#include -#endif - #ifdef __MINGW32__ #include #endif diff --git a/classify/featdefs.cpp b/classify/featdefs.cpp index 52b22edc7..2e8129002 100644 --- a/classify/featdefs.cpp +++ b/classify/featdefs.cpp @@ -18,10 +18,6 @@ /*----------------------------------------------------------------------------- Include Files and Type Defines -----------------------------------------------------------------------------*/ -#ifdef _MSC_VER -#include -#endif - #include "featdefs.h" #include "emalloc.h" #include "danerror.h" diff --git a/vs2010/port/mathfix.h b/vs2010/port/mathfix.h deleted file mode 100644 index 1b5759870..000000000 --- a/vs2010/port/mathfix.h +++ /dev/null @@ -1,38 +0,0 @@ -/////////////////////////////////////////////////////////////////////// -// File: mathfix.h -// Description: Implement missing math functions -// Author: zdenop -// Created: Fri Feb 03 06:45:06 CET 2012 -// -// (C) Copyright 2012, Google Inc. -// 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 VS2008_INCLUDE_MATHFIX_H_ -#define VS2008_INCLUDE_MATHFIXT_H_ - -#ifndef _MSC_VER -#error "Use this header only with Microsoft Visual C++ compilers!" -#endif - -#include -#include // for _isnan(), _finite() on VC++ - -#if _MSC_VER < 1800 -#define isnan(x) _isnan(x) -#define isinf(x) (!_finite(x)) -#define fmax max //VC++ does not implement all the provisions of C99 Standard -#define round(x) roundf(x) -inline float roundf(float num) { return num > 0 ? floorf(num + 0.5f) : ceilf(num - 0.5f); } -#endif - -#endif // VS2008_INCLUDE_MATHFIXT_H_