Commit Graph

5785 Commits

Author SHA1 Message Date
zdenop
984a9817fe
Merge pull request #1540 from stweil/strings
Remove unneeded include statements for string / strings.h
2018-05-01 10:15:40 +02:00
Stefan Weil
0efc528684 Remove unneeded include statements for string / strings.h
Tesseract code does not use strings.h (strngs.h was once called strings.h),
so that dependency can also be removed from cmake and cppan configuration.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-30 18:16:34 +02:00
zdenop
de78ef873e
Merge pull request #1539 from stweil/msvc
Remove old hack for Visual Studio
2018-04-30 17:49:54 +02:00
Stefan Weil
950469e645 Remove old hack for Visual Studio
It should not be needed with newer versions of Visual Studio.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-30 15:21:04 +02:00
zdenop
45bb9427e0
Merge pull request #1534 from UniQP/override
Add missing override specifiers
2018-04-28 19:30:47 +02:00
Egor Pugin
938bba3df3 Add missing file. 2018-04-28 12:04:47 +03:00
Sebastian Buchwald
4ac3063cbf Add missing override specifiers 2018-04-27 22:59:19 +02:00
zdenop
37d2088dc3
Merge pull request #1533 from stweil/cov
Fix some issues reported by Coverity Scan
2018-04-26 18:40:55 +02:00
Stefan Weil
fbeb55cd4e Fix CID 1164526 (Resource leak in object)
stream_ was allocated in the constructor,
but the destructor did not free it.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-26 18:21:12 +02:00
Stefan Weil
b87fc523ca Fix CID 1386084 (Uninitialized scalar variable)
The set_font method used the uninitialized member variable resolution_.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-26 18:02:43 +02:00
Stefan Weil
e2135de022 Fix CID 1385633 (Dereference before null check)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-26 17:18:15 +02:00
zdenop
af72ad77e8
Merge pull request #1531 from stweil/cov
java: Fix some issues reported by Coverity Scan
2018-04-26 15:47:20 +02:00
Stefan Weil
62df5ae686 java: Fix CID 1386112 (Resource leak)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-26 14:27:43 +02:00
Stefan Weil
63d5709958 java: Make SVWindow more robust (fix three CID issues)
1386093 Division or modulo by zero
1386096 Division or modulo by float zero
1386101 Division or modulo by float zero

A division by zero would have occurred if both sizeX and canvasSizeX or
sizeY and canvasSizeY were 0.

Catch also negative sizes which don't raise a division by zero exception
but which are also invalid.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-26 10:02:01 +02:00
Stefan Weil
64e2efffc7 java: Remove unused field (fix CID 1386094 UrF: Unread field)
desc is written once, but never used otherwise.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-26 09:36:46 +02:00
zdenop
3c269c9a39
Merge pull request #1529 from stweil/fix
Partial fix for autotools configuration after source tree reorganisation
2018-04-25 21:33:49 +02:00
Stefan Weil
a2a12a4469 Fix unittest for autotools configuration after source tree reorganisation
Now "make check" also works again.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-25 21:33:28 +02:00
Stefan Weil
4f9493c409 Partial fix for autotools configuration after source tree reorganisation
This should fix "make" and "make training".

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-25 21:33:28 +02:00
zdenop
d15558b97a
Merge pull request #1528 from stweil/crlf
Fix file endings
2018-04-25 21:27:50 +02:00
Stefan Weil
dabf3c299f Fix file endings
Text files should end with a LF, but not additional empty lines.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-25 19:35:33 +02:00
zdenop
8139ad9fdf
Merge pull request #1526 from stweil/crlf
Fix line endings
2018-04-25 19:12:15 +02:00
Stefan Weil
9ceb0c6430 Fix line endings
Replace DOS line endings (CRLF) by standard (LF only).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-25 19:04:50 +02:00
Egor Pugin
104fe7931c Move training to src. 2018-04-25 11:35:26 +03:00
Egor Pugin
ca5c15e6a8 Set correct rc name. 2018-04-25 11:27:40 +03:00
Egor Pugin
cfe15b9d14 Remove wrong src dir from configure. 2018-04-25 11:09:45 +03:00
Egor Pugin
8ae22b9ebb Remove wrong src dir from configure. 2018-04-25 11:09:04 +03:00
Egor Pugin
e95ff1159e Move sources into src dir. Update build scripts. 2018-04-25 11:02:54 +03:00
zdenop
e8fceb58ab
Merge pull request #1523 from stweil/test
Fix unittest (missing include path)
2018-04-24 17:25:04 +02:00
Stefan Weil
95f39142ac Fix unittest (missing include path)
Add include path for api/tess_version.h.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-24 13:17:57 +02:00
zdenop
79ab597b94
Merge pull request #1522 from ic/master
Revert failed attempt to support MacPort's g++
2018-04-24 08:19:24 +02:00
Eric Platon
4ded0d066e Revert failed attempt to support MacPort's g++
The support will require more work, and postpone for now.
2018-04-24 08:38:17 +09:00
zdenop
b6c6cd7aa6
Merge pull request #1521 from stweil/coverity
Fix CID 1164613 (Uninitialized pointer field)
2018-04-23 21:03:52 +02:00
Stefan Weil
3b69c2bc4c Fix CID 1164613 (Uninitialized pointer field)
This involves removing some constructors without argument.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-23 20:49:01 +02:00
Egor Pugin
d5fb4041ee
Merge pull request #1519 from stweil/winfix
Fix linker regression for Visual Studio
2018-04-23 17:05:21 +03:00
Egor Pugin
d522655125
Merge pull request #1518 from amitdo/subdir-objects
Remove 'AUTOMAKE_OPTIONS' from all Makefile.am files
2018-04-23 17:05:07 +03:00
Stefan Weil
17f29d0079 Fix linker regression for Visual Studio
Commit cb77067f55 changed the declaration of
null_script. An additional TESS_API is needed to satisfy the VS linker.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-04-23 14:18:36 +02:00
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