Commit Graph

1046 Commits

Author SHA1 Message Date
Tom Morris
1b4f83a1c9 Simplify build and run of ScrollView 2016-02-05 10:50:05 +01:00
Tom Morris
109c309356 Add ULL to constants which overflow 32 bits 2016-02-05 10:49:50 +01:00
James R. Barlow
b3eaf6d748 Fix configure.ac unconditionally enabling OpenCL 2016-02-05 10:47:27 +01:00
James R. Barlow
7b85eeafe2 Get OpenCL to compile on OS X
However, the output of the OpenCL build is garbage....
2016-02-05 10:47:15 +01:00
James R. Barlow
8d5abff34a 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.
2016-02-05 10:47:04 +01:00
James R. Barlow
8f6ebc95c0 Fix missing "allheaders.h" when compiling with --enable-opencl on OS X 2016-02-05 10:46:56 +01:00
James R. Barlow
98292ae435 Fix configure.ac for OS X and -framework 2016-02-05 10:46:41 +01:00
Zdenko Podobný
2df0ee56ab fix OpenCL build on Mac 2016-02-05 10:46:29 +01:00
Zdenko Podobný
d9aafcfcc5 fix VS2010 build 2016-02-05 10:46:19 +01:00
gargrahul
8e9159b091 Fixes for OpenCL issues reported on Apple Mac. Still get -54 on Apple Mac while running on OpenCL CPU, however it is ignored now. 2016-02-05 10:45:07 +01:00
Renard Wellnitz
2c8bc4a2ac fix to compile tesseract on mac with clang 2016-02-05 10:44:40 +01:00
Zdenko Podobný
07128d8432 remove info about VS 2008 2016-02-05 10:44:28 +01:00
Zdenko Podobný
387ae36cd0 rename README to README.md - fixes #45 2016-02-05 10:44:16 +01:00
Zdenko Podobný
b4b2aaee80 turn off optimisation in Microsoft Visual Studio for TextlineProjection::TruncateToImageBounds#pragma optimize( "", on )
fix issue 1496
2016-02-05 10:43:35 +01:00
Zdenko Podobný
f7fd63efea Fixes #76 - enable OpenMP support 2016-02-05 10:43:21 +01:00
Jaka Konda
9cc0914f06 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>
2016-02-05 10:43:02 +01:00
Robert Theis
76a28640c6 Remove extraneous line feed 2016-02-05 10:42:41 +01:00
Zdenko Podobný
85f8a98c93 fix bug in UTF-16BE conversion 2016-02-05 10:42:29 +01:00
Zdenko Podobný
41918a452a improve NO_CUBE_BUILD 2016-02-05 10:42:19 +01:00
Zdenko Podobný
9e4ceb1522 Fixes #74 NO_CUBE_BUILD with reverting to ANDROID_BUILD in baseapi 2016-02-05 10:42:10 +01:00
Zdenko Podobný
ff6c088084 enable pdfrender with NO_CUBE_BUILD 2016-02-05 10:41:49 +01:00
Jeff Breidenbach
300b5246f3 replace CubeUtils::UTF8ToUTF32 in pdfrenderer 2016-02-05 10:41:39 +01:00
Zdenko Podobný
7cb196d80d remove empty header file secname.h 2016-02-05 10:41:06 +01:00
Zdenko Podobný
350df2d27f fix memmory leak based on issue 1488 (https://code.google.com/p/tesseract-ocr/issues/detail?id=1488) 2016-02-05 10:40:56 +01:00
Zdenko Podobný
53d54f4684 Fixes #64 - tessedit_create_txt 0 blocks box training 2016-02-05 10:40:45 +01:00
Zdenko Podobný
982789ac35 implement build without cube (-DNO_CUBE_BUILD) 2016-02-05 10:40:26 +01:00
Jim O'Regan
e4613841ba libicui18n is only called libicuin on mingw, not cygwin 2016-02-05 10:40:13 +01:00
Jim Regan
84f1a3dc74 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);
```
2016-02-05 10:39:45 +01:00
Zdenko Podobný
0ae83ca5c4 fix GRAPHICS_DISABLED build 2016-02-05 10:39:37 +01:00
Zdenko Podobný
1cf492818f fix typo 2016-02-05 10:39:26 +01:00
Zdenko Podobný
45bd4ea8d4 rework opencl requirements (fix configure: error: conditional "AMDEP" was never defined) 2016-02-05 10:39:12 +01:00
Zdenko Podobný
e5f5b8605c add check for opencl requirements 2016-02-05 10:38:48 +01:00
Zdenko Podobný
b677761ba9 increase version number 2015-07-21 22:48:35 +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
zdenop
e4f4893fb8 Merge pull request #52 from unbe/null-pointer-access-in-hocr
Fix null pointer dereference when writing font name into HOCR.
2015-07-20 07:40:59 +02:00
zdenop
da9489388e Merge pull request #51 from unbe/TessDeleteResultRenderer-delete-fix
Fix incorrect use of delete[] in TessDeleteResultRenderer
2015-07-20 07:40:43 +02:00
zdenop
e231dbc362 Merge pull request #46 from jwilk/autogen-bashism
autogen.sh: fix a bashism
2015-07-20 07:40:19 +02:00
artem
2b6801eddb Fix null pointer dereference when writing font name into HOCR. 2015-07-19 22:05:02 +02:00
unbe
67ffea8877 Update capi.cpp
Make TessDeleteResultRenderer use delete, not delete[]
2015-07-19 15:15:42 +02:00
Jim O'Regan
43834da7a2 disable text creation when creating hOCR (issue #49) 2015-07-18 08:56:21 +01:00
Jeff Breidenbach
fd429c32a0 PDF creation: not disabling tessedit_create_txt
Okay, everything is more of less under control except for this:

  tesseract phototest.tif - pdf > phototest.pdf

This is sending activating both the text renderer, and the pdf renderer.
They both get sent to stdout where they mix together and cause chaos.
Same thing happens with this command.

   tesseract phototest.tif stdout pdf > phototest.pdf

What's happening is tesseractmain.cpp is setting tessedit_create_pdf without
disabling tessedit_create_txt.

https://groups.google.com/d/msgid/tesseract-dev/32c065ee-aefa-441a-b37b-b6bdc234c8ab%40googlegroups.com
2015-07-18 08:39:57 +01:00
Jakub Wilk
9851bb23b1 autogen.sh: fix a bashism
Use [ "$foo" = "bar" ] instead of [ "$foo" == "bar" ].
The latter is a bashism.
2015-07-13 17:26:40 +02:00
spSerg
0d910c3133 Merge remote-tracking branch 'upstream/master' 2015-07-13 11:10:40 +03:00