mirror of
https://github.com/tesseract-ocr/tesseract.git
synced 2025-06-07 18:02:40 +08:00
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 <sw@weilnetz.de>
This commit is contained in:
parent
5f8ecdb2b3
commit
1cf8fe51a0
@ -29,7 +29,6 @@
|
|||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#include "vcsversion.h"
|
#include "vcsversion.h"
|
||||||
#include "mathfix.h"
|
|
||||||
#elif MINGW
|
#elif MINGW
|
||||||
// workaround for stdlib.h with -std=c++11 for _splitpath and _MAX_FNAME
|
// workaround for stdlib.h with -std=c++11 for _splitpath and _MAX_FNAME
|
||||||
#undef __STRICT_ANSI__
|
#undef __STRICT_ANSI__
|
||||||
|
@ -28,10 +28,6 @@
|
|||||||
#include "strngs.h"
|
#include "strngs.h"
|
||||||
#include "tprintf.h"
|
#include "tprintf.h"
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#include "mathfix.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
||||||
Design notes from Ken Sharp, with light editing.
|
Design notes from Ken Sharp, with light editing.
|
||||||
|
@ -17,11 +17,6 @@
|
|||||||
//
|
//
|
||||||
///////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#pragma warning(disable:4244) // Conversion warnings
|
|
||||||
#include <mathfix.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __MINGW32__
|
#ifdef __MINGW32__
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -18,10 +18,6 @@
|
|||||||
/*-----------------------------------------------------------------------------
|
/*-----------------------------------------------------------------------------
|
||||||
Include Files and Type Defines
|
Include Files and Type Defines
|
||||||
-----------------------------------------------------------------------------*/
|
-----------------------------------------------------------------------------*/
|
||||||
#ifdef _MSC_VER
|
|
||||||
#include <mathfix.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "featdefs.h"
|
#include "featdefs.h"
|
||||||
#include "emalloc.h"
|
#include "emalloc.h"
|
||||||
#include "danerror.h"
|
#include "danerror.h"
|
||||||
|
@ -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 <math.h>
|
|
||||||
#include <float.h> // 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_
|
|
Loading…
Reference in New Issue
Block a user