zdenop
b000dd22f4
Merge pull request #398 from stweil/windows
...
text2image: Add linefeed to error message
2016-08-28 21:43:41 +02:00
Stefan Weil
3420acabe5
text2image: Add linefeed to error message
...
This changes the error message for a missing font from
Could not find font named Times New Roman.Please correct --font arg.
(missing space after first sentence) to
Could not find font named Times New Roman.
Please correct --font arg.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-08-28 21:33:52 +02:00
zdenop
a1f0f36ddc
Merge pull request #397 from stweil/warnings
...
stringrenderer: Fix compiler warning (-Wwrite-strings)
2016-08-28 15:52:35 +02:00
Stefan Weil
34ed8ddf62
stringrenderer: Fix compiler warning (-Wwrite-strings)
...
gcc reported this warning:
../training/stringrenderer.cpp:
In member function ‘void tesseract::StringRenderer::SetLayoutProperties()’:
../training/stringrenderer.cpp:211:42: warning:
ISO C++ forbids converting a string constant to ‘char*’ [-Wwrite-strings]
set_features("liga, clig, dlig, hlig");
^
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-08-28 14:07:03 +02:00
zdenop
939023ffb9
Merge pull request #391 from vidiecan/issue_390
...
fixed #390 by introducing new rotate_image flag
2016-08-15 20:04:30 +02:00
zdenop
f06314ca50
Merge pull request #389 from vidiecan/issue_388
...
fixes #388 by using raw bytes utf8 encoding
2016-08-15 20:03:52 +02:00
jm
b69561c802
fixed #390 by introducing new rotate_image flag
2016-08-15 18:16:35 +02:00
jm
941e1c4c84
fixes #388 by using raw bytes utf8 encoding
2016-08-15 18:11:01 +02:00
Zdenko Podobný
5610738be9
fix #369 - pdf output with transparent background image
2016-08-05 22:37:58 +02:00
zdenop
fc6ce6273e
Merge pull request #381 from vidiecan/issue_380
...
fixes some of the windows issue with text2image, see #380
2016-08-05 20:35:58 +02:00
jm
8d2d94e4ed
fixes some of the windows issue with text2image, see #380
2016-08-05 20:11:01 +02:00
Egor Pugin
2bc4f94b71
Update cppan.yml
2016-07-17 17:45:37 +03:00
zdenop
d5b7f687df
Merge pull request #367 from stweil/windows
...
win32: Show TIFF warnings on console
2016-07-17 13:19:53 +02:00
Egor Pugin
5199957ae7
Update Configure.cmake
...
Move tiff library header from standard header list.
2016-07-17 13:58:33 +03:00
Stefan Weil
75fdc086ec
win32: Check whether tiffio.h is available
...
The previous commit added a dependency on tiffio.h, so enable the new
code only if that file is available.
The code which conditionally defines HAVE_TIFFIO_H was already there
although that macro was unused up to now.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-07-17 12:07:58 +02:00
Stefan Weil
896e80d9a7
win32: Show TIFF warnings on console
...
Showing them in a window (default) is not acceptable for a console
application like Tesseract which must be able to work in batch mode.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-07-16 10:45:18 +02:00
Egor Pugin
669c7397aa
[cppan] Make leptonica dependency private.
2016-07-08 20:44:23 +03:00
Egor Pugin
d8238c333c
Fix duplicate map keys in cppan.yml.
2016-07-08 13:59:09 +03:00
Egor Pugin
ffddb4b95e
Merge branch 'master' of github.com-egorpugin:tesseract-ocr/tesseract
2016-07-04 00:51:32 +03:00
Egor Pugin
9a2726b381
Add shared definitions to CPPAN.
2016-07-04 00:51:16 +03:00
Egor Pugin
d56c8a2f1b
Update cppan.yml
2016-07-04 00:13:50 +03:00
Egor Pugin
dae90392c7
Add initial CPPAN project info.
2016-07-03 23:34:33 +03:00
Egor Pugin
553c069608
Remove unused defines.
2016-07-03 23:34:14 +03:00
Egor Pugin
f1c2e6eaa9
Merge branch 'master' of github.com-egorpugin:tesseract-ocr/tesseract
2016-06-30 00:30:10 +03:00
Egor Pugin
57605d99e9
Implement CPPAN support for easy Windows building.
2016-06-30 00:29:55 +03:00
Nick White
382e15bec0
Merge branch 'master' into hocrcharboxes
...
Conflicts:
configure.ac
2016-06-29 09:32:38 +01:00
Nick White
78ae2cc073
Fix bug with linebreaking in hOCR
...
The hOCR output could incorrectly close span, p, and div tags
early. Oops, my bad.
2016-06-29 09:25:44 +01:00
zdenop
647b88daf0
Merge pull request #359 from StefRe/tsv-fix
...
Fix TSV bounding box width/hight calculation (addition to #358 )
2016-06-27 22:19:22 +02:00
Steffen Rehberg
c0fcce2f8f
Fix text box width/hight calculation (addition)
...
This occurrence was should have been included in commit 29d971e
but was overlooked by error.
2016-06-27 21:58:29 +02:00
zdenop
828f8528a8
Merge pull request #358 from StefRe/tsv-fix
...
Fix TSV bounding box width/hight calculation
2016-06-27 09:09:12 +02:00
Steffen Rehberg
29d971eb0c
Fix text box width/hight calculation
...
In Tesseract's coordinate system, width is just right - left, cf. slide #2 of
github.com/tesseract-ocr/docs/blob/master/das_tutorial2016/2ArchitectureAndDataStructures.pdf
2016-06-25 12:40:28 +02:00
zdenop
5ca73cca26
Merge pull request #355 from amitdo/pango-name-is-empty
...
Check that pango's suggested font name is not an empty string
2016-06-20 10:26:11 +02:00
zdenop
ba2ea39caa
Merge pull request #356 from stweil/cygwin
...
Fix Cygwin compatibility – part III
2016-06-20 10:24:41 +02:00
Stefan Weil
ed053aab94
Fix Cygwin compatibility – part III
...
Commit 65504c8cd2
misplaced the #endif.
The definition of _GNU_SOURCE is only needed for Cygwin.
Defining _GNU_SOURCE on Linux results in compiler warnings because this
macro is already defined by the compiler.
Fix this by moving the #endif to the right place. In addition the code
for Cygwin is made more robust: If a future Cygwin compiler defines
_GNU_SOURCE, too, the code will still work.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-06-19 22:38:03 +02:00
amitdo
724fb894ac
Check that pango's suggested font name is not an empty string
...
On msys2 pango seems to always returns empty string for the suggested
font. It's a good idea to check that the string is not empty before
printing it - on all platforms.
2016-06-19 13:40:17 +03:00
Amit
96720c785d
Merge pull request #351 from amitdo/cygwin-compat
...
Fix Cygwin compatibility
2016-06-19 12:43:35 +03:00
Stefan Weil
65504c8cd2
Fix Cygwin compatibility - Part II
2016-06-19 11:59:58 +03:00
Amit
91fe9ef51a
Merge pull request #354 from stweil/makefile
...
Makefile: Fix phony training target
2016-06-19 09:25:51 +03:00
Stefan Weil
c2574609e4
Makefile: Fix phony training target
...
This fixes wrong behaviour of "make training" when dependencies for
training were incomplete.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-06-19 08:20:53 +02:00
Amit Dovev
13d789d4df
Merge pull request #288 from nickjwhite/opentypeligatures
...
Enable all ligatures available in a font for text2image rendering
2016-06-19 03:33:32 +03:00
Amit Dovev
ad66dd2912
Merge pull request #282 from ianblenke/master
...
Dockerify using travis build script
2016-06-19 03:29:00 +03:00
Philipp Nordhus
c05ff3456e
Remove duplicate destructor
...
Destructor of base class GenericVector calls base class clear()
method, deallocating the memory.
2016-06-17 23:20:03 +02:00
Philipp Nordhus
907de5995f
Do not allocate in GenericVector default ctor
2016-06-17 22:38:41 +02:00
Philipp Nordhus
b6db68f083
Remove indirection in LanguageModelDawgInfo
2016-06-17 22:38:38 +02:00
Marco Atzeri
b1c921b59e
Fix Cygwin compatibility
2016-06-17 15:52:01 +03:00
Amit Dovev
034d666e7a
Replace use of TLOG_FATAL() with tprintf() and exit(1) ( #349 )
...
Asserts should not be used for missing or invalid input in the command
line! This leads to a bad UX.
2016-06-16 12:10:53 +03:00
Amit Dovev
32d5ef6e53
Merge pull request #345 from amitdo/training-noasserts
...
Replace asserts with tprintf() and exit(1)
2016-06-15 10:49:35 +03:00
Shreeshrii
c3a7fab349
Replace asserts with tprintf() and exit(1)
...
Asserts should not be used for missing or invalid input in the command
line! This leads to a bad UX.
2016-06-14 14:35:05 +03:00
Amit Dovev
86acff5a03
Merge pull request #340 from amitdo/fix-292
...
Bypass Leptonica error message with pixGenHalftoneMask()
2016-06-07 12:36:24 +03:00
scottb89
3dcb5c2488
Bypass Leptonica error message with pixGenHalftoneMask()
...
Fixes #292
2016-06-05 17:38:43 +03:00