Commit Graph

2966 Commits

Author SHA1 Message Date
Egor Pugin
5dac6f6656 Update cppan.yml 2016-09-29 12:24:18 +03:00
Egor Pugin
8d6dbb133b Tesseract is now tested with CPPAN on appveyor. 2016-09-26 13:12:59 +03:00
Zdenko Podobný
c943fc1a33 sets justification for ParagraphInfo; fixes #429 2016-09-18 20:31:45 +02:00
zdenop
a75ab450a8 Merge pull request #420 from stweil/warnings
Remove some unused constants
2016-09-08 19:56:56 +02:00
Stefan Weil
a5b61e2b35 ccmain: Remove unused constants
In osdetect.cpp, a local definition of kMinCredibleResolution was
identical to a global one, so the local one could be removed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-09-06 21:49:27 +02:00
Stefan Weil
fcd5f7d2a4 textord: Remove unused constants
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-09-06 21:49:27 +02:00
Stefan Weil
d40b28f47d textord: Remove unused constants
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-09-06 21:49:26 +02:00
Stefan Weil
db2a8e9f85 api: Remove unused constant kBytesPerBlob
This fixes a compiler warning:

api/baseapi.cpp:1743:11: warning:
 unused variable 'kBytesPerBlob' [-Wunused-const-variable]

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-09-06 21:49:26 +02:00
Stefan Weil
5bce3f7d87 classify: Remove unused constant kMinPCLengthIncrease
This fixes a compiler warning:

classify/intfeaturemap.cpp:33:14: warning:
 unused variable 'kMinPCLengthIncrease' [-Wunused-const-variable]

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-09-06 21:49:16 +02:00
Egor Pugin
193032a778 Update CMakeLists.txt 2016-09-05 18:10:56 +03:00
zdenop
01c364d287 Merge pull request #415 from stweil/warnings
Remove unneeded 'struct' from TessBaseAPI::GetHOCRText (issue #414)
2016-09-05 17:07:28 +02:00
Stefan Weil
caffb3133b Remove unneeded 'struct' from TessBaseAPI::GetHOCRText (issue #414)
It conflicts with a previous 'class' declaration for ETEXT_DESC:

include/tesseract/baseapi.h:594:21:
 Struct 'ETEXT_DESC' was previously declared as a class

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-09-05 13:17:13 +02:00
Zdenko Podobný
a6871a8c91 remove install-langs - fix #376 2016-09-01 19:21:30 +02:00
Zdenko Podobný
61032d9b14 set fonts_dir to system default font location. Fixes #409 2016-09-01 18:27:00 +02:00
Zdenko Podobný
916897da1b print text2image info to stdout instead of strerr 2016-09-01 13:38:06 +02:00
zdenop
94e21c3ded add info OSD data file is need too 2016-09-01 12:30:47 +02:00
zdenop
b14f7353ab you do not need download all tessdata repository 2016-08-31 20:54:43 +02:00
zdenop
77af7cfa66 Merge pull request #406 from stweil/windows
vs2010: Fix implementation of strcasestr
2016-08-31 15:26:06 +02:00
Stefan Weil
4708ea3b42 vs2010: Fix implementation of strcasestr
A haystack which is shorter than the needle resulted in negative value
for length_haystack which was forced to a very large unsigned value.

The resulting buffer overflow while reading the haystack would crash
text2image when it was called with a short font name.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-08-31 14:48:07 +02:00
zdenop
2660647007 Merge pull request #404 from stweil/warnings
configure: Don't use -Wno-uninitialized for debug builds
2016-08-30 15:44:45 +02:00
Stefan Weil
fdf950babf configure: Don't use -Wno-uninitialized for debug builds
There is no good reason to suppress useful compiler warnings.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-08-30 15:36:18 +02:00
zdenop
7f8bd11c59 Merge pull request #402 from stweil/windows
fileio: Replace assert with tprintf() and exit(1)
2016-08-30 08:38:21 +02:00
Stefan Weil
6ec1a0a09b fileio: Replace assert with tprintf() and exit(1)
Assertions are good for programming errors, but not for wrong user input.

The new code no longer needs File::ReadFileToStringOrDie, so remove that
method.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-08-30 07:13:56 +02:00
zdenop
d093ed40cc Merge pull request #401 from stweil/windows
tlog: Remove unused macro TLOG_FATAL
2016-08-29 21:02:06 +02:00
Stefan Weil
1950fec7a2 tlog: Remove unused macro TLOG_FATAL
The implementation was also wrong because it did not use __VA_ARGS__.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-08-29 19:11:01 +02:00
zdenop
a1a4575f4b Merge pull request #6 from jimregan/gcode_issue1316
Issue 1316: The traineddata file must be closed after it was opened
2016-08-29 17:31:48 +02:00
zdenop
0497dc0e3e Merge pull request #17 from tesseract-ocr/gcode_issue1351
Issue 1351: OpenCL build - kernel_ThresholdRectToPix() not accounting for padding bits in the output pix?!
2016-08-29 17:28:42 +02:00
zdenop
3e5323705a Merge pull request #400 from stweil/windows
ccutil: Fix and simplify implementation of variadic macro
2016-08-29 17:27:33 +02:00
Stefan Weil
1274874e90 ccutil: Fix and simplify implementation of variadic macro
The implementation for MS C did not pass the variable arguments to
tprintf.

The standard is supported since C99 / C++11, so one implementation
is sufficient.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-08-29 08:15:00 +02:00
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