mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-12-22 22:47:50 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity
1,465 Commits 10 Branches 66 Tags 222 MiB
7e90200d26
Commit Graph

1465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick White
e110b14465 tesstrain.sh: Initialise fontconfig even if Arial isn't available 
The fontconfig initialisation hardcodes using Arial. However it may
not be available, whereas the fonts being used later will be, so use
one of them for initialisation instead.
 2015-08-26 18:32:44 +01:00
Nick White
422c424995 tesstrain.sh: Only set FONTS if they weren't set on the command line 
Previously the fonts specified in language-selection.sh would override
any specified on the command line.

This changes language-specific.sh from overriding a user request to
just setting the default fonts if none are specified with --fontlist.
 2015-08-26 18:24:14 +01:00
Nick White
8d0f59d09d tesstrain.sh: Only fall back to default Latin fonts if none were provided 
The --fontlist argument to tesstrain.sh was always ignored, even if
the language had no specific fonts specified in language-specific.sh.

Change this behaviour so the --fontlist argument is used if no specifc
fonts are selected by language-specific.sh.
 2015-08-26 18:14:30 +01:00
James R. Barlow
73b0297e5e Fix configure.ac unconditionally enabling OpenCL 2015-08-26 02:17:10 -07:00
James R. Barlow
18ac7ae7ef Get OpenCL to compile on OS X 
However, the output of the OpenCL build is garbage....
 2015-08-26 02:03:07 -07:00
James R. Barlow
65f1a96e3a Fix various clang compilation errors 
Also fixed a writable strings warning/error.
warning: ISO C++11 does not allow conversion from
      string literal to 'char *' [-Wwritable-strings]

Several were of this form and fixed as the compiler suggested:
openclwrapper.cpp:2411:33: error: non-constant-expression cannot be narrowed
      from type 'int' to 'size_t' (aka 'unsigned long') in initializer list
      [-Wc++11-narrowing]
    size_t local_work_size[] = {block_size};
                                ^~~~~~~~~~
openclwrapper.cpp:2411:33: note: insert an explicit cast to silence this issue
    size_t local_work_size[] = {block_size};
                                ^~~~~~~~~~
                                static_cast<size_t>( )

Should have low impact on other platforms/compilers. The change makes
the code more correct.
 2015-08-26 01:00:05 -07:00
James R. Barlow
8476d0bc6b Fix missing "allheaders.h" when compiling with --enable-opencl on OS X 2015-08-26 00:47:59 -07:00
zdenop
252d9a4d30 Merge pull request #86 from jbarlow83/master 
Fix configure.ac for OS X and -framework
 2015-08-26 09:32:39 +02:00
James R. Barlow
71f747f668 Fix configure.ac for OS X and -framework 2015-08-26 00:10:56 -07:00
Zdenko Podobný
f331a57b8e fix OpenCL build on Mac 2015-08-25 20:57:49 +02:00
Zdenko Podobný
0c3c3eaba8 fix VS2010 build 2015-08-24 14:54:13 +02:00
zdenop
a7fcebb0a0 Merge pull request #84 from gargrahul/master 
Fixes for OpenCL issues reported on Apple Mac. Still get -54 on Apple…
 2015-08-24 14:53:16 +02:00
gargrahul
5c6a57b727 Fixes for OpenCL issues reported on Apple Mac. Still get -54 on Apple Mac while running on OpenCL CPU, however it is ignored now. 2015-08-24 15:57:18 +05:30
zdenop
cb05aba905 Merge pull request #24 from tesseract-ocr/hashfn-clang 
fix to compile tesseract with clang
 2015-08-21 16:39:10 +02:00
Zdenko Podobný
b7cec01ce2 remove info about VS 2008 2015-08-20 14:09:29 +02:00
Zdenko Podobný
f81c258e14 rename README to README.md - fixes #45 2015-08-20 13:58:36 +02:00
Zdenko Podobný
9d359cf58a turn off optimisation in Microsoft Visual Studio for TextlineProjection::TruncateToImageBounds#pragma optimize( "", on ) 
fix issue 1496
 2015-08-16 21:38:41 +02:00
Zdenko Podobný
bb19f2c16b Fixes #76 - enable OpenMP support 2015-08-14 21:39:40 +02:00
zdenop
ae6f195b1f Merge pull request #81 from jakakonda/master 
Fix VC14 (VS2015) compile issue with snprintf
 2015-08-13 20:25:18 +02:00
Jaka Konda
0c492cb8bd Fixed VC14 compiler issue. 
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"

Signed-off-by: Jaka Konda <jaka.konda@outlook.com>
 2015-08-13 16:23:47 +02:00
zdenop
83c7f56140 Merge pull request #80 from rmtheis/fix-hocr-title 
Remove extraneous line feed
 2015-08-13 08:41:03 +02:00
Robert Theis
aa6a0b12f9 Remove extraneous line feed 2015-08-12 18:02:35 -07:00
Zdenko Podobný
0337d898d4 fix bug in UTF-16BE conversion 2015-08-10 21:22:20 +02:00
Zdenko Podobný
545a0634da improve NO_CUBE_BUILD 2015-08-09 18:09:52 +02:00
Zdenko Podobný
67ede37b50 Fixes #74 NO_CUBE_BUILD with reverting to ANDROID_BUILD in baseapi 2015-08-09 18:09:30 +02:00
Zdenko Podobný
628de5ba3f enable pdfrender with NO_CUBE_BUILD 2015-08-07 23:20:22 +02:00
Jeff Breidenbach
9dcf2c6aa8 replace CubeUtils::UTF8ToUTF32 in pdfrenderer 2015-08-07 22:18:33 +02:00
Zdenko Podobný
66a76a9477 Revert "temporary add config/*, configure and Makefile.in for release" 
This reverts commits ec9581d8f2, 1afe382c4e, 4b2cfabcc1
 2015-07-31 21:44:43 +02:00
Zdenko Podobný
bedc46f16d remove empty header file secname.h 2015-07-31 17:32:54 +02:00
Zdenko Podobný
d9376594a8 fix memmory leak based on issue 1488 (https://code.google.com/p/tesseract-ocr/issues/detail?id=1488) 2015-07-27 20:58:54 +02:00
ws233
0146185c04 Type mismatch on a 64bit platforms has been fixed. 2015-07-26 11:37:15 +03:00
Zdenko Podobný
5dfb0cb898 Fixes #64 - tessedit_create_txt 0 blocks box training 2015-07-25 22:49:55 +02:00
Zdenko Podobný
41478fd5a1 implement build without cube (-DNO_CUBE_BUILD) 2015-07-24 11:51:44 +02:00
zdenop
4085f91dd6 Merge pull request #62 from jimregan/jimregan-cygwin-2 
libicui18n is only called libicuin on mingw, not cygwin
 2015-07-24 07:28:22 +02:00
Jim O'Regan
6368a37da6 libicui18n is only called libicuin on mingw, not cygwin 2015-07-24 00:16:55 +01:00
zdenop
b31a3370c6 Merge pull request #60 from tesseract-ocr/jimregan-cygwin-1 
strcasestr needed on Cygwin too
 2015-07-24 00:05:22 +02:00
Jim Regan
c09ed71740 strcasestr needed on Cygwin too 
See: https://groups.google.com/d/msgid/tesseract-ocr/55B12C3C.3010908%40vol.at
```
pango_font_info.cpp:223:46: error: 'strcasestr' was not declared in this scope
   is_fraktur_ = (strcasestr(family, "Fraktur") != NULL);
```
 2015-07-23 22:20:10 +01:00
Zdenko Podobný
27b8a5cc89 fix GRAPHICS_DISABLED build 2015-07-23 23:14:53 +02:00
Zdenko Podobný
caab420896 fix typo 2015-07-23 14:15:45 +02:00
Zdenko Podobný
abf0981d97 rework opencl requirements (fix configure: error: conditional "AMDEP" was never defined) 2015-07-22 22:03:03 +02:00
Zdenko Podobný
ffbe610349 add check for opencl requirements 2015-07-22 14:40:07 +02:00
Zdenko Podobný
71e226c44f increase version number 2015-07-21 22:46:52 +02:00
Jim Regan
953523bbe2 What the...? Git's merge failed hard. 2015-07-20 22:42:58 +01:00
Zdenko Podobný
301eaeca5f replace vs2008 directory with vs2010 directory (fixes cygwin build) 2015-07-20 20:35:52 +02:00
Jim O'Regan
5cc948d28b stray "**" via merge conflict 2015-07-20 18:53:53 +01:00
Jim O'Regan
524a61452d Doxygen 
Squashed commit from https://github.com/tesseract-ocr/tesseract/tree/more-doxygen
closes #14

Commits:
6317305  doxygen
9f42f69  doxygen
0fc4d52  doxygen
37b4b55  fix typo
bded8f1  some more doxy
020eb00  slight tweak
524666d  doxygenify
2a36a3e  doxygenify
229d218  doxygenify
7fd28ae  doxygenify
a8c64bc  doxygenify
f5d21b6  fix
5d8ede8  doxygenify
a58a4e0  language_model.cpp
fa85709  lm_pain_points.cpp lm_state.cpp
6418da3  merge
06190ba  Merge branch 'old_doxygen_merge' into more-doxygen
84acf08  Merge branch 'master' into more-doxygen
50fe1ff  pagewalk.cpp cube_reco_context.cpp
2982583  change to relative
192a24a  applybox.cpp, take one
8eeb053  delete docs for obsolete params
52e4c77  modernise classify/ocrfeatures.cpp
2a1cba6  modernise cutil/emalloc.cpp
773e006  silence doxygen warning
aeb1731  silence doxygen warning
f18387f  silence doxygen; new params are unused?
15ad6bd  doxygenify cutil/efio.cpp
c8b5dad  doxygenify cutil/danerror.cpp
784450f  the globals and exceptions parts are obsolete; remove
8bca324  doxygen classify/normfeat.cpp
9bcbe16  doxygen classify/normmatch.cpp
aa9a971  doxygen ccmain/cube_control.cpp
c083ff2  doxygen ccmain/cube_reco_context.cpp
f842850  params changed
5c94f12  doxygen ccmain/cubeclassifier.cpp
15ba750  case sensitive
f5c71d4  case sensitive
f85655b  doxygen classify/intproto.cpp
4bbc7aa  partial doxygen classify/mfx.cpp
dbb6041  partial doxygen classify/intproto.cpp
2aa72db  finish doxygen classify/intproto.cpp
0b8de99  doxygen training/mftraining.cpp
0b5b35c  partial doxygen ccstruct/coutln.cpp
b81c766  partial doxygen ccstruct/coutln.cpp
40fc415  finished? doxygen ccstruct/coutln.cpp
6e4165c  doxygen classify/clusttool.cpp
0267dec  doxygen classify/cutoffs.cpp
7f0c70c  doxygen classify/fpoint.cpp
512f3bd  ignore ~ files
5668a52  doxygen classify/intmatcher.cpp
84788d4  doxygen classify/kdtree.cpp
29f36ca  doxygen classify/mfoutline.cpp
40b94b1  silence doxygen warnings
6c511b9  doxygen classify/mfx.cpp
f9b4080  doxygen classify/outfeat.cpp
aa1df05  doxygen classify/picofeat.cpp
cc5f466  doxygen training/cntraining.cpp
cce044f  doxygen training/commontraining.cpp
167e216  missing param
9498383  renamed params
37eeac2  renamed param
d87b5dd  case
c8ee174  renamed params
b858db8  typo
4c2a838  h2 context?
81a2c0c  fix some param names; add some missing params, no docs
bcf8a4c  add some missing params, no docs
af77f86  add some missing params, no docs; fix some param names
01df24e  fix some params
6161056  fix some params
68508b6  fix some params
285aeb6  doxygen complains here no matter what
529bcfa  rm some missing params, typos
cd21226  rm some missing params, add some new ones
48a4bc2  fix params
c844628  missing param
312ce37  missing param; rename one
ec2fdec  missing param
05e15e0  missing params
d515858  change "<" to &lt; to make doxygen happy
b476a28  wrong place
 2015-07-20 18:48:00 +01:00
Jim O'Regan
541408763d Merge branch 'master' of https://github.com/tesseract-ocr/tesseract 2015-07-20 10:08:15 +01:00
Jim O'Regan
05de195efc disable text creation for unlv, makebox, box.train, and box.train.stderr (see #49) 2015-07-20 10:07:55 +01:00
zdenop
4a358e1f02 Merge pull request #43 from spSerg/master 
class and struct are incompatible in MSVC2013 compiler.
 2015-07-20 08:33:18 +02:00
Zdenko Podobný
4f082a9294 fix link in README 2015-07-20 07:48:27 +02:00