Commit Graph

2408 Commits

Author SHA1 Message Date
rays
f4f66f8fa9 Fixed regression of issue #644 2017-07-15 17:21:47 -07:00
zdenop
4b6f0b9538 Merge pull request #1039 from stweil/clean
Fix compiler warnings
2017-07-15 20:18:50 +02:00
Egor Pugin
4907a23fea Fix windows build. 2017-07-15 15:09:00 +03:00
Stefan Weil
9929587f36 Remove extra semicolons
This fixes these compiler warnings:

    ccmain/equationdetect.cpp:1519:2: warning: extra ‘;’ [-Wpedantic]
    ccstruct/blobs.cpp:65:17: warning: extra ‘;’ [-Wpedantic]
    ccstruct/blobs.h:178:18: warning: extra ‘;’ [-Wpedantic]
    ccstruct/ratngs.cpp:36:22: warning: extra ‘;’ [-Wpedantic]
    ccstruct/ratngs.cpp:37:22: warning: extra ‘;’ [-Wpedantic]
    ccutil/ambigs.cpp:46:20: warning: extra ‘;’ [-Wpedantic]
    ccutil/ambigs.h:137:21: warning: extra ‘;’ [-Wpedantic]
    cutil/structures.cpp:36:45: warning: extra ‘;’ [-Wpedantic]
    textord/equationdetectbase.cpp:65:2: warning: extra ‘;’ [-Wpedantic]
    textord/equationdetectbase.h:57:2: warning: extra ‘;’ [-Wpedantic]
    wordrec/lm_state.cpp:25:28: warning: extra ‘;’ [-Wpedantic]
    wordrec/lm_state.h:190:29: warning: extra ‘;’ [-Wpedantic]

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-07-15 12:40:34 +02:00
Stefan Weil
fa9e43fdde Fix wrong data type in argument for sscanf
Compiler warning:

    ccutil/unicharcompress.cpp:76:76: warning: format ‘%x’ expects argument of type ‘unsigned int*’, but argument 3 has type ‘int*’ [-Wformat=]
    ccutil/unicharcompress.cpp:80:31: warning: format ‘%x’ expects argument of type ‘unsigned int*’, but argument 3 has type ‘int*’ [-Wformat=]

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-07-15 09:30:31 +02:00
Stefan Weil
f527715933 Fix type of bit values (fixes compiler warning)
A single bit cannot represent a signed integer value, so it must be an
unsigned integer. This fixes a compiler warning:

    In file included from ../ccutil/clst.h:24:0,
                     from ../ccstruct/blobbox.h:23,
                     from workingpartset.h:24,
                     from workingpartset.cpp:21:
    ../ccstruct/blobbox.h: In member function ‘void BLOBNBOX::set_reduced_box(TBOX)’:
    ../ccutil/host.h:79:25: warning: overflow in conversion from ‘int’ to ‘signed char:1’ changes value from ‘1’ to ‘-1’ [-Woverflow]
     #define TRUE            1
                             ^
    ../ccstruct/blobbox.h:236:17: note: in expansion of macro ‘TRUE’
           reduced = TRUE;
                     ^~~~

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-07-15 09:30:31 +02:00
Ray Smith
dc8745e6fd Move LSTM unicharset and recoder to traineddata with version string part1. Backwards compatible - maybe. 2017-07-14 11:14:23 -07:00
Ray Smith
7588540296 Removed changes from last commit that didn't belong 2017-07-14 11:08:26 -07:00
Ray Smith
3ec11bd37a Deleted some dead LSTM code, making everything use the recoder 2017-07-14 10:58:21 -07:00
Ray Smith
aee910a7bf Fixed build broken by previous commits that added use of string in low-level code 2017-07-14 10:33:55 -07:00
Ray Smith
df41eab6aa Added script-specific validation and normalization for virama-using scripts and updated normalization for others 2017-07-14 10:05:05 -07:00
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
zdenop
f5c18f78c0 Merge pull request #1018 from hotchkiss87/fix_file_names
fix filenames in comments (trivial)
2017-07-03 08:22:57 +02:00
Justin Hotchkiss Palermo
f057938069 fix filenames in comments 2017-07-02 17:35:47 -04:00
zdenop
10779bd9e5 Merge pull request #1017 from hotchkiss87/correct_error_message_format
Add new line to a few error messages.
2017-07-01 17:47:58 +02:00
Justin Hotchkiss Palermo
1d862a54bd Add new line to a few error messages. 2017-07-01 08:40:57 -04:00
zdenop
a9303a18ce Merge pull request #1014 from elopio/patch-1
Download the leptonica source from github
2017-06-30 13:37:48 +02:00
Leo Arias
91afb5540f Download the leptonica source from github
1.74.2 is no longer available from the leptonica website. But anyway, it seems safer going forward to download it from github. It's https, and it won't disappear as easily. Also, this is the same source used by travis, so there's less chance of shipping something untested.
2017-06-29 16:29:29 -06:00
zdenop
2b854e3749 Merge pull request #978 from stweil/lstm
LSTMTrainer: Catch empty vectors
2017-06-12 19:32:45 +02:00
zdenop
8c29e6827f Merge pull request #980 from stweil/clean
Remove portability code which is no longer needed
2017-06-05 21:01:46 +02: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
5f8ecdb2b3 Remove local implementation of strtok_r
MS Visual Studio does not provide that function, but can use strtok_s
which does exactly the same.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-05 19:52:25 +02:00
Egor Pugin
22bcf4d1a2 Merge pull request #979 from stweil/update
Update from Leptonica 1.74.1 to 1.74.2
2017-06-05 16:03:15 +03:00
Stefan Weil
a2404ae735 Fix Travis CI for Leptonica 1.74.2
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-05 13:30:49 +02:00
Stefan Weil
44a5e3da40 Update from Leptonica 1.74.1 to 1.74.2
The newer version contains fixes for the pixUnsharpMaskingGray*
functions which are relevant for Tesseract (used in ImageData::PreScale
which calls pixScale).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-05 10:31:53 +02:00
Stefan Weil
34d1e7331d LSTMTrainer: Catch empty vectors
The new test in LSTMTrainer::UpdateErrorGraph fixes an assertion
(see issues #644, #792).

The new test in LSTMTrainer::ReadTrainingDump was added to improve
the robustness of the code.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-04 18:18:16 +02:00
zdenop
1e5522d321 Merge pull request #975 from stweil/ocl
Clean OpenCL code
2017-06-03 19:55:44 +02:00
Stefan Weil
1bbcbd89d0 opencl: Fix some compiler warnings
Remove several unused variables and fix some signed / unsigned mismatches.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-03 17:21:58 +02:00
Stefan Weil
1cf098dc2c opencl: Remove unused code
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-03 16:52:02 +02:00
zdenop
34bdf99774 Merge pull request #970 from Shreeshrii/patch-1
Make less verbose
2017-06-03 15:31:44 +02:00
zdenop
59de660386 Merge pull request #969 from stweil/clean
PangoFontInfo: Remove some unused methods
2017-06-03 15:30:46 +02:00
Shreeshrii
1263941f1d Make less verbose
Eariler version as displayed when opening a new issue was not readable (too much markdown). 
Now made shorter/simpler.
2017-06-03 15:30:48 +05:30
Stefan Weil
2843739843 PangoFontInfo: Remove unused method is_italic
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-03 11:42:44 +02:00
Stefan Weil
e420417c85 PangoFontInfo: Remove unused method is_bold
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-03 11:42:44 +02:00
Stefan Weil
0d411cb5c5 PangoFontInfo: Remove unused method is_smallcaps
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-03 11:42:44 +02:00
Stefan Weil
8786e56084 PangoFontInfo: Remove unused method is_monospace
Remove also some macros which are no longer needed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-03 11:42:19 +02:00
Egor Pugin
4950b7e065 Merge pull request #964 from Shreeshrii/master
Reorder README text
2017-06-03 12:35:44 +03:00
Egor Pugin
916da39da5 Merge pull request #965 from Shreeshrii/docs
Add Issue Template
2017-06-03 12:33:51 +03:00
Egor Pugin
4ed4864dd6 Merge pull request #966 from rfschtkt/pen_color_
StringRenderer::pen_color_: int[3]->double[3]
2017-06-03 12:32:26 +03:00
Egor Pugin
d0a2f1c8fd Merge pull request #967 from leonoverweel/patch-1
Change Mac OS X -> macOS
2017-06-03 12:30:40 +03:00
Egor Pugin
945590d518 Merge pull request #968 from stweil/autoconf
Remove unused code
2017-06-03 12:30:28 +03:00
Stefan Weil
8ec67a940d Remove strcasestr which is no longer needed
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-03 10:11:44 +02:00
Stefan Weil
25e0c1accb PangoFontInfo: Remove unused method is_fraktur
That allows removing a dirty hack which used the
non-portable function strcasestr.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-03 10:08:21 +02:00
Leon Overweel
3e1099157f Change Mac OS X -> macOS
The official name of Apple's desktop / laptop operating system is macOS, not Mac OS X.
2017-06-02 21:50:17 +02:00
Raf Schietekat
2981c6c585 StringRenderer::pen_color_: int[3]->double[3] 2017-06-02 09:58:26 +02:00
Shree Devi Kumar
4506133aa2 Update readme for 3.05.01 2017-06-02 09:14:47 +05:30
Shreeshrii
79d866af74 fix typo 2017-06-01 17:01:57 +05:30
Shreeshrii
f17697b85f Add badges for Doxygen and Wiki documentation 2017-06-01 17:00:19 +05:30
Shreeshrii
063d2ed73e Add link to guidelines for this repository 2017-06-01 16:45:59 +05:30
Shreeshrii
d2471e4595 Add link to the guidelines for this repository 2017-06-01 16:18:10 +05:30