fix mingw build issues

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@995 d0cd1f9f-072b-0410-8dd7-cf729c803f20
This commit is contained in:
zdenop@gmail.com 2014-01-18 09:00:54 +00:00
parent ff5fb7f105
commit ef3b1d936e
7 changed files with 17 additions and 16 deletions

View File

@ -57,12 +57,14 @@
#ifdef _WIN32
#include <windows.h>
#include <stdlib.h>
#ifdef _MSC_VER
#include "mathfix.h"
#endif // _MSC_VER
#else
#include <dirent.h>
#include <libgen.h>
#include <string.h>
#endif
#endif // _WIN32
#if !defined(VERSION)
#include "version.h"

View File

@ -14,7 +14,7 @@
#include "version.h"
#endif
#ifdef _WIN32
#ifdef _MSC_VER
#include "mathfix.h"
#endif

View File

@ -23,6 +23,10 @@
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
/* #ifdef MINGW
#include <pthread.h>
#endif // MINGW
*/
#include "tesscallback.h"
#include "errcode.h"
@ -911,7 +915,7 @@ int GenericVector<T>::choose_nth_item(int target_index, int start, int end,
}
}
// Place the pivot at start.
#if defined(_MSC_VER) || defined(ANDROID) // TODO(zdenop): check this
#ifndef rand_r // _MSC_VER, ANDROID
srand(*seed);
#define rand_r(seed) rand()
#endif // _MSC_VER

View File

@ -43,6 +43,12 @@
#define SIGNED signed
#endif
#ifdef _WIN32
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#endif
#if defined(_WIN32) || defined(__CYGWIN__)
#if defined(TESS_EXPORTS)
#define TESS_API __declspec(dllexport)

View File

@ -8,7 +8,7 @@
AC_PREREQ(2.50)
AC_INIT([tesseract], [3.03], [http://code.google.com/p/tesseract-ocr/issues/list])
${CXXFLAGS=""}
CXXFLAGS=""
AC_CONFIG_MACRO_DIR([m4])
AC_REVISION([$Revision$])
AC_CONFIG_AUX_DIR(config)

View File

@ -23,17 +23,12 @@
#include <algorithm>
#include "bmp_8.h"
#include "con_comp.h"
#include "platform.h"
#ifdef USE_STD_NAMESPACE
using std::min;
using std::max;
#endif
#ifdef _WIN32
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#endif
namespace tesseract {
const int Bmp8::kDeslantAngleCount = (1 + static_cast<int>(0.5f +

View File

@ -29,12 +29,6 @@
#include "const.h"
#include "char_samp.h"
#ifdef _WIN32
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#endif
namespace tesseract {
FeatureChebyshev::FeatureChebyshev(TuningParams *params)