Commit Graph

4521 Commits

Author SHA1 Message Date
Egor Pugin
14c6e38723
Merge pull request #2789 from stweil/master
Clean handling of SIMD related macros
2019-11-28 20:08:50 +03:00
Stefan Weil
dfdc2abef0 unittest: Improve logging for intsimdmatrix_test
Use GTEST_SKIP if AVX2 or SSE tests are skipped.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-28 17:51:37 +01:00
Stefan Weil
a1a139cbd2 Replace AVX_OPT, ..., AVX macros by HAVE_AVX, ... and clean related code
- Replace AVX_OPT, AVX2_OPT, FMA_OPT, SSE41_OPT
- Replace AVX, AVX2, FMA, SSE4_1
- Write new HAVE_AVX, HAVE_AVX2, HAVE_FMA, HAVE_SSE4_1 into config_auto.h
- Put related conditionals in Makefile.am in one place

This makes the code clearer and fixes a log message in
IntSimdMatrixTest.AVX2.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-28 17:51:37 +01:00
Egor Pugin
cbed7dd383
Merge pull request #2788 from stweil/libcurl
Show libcurl version
2019-11-28 19:06:47 +03:00
Stefan Weil
074844ce46 Show libcurl version
`tesseract --version` now also shows the version of libcurl and related
libraries if it was build with libcurl.

The preprocessor macro HAVE_LIBCURL is now defined in config_auto.h.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-28 16:34:52 +01:00
Stefan Weil
3311c48f23 Update .gitignore
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-27 16:46:14 +01:00
zdenop
632b492cf7
Merge pull request #2785 from stweil/automake-flat
automake: Use non-recursive build for tesseract and libtesseract
2019-11-27 15:12:10 +01:00
Stefan Weil
9ed526625a Remove compiler flag which had no effect
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-27 09:43:11 +01:00
Stefan Weil
cbd3a21cb2 automake: Flat build for src/viewer and src/wordrec
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-26 16:20:46 +01:00
Stefan Weil
0cd2bdbd2b automake: Flat build for src/textord
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-26 16:20:46 +01:00
Stefan Weil
558462358a automake: Flat build for src/opencl
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-26 16:20:46 +01:00
Stefan Weil
6eeb486b77 automake: Flat build for src/lstm
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-26 16:20:46 +01:00
Stefan Weil
7ebcc77e3b automake: Flat build for src/dict
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-26 16:20:46 +01:00
Stefan Weil
6181acf367 automake: Flat build for src/cutil
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-26 16:20:46 +01:00
Stefan Weil
159160518b automake: Flat build for src/classify
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-26 16:20:46 +01:00
Stefan Weil
9730c7e167 automake: Flat build for src/ccutil
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-26 16:20:46 +01:00
Stefan Weil
b1d449315e automake: Flat build for src/ccstruct
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-26 16:20:46 +01:00
Stefan Weil
9745a9d111 automake: Flat build for src/ccmain
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-26 16:20:46 +01:00
Stefan Weil
a166efaad6 automake: Flat build for src/arch
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-26 16:20:46 +01:00
Stefan Weil
cafb1bbfd7 automake: Flat build for src/api
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-26 16:20:46 +01:00
Martin Malmsten
9ed3887432 Added ComposedBlock level to Alto output 2019-11-17 21:06:12 +01:00
zdenop
2b688983f6 cmake: fix typo 2019-11-11 19:10:01 +01:00
zdenop
2d6f38eebf fix using bilevel tiff in pdf output 2019-11-10 16:11:52 +01:00
Shreeshrii
99dfa8a680 Add separator and training_iteration to checkpoint name (#2752)
* Add separator and training_iteration to checkpoint name
* specify modelname_N.NN_NN_NN.checkpoint for intermediate checkpoint
2019-11-09 12:22:40 +01:00
Egor Pugin
944c1d9bff
Merge pull request #2751 from stweil/master
Fix issue #2748
2019-11-08 21:43:23 +03:00
Stefan Weil
ac46b286a4 Fix issue #2748
Commit 94d0f77f56 tried to fix issue #2741
but created a new problem.

This commit should fix both old and new issue.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-08 17:12:20 +01:00
Stefan Weil
0406f7706d Use BRT_UNKNOWN instead of BRT_NOISE to initialize ColPartition::blob_type_
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-08 07:40:06 +01:00
Stefan Weil
9b46a67efa Use "C" locale for printing parameters
This fixes a test for the Python wrapper `tesserocr` (python setup.py test).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-04 19:21:20 +01:00
Stefan Weil
41c3e93cb7 Add missing libraries in configuration for pkg-config
This fixes linker errors in third-party software like tesserocr for builds
which use any of these libraries.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-02 19:00:05 +01:00
Egor Pugin
ab836dbb31
Merge pull request #2743 from DavidMaung/master
Exposed the text2image option --ptsize to tesstrain.sh.
2019-11-02 17:09:51 +03:00
Egor Pugin
5d5ae6a963
Merge pull request #2745 from stweil/format-headers
Format API headers
2019-11-02 11:44:56 +03:00
Egor Pugin
ceea079eff
Merge pull request #2744 from stweil/master
Fix issue #2741
2019-11-02 11:44:36 +03:00
Stefan Weil
90db9b5224 Format API header files
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-02 07:54:55 +01:00
Stefan Weil
29dcfb081a Use relative includes for API headers in API headers
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-02 07:54:55 +01:00
Stefan Weil
a306cd7370 Fail if no valid lstmf file was written (fix issue #2741)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 21:52:45 +01:00
Stefan Weil
94d0f77f56 Don't create an empty lstmf file
If Tesseract cannot find text in the input image, it should not write
an empty lstmf file. This problem was reported in issue #2741.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 21:43:26 +01:00
maungd@battelle.org
3d7afb69ea Exposed the text2image option --ptsize to tesstrain.sh. Text2image has the
option --ptsize which defaults to 12.  This option is not exposed through
tesstrain.sh; thus, you cannot use tesstrain.sh to explore training with
different font sizes.  I made a small modification to expose the --ptsize
option to tesstrain.sh.  It defaults to 12 if not specified.
2019-11-01 15:10:58 -04:00
zdenop
6f31c3b849 Merge branch 'master' of https://github.com/tesseract-ocr/tesseract 2019-11-01 09:29:10 +01:00
zdenop
dbcff0ae88 cmake: fix clan openmp build on windows 2019-11-01 09:28:51 +01:00
zdenop
a5716692b2 cmake: allow build on Raspbian GNU/Linux 9 (stretch) 2019-11-01 09:28:08 +01:00
Egor Pugin
0d96ff3617
Merge pull request #2740 from stweil/master
Use pre-calculated lookup tables for all C++ compilers
2019-11-01 01:13:42 +03:00
Egor Pugin
92e543538a
Update .travis.yml 2019-11-01 00:47:36 +03:00
Stefan Weil
b5498c70fa Use pre-calculated lookup tables for all C++ compilers
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-10-31 20:26:01 +01:00
Egor Pugin
2bcc9d8093 Remove cppan build. 2019-10-30 21:37:38 +03:00
Stefan Weil
ca87b06d59 Fix build for Intel Compiler (issue #2736)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-10-30 10:09:44 +01:00
Stefan Weil
20a50e9bcb Fix typo in comment
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-10-30 10:06:31 +01:00
Stefan Weil
6a3df91edf Update cppan build for new include file structure
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-10-29 18:09:08 +01:00
Stefan Weil
e3e7a9bf33 Use #include <tesseract/*.h> for unittest
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-10-29 18:01:18 +01:00
Egor Pugin
c7c250c8b4 Add include dir explicitly. 2019-10-29 14:57:32 +03:00
Egor Pugin
2a37f5dd62 Update includes to use <>. 2019-10-29 14:50:11 +03:00