Commit Graph

4086 Commits

Author SHA1 Message Date
Julian Gilbey
d8f695271f fix #2616: allow building of training data
This fixes Issue #2616 by preventing an attempt to build the recognition engine when running tesstrain.sh.
2019-11-01 13:59:26 +01:00
Egor Pugin
55b4099ad1 Export some classify vars. 2019-11-01 13:59:14 +01:00
zdenop
0d8be252cc Remove more code for builds with disabled legacy engine
Now the Tesseract library no longer includes unused code.

Signed-off-by: Stefan Weil <sw@weilnetz.de>

# Conflicts:
#	src/cutil/Makefile.am
#	unittest/Makefile.am
2019-11-01 13:58:37 +01:00
Stefan Weil
b52c466ab4 [sw] Update build for commit e84cb24def
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 13:51:01 +01:00
Egor Pugin
0bce4ebb2b [sw] Try to fix build. 2019-11-01 13:50:53 +01:00
zdenop
c9ecab8854 Move source files which are used for training only to src/training 2019-11-01 13:50:26 +01:00
Stefan Weil
b80acd81ba OpenCL: Add static attribute for kernel_src
It is only used in openclwrapper.cpp.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 13:36:22 +01:00
Stefan Weil
14665dfa2c Remove unused functions create_edges_window, draw_raw_edge
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 13:36:15 +01:00
Stefan Weil
91f0de94bc Remove unused function truncate_path and related files
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 13:36:07 +01:00
Stefan Weil
c3d4742af6 Remove global array kPolyBlockNames from Tesseract library
It is only used in unittest/layout_test.cc after moving a test from
baseapi_test.cc to that file, so it can be made local.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 13:35:55 +01:00
Egor Pugin
25c411c86c [sw] Update build script. 2019-11-01 13:00:10 +01:00
Stefan Weil
92b460010e cmake: Don't link pthread on Windows
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 13:00:03 +01:00
Stefan Weil
5989f128a3 Fix linker error in Appveyor CI
This completes commit c5a50b93ce.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:59:52 +01:00
Stefan Weil
5d2265478f universalambigs: Add hack to fix builds with Microsoft compiler
The MS compiler only accepts string constants up to 65535 characters,
so shorten the string for that compiler to fix the compilation.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:59:44 +01:00
Egor Pugin
26feea5ef4 [sw] Use the latest pango again. 2019-11-01 12:59:37 +01:00
Zdenko Podobný
9dd392d8b2 move fileio.cpp and fileio.h to training (this fix android build) 2019-11-01 12:59:31 +01:00
Stefan Weil
ea34763fea universalambigs: Replace octal characters by UTF-8 string
This improves readability and reduces the file size.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:59:20 +01:00
Stefan Weil
a473283482 Clean ambigs.h
* Remove unused kUnigramAmbigsBufferSize and kAmbigNgramSeparator
* Move some declarations to ambigs.cpp

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:59:12 +01:00
Egor Pugin
8ebcea2926 Use pangocairo-1.43 for the moment. Remove private pango header. 2019-11-01 12:59:04 +01:00
Egor Pugin
49ce908e4b Try to fix #2599 2019-11-01 12:58:57 +01:00
Egor Pugin
f522b51b90 [sw] Install tess headers. 2019-11-01 12:58:49 +01:00
Stefan Weil
7fcad19286 cmake: Add missing pthread library
It is needed for C++ threads since commit 85068be405.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:58:42 +01:00
Stefan Weil
d6a1e2ddb9 cmake: Add missing include directory for LibArchive
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:58:36 +01:00
Egor Pugin
a2dd6bf35b [appveyor] Disable VS2019 image because it's too slow. 2019-11-01 12:58:26 +01:00
Egor Pugin
5541a3d502 Update appveyor.yml 2019-11-01 12:56:19 +01:00
Stefan Weil
b21779d699 Improve formatting of hOCR output with character boxes
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:55:49 +01:00
Stefan Weil
d338681758 Use auto data type for results of std::ftell
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:53:44 +01:00
Stefan Weil
47c8710ac2 Remove unused filesize_ from class InputBuffer
This also simplifies the constructors.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:53:36 +01:00
Stefan Weil
e34acfeb46 Simplify shell code (fixes warning from Codacy)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:53:28 +01:00
Stefan Weil
8baf817192 Use long instead of off_t for result from ftell
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:53:21 +01:00
Stefan Weil
055f32d422 Fix training script for macOS (issue #2578)
Bash on macOS does not support "|&":

    tesstrain_utils.sh: line 80: syntax error near unexpected token `&'

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:53:14 +01:00
Stefan Weil
a469224ec1 Fix some compiler warnings (unused local variables)
gcc warnings:

    src/classify/protos.cpp:85:7: warning: unused variable ‘i’ [-Wunused-variable]
    src/classify/protos.cpp:86:7: warning: unused variable ‘Bit’ [-Wunused-variable]
    src/classify/protos.cpp:89:14: warning: unused variable ‘Config’ [-Wunused-variable]

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:53:06 +01:00
zdenop
5775cf0535 Implemented improved bounding box algorithm
Signed-off-by: Noah Metzger <noah.metzger@bib.uni-mannheim.de>

# Conflicts:
#	src/lstm/recodebeam.cpp
2019-11-01 12:52:47 +01:00
Stefan Weil
25b1a4b951 classify: Use fixed size bit vector
The vector was already limited to MAX_NUM_PROTOS (512) entries or 64 bytes
in the old code. Now it uses that size right from the start which avoids
reallocating it later when entries are added.

The old code which reallocated the vector to expand it was buggy because
the realloc function can return a different pointer, but the code still
used the original pointer to reset the new bits.

Function ExpandBitVector is now unused and therefore removed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:46:44 +01:00
Robert Pösel
c01d230c10 Give word's bounds to callback also during second pass 2019-11-01 12:46:37 +01:00
Egor Pugin
574586a8d0 Update appveyor.yml 2019-11-01 12:46:19 +01:00
Stefan Weil
59659ddc6e Remove structures.*
It only provided the functions new_cell, free_cell which could be replaced by new, delete.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:46:02 +01:00
Egor Pugin
5912204d62 [appveyor] Enable artifacts.
Though they will be with some sw artifacts.
2019-11-01 12:44:49 +01:00
zhuangzhuang1988
4bc94da148 fix cmake warning. 2019-11-01 12:44:36 +01:00
Stefan Weil
40b69539ff Remove unused functions reverse16, reverse32
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:44:29 +01:00
Stefan Weil
ae6eddcc12 Remove non portable sleep by std::this_thread::sleep_for
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:44:22 +01:00
Egor Pugin
09837a60dc [appveyor] Print sw version for reference. 2019-11-01 12:30:24 +01:00
Zdenko Podobný
5e3772cad8 fix #2101 2019-11-01 12:30:15 +01:00
Egor Pugin
e4936adfa3 Update appveyor.yml 2019-11-01 12:30:08 +01:00
Egor Pugin
3cf4895737 [build][sw] Disable FMA dotproduct. 2019-11-01 12:30:01 +01:00
Stefan Weil
25a6fe7ba9 arch: Reduce number of include files for dot product functions
dotproductavx.h and dotproductsse.h declared only two functions.
Move those declarations to dotproduct.h.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:29:51 +01:00
Stefan Weil
2e1cd1d448 Add dot product implementation for Intel FMA (double = tessdata_best)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:29:39 +01:00
zdenop
27af9e883d use Ubuntu Xenial for travis 2019-11-01 12:29:32 +01:00
zdenop
838b6476f9 Give info about expected leptonica dependencies (fix #2333) 2019-11-01 12:29:24 +01:00
Stefan Weil
ba8e870f85 Optimize tprintf implementation
It no longer uses a local buffer, so it needs less memory
and no mutex.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-11-01 12:28:19 +01:00