mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-27 20:59:36 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixed build broken by previous commits that added use of string in low-level code

Browse Source
This commit is contained in:
Ray Smith 2017-07-14 10:33:55 -07:00
parent df41eab6aa
commit aee910a7bf
9 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccstruct/Makefile.am
View File

@ -2,7 +2,7 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/ccutil -I$(top_srcdir)/cutil \
-I$(top_srcdir)/viewer \
-I$(top_srcdir)/opencl
AM_CPPFLAGS += $(OPENCL_CPPFLAGS)
AM_CPPFLAGS += $(OPENCL_CPPFLAGS) -DUSE_STD_NAMESPACE
if VISIBILITY
AM_CPPFLAGS += -DTESS_EXPORTS \

1
ccutil/Makefile.am
View File

@ -1,6 +1,7 @@
AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS =
AM_CXXFLAGS =
AM_CPPFLAGS = -DUSE_STD_NAMESPACE
if !NO_TESSDATA_PREFIX
AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@/

6
ccutil/platform.h
View File

@ -53,6 +53,12 @@
#define SIGNED signed
#endif
// Fix to map between google use of string without std and everywhere else.
#ifdef USE_STD_NAMESPACE
#include <string>
using std::string;
#endif
#if defined(_WIN32) || defined(__CYGWIN__)
#ifndef M_PI
#define M_PI 3.14159265358979323846

1
ccutil/unichar.h
View File

@ -24,6 +24,7 @@
#include <string.h>
#include <string>
#include <vector>
#include "platform.h"
// Maximum number of characters that can be stored in a UNICHAR. Must be
// at least 4. Must not exceed 31 without changing the coding of length.

2
classify/Makefile.am
View File

@ -1,7 +1,7 @@
AM_CPPFLAGS += \
-I$(top_srcdir)/cutil -I$(top_srcdir)/ccutil \
-I$(top_srcdir)/ccstruct -I$(top_srcdir)/dict \
-I$(top_srcdir)/viewer
-I$(top_srcdir)/viewer -DUSE_STD_NAMESPACE
if VISIBILITY
AM_CPPFLAGS += -DTESS_EXPORTS \

2
cutil/Makefile.am
View File

@ -1,4 +1,4 @@
AM_CPPFLAGS += -I$(top_srcdir)/ccutil -I$(top_srcdir)/viewer
AM_CPPFLAGS += -I$(top_srcdir)/ccutil -I$(top_srcdir)/viewer -DUSE_STD_NAMESPACE
if VISIBILITY
AM_CPPFLAGS += -DTESS_EXPORTS \

2
dict/Makefile.am
View File

@ -1,5 +1,5 @@
AM_CPPFLAGS += -I$(top_srcdir)/cutil -I$(top_srcdir)/ccutil \
-I$(top_srcdir)/ccstruct -I$(top_srcdir)/viewer
-I$(top_srcdir)/ccstruct -I$(top_srcdir)/viewer -DUSE_STD_NAMESPACE
if VISIBILITY
AM_CPPFLAGS += -DTESS_EXPORTS \

2
lstm/Makefile.am
View File

@ -1,7 +1,7 @@
AM_CPPFLAGS += \
-I$(top_srcdir)/ccutil -I$(top_srcdir)/cutil -I$(top_srcdir)/ccstruct \
-I$(top_srcdir)/arch -I$(top_srcdir)/viewer -I$(top_srcdir)/classify \
-I$(top_srcdir)/dict -I$(top_srcdir)/lstm
-I$(top_srcdir)/dict -I$(top_srcdir)/lstm -DUSE_STD_NAMESPACE
AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS =
AM_CXXFLAGS = $(OPENMP_CXXFLAGS)

2
wordrec/Makefile.am
View File

@ -2,7 +2,7 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/ccstruct -I$(top_srcdir)/ccutil \
-I$(top_srcdir)/cutil -I$(top_srcdir)/classify \
-I$(top_srcdir)/dict \
-I$(top_srcdir)/viewer
-I$(top_srcdir)/viewer -DUSE_STD_NAMESPACE
if VISIBILITY
AM_CPPFLAGS += -DTESS_EXPORTS \