Commit Graph

5220 Commits

Author SHA1 Message Date
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
Egor Pugin
b6269a7206 Add include headers to cmake target. 2020-12-20 14:20:59 +03:00
Egor Pugin
9760425316
Merge pull request #3186 from stweil/flat-training
automake: Flat build for src/training
2020-12-20 04:04:11 +03:00
Stefan Weil
30a68d92f5 Fix git submodule 'test'
The subdirectory for that submodule was accidentally removed
in commit 068b79052f.

Add also .git to the submodule URL.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-19 23:08:40 +01:00
Stefan Weil
3efedabda3 automake: Flat build for src/training
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-19 15:25:21 +01:00
Egor Pugin
eac5f88cc0
Merge pull request #3179 from Shatur95/fix-cmake-issues
Improve CMake configuration
2020-12-13 17:48:22 +03:00
Egor Pugin
9b8b7d8af3
Merge pull request #3181 from stweil/m1
Fix automake build for native builds with Homebrew on MacOS with Apple M1
2020-12-13 17:47:26 +03:00
Stefan Weil
0b97bc5c16 Fix include statements for Leptonica header
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-13 13:26:36 +01:00
Stefan Weil
6fcf8d23bc Use more compiler and linker flags from pkg-config
This fixes some build issues with Homebrew on MacOS.

Signed-off-by: Stefan Weil <stefan@Sabines-Mac-mini.fritz.box>
2020-12-13 13:24:46 +01:00
Shatur95
068b79052f Fix typo 2020-12-11 18:39:13 +02:00
Shatur95
8719498c19 Locate CMake config files without subfolder 2020-12-11 18:24:51 +02:00
Shatur95
30e2516337 Use find_dependency instead of find_package 2020-12-11 18:05:09 +02:00
Stefan Weil
66175f9745
Merge pull request #3172 from MerlijnWajer/master
tesseract.1.asc: sync with languages available in tessdata-fast
2020-12-08 06:00:15 +01:00
Stefan Weil
3f2892bc04
Update description for fry language to match Wikipedia 2020-12-08 05:59:17 +01:00
softana
bb832d491e
Update Dockerfile
Change double hyphen "--" to single hyphen "-" to prevent build errors:
Fix invalid option no-ri-no-rdoc
> ERROR: While executing gem ... (OptionParser::InvalidOption) invalid option: --no-ri
2020-12-07 11:33:09 -06:00
Stefan Weil
43e13ea6f4
Merge pull request #3171 from stweil/lsan
Suppress some LeakSanitizer errors in unit tests
2020-12-05 10:20:54 +01:00
Merlijn Wajer
5ff273675c tesseract.1.asc: sync with languages available in tessdata-fast
cos, div, fao, fyr, gla, hye are available in Ubuntu's 'tesseract-ocr-*'
packages but not mentioned in the manpage.
2020-12-04 18:16:45 +01:00
Stefan Weil
b303dd6ac2 Add more patterns to suppress memory leaks from libfontconfig
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-04 13:30:58 +01:00
Stefan Weil
490bd3ec8f Fix build with enabled TensorFlow
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-04 10:56:23 +01:00
Stefan Weil
5eb5e6ea23 Suppress some LeakSanitizer errors in unit tests
The fontconfig library has some (intentional) memory leaks which
must be suppressed for unit tests with the LeakSanitizer.

This fixes the issues #3156 and #3157.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-04 07:25:49 +01:00
Stefan Weil
ac116d1b28 Fix regression in Network::Serialize (fix issue #3167)
The regression was caused by a wrong string serialization in
commit 4613738a5e.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-12-03 19:36:58 +01:00
Stefan Weil
69ed480a9a
Merge pull request #3165 from MerlijnWajer/master
Remove references to "kur" and "tgl", add "fil" to man page
2020-12-03 13:42:55 +01:00
Merlijn Wajer
58f7a72f00 Remove references to "kur" and "tgl", add "fil" to man page
"kur" no longer exists, might be named "kur_ara" (the old "kur_ara" is
now "kmr", which is actually Latin) now, but "kur" is not present in
tessdata_fast nor in tessdata_best. [1] [2]

"tgl" (Tagalo) is now named "fil" (Filipino) [3]

[1] https://github.com/tesseract-ocr/langdata/issues/124
[2] https://github.com/tesseract-ocr/tessdata_best/issues/23
[3] https://github.com/tesseract-ocr/langdata/issues/84
2020-12-01 23:43:50 +01:00
0xloem
fed6603a77 Specify ADD_RT for android platform, which embeds librt in libc 2020-11-28 14:39:46 -05:00
zdenop
a06c61cc90
Merge pull request #3128 from acoder77/patch-1
Create .gitattributes for cross os contributors
2020-11-27 18:27:26 +01:00
zdenop
279b0b2e37
Merge pull request #3160 from stweil/string2
Replace more occurrences of STRING by std::string of char*
2020-11-27 18:24:17 +01:00
zdenop
6bc42464af
Merge pull request #3159 from stweil/pack
Pack BlamerBundle, CLASS_STRUCT and SVMenuNode
2020-11-27 18:23:14 +01:00
Stefan Weil
65b11a1e12 Pack class SVMenuNode
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-11-26 17:17:27 +01:00
Stefan Weil
a1849bc65c Pack struct CLASS_STRUCT
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-11-26 17:17:27 +01:00
Stefan Weil
0bb46ac2e0 Pack struct BlamerBundle
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-11-26 17:17:27 +01:00
Stefan Weil
bf3774cc91 Use more const char*
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-11-26 17:01:17 +01:00
Stefan Weil
4613738a5e Use const char* for filename and network_spec parameters
This replaces the proprietary STRING data type
(764 instead of 838 lines remaining).

It also removes STRING from osdetect.h and serialis.h.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2020-11-26 17:01:17 +01:00
Amit D
4c35f51a5c
Merge pull request #3158 from Shreeshrii/master
fixes issue #3099
2020-11-25 03:48:42 +02:00
Shree Devi Kumar
31710098e3 fixes issue 3099 2020-11-23 13:30:26 +00:00