mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-12-27 10:34:12 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity
3,759 Commits 10 Branches 66 Tags 222 MiB
5f06402755
Commit Graph

3759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick White
c43e4501e3 Merge remote-tracking branch 'origin/master' into hocrcharboxes 2019-01-13 12:41:42 +00:00
zdenop
238cb219d5
Merge pull request #2152 from stweil/clean 
Remove opencl_device_selection.h
 2019-01-09 15:02:59 +01:00
zdenop
21e7e4ba3e
Merge pull request #2153 from stweil/documentation 
Fix documentation for page segmentation mode 2
 2019-01-09 15:02:14 +01:00
Stefan Weil
a0e6586e63 Fix documentation for page segmentation mode 2 
It never worked, so add a comment that the implementation is missing.
Add also a to-do comment.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2019-01-09 13:51:44 +01:00
Stefan Weil
0fae848b58 OpenCL: Add comments to users of openclwrapper.h 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2019-01-09 12:11:00 +01:00
Stefan Weil
e0fc4f2945 Remove opencl_device_selection.h 
Always use OpenCL device selection if OpenCL is enabled.

This fixes a regression which was introduced by commit
5c6a57b727 which removed
the definition for USE_DEVICE_SELECTION.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2019-01-09 12:09:56 +01:00
Egor Pugin
62b857554a [sw] Depend on leptonica-master. 2019-01-08 23:52:29 +03:00
Egor Pugin
7732f65b4a Activate sw builds. 2019-01-08 23:33:34 +03:00
zdenop
c39a95ca57 try to fix appveyor 2019-01-06 17:46:59 +01:00
zdenop
bd1c05c102 remove old line 2019-01-06 16:56:38 +01:00
zdenop
c41a80f107 respect cmake -DCPPAN_BUILD=OFF 2019-01-06 16:47:54 +01:00
zdenop
7a83bb32e1
Merge pull request #2147 from stweil/clean 
OpenCL: Remove unused code
 2019-01-05 19:57:40 +01:00
Stefan Weil
595bb7df16 OpenCL: Remove unused code 
The OpenCL kernel pixSubtract is never used, so remove it.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2019-01-05 16:41:20 +01:00
zdenop
7c7c6ecaa8
Merge pull request #2144 from nickjwhite/fixheaders 
Fix headers
 2019-01-05 11:07:56 +01:00
Nick White
b8de06430d Ensure baseapi.h header is used by commontraining.h regardless of autotools usage 2019-01-04 20:20:00 +00:00
Nick White
cd34ee55ec Add necessary intproto.h header to protos.cpp 2019-01-04 20:19:54 +00:00
zdenop
f46e8e7e10
Merge pull request #2142 from rhardih/master 
Avoid linking pthread on Android
 2019-01-04 08:36:59 +01:00
René Hansen
ff2535f8ec Avoid linking pthread on Android 2019-01-03 23:53:38 +01:00
zdenop
40e14b027f
Merge pull request #2140 from stweil/clean 
Remove unused code
 2019-01-03 14:14:36 +01:00
Stefan Weil
62b635a74e Remove unused functions from cluster.cpp 
Add also missing static attributes.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2019-01-03 13:16:31 +01:00
Stefan Weil
f76d8a14cd Remove unused code from oldlist 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2019-01-03 12:27:10 +01:00
zdenop
3377ed2e25
Merge pull request #2139 from stweil/tensorflow 
Add missing std namespace in tensorflow code
 2019-01-03 11:49:51 +01:00
Stefan Weil
7719f80155 Add missing std namespace in tensorflow code 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2019-01-03 11:15:36 +01:00
Stefan Weil
8a6fa452dc Fix build for architectures without CPUID 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2019-01-03 09:32:36 +01:00
Egor Pugin
0aca60906d
Merge pull request #2137 from stweil/nullptr 
Replace NULL by nullptr and fix a compiler warning
 2019-01-02 11:45:43 +03:00
Stefan Weil
91af010200 Fix compiler warning 
gcc warning:

    src/training/text2image.cpp:694:35: warning:
        ISO C++ forbids converting a string constant to ‘char*’
        [-Wwrite-strings]

putenv expects a string which can be modified.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2019-01-01 22:49:04 +01:00
Stefan Weil
5dd606c631 Replace NULL by nullptr 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2019-01-01 22:45:49 +01:00
zdenop
87d0f71041
Merge pull request #2135 from stweil/simdetect 
Fix and simplify SIMD tests
 2019-01-01 15:48:05 +01:00
Stefan Weil
5f96ac1a71 Update cmake compiler flags for new simdetect.cpp 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2019-01-01 13:15:58 +01:00
Stefan Weil
d9600cd82e Fix and simplify SIMD tests 
The tests for SSE and AVX must only be done if the correct compiler
flags were used.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2019-01-01 11:19:17 +01:00
zdenop
d3065520fa fix 2 clang warnings 2018-12-30 20:25:24 +01:00
Stefan Weil
cb049133cd Fix compiler warning 
clang warning:

    tesseractmain.cpp(512,21): warning: '&&' within '||' [-Wlogical-op-parentheses]

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-12-29 22:17:33 +01:00
zdenop
b9a34d741d add support for clang on windows (cmake&ninja) 2018-12-29 10:43:13 +01:00
zdenop
420fb0ced0 Merge branch 'master' of https://github.com/tesseract-ocr/tesseract 2018-12-29 10:31:33 +01:00
zdenop
3e6ec97ac3 Remove altorenderer.cpp from resource compiling (already included in tesseract_src) 2018-12-29 10:30:56 +01:00
zdenop
8885fe2ccb provide info about compiled openmp version 2018-12-29 10:18:27 +01:00
zdenop
d44b58323f
Merge pull request #2133 from stweil/fix 
Don't try to create text output if other renderers failed (fix regres…
 2018-12-27 14:10:34 +01:00
Stefan Weil
993e56ffde Don't try to create text output if other renderers failed (fix regression) 
Commit 49d7df6dc3 added error handling,
but since that commit Tesseract used the text fallback if the user
selected output failed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-12-27 10:23:28 +01:00
zdenop
cc997b53c7 add missing the implementation for TessBaseAPIGetAltoText method in C-API 2018-12-26 21:35:47 +01:00
Egor Pugin
e3a39c3577 Revert "Switch windows builds to SW." 
This reverts commit 0967a32498.
 2018-12-18 18:33:56 +03:00
Egor Pugin
0967a32498
Switch windows builds to SW. 2018-12-18 01:21:24 +03:00
zdenop
a3b2d74ce3
Merge pull request #2123 from stweil/hocr 
Use std::stringstream to generate hOCR output
 2018-12-16 22:21:14 +01:00
Stefan Weil
db9c7e0312 Use std::stringstream to generate hOCR output 
Using std::stringstream simplifies the code and allows conversion of
double to string independant of the current locale setting.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-12-16 20:14:11 +01:00
zdenop
72d8df581b
Merge pull request #2121 from stweil/hocr 
Move code for hOCR renderer to new file
 2018-12-16 16:26:27 +01:00
zdenop
c7247a8be5
Merge pull request #2122 from stweil/alto 
Fix value for PHYSICAL_IMG_NR in ALTO output
 2018-12-16 16:24:27 +01:00
Stefan Weil
c7e8d30280 Fix value for PHYSICAL_IMG_NR in ALTO output 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-12-16 15:07:02 +01:00
Stefan Weil
fda0fa4e7e Add new hocrrenderer.cpp to CMakeList.txt and Android.mk 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-12-15 22:58:51 +01:00
Stefan Weil
457c53026d Fix indentation of hOCR output 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-12-15 17:51:59 +01:00
Stefan Weil
5de3fc47bb Format code in new file hocrrenderer.cpp 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-12-15 15:35:21 +01:00
Stefan Weil
48713f7df2 Move code for hOCR renderer to new file 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-12-15 15:33:47 +01:00