Commit Graph

5358 Commits

Author SHA1 Message Date
Stefan Weil
418064f639 Add missing namespace prefix (fix build for merge_unicharsets)
Signed-off-by: Stefan Weil <sw@weil.de>
2020-12-26 13:09:39 +01:00
Egor Pugin
b2b2d02167 Another msvc/macos fix attempt. 2020-12-26 15:09:03 +03:00
Egor Pugin
f7c78f97a1 Fix macos build. Add missing header. 2020-12-26 15:00:43 +03:00
Egor Pugin
560560eb35
Try to fix macos build. 2020-12-26 13:40:27 +03:00
Egor Pugin
83544566af
[travis] Update macos image. 2020-12-26 04:28:48 +03:00
Egor Pugin
6a63b0e11e
[cmake] Enable C++17 temporarily. 2020-12-26 04:25:16 +03:00
Egor Pugin
5388d1d6f1
[travis] Upgrade to Ubuntu 18.04. 2020-12-26 04:22:07 +03:00
Egor Pugin
c8b8d266d6 Fix some of vector<bool> cases for msvc. 2020-12-26 04:17:13 +03:00
Egor Pugin
6b22972bc2 Fix linux build. 2020-12-26 04:15:42 +03:00
Egor Pugin
b09fa9b166 [sw] Bump minimal C++ standard to C++17. 2020-12-26 03:48:57 +03:00
Egor Pugin
c3e04abe1e Inherit STRING from std::string. 2020-12-26 03:48:35 +03:00
Egor Pugin
b4495a6bb5 Call base vector::insert() explicitly. 2020-12-26 03:37:21 +03:00
Egor Pugin
4fc467a922 Inherit GenericVector from std::vector. Inherit kdpairs from std::pair. Rewrite some move ctors to modern C++ style. 2020-12-26 03:23:09 +03:00
Egor Pugin
04d3cfcf2f Merge branch 'master' of github.com-egorpugin:tesseract-ocr/tesseract 2020-12-26 00:55:37 +03:00
Egor Pugin
79a86f2582 Move all tesseract symbols into tesseract namespace. Fix include order in many places. 2020-12-26 00:55:30 +03:00
Egor Pugin
a67fa1780f Delete .rc from tesseractmain. 2020-12-26 00:47:51 +03:00
Amit D
e1a3479ddd
Merge pull request #3194 from zdenop/i2551
embed pdf.ttf to tesseract library #2551
2020-12-25 22:37:17 +02:00
zdenop
ceadc4ddb8 remove inline declaration 2020-12-25 16:28:00 +01:00
Egor Pugin
a905e8c1ef Reorder includes. 2020-12-25 18:11:37 +03:00
Egor Pugin
688bb8dfae [cmake] Move include dirs into target include dirs. 2020-12-25 18:06:45 +03:00
Egor Pugin
14d52a79ba Remove .rc files. No need to add them into dll/exe. 2020-12-25 18:06:35 +03:00
Egor Pugin
ceddb7bc83 [cmake] Use source groups for libtess sources. 2020-12-25 17:43:26 +03:00
zdenop
044921267f embed pdf.ttf to tesseract library #2551 2020-12-25 13:20:36 +01:00
Stefan Weil
5ca4e0062d Create new pre-release 5.0.0-alpha-20201224
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-24 09:17:12 +01:00
Stefan Weil
5c579de68a Fix dependency on tmp directory for unittest programs
Signed-off-by: Stefan Weil <sw@weil.de>
2020-12-24 08:54:54 +01:00
Stefan Weil
30e3f10b3f Fix tar command for variants which require -j or -z
Signed-off-by: Stefan Weil <sw@weil.de>
2020-12-23 20:06:18 +01:00
Stefan Weil
49deadd799 Simplify code for equationdetect_test
It no longer depends on TensorFlow code, so it is now always enabled.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-23 17:03:06 +01:00
Stefan Weil
fef6004e6f Simplify code for cleanapi_test
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-23 17:01:07 +01:00
Stefan Weil
ce8ee86204 Remove unwanted # at EOL
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-23 16:44:23 +01:00
Amit D
c8a5b0ab13
Merge pull request #3191 from stweil/unittest
Fix more unittests for MacOS and add dependencies for unittest
2020-12-23 17:36:47 +02:00
Stefan Weil
2bfa52d517 Force fontconfig pangocairo backend for stringrenderer_test
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-23 12:59:57 +01:00
Stefan Weil
0d1e540267 Force fontconfig pangocairo backend for ligature_table_test
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-23 12:59:57 +01:00
Stefan Weil
4ce4e5ef66 Add more dependencies for unittest
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-23 12:59:57 +01:00
Stefan Weil
5aec08d9f2 Add rules to get fonts required for unittest
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-23 12:59:57 +01:00
zdenop
c7a2bd3c81
Merge pull request #3190 from stweil/pango_font_info_test
Force fontconfig pangocairo backend for pango_font_info_test
2020-12-23 12:23:32 +01:00
Stefan Weil
00a09c2f42 Force fontconfig pangocairo backend for pango_font_info_test
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-22 21:32:05 +01:00
Stefan Weil
cc133aa394 Fix text for fonts_dir parameter
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-22 21:32:05 +01:00
Stefan Weil
34abba8698 Add terminating linefeed to fonts.conf
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-22 21:32:05 +01:00
Stefan Weil
17a64eef1e Simplify code for PangoFontInfo::HardInitFontConfig
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-22 21:32:05 +01:00
zdenop
b672eeee01
Merge pull request #3189 from stweil/pango_font_info_test
Enable pango_font_info_test and fix crash for MacOS with M1
2020-12-22 21:12:41 +01:00
Stefan Weil
707ee70966 Use deprecated pango_fc_font_get_glyph for old Pango versions
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-22 12:02:37 +01:00
Stefan Weil
f759142c95 Remove buggy Windows implementation for getting glyph from font
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-22 09:07:09 +01:00
Stefan Weil
7669d36a37 Use HarfBuzz instead of deprecated pango_fc_font_get_glyph
This fixes the crash on MacOS with M1.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-22 09:03:05 +01:00
Stefan Weil
8c859a7329 Fix type cast from PangoFont to PangoFcFont
The original code crashes in pango_fc_font_get_glyph on MacOS with M1.

Replacing the type cast with the macro made for that conversion
gives at least an error message before crashing:

    (process:12546): GLib-GObject-WARNING **: 08:38:02.472: invalid cast from 'PangoCairoCoreTextFont' to 'PangoFcFont'
    zsh: segmentation fault  ./pango_font_info_test

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-22 08:45:11 +01:00
Stefan Weil
e75b217b37 Enable pango_font_info_test for unit tests
Most parts of that test can now be used without Tensorflow code.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-22 08:29:53 +01:00
Stefan Weil
d13e08bd85 Fix configure for flat training build without asciidoc
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-21 19:32:35 +01:00
Stefan Weil
421ebf0418 Fix installation of training tools for flat training build
Builds which were configured with --enable-shared did install the wrong files.
Using libtool fixes that.

Add also other flags which are used by the automake default install.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-21 18:34:32 +01:00
Stefan Weil
57efa41d47
Add XML_CATALOG_FILES for MacOS with Homebrew (#3188)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-21 16:39:32 +01:00
Stefan Weil
e66243fcea Fix unittest for flag training build
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-21 16:24:02 +01:00
Egor Pugin
6d866300a5 Merge branch 'master' of github.com-egorpugin:tesseract-ocr/tesseract 2020-12-20 14:21:11 +03:00