Commit Graph

2690 Commits

Author SHA1 Message Date
zdenop
c0f9699e9b
Merge pull request #1514 from stweil/cid
Fix two reports from Coverity Scan (Copy into fixed size buffer)
2018-04-23 13:08:58 +02:00
zdenop
acbd333ce4
Merge pull request #1516 from ic/master
Fix wrong environment test that breaks clang++ builds.
2018-04-23 13:07:43 +02:00
zdenop
0774069db6
Merge pull request #1517 from stweil/ignore
Update .gitignore
2018-04-23 13:06:56 +02:00
amitdo
c3e6083e42 Remove 'AUTOMAKE_OPTIONS' from all Makefile.am files
'AM_INIT_AUTOMAKE()' in configure.ac sets options globally.
2018-04-23 14:01:16 +03:00
Stefan Weil
4df706e7bf Update .gitignore
* Ignore generated version file
* Add some comments
* Add missing training executable
* Remove two CR at line endings
* Remove googletest (part of the git repository, so cannot be ignored)
* Add test related files

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-23 10:42:51 +02:00
Eric Platon
54b048fa0d Fix wrong environment test that breaks clang++ builds.
g++ builds require extra flags rejected by clang++. The bug is that the
flags are actually added unconditionally. This commit fixes the
condition.

See https://github.com/tesseract-ocr/tesseract/pull/1474
2018-04-23 16:11:24 +09:00
Stefan Weil
68450d8680 Fix CID 1164709 (Copy into fixed size buffer)
Using STRING removes the limitation for the filename length.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-23 08:58:07 +02:00
Stefan Weil
cb77067f55 Fix CID 1164710 (Copy into fixed size buffer)
As null_script never changes, it is not necessary to allocate it in
each class instance. Change this, too.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-23 08:58:06 +02:00
Egor Pugin
d3f6382b55
Merge pull request #1512 from stweil/cube
training: Remove some cube relicts
2018-04-22 21:54:42 +03:00
Egor Pugin
763b78414d
Merge pull request #1511 from stweil/nullcheck
Remove nullptr checks before destructor
2018-04-22 21:54:22 +03:00
Stefan Weil
e07414f425 training: Remove some cube relicts
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 20:45:31 +02:00
Stefan Weil
1b2677a278 Remove nullptr checks before destructor
It is not needed because delete accepts a nullptr argument.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 20:25:49 +02:00
zdenop
e2ab699777
Merge pull request #1506 from stweil/version
Support version names starting with non numeric characters
2018-04-22 19:33:35 +02:00
zdenop
577f6f76d2
Merge pull request #1507 from stweil/nullptr
Replace NULL by nullptr
2018-04-22 19:30:02 +02:00
zdenop
d67df9ee57
Merge pull request #1510 from Shreeshrii/Shreeshrii-tesstrain-msg
Change info message from tesstrain.sh
2018-04-22 19:26:12 +02:00
Shreeshrii
86275c2187
Clarify message to indicate additional LSTM training required for 4.0.0 2018-04-22 22:26:07 +05:30
Shreeshrii
0f3d33f699
Change max_pages to zero
Fixes https://github.com/tesseract-ocr/tesseract/issues/1149 and https://github.com/tesseract-ocr/tesseract/issues/1508
2018-04-22 22:19:06 +05:30
Stefan Weil
58d9593094 wordrec: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:36 +02:00
Stefan Weil
8374e373ac vs2010: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:36 +02:00
Stefan Weil
f785d5c046 viewer: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:36 +02:00
Stefan Weil
39cfbd04fe unittest: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:36 +02:00
Stefan Weil
5eca9143b9 training: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:36 +02:00
Stefan Weil
222f5b9d65 textord: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:36 +02:00
Stefan Weil
6e2750ce08 lstm: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:35 +02:00
Stefan Weil
16e00b59fe dict: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:35 +02:00
Stefan Weil
800b290d94 cutil: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:35 +02:00
Stefan Weil
72ac460f96 classify: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:35 +02:00
Stefan Weil
57755a2754 ccutil: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:35 +02:00
Stefan Weil
e74d997668 ccstruct: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:35 +02:00
Stefan Weil
5b4ce2431d ccmain: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:42:34 +02:00
Stefan Weil
17e01ee912 api: Replace NULL by nullptr
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 17:21:00 +02:00
Stefan Weil
3b3216e883 Support version names starting with non numeric characters
Not only version names like 4.0.0, but also version names like
v4.0.0 or tesseract-4.0.0 are now supported and give the same
GENERIC_MAJOR_VERSION = 4.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 16:43:35 +02:00
zdenop
6d311cc9cc
Merge pull request #1504 from stweil/readme
Separate build status badges from other status badges
2018-04-22 15:45:13 +02:00
zdenop
8dd56a796d
Merge pull request #1505 from stweil/winfix
Fix tessdata prefix from executable path for Windows
2018-04-22 15:44:32 +02:00
Stefan Weil
701bac904a Fix tessdata prefix from executable path for Windows
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 14:35:25 +02:00
Stefan Weil
e8946f9e86 Separate build status badges from other status badges
They are now again shown on two lines as it was before
commit 0d9cdbe6dd.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-22 14:15:56 +02:00
zdenop
4f56abba10
Merge pull request #1501 from stweil/cmdline
training: Support new command line option -v (short form for --version)
2018-04-21 10:26:23 +02:00
Stefan Weil
d68ab9f12e training: Support new command line option -v (short form for --version)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-20 22:36:22 +02:00
zdenop
5435c9c795
Merge pull request #1498 from noahmetzger/winfix
Fixed possible division by zero
2018-04-20 14:17:22 +02:00
Noah Metzger
7dcfd6884f Fixed possible division by zero
CID 1375394: cblob()->perimeter() can return zero under some circumstances.

Signed-off-by: Noah Metzger <noah.metzger@bib.uni-mannheim.de>
2018-04-20 13:43:39 +02:00
zdenop
c67a7c6edf
Merge pull request #1496 from amitdo/obsolete-autoconf-macros
configure.ac: Remove obsolete macros
2018-04-20 06:49:35 +02:00
Amit D
822082eeba
configure.ac: Remove obsolete macros
The newer macros that replace the obsolete ones are already present in configure.ac.

  * AC_PROG_LIBTOOL -> LT_INIT
  * AC_LANG_CPLUSPLUS -> AC_LANG([C++])
2018-04-20 03:31:08 +03:00
Egor Pugin
621f9e2054
Merge pull request #1495 from amitdo/autoconf-1.63
configure.ac: Update minimum required autoconf version to 2.63
2018-04-19 19:15:30 +03:00
Amit D
20254ae5b5
configure.ac: Update minimum required autoconf version to 2.63
This is the autoconf version shipped in RHEL/CentOS 6.
2018-04-19 19:11:43 +03:00
zdenop
815bab66c5
Merge pull request #1492 from noahmetzger/winfix
Fixed a resource leak and a memory corruption detected by Coverity
2018-04-19 17:00:17 +02:00
Egor Pugin
a474fd05a4
Merge pull request #1493 from stweil/train
lstmtraining: Fix handling of --max_iterations
2018-04-19 17:43:55 +03:00
Stefan Weil
f95041faac lstmtraining: Fix handling of --max_iterations
The iteration counter should be checked for each iteration,
not only at the end of a batch.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-19 14:47:24 +02:00
Noah Metzger
34efcd40be Fixed a resource leak detected by Coverity
Replaced the inheritance relation of BLOCK and PDBLK by a member relation. This avoids the necessity of a virtual destructor in PDBLK for the occuring upcasts.

Signed-off-by: Noah Metzger <noah.metzger@bib.uni-mannheim.de>
2018-04-19 13:55:39 +02:00
Noah Metzger
21e25d1829 Fixed a memory corruption, detected by Coverity
CID 1385632 Out-of-bounds write in DO-While loop

Signed-off-by: Noah Metzger <noah.metzger@bib.uni-mannheim.de>
2018-04-18 13:37:38 +02:00
zdenop
36d6cb3a46
Merge pull request #1488 from stweil/cmdline
training: Fix dubious parsing of command line
2018-04-18 08:26:59 +02:00