Commit Graph

1608 Commits

Author SHA1 Message Date
zdenop
555305f2be Merge pull request #835 from stweil/3.05
3.05: Backports from master branch
2017-04-23 17:40:01 +02:00
Stefan Weil
b66ff1f455 Use pkg-config for icu compiler and linker flags
The old settings are used as fallback if there is no configuration.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-22 19:40:27 +02:00
Stefan Weil
aec39d629d opencl: Backport changes from master branch
The code for 3.05 still uses NULL instead of nullptr.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-22 19:26:18 +02:00
Ray Smith
9283b07052 Removed dead TODO 2017-04-22 19:26:18 +02:00
Stefan Weil
37478e7d99 Fix ChangeLog for Leptonica 1.74
Since commit 245eebdf29, Tesseract 3.05
requires Leptonica 1.74.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-22 19:26:18 +02:00
Stefan Weil
5a3ccf06bf Synchronize COPYING with master branch
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-22 19:26:18 +02:00
Stefan Weil
2ac2417535 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 19:26:18 +02:00
Stefan Weil
f52d445074 Update Leptonica configuration
This synchronizes the code with the master branch.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-22 19:26:18 +02:00
Stefan Weil
720e8a6faf Synchronize Travis configuration with master branch
* Enable Travis CI for branch 3.05 (Linux and macOS)

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-22 17:59:40 +02:00
Stefan Weil
c20854066f Update required Leptonica version
Tesseract uses the function pixReadFromMultipageTiff since commit
245eebdf29.

That function requires Leptonica 1.74.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-22 17:38:08 +02:00
zdenop
ed31db6907 Merge pull request #809 from stweil/backport
[3.05] opencl: Add missing TIFF library for macOS
2017-04-11 12:44:13 +02:00
zdenop
ffc4daad61 Merge pull request #815 from jbarlow83/3.05-appveyor
[3.05] Fix YAML parse error in appveyor.yml
2017-04-11 12:43:58 +02:00
zdenop
b18cad4cda Merge pull request #814 from jbarlow83/3.05-opencl
[3.05] Fix #786 OpenCL linkage on macOS
2017-04-11 12:42:48 +02:00
James R. Barlow
64c3e4d5b7 [3.05] Fix YAML parse error in appveyor.yml 2017-04-10 15:17:20 -07:00
James R. Barlow
4c044eb361 [3.05] Fix #786 - 3.05 linkage fails on macOS Sierra with --enable-opencl 2017-04-10 14:42:06 -07:00
Stefan Weil
34fd87d4b2 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-10 13:36:26 -07:00
Stefan Weil
c8b28486b4 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-10 09:36:31 +02:00
Egor Pugin
9c1034d4e4 Update appveyor.yml 2017-03-23 08:21:48 +03:00
Egor Pugin
d0951da940 Update appveyor.yml 2017-03-23 01:23:07 +03:00
Egor Pugin
088186f489 Update appveyor.yml 2017-03-22 21:45:09 +03:00
Egor Pugin
f80c3b27df Fix windows build. 2017-03-22 21:21:57 +03:00
Wilson Mar
09acc4f487 Update README.md heading markdown 2017-03-21 09:29:49 +01:00
zdenop
51d0bbe6cc Merge pull request #776 from cjmayo/stdoutput
Add item to ChangeLog for options writing to stdout instead of stderr
2017-03-21 08:49:53 +01:00
Chris Mayo
4925e6c449 Add item to ChangeLog for options writing to stdout instead of stderr 2017-03-20 20:08:41 +00:00
Zdenko Podobný
f30cac479d libtiff is needed for windows build of tesseract executable 2017-03-17 20:44:37 +01:00
Egor Pugin
eea6d67567 Update CMakeLists.txt 2017-03-15 01:01:13 +03:00
Egor Pugin
ffea3faaf2 Disable warnings on Appveyor. 2017-03-14 22:54:01 +03:00
Egor Pugin
a692cca65b Update appveyor.yml 2017-03-14 11:12:40 +03:00
Zdenko Podobný
58062590ae Fix some typos in comments (found by codespell)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-03-10 23:21:31 +01:00
Zdenko Podobný
2c203e6059 fix --enable-visibility build (including training tools) 2017-03-10 23:17:30 +01:00
Zdenko Podobný
ec8d52b896 fix --disable-graphics build 2017-03-10 13:28:43 +01:00
Stefan Weil
6fcfcc85ac Use portable data types #709 2017-03-10 11:51:16 +01:00
Leo Arias
35a93348c0 Add the packaging metadata to build the tesseract snap 2017-03-10 11:32:40 +01:00
Bryce Glover
d9a9876a70 [autogen.sh:] Improve libtoolize invocation message.
Use the `$LIBTOOLIZE` variable inside the message to abstract over the two possible variants of the tool which
can be invoked.
2017-03-10 11:32:35 +01:00
Bryce Glover
3671de002d [autogen.sh:] Clarify libtoolize/glibtoolize existence check error message.
Explicitly mention the latter variant of the tool inside said error message.
2017-03-10 11:32:30 +01:00
Bryce Glover
ed49959d2a [autogen.sh:] Reduce in-script comment block width to 80 characters.
This is with respect to the comment preceding the `libtoolize`/`glibtoolize` existence check I introduced.
2017-03-10 11:32:25 +01:00
Bryce Glover
efb89f8133 [autogen.sh:] Abstract the absolute path of libtoolize or glibtoolize away into $LIBTOOLIZE.
Increase portability by insulating `autogen.sh` from platform variance.
2017-03-10 11:32:19 +01:00
Zdenko Podobný
697c3dc4da Fix indentation after conditional [-Wmisleading-indentation]
The indentation is wrong since commit
fd0683f9e0 and results in a gcc warning:

api/baseapi.cpp: In member function 'bool tesseract::TessBaseAPI::ProcessPagesMultipageTiff(const l_uint8*, size_t, const char*, const char*, int, tesseract::TessResultRenderer*, int)':
api/baseapi.cpp:986:5: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
     if (tessedit_page_number >= 0)
     ^~
api/baseapi.cpp:988:7: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
       pix = (data) ? pixReadMemFromMultipageTiff(data, size, &offset)
       ^~~

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-03-10 11:24:53 +01:00
Stefan Weil
6fbd9d2643 Use camel case for GitHub in README.md
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-03-10 11:24:47 +01:00
Mikhail Solomennik
183ee5668b Correct reading config files with \r\n 2017-03-10 11:24:43 +01:00
Egor Pugin
40dc28026b Rename cppan/cmake targets. 2017-02-23 20:20:05 +03:00
Zdenko Podobný
e85a7e2529 replace nullptr with NULL to enable non c++11 build (fixes #727) 2017-02-19 13:49:22 +01:00
Zdenko Podobný
2ca5d0a8e3 Merge branch '3.05' of https://github.com/tesseract-ocr/tesseract into 3.05
* '3.05' of https://github.com/tesseract-ocr/tesseract:
  3.05.00 release
2017-02-16 18:59:48 +01:00
Zdenko Podobný
998d4735d0 3.05.00 release 2017-02-16 18:59:32 +01:00
Zdenko Podobný
db87e210e3 3.05.00 release 2017-02-16 18:51:45 +01:00
Egor Pugin
16563b4df3 Add .cppan to ignore list. 2017-02-15 13:29:24 +03:00
Egor Pugin
77ff65078c Backport cmake fixes. 2017-02-13 23:11:30 +03:00
Egor Pugin
43f3b5f565 Merge branch '3.05' of github.com-egorpugin:tesseract-ocr/tesseract into 3.05 2017-02-13 22:47:22 +03:00
Egor Pugin
a912d70c79 Backport cppan fixes. 2017-02-13 22:47:02 +03:00
Zdenko Podobný
45fd3ede21 fix #712: Ghostscript mangling Tesseract-produced PDFs 2017-02-13 20:09:14 +01:00