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
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