Shree Devi Kumar
1b6815364a
remove generated files commited by error
2018-06-08 08:59:20 +00:00
Shree Devi Kumar
7a9fef9685
reformat EXTRA_DIST in makefile
2018-06-08 08:32:47 +00:00
zdenop
29304a4173
Merge pull request #1642 from stweil/unlvtests
...
Remove some files which are generated by the UNLV test
2018-06-08 08:42:14 +02:00
zdenop
1309749a15
Merge pull request #1643 from Shreeshrii/unlv
...
move unlvtests ignored files to .gitignore in root dir
2018-06-08 08:40:40 +02:00
Shree Devi Kumar
f2caeb43b4
add /src/ to api, training and vs2010
2018-06-08 05:34:47 +00:00
Shree Devi Kumar
828d727135
move unlvtests ignored files to .gitignore in root dir
2018-06-08 05:29:44 +00:00
Stefan Weil
fcaf192ea3
Remove some files which are generated by the UNLV test
...
They don't contain useful information.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-07 20:22:08 +02:00
zdenop
51ebf8a21e
Merge pull request #1640 from stweil/unlvtests
...
Fix script for UNLV tests
2018-06-07 07:20:54 +02:00
Stefan Weil
bbb4658733
Fix log message of UNLV tests
...
We must filter unwanted output from tesseract.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-07 07:18:55 +02:00
Stefan Weil
ff3b263c5b
Fix script for UNLV tests
...
Commit 934e612a3e
added too many quotes.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-07 07:12:08 +02:00
zdenop
d47cebcdc8
Merge pull request #1641 from stweil/fix
...
training: Add missing linefeed to error message
2018-06-06 22:13:26 +02:00
Stefan Weil
0215d91f45
training: Add missing linefeed to error message
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-06 21:32:16 +02:00
zdenop
8b3501e54f
Merge pull request #1638 from Shreeshrii/master
...
remove testing and testdata, use from submodule test, add unlvtests
2018-06-06 14:51:59 +02:00
Shree Devi Kumar
deea045e4a
Merge branch 'master' of https://github.com/tesseract-ocr/tesseract
2018-06-06 12:26:20 +00:00
Shree Devi Kumar
2563380d51
move testing and testdata to test, add unlvtests
2018-06-06 12:20:14 +00:00
zdenop
ee2ab73224
Merge pull request #1637 from paulk124/master
...
Reserve extra byte in LoadDataFromFile() in case caller wants to appe…
2018-06-05 16:57:40 +02:00
Paul Kitchen
805fb7699d
Reserve extra byte in LoadDataFromFile() in case caller wants to append '\0'
2018-06-05 08:19:41 -06:00
zdenop
f8b689f85f
Merge pull request #1632 from Shreeshrii/master
...
add test as submodule
2018-06-05 11:06:14 +02:00
zdenop
4a008d5f03
Merge pull request #1633 from stweil/fix
...
TFile: Relax assertion and allow FRead, FWrite with count == 0
2018-06-05 11:01:16 +02:00
Stefan Weil
52fddc3ca9
TFile: Relax assertion and allow FRead, FWrite with count == 0
...
The assertions introduced by commit 8bea6bcc12
were too strict. The first one failed in osd_test, the second one failed
in `tesseract IMAGE BASE --psm 13 lstm.train`.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-04 22:42:19 +02:00
Shree Devi Kumar
c8c9807be0
Added test repo as a submodule
2018-06-04 19:20:00 +00:00
Shree Devi Kumar
c09f13b820
Added test repo as a submodule
2018-06-04 19:19:48 +00:00
Egor Pugin
83ae900549
Merge pull request #1629 from stweil/bool
...
src/training: Replace more proprietary BOOL8 by standard bool data type
2018-06-04 18:54:31 +03:00
Egor Pugin
e700500d4a
Merge pull request #1628 from stweil/fix
...
TFile: Improve handling of potential integer overflow
2018-06-04 18:53:23 +03:00
Stefan Weil
4f3b266efe
src/training: Replace more proprietary BOOL8 by standard bool data type
...
Update also callers of the modified functions to use
false / true instead of 0 / 1.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-04 16:08:03 +02:00
Stefan Weil
b292013bdc
cntraining: Replace proprietary BOOL8 by standard bool data type
...
Add also "static" attribute to local functions and remove an old comment.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-04 16:08:03 +02:00
Stefan Weil
8bea6bcc12
TFile: Improve handling of potential integer overflow
...
Raise an assertion for unexpected arguments and use size_t instead of int
for the size argument which is typically sizeof(some_datatype).
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-04 13:53:36 +02:00
Egor Pugin
45b11cd93f
Reset appveyor cache.
2018-06-04 01:59:35 +03:00
Egor Pugin
0f29cb411c
Clear appveyor cache.
2018-06-04 01:59:05 +03:00
zdenop
aa35e1ce4c
Merge pull request #1626 from stweil/bool
...
src/training: Replace proprietary BOOL8 by standard bool data type
2018-06-03 21:44:00 +02:00
Stefan Weil
f2698c256d
src/training: Replace proprietary BOOL8 by standard bool data type
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-03 21:13:40 +02:00
zdenop
3aa9b37c81
Merge pull request #1621 from stweil/cmdline
...
More cleanup for handling of command line arguments
2018-06-02 09:31:10 +02:00
Stefan Weil
629ded223c
tesseractmain: Allow combinations of the different help options
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-02 09:03:56 +02:00
Stefan Weil
724a72a278
tesseractmain: Always use EXIT_SUCCESS and EXIT_FAILURE macros for exit status
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-02 09:03:56 +02:00
Stefan Weil
b5ac8502bc
tesseractmain: EXIT_FAILURE if tesseract is called without arguments
...
When Tesseract is called without any argument, the help message is still
printed, but the exit status no longer indicates success (EXIT_OK).
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-02 09:03:56 +02:00
Stefan Weil
6dba34dd8c
tesseractmain: No command line options between image and outputbase
...
The image name and the outputbase should not be separated by
command line options.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-02 09:03:56 +02:00
zdenop
e313ed1bb9
Merge pull request #1614 from j-kubik/master
...
Recognition progress in C API
2018-06-02 08:54:21 +02:00
Jaroslaw Kubik
67ceae8385
Fix the progres increase test
...
The progress increase test must compare the input value against
the variable that contains a previous value, not against it's
initial value.
2018-06-02 02:29:42 +02:00
Jaroslaw Kubik
e05d333378
Added tests for progress reporting API
...
The progress reporting API is now tested using googlemock tools.
2018-06-02 00:47:34 +02:00
Jaroslaw Kubik
92168c5e8b
Added googlemock building instructions
...
The googlemock tools are already present, so why not make use of
it. It can be usefull for testing callbacks.
2018-06-02 00:42:37 +02:00
Egor Pugin
f227f84231
Merge pull request #1619 from stweil/cmdline
...
tesseractmain: Fail if bad command line option is given
2018-06-01 22:01:52 +03:00
Stefan Weil
6f7206f574
tesseractmain: Remove unneeded duplicate code
...
The --list-langs option is already handled by other code.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-01 20:45:53 +02:00
Stefan Weil
d4ed0f841a
tesseractmain: Fail if bad command line option is given
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-06-01 20:04:35 +02:00
Jaroslaw Kubik
e6c9967b83
Fixed a typo in progres monitor C API
...
TessMonitorcDelete -> TessMonitorDelete
2018-06-01 19:42:28 +02:00
Jaroslaw Kubik
e254c9fa38
Return a value from default progress report function
...
The progress reporting function returns a boolean. The returned
value is never used by the tesseract and its meaing is not
documented, which renders the value meaningless. Still, lack of
return should not be premitted.
2018-05-30 10:44:13 +02:00
Jaroslaw Kubik
8f6242fd4f
Fixed a typo in the C API progress monitor
2018-05-30 00:22:06 +02:00
Jaroslaw Kubik
87d33b6c9e
Add progress monitoring C api
...
The C API is missing the ability to monitor the progress of the
recognition. This patch adds C wrappers to the progress monitor
that allow monitoring the progress and canceling the recognition
process early.
2018-05-29 23:26:41 +02:00
Jaroslaw Kubik
217e5e5881
Add a context-aware progress monitor pointer
...
The progress_callback field in the ETEXT_DESC monitor type does not
take any 'context' parameter, which may make implementing callback
functions difficult and may require use of global variables.
The new function receives the ETEXT_DESC pointer as an argument.
This makes it possible to share the cancel_this field as context
carrier if required.
The change is backwards-compatible: the old pointer remains as a
member of the class, and the default value for the new pointer is
a function calling the classic progress notifier. This way the code
unaware of the new member will continue to work as before.
2018-05-29 21:48:51 +02:00
Egor Pugin
8d3f8111f3
Try to fix VS2015 appveyor builds.
2018-05-29 19:19:12 +03:00
Egor Pugin
0c50ae3a9c
Fix windows build.
2018-05-29 19:15:01 +03:00