Stefan Weil
467f8f4140
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-07-17 17:18:44 +02:00
Stefan Weil
f92181561c
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-07-17 07:47:28 +02:00
Stefan Weil
a419f2d78b
Modernize BIT_VECTOR a little bit
...
This removes one more user of Emalloc / Efree.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-16 22:09:08 +02:00
zdenop
c8374cc528
Merge pull request #2576 from noahmetzger/LSTMChoiceRIL
...
Implemented improved character bounding box algorithm
2019-07-16 12:25:17 +02:00
zdenop
f4925077e8
Merge pull request #2574 from stweil/fix
...
classify: Use fixed size bit vector
2019-07-16 12:22:48 +02:00
zdenop
cb5c78be7d
Merge pull request #2572 from adaptech-cz/wordBoundsOn2ndPass
...
Give word's bounds to callback also during second pass
2019-07-16 12:19:31 +02:00
Noah Metzger
3a5e508934
Implemented improved bounding box algorithm
...
Signed-off-by: Noah Metzger <noah.metzger@bib.uni-mannheim.de>
2019-07-16 11:38:50 +02:00
Stefan Weil
028fff6edd
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-07-16 10:18:11 +02:00
Robert Pösel
f99fcd7691
Give word's bounds to callback also during second pass
2019-07-16 09:11:06 +02:00
Egor Pugin
0d5607c780
Update appveyor.yml
2019-07-16 08:12:41 +03:00
Stefan Weil
5bbb7f59a6
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-07-16 07:03:52 +02:00
Stefan Weil
3621272051
Remove cutil_class.*
...
It is no longer needed since commit 4523ce9f7d
.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-16 07:03:52 +02:00
Egor Pugin
b577af1fe0
[appveyor] Enable artifacts.
...
Though they will be with some sw artifacts.
2019-07-16 07:51:31 +03:00
Egor Pugin
872a18086c
Merge pull request #2571 from zhuangzhuang/master
...
fix cmake warning.
2019-07-16 07:47:23 +03:00
zhuangzhuang1988
35d252e30e
fix cmake warning.
2019-07-16 11:03:14 +08:00
Stefan Weil
ea462b2c03
Remove unused functions reverse16, reverse32
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-15 21:50:46 +02:00
Stefan Weil
c8cb925813
Remove non portable sleep by std::this_thread::sleep_for
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-15 16:00:07 +02:00
Stefan Weil
fcfdb7e56f
Remove unused include statements
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-15 14:48:31 +02:00
zdenop
852dbe3530
Merge pull request #2569 from stweil/thread
...
Replace propriatary thread data type by std::thread
2019-07-15 14:35:04 +02:00
Stefan Weil
ba0c55adc5
svutil: Remove SVSync::StartThread and SVSync::ExitThread
...
Both are unused now.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-15 14:30:51 +02:00
Stefan Weil
85068be405
lstmtester: Replace SVSync::StartThread by std::thread
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-15 14:30:51 +02:00
Stefan Weil
43a281893f
scrollview: Replace SVSync::StartThread by std::thread
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-15 14:30:51 +02:00
Stefan Weil
a6d723bf10
Replace SVSync::StartThread by std::thread and use std::this_thread::yield
...
Using yield instead of a sleep makes running imagedata_test much faster.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-15 14:30:51 +02:00
zdenop
c40159aa74
Merge pull request #2567 from stweil/mutex
...
Replace proprietary mutex data types by std::mutex and related changes
2019-07-15 12:38:33 +02:00
Stefan Weil
13bb4623b1
Use std::lock_guard to protect a code block
...
This is simpler than using lock() / unlock() explicitly.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-15 12:01:28 +02:00
Stefan Weil
93427391c1
Replace SVAutoLock by std::lock_guard
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-15 12:01:28 +02:00
Stefan Weil
c0b8ee3b82
Replace CCUtilMutex by std::mutex
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-15 12:01:28 +02:00
Stefan Weil
36026e3c35
Replace SVMutex by std::mutex
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-15 12:01:28 +02:00
zdenop
56d4fdce00
Merge pull request #2554 from noahmetzger/LSTMChoiceRIL
...
Improved lstm_choice_mode
2019-07-15 11:51:52 +02:00
Noah Metzger
2dd5d0d60a
Fixed a bug when first decode iteration stays empty and added some comments.
...
Signed-off-by: Noah Metzger <noah.metzger@bib.uni-mannheim.de>
2019-07-15 10:05:22 +02:00
Egor Pugin
757a885a59
Merge branch 'master' of github.com-egorpugin:tesseract-ocr/tesseract
2019-07-14 08:45:07 +03:00
Egor Pugin
7325d032e4
[appveyor] Print sw version for reference.
2019-07-14 08:44:58 +03:00
Zdenko Podobný
fef64d795c
fix #2101
2019-07-13 20:11:03 +02:00
Egor Pugin
cf8b8835bd
Update appveyor.yml
2019-07-13 20:17:15 +03:00
Egor Pugin
dbba30b82f
[build][sw] Disable FMA dotproduct.
2019-07-13 20:03:53 +03:00
zdenop
8352194959
Merge pull request #2561 from stweil/fma
...
Implement double dot product using Intel FMA and reduce number of include files
2019-07-13 09:51:32 +02:00
Stefan Weil
61eab60fe3
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-07-12 23:18:00 +02:00
Stefan Weil
2d5b166876
Add dot product implementation for Intel FMA (double = tessdata_best)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-12 23:18:00 +02:00
zdenop
cce26fa197
use Ubuntu Xenial for travis
2019-07-12 10:49:59 +02:00
zdenop
2e2ea63cf2
Give info about expected leptonica dependencies ( fix #2333 )
2019-07-12 10:39:01 +02:00
zdenop
c8b9000ad9
info about 4.1.0 release to master
2019-07-12 10:25:06 +02:00
zdenop
8a8591a9db
update Changelog (main 4.1 changes)
2019-07-12 10:22:53 +02:00
Egor Pugin
25534d325f
Merge pull request #2556 from stweil/tprintf
...
Optimize tprintf implementation
2019-07-10 22:40:14 +03:00
Stefan Weil
9259ed8f26
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-07-10 20:59:07 +02:00
Stefan Weil
2aebd10fb7
FPRow: Add missing initialisation for scalar (CID 1402754)
...
Modernize the code also a little bit.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-10 17:15:55 +02:00
Stefan Weil
bdc7abf518
Fix format strings for size_t arguments (CID 1402762, 1402767)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-10 16:57:19 +02:00
Stefan Weil
2ba90f02cb
unittest: Initialize non-static class members in RecodeBeamTest (CID 1402765)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-10 16:52:27 +02:00
Stefan Weil
d40a2423e8
unittest: Fix two issues reported by Coverity Scan (CID 1402761, 1402755)
...
GTEST_SKIP() returns from the function which caused two warnings:
CID 1402755 (#1 of 1): Resource leak (RESOURCE_LEAK)
CID 1402761 (#1 of 1): Structurally dead code (UNREACHABLE)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-07-10 16:38:30 +02:00
Noah Metzger
11a4cd298b
Added parameters for the LSTM CTC Choice mode
...
Signed-off-by: Noah Metzger <noah.metzger@bib.uni-mannheim.de>
2019-07-10 16:34:41 +02:00
Noah Metzger
f2d685a90f
Added CTC-based Symbolchoices.
...
Signed-off-by: Noah Metzger <noah.metzger@bib.uni-mannheim.de>
2019-07-10 16:34:41 +02:00