Commit Graph

1312 Commits

Author SHA1 Message Date
Nick White
d71133a769 Use ocrx_cinfo to hold character box and confidence information
With hocr_char_boxes enabled in hocr output, each grapheme now gets
its own span tag, which holds the character confidence and box
coordinates. Using x_bboxes at the ocrx_word level was
inappropriate, as it was impossible to find which grapheme was
represented by each bounding box.
2016-05-06 13:06:46 +01:00
Nick White
06b7a7b188 Add option to include character bounding boxes in hocr output
Add the 'hocr_char_boxes' configuration option (off by default),
which enables printing the bounding boxes of each character in the
x_bboxes property of an ocrx_word element in hocr output.
2016-04-29 15:37:46 +01:00
Zdenko Podobný
1af0639f50 replace __CYGWIN32__ with __CYGWIN__ 2016-04-29 15:36:48 +01:00
Zdenko Podobný
d4ee4115a8 Revert "allow OpenMP in VS2010 LIB_Release"
This reverts commit a02ef80f27.
2016-04-29 15:36:48 +01:00
Zdenko Podobný
04b1940966 fix #289 mingw64 build 2016-04-29 15:36:48 +01:00
Zdenko Podobný
ca3fd58cea allow OpenMP in VS2010 LIB_Release 2016-04-29 15:36:48 +01: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
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
zdenop
b46af6da31 fix comment about default PSM 2016-03-09 19:19:45 +01:00
zdenop
b1c1382843 Merge pull request #259 from innir/abi-break-fix
Fix ABI break introduced in 3.04.00, fixes #254
2016-03-08 11:46:51 +01:00
Philip Rinn
7461b61743 Fix ABI break introduced in 3.04.00, fixes #254 2016-03-08 11:35:24 +01:00
zdenop
976433820c Merge pull request #255 from amitdo/no-banner
Don't display tesseract's banner when quiet mode is active
2016-03-08 08:28:24 +01:00
amitdo
bf5345f6a1 Don't display tesseract's banner when quiet mode is active 2016-03-07 19:25:09 +02:00
Zdenko Podobný
8796b5c914 update Release Notes (fixes #250) 2016-03-06 17:55:29 +01:00
Zdenko Podobný
b2262750eb solve segfault for box.train; fixes #57 2016-03-04 23:04:55 +01:00
Zdenko Podobný
ef26b312f9 improve tesseract.pc.in - fixes #241 2016-03-04 22:25:40 +01:00
zdenop
ff2ca31b9f Update INSTALL.GIT.md
fix leptonica link
2016-03-04 19:06:14 +01:00
Zdenko Podobný
8bfaf84007 move new&delete histogramAllChannels inside the #ifdef USE_OPENCL; fixes #248 2016-03-04 14:35:08 +01:00
Egor Pugin
4d4bfb552c Add inactivity timeout for icu download on windows 2016-03-04 12:34:01 +03:00
zdenop
d55f5fbcf4 Merge pull request #245 from tfmorris/result_renderer_tsv
Add TSV result renderer. Fixes #18
2016-03-03 09:16:27 +01:00
Tom Morris
fc80ceafb9 Fix hocrtsv references in Makefile 2016-03-02 10:46:52 -05:00
Tom Morris
6700edd8bc Cleanup TSV renderer
Remove all references to hocr, hocr.tsv, etc. Remove dead code for font
info, input filename, HTML escapes. Improved comments. Fixed
indentation.
2016-03-01 13:41:19 -05:00
Sundar M. Vaidya
858f4b75ce Avoids HTML escaping. 2016-03-01 12:30:39 -05:00
Sundar M. Vaidya
b1e4a82b0b Render output in TSV format. 2016-03-01 12:30:39 -05:00
Sundar M. Vaidya
738fe4f757 Adds BoolParam tessedit_create_hocrtsv in class Tesseract. 2016-03-01 12:30:39 -05:00
Sundar M. Vaidya
937ceb2d1b Adds hocrtsv to tessdata/configs/Makefile.am 2016-03-01 12:25:15 -05:00
Sundar M. Vaidya
3163b38151 Adds hocrtsv file to configs folder. 2016-03-01 12:23:12 -05:00