Ray Smith
da03e4e910
Fixes from pull of cleanups: clang tidied, reviewed, fixed new bugs, undeleted needed code. Probably breaks the build, due to some inclusion of changes in utf8/32 conversion
2017-07-14 09:30:14 -07:00
Justin Hotchkiss Palermo
f057938069
fix filenames in comments
2017-07-02 17:35:47 -04:00
Stefan Weil
1cf8fe51a0
Remove mathfix.h
...
It was only needed for MS Visual Studio 2012 and older.
Those compilers are not supported for Tesseract.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-05 20:26:25 +02:00
Stefan Weil
562de89728
Reduce number of new / delete operations for class KDTreeSearch
...
Add also several TODO comments because it is not clear why expensive
FLOAT64 calculations are used instead of cheaper FLOAT32 ones.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-05-19 18:30:11 +02:00
Raf Schietekat
c335508e84
Fewer g++ -Wsign-compare warnings
2017-05-11 23:14:52 +02:00
Raf Schietekat
3983d2f76a
Reviewed uses of reinterpret_cast
2017-05-11 01:58:40 +02:00
Ray Smith
8e79297dce
Final part of endian improvement. Adds big-endian support to lstm and fixes issue 518
2017-05-03 16:09:44 -07:00
Stefan Weil
048cf9d06a
Remove unused local variables
...
This fixes some compiler warnings.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-05-02 09:43:29 +02:00
Stefan Weil
e219ad195c
classify: Replace memfree by free
...
free also accepts a nullptr argument, so the code can be simplified.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-05-01 18:14:00 +02:00
Stefan Weil
80fdb634ba
classify: Remove unused ContextsSeen
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-05-01 18:14:00 +02:00
Stefan Weil
83588bc7a1
Classify: Avoid unneeded new / delete operations
...
Both class variables BaselineCutoffs and CharNormCutoffs were pointers
to fixed size arrays which were allocated in the constructor and
deallocated in the destructor. These two extra allocations and two
extra deallocations can be avoided.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-30 19:45:50 +02:00
Stefan Weil
f8fba59804
Replace alloc_struct, free_struct
...
Both functions simply call malloc, free.
Remove also unneeded null pointer checks and use calloc where possible.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-30 09:25:04 +02:00
Ray Smith
1cc511188d
Added extra Init that takes a memory buffer or a filereader function pointer to enable read of traineddata from memory or foreign file systems. Updated existing readers to use TFile API instead of FILE. This does not yet add big-endian capability to LSTM, but it is very easy from here.
2017-04-27 15:48:23 -07:00
Stefan Weil
dabf3f3dbd
classify: Remove unused local function
...
This fixes a compiler warning:
classify/trainingsampleset.cpp:510:13: warning:
'Pix* tesseract::DebugSample(const UNICHARSET&, tesseract::TrainingSample*)'
defined but not used [-Wunused-function]
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-03-09 16:19:21 +01:00
Stefan Weil
f6eed019ab
Fix typo in comment
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-02-05 12:51:09 +01:00
Ray Smith
f566a45b30
clang-tidy changes from sync
2017-01-25 16:20:19 -08:00
Ray Smith
a1c22fb0d0
Fixed issue #557
2017-01-25 16:05:59 -08:00
Zdenko Podobný
11f205707e
Multi-page TIFF buffering is broken - fix #233
2016-12-24 09:17:02 +01:00
Egor Pugin
442b5b731a
Fix building of training tools in shared configuration.
2016-12-17 16:19:35 +03:00
Stefan Weil
70c6f1624c
Fix #define guards in header files
...
Some guards were missing, others were not the first statement.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-04 15:43:03 +01:00
Stefan Weil
4897796d57
Replace reserved identifiers used in #define guards header files
...
Use macro names as suggested by the Google C++ Style Guide
(https://google.github.io/styleguide/cppguide.html#The__define_Guard ).
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-04 15:43:03 +01:00
Ray Smith
53003f9074
Formatting changes from clang_tidy on latest pull
2016-11-30 15:44:25 -08:00
Ray Smith
185a264f52
Fixed the memory leak/double free cleanly
2016-11-28 09:39:17 -08:00
Stefan Weil
85e37798cb
Simplify delete operations
...
It is not necessary to check for null pointers.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-11-24 17:59:13 +01:00
Ray Smith
51368c8eb4
Fixed failed merge of memory leak
2016-11-22 10:41:43 -08:00
Ray Smith
9c7e99b041
Merged with commit 4ca6ba985b
2016-11-21 08:27:02 -08:00
Ray Smith
2c837dffc3
Result of clang tidy on recent merge
2016-11-07 10:46:33 -08:00
Stefan Weil
1e60a8d71c
Fix crash caused by undefined value of local variable
...
Commit b1f03cb697
added a call of function
FreeFeatureSet to fix a memory leak, but introduced a new bug because the
local variable FloatFeatures was not always assigned a value.
Now FloatFeatures is always assigned a value, and we only need a single
place where FreeFeatureSet is called.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-11-07 12:31:20 +01:00
Stefan Weil
b1f03cb697
classify/adaptmatch: Fix memory leak
...
Coverity report:
CID 1340280 (#1 of 1): Resource leak (RESOURCE_LEAK)
7. leaked_storage: Variable FloatFeatures going out of scope leaks the storage it points to.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-10-24 16:12:31 +02:00
Stefan Weil
1327551b49
classify/mastertraining: Fix memory leaks
...
Coverity report:
CID 1164739 (#1 of 1): Resource leak (RESOURCE_LEAK)
18. leaked_storage: Variable frag going out of scope leaks the storage it points to.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-10-24 13:50:42 +02:00
Stefan Weil
963b935e80
classify/adaptmatch: Fix memory leak
...
Coverity report:
CID 1164738 (#1 of 1): Resource leak (RESOURCE_LEAK)
7. leaked_storage: Variable sample going out of scope leaks the storage it points to.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-10-24 13:42:18 +02:00
Stefan Weil
5bce3f7d87
classify: Remove unused constant kMinPCLengthIncrease
...
This fixes a compiler warning:
classify/intfeaturemap.cpp:33:14: warning:
unused variable 'kMinPCLengthIncrease' [-Wunused-const-variable]
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-09-06 21:49:16 +02:00
Stefan Weil
a95edd7e13
Fix argument for tprintf
...
This fixes a gcc warning:
ccutil/tprintf.h:31:50: warning:
format ‘%d’ expects argument of type ‘int’,
but argument 2 has type ‘tesseract::ScoredFont’ [-Wformat=]
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-17 11:27:06 +01:00
Stefan Weil
6f1142080a
Fix free of buffer which was not allocated
...
Coverity bug report: CID 1270420 "Free of address-of expression"
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-11-27 07:02:22 +01:00
Stefan Weil
83541d8ea0
Remove register attribute for local variables
...
This fixes clang compiler warnings like this one:
wordrec/gradechop.cpp:52:3: warning:
'register' storage class specifier is deprecated [-Wdeprecated-register]
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-11-06 06:45:19 +01:00
Stefan Weil
55fde61a8f
classify: Fix typos in comments and strings
...
All of them were found by codespell.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-09-14 22:12:06 +02:00
Zdenko Podobný
66a76a9477
Revert "temporary add config/*, configure and Makefile.in for release"
...
This reverts commits ec9581d8f2
, 1afe382c4e
, 4b2cfabcc1
2015-07-31 21:44:43 +02:00
Jim Regan
953523bbe2
What the...? Git's merge failed hard.
2015-07-20 22:42:58 +01:00
Jim O'Regan
5cc948d28b
stray "**" via merge conflict
2015-07-20 18:53:53 +01:00
Jim O'Regan
524a61452d
Doxygen
...
Squashed commit from https://github.com/tesseract-ocr/tesseract/tree/more-doxygen
closes #14
Commits:
6317305
doxygen
9f42f69
doxygen
0fc4d52
doxygen
37b4b55
fix typo
bded8f1
some more doxy
020eb00
slight tweak
524666d
doxygenify
2a36a3e
doxygenify
229d218
doxygenify
7fd28ae
doxygenify
a8c64bc
doxygenify
f5d21b6
fix
5d8ede8
doxygenify
a58a4e0
language_model.cpp
fa85709
lm_pain_points.cpp lm_state.cpp
6418da3
merge
06190ba
Merge branch 'old_doxygen_merge' into more-doxygen
84acf08
Merge branch 'master' into more-doxygen
50fe1ff
pagewalk.cpp cube_reco_context.cpp
2982583
change to relative
192a24a
applybox.cpp, take one
8eeb053
delete docs for obsolete params
52e4c77
modernise classify/ocrfeatures.cpp
2a1cba6
modernise cutil/emalloc.cpp
773e006
silence doxygen warning
aeb1731
silence doxygen warning
f18387f
silence doxygen; new params are unused?
15ad6bd
doxygenify cutil/efio.cpp
c8b5dad
doxygenify cutil/danerror.cpp
784450f
the globals and exceptions parts are obsolete; remove
8bca324
doxygen classify/normfeat.cpp
9bcbe16
doxygen classify/normmatch.cpp
aa9a971
doxygen ccmain/cube_control.cpp
c083ff2
doxygen ccmain/cube_reco_context.cpp
f842850
params changed
5c94f12
doxygen ccmain/cubeclassifier.cpp
15ba750
case sensitive
f5c71d4
case sensitive
f85655b
doxygen classify/intproto.cpp
4bbc7aa
partial doxygen classify/mfx.cpp
dbb6041
partial doxygen classify/intproto.cpp
2aa72db
finish doxygen classify/intproto.cpp
0b8de99
doxygen training/mftraining.cpp
0b5b35c
partial doxygen ccstruct/coutln.cpp
b81c766
partial doxygen ccstruct/coutln.cpp
40fc415
finished? doxygen ccstruct/coutln.cpp
6e4165c
doxygen classify/clusttool.cpp
0267dec
doxygen classify/cutoffs.cpp
7f0c70c
doxygen classify/fpoint.cpp
512f3bd
ignore ~ files
5668a52
doxygen classify/intmatcher.cpp
84788d4
doxygen classify/kdtree.cpp
29f36ca
doxygen classify/mfoutline.cpp
40b94b1
silence doxygen warnings
6c511b9
doxygen classify/mfx.cpp
f9b4080
doxygen classify/outfeat.cpp
aa1df05
doxygen classify/picofeat.cpp
cc5f466
doxygen training/cntraining.cpp
cce044f
doxygen training/commontraining.cpp
167e216
missing param
9498383
renamed params
37eeac2
renamed param
d87b5dd
case
c8ee174
renamed params
b858db8
typo
4c2a838
h2 context?
81a2c0c
fix some param names; add some missing params, no docs
bcf8a4c
add some missing params, no docs
af77f86
add some missing params, no docs; fix some param names
01df24e
fix some params
6161056
fix some params
68508b6
fix some params
285aeb6
doxygen complains here no matter what
529bcfa
rm some missing params, typos
cd21226
rm some missing params, add some new ones
48a4bc2
fix params
c844628
missing param
312ce37
missing param; rename one
ec2fdec
missing param
05e15e0
missing params
d515858
change "<" to < to make doxygen happy
b476a28
wrong place
2015-07-20 18:48:00 +01:00
spSerg
0d910c3133
Merge remote-tracking branch 'upstream/master'
2015-07-13 11:10:40 +03:00
Zdenko Podobný
ec9581d8f2
temporary add configure and Makefile.in for release
2015-07-11 09:42:43 +02:00
Zdenko Podobný
cdc84a5dd7
fix VS2010 build
2015-07-11 07:38:57 +02:00
Ray Smith
a303ab9d00
Misc fixes, mostly clang formatting, but some bug fixes in matrix, werd, and tesstrain_utils. Also updates unicharset to match traineddata files.
2015-07-09 14:28:20 -07:00
spSerg
015fdcbd08
class and struct are incompatible in MSVC2013 conpiler.
...
At least as a template parameter.
2015-07-09 21:45:29 +03:00
Ray Smith
b1d99dfe23
Added a backup adaptive classifier to take over from primary when it fills on a large document
2015-06-12 11:10:53 -07:00
Ray Smith
d74c625e52
Fixed blob division params to fix CJK training speed.
2015-06-12 10:59:26 -07:00
Zdenko Podobný
1d6de86150
fix VS2010 linking error
2015-05-14 14:24:55 +02:00
Ray Smith
d91df9856b
Fixed crash on debugging classifier with a shapetable present
2015-05-13 17:10:23 -07:00
Ray Smith
4598061324
Fixed infinite loop in training due to poor clipping of the table filler
2015-05-13 17:09:35 -07:00