Commit Graph

1022 Commits

Author SHA1 Message Date
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
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
Zdenko Podobný
228317caa1 Merge branch 'master' of https://github.com/tesseract-ocr/tesseract
* 'master' of https://github.com/tesseract-ocr/tesseract:
  temporary add config/* for release
2015-07-11 09:53:12 +02:00
Zdenko Podobný
1afe382c4e temporary add config/* for release 2015-07-11 09:52:45 +02:00
Zdenko Podobný
4b2cfabcc1 temporary add config/* for release 2015-07-11 09:50:31 +02:00
Zdenko Podobný
8950a2ec96 change version 2015-07-11 09:43:50 +02:00
Zdenko Podobný
bf3f125ad5 change links from code.google.com to github.com 2015-07-11 09:43:31 +02:00
Zdenko Podobný
ec9581d8f2 temporary add configure and Makefile.in for release 2015-07-11 09:42:43 +02:00
Zdenko Podobný
b8862b33df remove unsupported VS2008 solution 2015-07-11 07:41:13 +02:00
Zdenko Podobný
cdc84a5dd7 fix VS2010 build 2015-07-11 07:38:57 +02:00
Ray Smith
462eff5088 Merge branch 'master' of https://github.com/tesseract-ocr/tesseract
Huh?
2015-07-10 16:00:59 -07:00
Ray Smith
19c26f0646 Removed warning about ligatures and fixed root font dir 2015-07-10 15:56:33 -07:00
Ray Smith
bb8cf7b3ae Yet another clang format fix 2015-07-09 14:56:22 -07:00
Ray Smith
44122698d7 Removed debug messages, forward compatability of traineddata files, further bug fix. 2015-07-09 14:50:25 -07:00
Ray Smith
a303ab9d00 Misc fixes, mostly clang formatting, but some bug fixes in matrix, werd, and tesstrain_utils. Also updates unicharset to match traineddata files. 2015-07-09 14:28:20 -07:00
spSerg
015fdcbd08 class and struct are incompatible in MSVC2013 conpiler.
At least as a template parameter.
2015-07-09 21:45:29 +03:00
Zdenko Podobný
d00d833b9b fix OpenCL on mac thank to mevikas (https://code.google.com/p/tesseract-ocr/issues/detail?id=1479) 2015-06-29 12:39:29 +02:00
Jeff Breidenbach
935e72401a Changes to get 'make-dist' to work
This is what was required to get 'make-dist' to work. I left autogen alone
since it works, albeit with an error message. My practice packages appear
to work fine.
2015-06-29 08:11:26 +01:00
Zdenko Podobný
dcc457cc05 add new lang info 2015-06-28 22:26:39 +02:00
zdenop
e8b6d6f71b Merge pull request #39 from tfmorris/patch-1
Update for Github & fix spelling
2015-06-22 22:09:56 +02:00
Tom Morris
d3c69072d7 Update for Github & fix spelling 2015-06-22 16:08:18 -04:00
Zdenko Podobný
3a0da4e1b7 fix DISABLE_GRAPHICS build (google code issue 1490) 2015-06-21 22:50:14 +02:00
Zdenko Podobný
392ad881cc fix link to UNVL test 2015-06-14 17:29:55 +02:00
Zdenko Podobný
6a998ec5d0 fix redefinition in stringrenderer.cpp (stringrenderer.h) 2015-06-14 17:29:27 +02:00
Zdenko Podobný
9b7f2527f1 fix links in doc; autotools requires README 2015-06-13 00:08:05 +02:00
Ray Smith
0ee178d79b Clang fixes to earlier changes and build compatability with Google environment part 2 2015-06-12 11:17:47 -07:00