Commit Graph

124 Commits

Author SHA1 Message Date
Stefan Weil
5e3665c6ae Remove most libtiff dependencies
libtiff is no longer needed for OpenCL, so remove that dependency.

It is still suggested for Windows to redirect warning messages
from the tesseract executable to the console.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-05-12 10:15:35 +02:00
Stefan Weil
31cb732a0f opencl: Add missing TIFF library for macOS
The OpenCL code of Tesseract uses TIFF functions, but the TIFF library
was not added to the linker flags for macOS.

This fixes builds with OpenCL on Mac.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-09 12:12:18 +02:00
Stefan Weil
e663d00fbe Support AVX for 32 bit platforms
_mm256_extract_epi64 is not available for 32 bit platforms,
but it can be replaced by "a very simple workaround".

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-02-27 11:15:28 +01:00
Stefan Weil
b7ef3e0193 configure: Run AVX test only with 64 bit compiler
The current implementation for AVX uses 64 bit code,
so run the AVX test only when the compiler is a 64 bit compiler.

This fixes the broken implementation for 32 bit hosts
which provide AVX but call the stub of DotProductAVX.

Simplify also the conditional code for AVX_OPT and SSE41_OPT.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-02-02 21:59:27 +01:00
Amit D
e6829546ae configure.ac: Exit if compiler does not have c++11 support 2017-01-08 19:00:58 +02:00
Zdenko Podobný
38cb4acaf9 require leptonica 1.74 or higher 2016-12-24 09:05:32 +01:00
Zdenko Podobný
02a6970cf3 autotools: test if compiler support -mavx and -msse4.1 2016-12-23 10:20:08 +01:00
Zdenko Podobný
54611c1cc8 increase min autoconf version (2.59). Fixes #598. 2016-12-23 09:32:51 +01:00
zdenop
d77a9b7375 Merge pull request #577 from stweil/config
Simplify configuration for Leptonica
2016-12-15 08:30:48 +01:00
Ray Smith
432684dd6e Makefile changes to remove cube 2016-12-14 10:58:24 -08:00
Stefan Weil
d70f3c3663 Simplify configuration for Leptonica
All relevant versions of Leptonica support pkg-config, so the old
configuration code can be removed.

Update also the error message for missing Leptonica.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-14 14:51:49 +01:00
Stefan Weil
3a5446bb52 Use pkg-config for Leptonica compiler flags
The old settings don't work for cross compilations (wrong include path)
or require setting LIBLEPT_HEADERSDIR. They are used as fallback if
there is no pkg-config configuration.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-13 15:52:29 +01:00
Stefan Weil
a9b300dc1d Use pkg-config for icu compiler and linker flags
The old settings are used as fallback if there is no configuration.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-13 13:29:34 +01:00
Stefan Weil
6140be6a55 openmp: Fix build with clang++ and compilers without OpenMP support
Builds without support for OpenMP failed with the old code. Fix this:

* Add OPENMP_CXXFLAGS for ccmain.
* Replace unconditional -fopenmp by OPENMP_CXXFLAGS for lstm.
* Always use _OPENMP for conditional compilation.
* Remove OPENMP as there is already _OPENMP.
* Include omp.h conditionally.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-04 18:44:03 +01:00
Ray Smith
9c7e99b041 Merged with commit 4ca6ba985b 2016-11-21 08:27:02 -08:00
Zdenko Podobný
a4615929ff allow combination of enable/disable 2016-11-11 22:03:16 +01:00
Ray Smith
c1c1e426b3 Added new LSTM-based neural network line recognizer 2016-11-07 15:38:07 -08:00
Stefan Weil
3f959e394c opencl: Add tiff library needed by openclwrapper
openclwrapper calls function TIFFReadRGBAImageOriented which is provided
by libtiff, so add that library to OPENCL_LIBS.

This fixes a linker error (unresolved symbol) when opencl is enabled.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-10-30 08:10:07 +01:00
Stefan Weil
fdf950babf configure: Don't use -Wno-uninitialized for debug builds
There is no good reason to suppress useful compiler warnings.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-08-30 15:36:18 +02:00
Marco Atzeri
b1c921b59e Fix Cygwin compatibility 2016-06-17 15:52:01 +03:00
Stefan Weil
4cbe9622d1 configure: Enclose most macro arguments in []
This is not strictly necessary, but recommended in the GNU autoconf manual.
No [] was added to arguments like true or false.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-05-27 15:30:17 +02:00
Stefan Weil
1b9d0688fa configure: Fix check for dependencies needed for training
The different checks had set ENABLE_TRAINING unconditionally,
thus overwriting the value from the preceding checks.

So if pango and cairo were available, but icu was missing,
users would still be offered to build the training tools.

The changes for icu and has_cpp11 are not strictly necessary,
but are made here to have uniform code patterns.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-05-23 22:44:17 +02:00
Stefan Weil
ee5e1e972a configure: Fix cross compiler flags for cairo and pango
Calling pkg-config directly is a bad idea because it returns
the compiler flags for native builds.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-05-15 19:13:11 +02:00
Zdenko Podobný
bd424f6201 fix #289 mingw64 build 2016-03-23 17:24:21 +01:00
Zdenko Podobný
db9e194761 check for pdf support in leptonica 2016-03-15 14:22:24 +01:00
Zdenko Podobný
34f34eadb8 autotools: fail if g++ or clang++ compiler is not found; Fixes #130 2015-11-04 22:39:24 +01:00
Felix Janda
87c21aaa5c Detect presence of 'off_t' by configure test 2015-10-31 11:54:37 +01:00
zdenop
896db80f26 Merge pull request #108 from johnteslade/unicharset_extractor
Unicharset extractor problems with wchar
2015-10-05 21:49:03 +02:00
John Slade
2517ffefe7 configure.ac: Detect wchar_t using wchar.h header
The wchar_t type is defined in `wchar.h` and if this header is not
included by autoconf the detection of the type will fail.  This type is
required by `unicharset_extractor` to autogenerate the character
properties.

This problem was detected when running under Fedora 21.
2015-10-05 11:20:34 +01:00
Zdenko Podobný
c4d52c77be Merge pull request #87 from jbarlow83/master
Get --enable-opencl to compile (but not work)
2015-09-01 17:43:38 +02:00
James R. Barlow
73b0297e5e Fix configure.ac unconditionally enabling OpenCL 2015-08-26 02:17:10 -07:00
James R. Barlow
18ac7ae7ef Get OpenCL to compile on OS X
However, the output of the OpenCL build is garbage....
2015-08-26 02:03:07 -07:00
James R. Barlow
8476d0bc6b Fix missing "allheaders.h" when compiling with --enable-opencl on OS X 2015-08-26 00:47:59 -07:00
James R. Barlow
71f747f668 Fix configure.ac for OS X and -framework 2015-08-26 00:10:56 -07:00
Zdenko Podobný
f331a57b8e fix OpenCL build on Mac 2015-08-25 20:57:49 +02:00
Zdenko Podobný
f81c258e14 rename README to README.md - fixes #45 2015-08-20 13:58:36 +02:00
Zdenko Podobný
bb19f2c16b Fixes #76 - enable OpenMP support 2015-08-14 21:39:40 +02:00
Zdenko Podobný
41478fd5a1 implement build without cube (-DNO_CUBE_BUILD) 2015-07-24 11:51:44 +02:00
Jim O'Regan
6368a37da6 libicui18n is only called libicuin on mingw, not cygwin 2015-07-24 00:16:55 +01:00
Zdenko Podobný
abf0981d97 rework opencl requirements (fix configure: error: conditional "AMDEP" was never defined) 2015-07-22 22:03:03 +02:00
Zdenko Podobný
ffbe610349 add check for opencl requirements 2015-07-22 14:40:07 +02:00
Zdenko Podobný
71e226c44f increase version number 2015-07-21 22:46:52 +02:00
Zdenko Podobný
8950a2ec96 change version 2015-07-11 09:43:50 +02:00
Zdenko Podobný
aec22a47ec fix autotools c++11 issue with disabled training 2015-05-14 14:25:49 +02:00
Zdenko Podobný
d508751e58 Fixed issue 1317 - git revision info used as version info for autotools & DEBUG 2015-05-02 12:15:13 +02:00
Zdenko Podobný
c0640a4bef fix cygwin build (issue 1289) 2014-09-28 23:19:52 +02:00
Zdenko Podobný
298e31465a require leptonica 1.71 for tesseract build 2014-08-18 23:04:08 +02:00
Zdenop
524ee27f01 increase version number based on baseapi.h 2014-08-16 21:02:41 +02:00
Zdenko Podobný
769fef8c96 fix training tools build 2014-08-13 22:07:44 +02:00
Zdenko Podobný
3295dc29e2 improve testing whether it is possible to build trainings tools 2014-08-13 21:18:03 +02:00