Merge pull request #980 from stweil/clean

Remove portability code which is no longer needed

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__

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.

ccmain/equationdetect.cpp

@@ -17,11 +17,6 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#ifdef _MSC_VER
-#pragma warning(disable:4244)  // Conversion warnings
-#include <mathfix.h>
-#endif
-
 #ifdef __MINGW32__
 #include <limits.h>
 #endif

ccutil/Makefile.am

@@ -42,7 +42,5 @@ libtesseract_ccutil_la_SOURCES = \
     params.cpp universalambigs.cpp
 
 if T_WIN
-AM_CPPFLAGS += -I$(top_srcdir)/vs2010/port -DWINDLLNAME=\"lib@GENERIC_LIBRARY_NAME@\"
-noinst_HEADERS += ../vs2010/port/strtok_r.h
-libtesseract_ccutil_la_SOURCES += ../vs2010/port/strtok_r.cpp
+AM_CPPFLAGS += -DWINDLLNAME=\"lib@GENERIC_LIBRARY_NAME@\"
 endif

ccutil/ambigs.cpp

@@ -24,13 +24,9 @@
 #include "helpers.h"
 #include "universalambigs.h"
 
-#if defined _WIN32
-#ifndef __GNUC__
-#define strtok_r strtok_s
-#else
-#include "strtok_r.h"
-#endif  /* __GNUC__ */
-#endif  /* _WIN32 */
+#if defined(_WIN32) && !defined(__GNUC__)
+# define strtok_r(str, delim, saveptr) strtok_s(str, delim, saveptr)
+#endif  /* _WIN32 && !__GNUC__ */
 
 namespace tesseract {
 

classify/featdefs.cpp

@@ -18,10 +18,6 @@
 /*-----------------------------------------------------------------------------
           Include Files and Type Defines
 -----------------------------------------------------------------------------*/
-#ifdef _MSC_VER
-#include <mathfix.h>
-#endif
-
 #include "featdefs.h"
 #include "emalloc.h"
 #include "danerror.h"

vs2010/port/mathfix.h

-///////////////////////////////////////////////////////////////////////
-// 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_

vs2010/port/strtok_r.cpp

-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-// source: https://github.com/heimdal/heimdal/blob/master/lib/roken/strtok_r.c
-
-#include <string.h>
-
-char *strtok_r(char *s1, const char *s2, char **lasts) {
-  char *ret;
-
-  if (s1 == NULL)
-    s1 = *lasts;
-  while (*s1 && strchr(s2, *s1))
-    ++s1;
-  if (*s1 == '\0')
-    return NULL;
-  ret = s1;
-  while (*s1 && !strchr(s2, *s1))
-    ++s1;
-  if (*s1)
-    *s1++ = '\0';
-  *lasts = s1;
-  return ret;
-}
-

vs2010/port/strtok_r.h

-///////////////////////////////////////////////////////////////////////
-// File:        strtok_r.h
-// Description: Header file for strtok_r.cpp
-// source: https://github.com/heimdal/heimdal/blob/master/lib/roken/
-//              strtok_r.c
-// Author:      zdenop
-// Created:     Fri Aug 12 23:55:06 CET 2011
-//
-// (C) Copyright 2011, 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 VS2010_PORT_STRTOK_R_H_
-#define VS2010_PORT_STRTOK_R_H_
-
-char *strtok_r(char *s1, const char *s2, char **lasts);
-
-#endif  // VS2010_PORT_STRTOK_R_H_