mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-12-11 23:19:04 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity
4,012 Commits 10 Branches 66 Tags 67 MiB
bbd3626d77
Commit Graph

190 Commits

Author SHA1 Message Date
Eric Platon
708f55423b Add flag to build compiler options with G++ on macOS. 
Building with G++ on Darwin breaks when either AVX, AVX2, or SSE4.1
compiler option is set, unless G++ is actually CLANG.

This commit allows to build with G++, by asking G++ to delegate assembly
to the clang integrated assembler, instead of the GNU one.
 2018-04-13 09:39:40 +09:00
Stefan Weil
ef31eaa7d7 Don't try to build manpages if asciidoc is missing 
Commit f9157fd91d changed the rules for
the documentation, so make always tried to build it and failed if
asciidoc was missing since that commit.

Now configure tests whether asciidoc is available and builds the
documentation conditionally. It also reports that to the user.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-04-09 19:07:54 +02:00
Stefan Weil
f9157fd91d configure: Don't use AM_MAINTAINER_MODE by default 
That macro disables automated updates when configure.ac or a Makefile.am
changes. Normally those updates are wanted because users typically
forget running ./autogen.sh.

See also the GNU documentation why AM_MAINTAINER_MODE should not be used:
https://www.gnu.org/software/automake/manual/html_node/maintainer_002dmode.html

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-04-08 14:44:14 +02:00
Zdenko Podobný
af037c27e7 rename version.h.in because the filename is too general for distribution 2018-04-02 19:11:02 +02:00
Stefan Weil
6bbfc3b5fc Create version.h from available version information (#1432) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-03-27 14:32:30 +02:00
Stefan Weil
53a25713ca autoconf: Get version components from PACKAGE_VERSION (#1431) 
AX_SPLIT_VERSION only works after AM_INIT_AUTOMAKE, so that macro had
to be moved.

GENERIC_MAJOR_VERSION, GENERIC_MINOR_VERSION and GENERIC_MICRO_VERSION
are now set automatically and can be used in further processing.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-03-27 09:46:08 +02:00
Stefan Weil
d087f20212 configure: Remove GIT_REV which is no longer used (#1416) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-03-25 17:20:13 +02:00
Stefan Weil
81c47288a2 configure: Use m4_esyscmd_s to suppress linefeed (fix needed for macOS) (#1401) 
While "echo -n" works on Debian GNU Linux, it fails to produce a valid
configure file on macOS, so try a different shorter solution.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-03-18 20:15:14 +01:00
Stefan Weil
8fb68746fb configure: Get version string from git or from VERSION file (#1380) 
Use git to create the version string if possible.
Otherwise get the version from the VERSION file.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-03-12 21:38:46 +01:00
Stefan Weil
2d319cb8d3 configure: Update date, version and add project URL (#1379) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-03-12 19:53:00 +01:00
Stefan Weil
8130b8d346 Fix some typos in comments (found by codespell) (#1331) 
Fix also a grammar issue.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-02-21 08:39:07 +01:00
amitdo
a905548ed6 Autotools build: Remove the option 'USING_MULTIPLELIBS' 
Libtool's convenience libraries should never be installed. Fixes #985.
 2017-09-11 15:03:53 +03:00
Ray Smith
fc6a390c6c Added intsimdmatrix as a generic integer matrixdotvector function with AVX2 and SSE specializations 2017-09-08 15:06:19 +01:00
zdenop
f29498ffd6 Merge pull request #1088 from Shreeshrii/master 
makefile.am and apiexample_test
 2017-09-05 20:40:00 +02:00
Stefan Weil
742b303548 Fix hint for training build 
* Fix grammar.
* Fix text ("after building ..." is not necessary).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2017-08-19 21:35:55 +02:00
Shreeshrii
267734bc34 Changes needed for adding make check for unittest 2017-08-19 19:01:46 +05:30
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
zdenop
c550aee2f9 revert commit r1122 ;-) 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1123 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-07-01 22:04:56 +00:00
zdenop
bcbfb93475 fix issue 1240 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1122 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-07-01 21:57:22 +00:00
zdenop
c3b9b7c60d fix OSX build 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1059 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-04-16 09:04:28 +00:00
zdenop@gmail.com
86ed90421b fix CYGWIN: use gnu++11 instead of c++11 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1054 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-03-11 14:12:39 +00:00
zdenop
d451b28054 fix issue 1127; add unvl output to tesseract executable 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1052 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-03-02 14:40:21 +00:00
zdenop
e28176c5dd check for leptonica version; add info to tesseract.pc about opencl lib if needed 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1035 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-01-31 23:00:40 +00:00
zdenop@gmail.com
ac5a8a871b fix windows builds (mingw and VS2010) 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1017 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-01-26 22:39:20 +00:00
zdenop@gmail.com
afc440d9b5 fix issue 1069: improve identification of OS X 10.9.1 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1008 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-01-23 07:40:27 +00:00
zdenop@gmail.com
71ae509354 fix for mingw32/g++ 4.8.1 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@998 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-01-22 08:10:15 +00:00
zdenop@gmail.com
ef3b1d936e fix mingw build issues 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@995 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-01-18 09:00:54 +00:00
zdenop
ff5fb7f105 fix issue 1044: OS X build 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@994 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-01-17 20:53:15 +00:00
zdenop
8299e2a605 fix linux build, remove not used folder and spec file 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@979 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-01-10 23:52:04 +00:00
theraysmith@gmail.com
31f98f7fc9 Removed image directory 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@967 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2014-01-09 18:08:12 +00:00
zdenop
8b3e590123 fix OpenCL build on OSX 10.9; add info about OpenCL to 'tesseract -v' 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@921 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-12-14 08:35:14 +00:00
rajesh.katikam@gmail.com
bf0a83907b Cleaned up configure.ac and Makefile.am in multiple folder to use OPENCL paths 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@910 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-11-12 10:40:40 +00:00
rajesh.katikam@gmail.com
983aaabaae Initial version of OpenCL support added. 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@909 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-11-11 17:43:13 +00:00
zdenop@gmail.com
7bf559dcb3 use default gcc optimization 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@906 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-11-10 15:12:01 +00:00
zdenop@gmail.com
9b730d4729 gcc: use c++11 if possible 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@902 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-11-03 17:22:27 +00:00
zdenop@gmail.com
acd0a66e51 fix issue 582/915 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@895 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-10-20 20:59:18 +00:00
zdenop@gmail.com
9f1d243d82 autotools: check for icu library, implement 'make training' 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@885 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-09-26 20:23:17 +00:00
theraysmith@gmail.com
4d514d5a60 Major refactor of beam search, elimination of dead code, misc bug fixes, updates to Makefile.am, Changelog etc. 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@878 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-09-23 15:26:50 +00:00
zdenop@gmail.com
b5d3d66a68 remove unused code(gettext) 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@859 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-07-07 16:39:13 +00:00
zdenop@gmail.com
d919bfde1e increase version number 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@857 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-07-05 09:35:42 +00:00
zdenop@gmail.com
8a0878af3a fix mingw build 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@856 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-07-05 08:46:57 +00:00
zdenop@gmail.com
6e59888b76 put back --with-extra-libraries and --with-extra-includes 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@824 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-01-31 23:10:18 +00:00
zdenop@gmail.com
5afcfde428 clean up configure.ac (fix for issue 819 and 763) 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@823 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2013-01-30 22:57:49 +00:00
theraysmith@gmail.com
be09fec7a2 Tarball Version 3.02.02 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@790 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2012-10-25 20:15:11 +00:00
zdenop@gmail.com
0ed5c67070 fix issue 757 (Solaris needs -lrt for sem_init) 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@756 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2012-09-21 20:00:01 +00:00
zdenop@gmail.com
a877d8a5a7 fix 'make distclean' in configure.ac too 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@755 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2012-09-21 17:56:53 +00:00
zdenop@gmail.com
eaf9d63626 Provide pkgconfig file (issue 451), improve configure.ac and INSTALL.SVN 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@733 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2012-07-28 21:17:20 +00:00
zdenop@gmail.com
8708102883 implement '--enable-debug' for ./configure; small clean up autogen.sh and configure.ac 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@732 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2012-07-22 21:36:20 +00:00
zdenop@gmail.com
d39cb38ab8 Fix Issue 678 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@722 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2012-04-17 17:32:42 +00:00
zdenop@gmail.com
d4d4b8aad8 improve autools system (mingw+msys fix); implementation of --disable-tessdata-prefix 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@708 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2012-03-22 20:01:33 +00:00
zdenop@gmail.com
30a70142a0 visibility - autotools part (./configure --enable-visibility) 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@690 d0cd1f9f-072b-0410-8dd7-cf729c803f20
 2012-03-02 23:51:33 +00:00