Commit Graph

2467 Commits

Author SHA1 Message Date
zdenop
eaf5629b46 Merge pull request #744 from stweil/malloc
Replace alloc_struct, free_struct
2017-04-30 17:35:17 +02:00
Stefan Weil
2794410c9b doc: Remove generated files and add rules to build manpages
Those files can be built by doc/generate_manpages.sh.

The manpages are needed for the installation,
so add Makefile rules for them.

Git must ignore the generated manpages.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-30 11:27:17 +02:00
Stefan Weil
1c59914b61 Use Leptonica struct names L_Compressed_Data, Pix
The Tesseract project prefers that names, so fix the remaining exceptions.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-30 10:50:12 +02:00
Stefan Weil
f8fba59804 Replace alloc_struct, free_struct
Both functions simply call malloc, free.

Remove also unneeded null pointer checks and use calloc where possible.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-30 09:25:04 +02:00
Ray Smith
7a116ce8bb More formatting fixes from clang tidy 2017-04-28 13:38:32 -07:00
Ray Smith
77015526fa Jeff's fixes to pdf rendering 2017-04-28 13:38:13 -07:00
zdenop
13b7900ebf Merge pull request #778 from cjmayo/singleopts
tidy tesseract(1) adding missing options
2017-04-28 18:58:40 +02:00
zdenop
177ceff9dd Merge pull request #853 from stweil/doc
doc: Remove unsupported font name
2017-04-28 18:58:08 +02:00
zdenop
84f78f87c9 Merge pull request #851 from stweil/typo
Fix typo in comment
2017-04-28 18:56:47 +02:00
Stefan Weil
151a76ef26 doc: Remove unsupported font name
Fix this warning from doxygen:

    warning: doxygen no longer ships with the FreeSans font.
    You may want to clear or change DOT_FONTNAME.
    Otherwise you run the risk that the wrong font is being used for dot generated graphs.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-28 16:13:41 +02:00
Stefan Weil
73db84d674 Fix typo in comment
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-28 06:59:00 +02:00
Ray Smith
500bfaf315 Added std:: to some stl types 2017-04-27 17:15:35 -07:00
Ray Smith
1cc511188d Added extra Init that takes a memory buffer or a filereader function pointer to enable read of traineddata from memory or foreign file systems. Updated existing readers to use TFile API instead of FILE. This does not yet add big-endian capability to LSTM, but it is very easy from here. 2017-04-27 15:48:23 -07:00
zdenop
10e04ffe99 Merge pull request #849 from stweil/opencl
opencl: Remove more unused functions and related code
2017-04-27 09:02:56 +02:00
zdenop
394162e120 Merge pull request #848 from stweil/lept
ccstruct: Fix Leptonica data type
2017-04-27 09:01:43 +02:00
zdenop
72b86e098f Merge pull request #847 from stweil/crash
opencl: Fix crash on hosts with no OpenCL platform
2017-04-27 09:01:11 +02:00
Stefan Weil
582eaeba7d opencl: Remove more unused functions and related code
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-27 08:32:43 +02:00
Stefan Weil
b5abfb53d7 ccstruct: Fix Leptonica data type
L_Bmf works for C++ code, but the common form is L_BMF, so use that.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-27 07:51:50 +02:00
Stefan Weil
1e11b16d73 opencl: Fix crash on hosts with no OpenCL platform
A Tesseract binary with OpenCL support can also run on a host without
any OpenCL platform, as it simply uses the normal CPU based code.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-27 07:50:05 +02:00
zdenop
50f92c8f23 Merge pull request #843 from stweil/opencl
opencl: Remove unused code
2017-04-26 15:20:10 +02:00
Stefan Weil
e8ca29fb17 opencl: Remove unused function selectedDeviceIsNativeCPU
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-26 07:55:54 +02:00
Stefan Weil
bf9160cede opencl: Remove unused function pixConvertRGBToGray
Remove also the related OpenCL kernel code kernel_RGBToGray.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-26 07:55:54 +02:00
zdenop
7bb00d9a31 Merge pull request #834 from stweil/master
Leptonica related updates
2017-04-23 17:38:49 +02:00
Stefan Weil
e2b1e9f977 Fix ChangeLog for Leptonica 1.74
Since commit 245eebdf29, Tesseract 3.05
requires Leptonica 1.74, so this is not a new requirement for 4.00.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-22 18:33:37 +02:00
Stefan Weil
a3e0c10dc7 Remove unneeded code for old Leptonica versions
Tesseract requires Leptonica 1.74 or newer,
so that code is no longer needed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-22 18:22:13 +02:00
Stefan Weil
325de57d54 Update Leptonica version for Travis CI
Use the latest version which is available.
Remove also some unneeded whitespace.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-22 17:51:39 +02:00
Egor Pugin
11b244f6b7 Merge pull request #831 from aleksey-nikolaev/cmake-install
Cmake install
2017-04-20 22:06:25 +03:00
Aleksey Nikolaev
be747a501b Correct include path for installed project 2017-04-20 14:59:13 +03:00
Aleksey Nikolaev
6641989866 Cmake install 2017-04-20 14:50:53 +03:00
zdenop
e18a802994 Merge pull request #823 from RandomDSdevel/typo-fixes
Small Typo Fix
2017-04-15 19:12:51 +02:00
zdenop
6614b86bb3 Merge pull request #824 from stweil/typo
Fix typo
2017-04-15 19:11:44 +02:00
Bryce Glover
2be86764fe autogen.sh: Small Typo Fix
Implement and contribute one small typographical fix, thereby improving the readability of the script's check
for the existence of the `m4` top-level directory.
2017-04-15 12:31:24 -04:00
Stefan Weil
8f8651b6ce Fix typo
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-15 17:27:56 +02:00
Jim Regan
7231e67682 typo in comment 2017-04-14 15:54:10 +01:00
zdenop
6393e6122f Merge pull request #816 from stweil/codacy
testing: Fix warnings from shellcheck
2017-04-12 08:53:36 +02:00
Stefan Weil
934e612a3e testing: Fix warnings from shellcheck
Fix these kinds of warnings:

SC2002: Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead.
SC2086: Double quote to prevent globbing and word splitting.
SC2166: Prefer [ p ] && [ q ] as [ p -a q ] is not well defined.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-11 18:23:47 +02:00
zdenop
afd6b7d105 Merge pull request #813 from jbarlow83/4.00-opencl
[4.00] Fix #786 OpenCL linkage fails on macOS
2017-04-11 12:43:23 +02:00
James R. Barlow
f54577e6be Fix #786 - 3.05 linkage fails on macOS Sierra with --enable-opencl
Also needed for 4.00.
2017-04-10 22:22:49 -07:00
Egor Pugin
36a995bdc9 Merge pull request #812 from stweil/readme
README: Update stable version
2017-04-11 00:17:05 +03:00
Stefan Weil
98961ed169 README: Update stable version
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-10 22:28:14 +02:00
zdenop
5baa8c883a Merge pull request #808 from stweil/macos
opencl: Add missing TIFF library for macOS
2017-04-09 19:10:40 +02:00
Stefan Weil
31cb732a0f opencl: Add missing TIFF library for macOS
The OpenCL code of Tesseract uses TIFF functions, but the TIFF library
was not added to the linker flags for macOS.

This fixes builds with OpenCL on Mac.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-09 12:12:18 +02:00
zdenop
cf0b378577 Merge pull request #801 from amitdo/readme-compilers
README.md: Add subsection 'Supported compilers'
2017-04-03 19:07:40 +02:00
Amit D
3357e25c66 Update README.md 2017-04-03 19:24:26 +03:00
zdenop
168e7998eb Merge pull request #800 from atuyosi/fix-makefile
Update Makefile.am (add 'lstm.train')
2017-04-02 19:30:50 +02:00
Jeff Breidenbach
9038faf436 Better escaping for PDF title; fixes #636 2017-04-02 19:01:16 +02:00
zdenop
c38eedae7e Merge pull request #797 from stweil/warnings
opencl: Fix some compiler warnings [-Wunused-function]
2017-04-02 17:07:41 +02:00
Atsuyoshi Suzuki
82d62f89a2 Update Makefile.am (add 'lstm.train') 2017-04-02 17:06:12 +09:00
Stefan Weil
c1a01d0c51 opencl: Fix some compiler warnings [-Wunused-function]
opencl_device_selection.h contains lots of code which is only used in
openclwrapper.cpp. This results in several compiler warnings:

opencl/opencl_device_selection.h:396:18: warning:
 ‘ds_status readProfileFromFile(ds_profile*, ds_score_deserializer, const char*)’ defined but not used [-Wunused-function]
opencl/opencl_device_selection.h:257:18: warning:
 ‘ds_status writeProfileToFile(ds_profile*, ds_score_serializer, const char*)’ defined but not used [-Wunused-function]
opencl/opencl_device_selection.h:196:18: warning:
 ‘ds_status profileDevices(ds_profile*, ds_evaluation_type, ds_perf_evaluator, void*, unsigned int*)’ defined but not used [-Wunused-function]
opencl/opencl_device_selection.h:90:18: warning:
 ‘ds_status initDSProfile(ds_profile**, const char*)’ defined but not used [-Wunused-function]
opencl/opencl_device_selection.h:70:18: warning:
 ‘ds_status releaseDSProfile(ds_profile*, ds_score_release)’ defined but not used [-Wunused-function]

Move that functions and all related code to openclwrapper.cpp.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-01 12:34:27 +02:00
Egor Pugin
362b68ecfd Update .travis.yml 2017-03-25 22:06:12 +03:00