Commit Graph

2134 Commits

Author SHA1 Message Date
zdenop
d8c04e82d1 Merge pull request #332 from hoiqs/fix_add_str_double
Fix of add_str_double
2016-05-25 16:53:13 +02:00
Heiko Oberdiek
dec38db7ce Fix for constant kMaxDoubleSize (from 15 to 16),
which is used by method STRING::add_str_double.
2016-05-25 16:26:41 +02:00
zdenop
daa8a53e5f Merge pull request #331 from stweil/master
configure: Fix check for dependencies needed for training
2016-05-24 13:15:49 +02:00
zdenop
d9f465926c Merge pull request #299 from mmcco/rm-off_t
Remove conditional definition of off_t
2016-05-24 13:14:17 +02:00
Stefan Weil
1b9d0688fa configure: Fix check for dependencies needed for training
The different checks had set ENABLE_TRAINING unconditionally,
thus overwriting the value from the preceding checks.

So if pango and cairo were available, but icu was missing,
users would still be offered to build the training tools.

The changes for icu and has_cpp11 are not strictly necessary,
but are made here to have uniform code patterns.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-05-23 22:44:17 +02:00
zdenop
99ccebadfc Merge pull request #330 from amitdo/training-argv1
Training tools: Print help message when (argv == 1)
2016-05-22 13:34:07 +02:00
amitdo
cd1a14450c Training tools: Print help message when (argv == 1) 2016-05-22 11:16:42 +03:00
zdenop
7ffa2a01c2 Merge pull request #329 from amincheloh/patch-1
fix invalid release year for V3.04.01
2016-05-21 20:29:00 +02:00
Amin Cheloh
c4d273d33c fix invalid release year for V3.04.01 2016-05-21 17:51:04 +07:00
Zdenko Podobný
cab6de1740 remove unused GlyphLessFont files 2016-05-20 21:19:00 +02:00
zdenop
d946ae27d0 Merge pull request #311 from robbertkl/patch-1
Fix incompatibility with some C++11 implementations
2016-05-17 08:44:15 +02:00
zdenop
c5e7dc6642 Merge pull request #323 from stweil/stdout
Print normal user messages to stdout instead to stderr
2016-05-17 08:42:37 +02:00
zdenop
d5fd184302 Merge pull request #321 from stweil/build
configure: Fix cross compiler flags for cairo and pango
2016-05-17 08:42:18 +02:00
Stefan Weil
e59be55bcc Print list of languages to stdout instead to stderr
It is common practice for command line programs to print
user requested information on stdout.

This seems to be reasonable for Tesseract, too.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-05-16 17:59:48 +02:00
Stefan Weil
7e98c33432 Print help text to stdout instead to stderr
It is common practice for command line programs to show help text
on stdout. This seems to be reasonable for Tesseract, too.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-05-16 17:59:48 +02:00
Stefan Weil
ee5e1e972a configure: Fix cross compiler flags for cairo and pango
Calling pkg-config directly is a bad idea because it returns
the compiler flags for native builds.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-05-15 19:13:11 +02:00
Robbert Klarenbeek
4919b276eb Fix incompatibility with some C++11 implementations 2016-04-28 22:34:44 +02:00
Michael McConville
eb00574c4a Remove conditional definition of off_t
As pointed out by Stefan Weil, conditionally defining off_t using a
macro isn't a valid approach. off_t does not have a fixed size and is
used in ABI definitions (e.g. syscalls), so silently guessing its size
risks breaking the build. Additionally, all sane and modern platforms
will have off_t.
2016-04-13 15:15:56 -04:00
Zdenko Podobný
60176fc5ae replace __CYGWIN32__ with __CYGWIN__ 2016-03-25 14:58:24 +01:00
Zdenko Podobný
a3ba11b030 Revert "allow OpenMP in VS2010 LIB_Release"
This reverts commit a02ef80f27.
2016-03-24 17:32:03 +01:00
Zdenko Podobný
bd424f6201 fix #289 mingw64 build 2016-03-23 17:24:21 +01:00
Zdenko Podobný
a02ef80f27 allow OpenMP in VS2010 LIB_Release 2016-03-23 17:19:58 +01:00
Nick White
76ed9decb3 Only enable extra ligatures with recent Pango versions
Pango's opentype feature selection functions are only available
from version 1.38+, which is still quite new, so ensure it's just
ignored if using an older version.
2016-03-21 13:03:03 +00:00
Nick White
9100adcbde Enable all ligatures available in a font for text2image rendering
This enables all OpenType ligatures for a specific font, where
available. Specifically, it explicitly enables the OpenType
features liga (standard ligatures), hlig (historical ligatures),
clig (contextual ligatures), and dlig (discretionary ligatures).

This feature requires Pango 1.38 or newer.
2016-03-21 11:41:36 +00:00
Zdenko Podobný
66f37f0cd3 add copyright to renderer.cpp and pdfr.cpp 2016-03-18 19:43:45 +01:00
Zdenko Podobný
75e27414eb add copyright to C-API 2016-03-18 19:17:09 +01:00
Ian Blenke
71ad8c9bff Dockerifying using travis build script 2016-03-18 00:32:35 -04:00
zdenop
0c596052dd Merge pull request #280 from stweil/format
Fix more format string related errors
2016-03-17 11:31:53 +01:00
Stefan Weil
c388c0c145 Add some missing format specifiers to format strings
There was a mismatch of the number of format specifiers and the number
of arguments.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-17 11:27:06 +01:00
Stefan Weil
3ed36ff572 Fix format string for float value
repetition_spacing is a float value.

Use %5.2 as that is used for similar float values in the same file.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-17 11:27:06 +01:00
Stefan Weil
a95edd7e13 Fix argument for tprintf
This fixes a gcc warning:

ccutil/tprintf.h:31:50: warning:
 format ‘%d’ expects argument of type ‘int’,
 but argument 2 has type ‘tesseract::ScoredFont’ [-Wformat=]

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-17 11:27:06 +01:00
Stefan Weil
92c02a7d7c Fix format string for tprintf
The format string expected two double / int pairs, but there is only
one float and one int argument.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-17 11:24:57 +01:00
zdenop
6b8200207d Merge pull request #279 from stweil/format
Fix arguments for tprintf
2016-03-17 11:19:14 +01:00
Stefan Weil
17d78a2584 Fix arguments for tprintf
The format string expects two int arguments.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-17 10:46:22 +01:00
zdenop
9279b1628c Merge pull request #278 from stweil/format
Fix order of arguments for tprintf
2016-03-17 10:34:33 +01:00
Stefan Weil
f9051083d9 Fix order of arguments for tprintf
Format string and arguments did not match.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-17 10:25:12 +01:00
zdenop
91046ac76b Merge pull request #277 from stweil/format
Add missing argument for tprintf
2016-03-17 10:09:55 +01:00
Stefan Weil
e6c0d263db Add missing argument for tprintf
The format string expects an int arguments.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-17 09:30:25 +01:00
zdenop
1bc83fc8de Merge pull request #275 from amitdo/tlog-percent
Add missing % char from format specifier in tlog()
2016-03-17 08:31:24 +01:00
zdenop
1c63700f46 Merge pull request #276 from stweil/format
Add missing argument for tprintf
2016-03-17 08:31:11 +01:00
Stefan Weil
fe11c19bf3 Add missing argument for tprintf
The format string expects 3 int arguments.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-17 06:23:30 +01:00
Amit Dovev
96c2f637fd Add missing % char from format specifier in tlog()
- In training/ango_font_info.cpp
2016-03-17 01:09:46 +02:00
zdenop
8dab5975d4 Merge pull request #273 from stweil/stdout
Print version to stdout instead to stderr
2016-03-16 13:21:09 +01:00
Stefan Weil
076f21c1f2 Print version to stdout instead to stderr
Most command line programs print the version to stdout.
This seams to be reasonable for Tesseract, too.

Now a shell statement like "VERSION=$(tesseract --version)" works
without I/O redirection.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-16 12:10:27 +01:00
Zdenko Podobný
32bbb95283 Merge branch 'master' of https://github.com/tesseract-ocr/tesseract 2016-03-15 14:24:15 +01:00
Zdenko Podobný
db9e194761 check for pdf support in leptonica 2016-03-15 14:22:24 +01:00
zdenop
fbc1501d14 Merge pull request #270 from edcarroll/master
Fix other instance of VS2015 compiler problem
2016-03-14 23:07:07 +01:00
Zdenko Podobný
ddd3cad8c6 update ChangeLog;
remove ReleaseNotes (a relevant information are in Changelog file and there is Release note wiki online)
2016-03-14 23:03:44 +01:00
Edward Carroll
4ecb6858ff Fix other instance of VS2015 compiler problem
As with 0c492cb, in VC14 snprintf function is provided in standard library there triggering error. "snprintf Do not define snprintf as a macro. Macro definition of snprintf conflicts with Standard Library function declaration"
2016-03-14 21:37:13 +00:00
Zdenko Podobný
2c675dcc77 Revert "fix comment about default PSM"
This reverts commit b46af6da31.
2016-03-10 09:42:01 +01:00