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
Ray Smith
5bb0d89291
Improved debug of class pruner
2015-05-13 17:07:11 -07:00
Ray Smith
03f3c9dc88
Misc fixes missed from previous commits
2015-05-12 18:13:15 -07:00
Ray Smith
21805e63a4
Improved performance with PIC compilation option
2015-05-12 17:56:04 -07:00
Ray Smith
84920b92b3
Font and classifier output structure cleanup.
...
Font recognition was poor, due to forcing a 1st and 2nd choice at
a character level, when the total score for the correct font is often
correct at the word level, so allowed the propagation of a full set
of fonts and scores to the word recognizer, which can now decide word
level fonts using the scores instead of simple votes.
Change precipitated a cleanup of output data structures for classifier
results, eliminating ScoredClass and INT_RESULT_STRUCT, with a few
extra elements going in UnicharRating, and using that wherever possible.
That added the extra complexity of 1-rating due to a flip between 0 is
good and 0 is bad for the internal classifier scores before they are
converted to rating and certainty.
2015-05-12 17:24:34 -07:00
Ray Smith
2eec979577
Makefile.am for fix to issue 1252
2015-05-12 15:25:00 -07:00
Ray Smith
53fc4456cc
Fixed issue 1252: Refactored LearnBlob and its call hierarchy to make it a member of Classify.
...
Eliminated the flexfx scheme for calling global feature extractor functions
through an array of function pointers.
Deleted dead code I found as a by-product.
This CL does not change BlobToTrainingSample or ExtractFeatures to be full
members of Classify (the eventual goal) as that would make it even bigger,
since there are a lot of callers to these functions.
When ExtractFeatures and BlobToTrainingSample are members of Classify they
will be able to access control parameters in Classify, which will greatly
simplify developing variations to the feature extraction process.
2015-05-12 15:22:34 -07:00
Ray Smith
25d0968d09
Major refactor to improve speed on difficut images, especially when running
...
a heap checker.
SEAM and SPLIT have been begging for a refactor for a *LONG* time.
This change does most of the work of turning them into proper classes:
Moved relevant code into SEAM/SPLIT/TBLOB/EDGEPT etc from global helper functions.
Made the splits full data members of SEAM in an array instead of 3 separate pointers.
This greatly reduces the amount of new/delete happening in the chopper, which is the main goal.
Deleted redundant files: olutil.*, makechop.*
Brought other code into SEAM in order to keep its data members private with only priority having accessors.
2015-05-12 14:59:14 -07:00
theraysmith@gmail.com
d7b089fbcf
Fixed some clang errors about explicit constructors and more formatting.
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1085 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-04-28 23:10:48 +00:00
theraysmith@gmail.com
9f065fc755
Fixed issue 1117
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1075 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-04-24 00:52:31 +00:00
theraysmith@gmail.com
3a5f699013
Applied patch to refix issue 331
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1064 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-04-23 23:12:53 +00:00
theraysmith@gmail.com
7f5e5264d3
Fixed issues 1093-1097
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1048 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-02-04 23:36:24 +00:00
theraysmith@gmail.com
2fcea93846
Fixed issues 1081-1090
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1046 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-02-04 02:23:18 +00:00
theraysmith@gmail.com
8d9b66281f
Fixed issue 1074
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1023 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-27 23:48:54 +00:00
theraysmith@gmail.com
d11dc049e3
Fixed a lot of compiler/clang warnings
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1015 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-25 02:28:51 +00:00
theraysmith@gmail.com
1a487252f4
Fixed slow-down that was caused by upping MAX_NUM_CLASSES
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1013 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-24 21:12:35 +00:00
zdenop
9cf08ca8d3
fix build with -DGRAPHICS_DISABLED
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@981 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-11 23:08:54 +00:00
theraysmith@gmail.com
91d2265429
More minor fixes from issues and cleanup
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@974 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-10 01:38:00 +00:00
theraysmith@gmail.com
28c00478c6
Removed dependence on IMAGE class
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@947 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-09 17:33:44 +00:00
theraysmith@gmail.com
2ce9cb7d01
misc fixes
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@946 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-09 17:33:39 +00:00
zdenop
9041990be5
fix issue 1036
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@930 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-12-22 21:40:23 +00:00
zdenop
9de80e0a06
fix resource leaks - issues 1034, 1038, 1040. Thanks to Martin Ettl
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@920 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-12-13 22:13:52 +00:00
zdenop
38b25b5777
fix issue 1018, 1031
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@918 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-12-06 22:07:46 +00:00
theraysmith@gmail.com
7ec4fd7a56
Refactorerd control functions to enable parallel blob classification
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@904 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-11-08 20:30:56 +00:00
zdenop@gmail.com
53a3e0f88a
fix issue 755; add example config files from tesseract manpage
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@894 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-10-20 20:20:10 +00:00
theraysmith@gmail.com
99edf4ccbd
Refactored classifier to make it easier to add new ones and generalized feature extractor to allow fx from grey
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@873 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-09-23 15:15:06 +00:00
theraysmith@gmail.com
4d9e544085
Fixed debian bug#704911: assert failure during training
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@851 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-06-13 22:53:43 +00:00
zdenop@gmail.com
80040b834b
Fix segfault at ComputeNormMatch/normmatch.cpp:118 (issue 755)
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@839 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-05-02 08:00:23 +00:00
theraysmith@gmail.com
00a79cb93a
Fixed crash reported as bug 697544 to debian
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@822 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-01-16 00:16:12 +00:00
theraysmith@gmail.com
ca9daf2573
Fixed build break
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@775 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2012-10-09 01:28:37 +00:00
theraysmith@gmail.com
59d244b06e
More fixes for GRAPHICS_DISABLED from Zdenko and Ray
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@757 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2012-09-22 00:59:31 +00:00
theraysmith@gmail.com
da1047f020
Fixed typos and improved comments
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@753 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2012-09-21 15:31:20 +00:00
theraysmith@gmail.com
c7cef53ee3
Fixed issue 669
...
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@743 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2012-09-21 15:20:35 +00:00