Egor Pugin
6a9584fbc2
Merge pull request #2650 from stweil/cid
...
Fix several issues reported by Coverity Scan
2019-09-14 21:18:37 +03:00
Egor Pugin
8be05c6bed
Merge pull request #2649 from stweil/master
...
Remove unused italic, bold in class BLOCK_RES and class WORD_RES
2019-09-14 21:18:25 +03:00
Stefan Weil
763f4781e8
Fix CID 1164662 (Uninitialized scalar field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 19:22:56 +02:00
Stefan Weil
6fd58d2897
Fix CID 1164659 (Uninitialized scalar field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 19:20:14 +02:00
Stefan Weil
c3500e8d95
Fix CID 1164657 (Uninitialized scalar field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 19:11:02 +02:00
Stefan Weil
1d3ee3b2a7
Fix CID 1164649 (Uninitialized scalar field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 17:37:00 +02:00
Stefan Weil
bd1083904d
Fix CID 1164648 (Uninitialized scalar field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 17:32:29 +02:00
Stefan Weil
80f367c6f4
Fix CID 1164644 (Uninitialized scalar field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 17:26:49 +02:00
Stefan Weil
7caded8e6b
Fix CID 1164643 (Uninitialized scalar field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 17:24:26 +02:00
Stefan Weil
3127242bcd
Fix CID 1164638 (Uninitialized scalar field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 17:18:15 +02:00
Stefan Weil
06de3075e0
Fix CID 1164636 (Uninitialized pointer field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 17:13:06 +02:00
Stefan Weil
052f9ca0bc
Fix CID 1164634, CID 1164635 (Uninitialized pointer field)
...
Remove the unused dummy member variables.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 17:12:39 +02:00
Stefan Weil
97dda3d535
Fix CID 1386099 (Uninitialized pointer field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 15:43:50 +02:00
Stefan Weil
46f21a4182
Fix CID 1164633 (Uninitialized pointer field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 15:43:50 +02:00
Stefan Weil
9ea579bf1b
Fix CID 1164628 ff (Uninitialized pointer field) and optimize class ParamContent
...
Only one of bIt, dIt, iIt and sIt is used, so put all four in a union.
This fixes CID 1164628, CID 1164629, CID 1164630 and CID 1164631.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 15:43:50 +02:00
Stefan Weil
74b552fc31
Remove unused FeatureEnabled from FEATURE_DEFS_STRUCT
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 15:43:50 +02:00
Stefan Weil
9f709404f9
Fix CID 1164622 (Uninitialized pointer field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 15:43:50 +02:00
Stefan Weil
5b1f0dbd4b
Fix CID 1164620 (Uninitialized pointer field)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 15:43:50 +02:00
Stefan Weil
951f442303
Fix CID 1386105 (Logically dead code)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 15:43:50 +02:00
Stefan Weil
64fc205e78
Fix CID 1402767 (Invalid type in argument to printf format specifier)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 15:43:50 +02:00
Stefan Weil
f62a895f74
Remove unused italic, bold in class BLOCK_RES and class WORD_RES
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-14 11:53:58 +02:00
Egor Pugin
c533beccd1
Merge pull request #2648 from stweil/master
...
Fix two new and several old isses reported by Coverity Scan
2019-09-13 23:23:23 +03:00
Stefan Weil
ceb8af889e
Fix CID 1340276 (Uninitialized scalar field) for class BLOB_CHOICE
...
xgap_before_ and xgap_after_ are never used, so remove them.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-13 22:15:47 +02:00
Stefan Weil
5fdd32bea8
Fix CID 1366450 (Uninitialized scalar field) for class RecodeBeamSearch
...
secondary_beam_size_ is set but never used, so remove it.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-13 22:09:03 +02:00
Stefan Weil
737173a84d
Fix CID 1375401 (Uninitialized scalar field) for class Dawg
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-13 22:03:10 +02:00
Stefan Weil
edba74d64f
Fix CID 1400760 (Uninitialized scalar field) for class BLOCK
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-13 21:58:05 +02:00
Stefan Weil
8ff321e41a
Fix two issues reported by Coverity Scan and modernize class WERD_RES
...
Report from Coverity Scan:
CID 1405560 (#1 of 1): Uninitialized scalar field (UNINIT_CTOR)
2. uninit_member: Non-static class member end is not initialized in
this constructor nor in any functions that it calls.
CID 1405561 [...]
Modernize and optimize class WERD_RES. This not only fixes the issues
but also reduces the size and eliminates the functions InitNonPointers
and InitPointers.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-13 21:51:36 +02:00
zdenop
a7e053ddd3
Merge pull request #2646 from stweil/master
...
Optimize more classes
2019-09-13 08:24:57 +02:00
Stefan Weil
ecf0f2dee5
Optimize classes Trie, Dawg and DawgPosition
...
Reduce size from 368 to 352 bytes for Trie, 72 to 64 bytes for Dawg
and 40 to 24 bytes for DawgPosition by avoiding holes.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-13 08:15:01 +02:00
Stefan Weil
efd8dea587
Optimize classes CLIST_ITERATOR, ELIST_ITERATOR, ELIST2_ITERATOR
...
Reduce size from 56 to 48 bytes by avoiding holes.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-12 22:03:03 +02:00
Stefan Weil
751fcd2b11
Optimize class Classify
...
Reduce size from 138016 to 13000 bytes by avoiding holes.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-12 21:46:55 +02:00
Stefan Weil
0ad08a99b0
Optimize class TFile
...
Reduce size from 24 to 16 bytes by avoiding holes.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-12 20:17:05 +02:00
Stefan Weil
5b4565b80b
Optimize class ColPartition
...
Reduce size from 248 to 224 bytes by avoiding holes.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-12 20:04:27 +02:00
Stefan Weil
5a12273650
Optimize struct LMConsistencyInfo
...
Reduce size from 104 to 96 bytes by avoiding holes.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-12 20:04:27 +02:00
Stefan Weil
091ce345f6
Optimize class ViterbiStateEntry
...
Reduce size from 232 to 216 bytes by avoiding holes.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-12 20:04:27 +02:00
zdenop
179c8b1295
Merge pull request #2617 from juliangilbey/fix-training-data-creation
...
fix #2616 : allow building of training data
2019-09-12 14:36:45 +02:00
zdenop
598a37d717
Merge pull request #2645 from stweil/master
...
Modernize and optimize BLOBNBOX and remove BLOBNBOX::ConstructionInit
2019-09-12 14:28:26 +02:00
Stefan Weil
913cbe6eae
Modernize and optimize BLOBNBOX and remove BLOBNBOX::ConstructionInit
...
The class no longer uses bit fields. Re-ordering the member variables
avoids holes and reduces the size of BLOBNBOX from 168 to 152 bytes.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-12 09:07:48 +02:00
Stefan Weil
a922745d9a
tfnetwork: Fix info text
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-11 19:10:25 +02:00
Stefan Weil
e903eaea59
Re-order commands in autogen.sh
...
This avoids an unnecessary reconfiguration when running
./autogen.sh && ./configure && make
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-11 15:50:23 +02:00
zdenop
4ed587a57d
Merge pull request #2643 from stweil/UndefinedBehaviorSanitizer
...
Fix several runtime errors detected by UndefinedBehaviorSanitizer
2019-09-10 18:18:48 +02:00
Stefan Weil
5fa09f184f
RecodedCharIDHash: Fix runtime errors detected by UndefinedBehaviorSanitizer
...
Fix this runtime error in recodebeam_test and unicharcompress_test:
src/ccutil/unicharcompress.h:84:27: runtime error:
left shift of 267 by 28 places cannot be represented in type 'int'
code has up to kMaxCodeLen (9) values, so the highest possible value for
i is 8, and the shift value can reach 7 * 8 = 56.
That requires an uint64_t data type.
size_t would fit for 64 bit hosts, but be too small for 32 bit hosts.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-10 15:56:32 +02:00
Stefan Weil
4a2d5a2e8d
OSResults: Fix runtime errors detected by UndefinedBehaviorSanitizer
...
Fix this runtime error in osd_test and textlineprojection_test:
src/ccmain/osdetect.cpp:109:14: runtime error: division by zero
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-10 15:56:32 +02:00
Stefan Weil
5c6fade555
BitVector: Fix runtime errors detected by UndefinedBehaviorSanitizer
...
Fix these runtime errors in mastertrainer_test:
src/ccutil/bitvector.cpp:119:18: runtime error:
null pointer passed as argument 2, which is declared to never be null
src/ccutil/bitvector.cpp:124:10: runtime error:
null pointer passed as argument 1, which is declared to never be null
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-10 15:56:32 +02:00
zdenop
98c7aaa343
Lstm choice ril ( #2635 )
...
Lstm choice ril
2019-09-06 19:12:00 +02:00
Stefan Weil
9f32032517
ccutil: Remove old comments
...
There is no CLIST2 in the current code.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-05 17:52:42 +02:00
Stefan Weil
b6933a1082
Use type bool for boolean values in class BLOBNBOX
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-09-03 19:56:59 +02:00
Noah Metzger
c350077b96
Made the lstm_choice mode compatible with the hocr_char_boxes mode
...
Signed-off-by: Noah Metzger <noah.metzger@bib.uni-mannheim.de>
2019-09-02 11:09:54 +02:00
Noah Metzger
e8b9c10d07
Clean up lstm_choice_mode and cut it down to 2 modes instead of 4
...
Signed-off-by: Noah Metzger <noah.metzger@bib.uni-mannheim.de>
2019-09-02 11:09:53 +02:00
Stefan Weil
fdf4067296
Fix warnings from LGTM
...
This fixes three LGTM warnings:
Multiplication result may overflow 'float' before it is converted to 'double'.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2019-08-30 22:04:24 +02:00