Commit Graph

3653 Commits

Author SHA1 Message Date
Nick White
de789ac8ea Use mktemp to create workspace directory
mktemp is a better idea for security, as well as enabling users to
specify a different directory using the TMPDIR environment variable,
which is useful if /tmp is a small tmpfs.

Also fix a bug where the first few log messages were failing as the
workspace directory wasn't been created early enough.
2015-09-10 15:05:07 +01:00
Nick White
c0133ecfa6 Add --exposures option to tesstrain.sh
This flag can be used to specify multiple different exposure levels
for a training. There was some code already in tesstrain_utils.sh
to deal with multiple exposure levels, so it looks like this
functionality was always intended.

The default usage does not change, with exposure level 0 being the
only one used if --exposures is not used.
2015-09-10 14:57:17 +01:00
zdenop
da703a0a78 Merge pull request #91 from tfmorris/scrollview-convenience
Simplify build and run of ScrollView
2015-09-10 08:36:08 +02:00
zdenop
f25d63ea91 Merge pull request #90 from tfmorris/32bitlong-overflow
Add ULL to constants which overflow 32 bits
2015-09-10 08:35:38 +02:00
Tom Morris
b10fe909bc Merge branch 'scrollview-convenience' of github.com:tfmorris/tesseract into scrollview-convenience 2015-09-09 17:24:30 -04:00
Tom Morris
4d92667e89 Simplify build and run of ScrollView 2015-09-09 17:21:58 -04:00
Tom Morris
a1e14ea93c Add ULL to constants which overflow 32 bits 2015-09-09 16:51:45 -04:00
Egor Pugin
25136e40ea Restore ICU_INCLUDE_DIRS for OS X. 2015-09-07 13:02:22 +03:00
Egor Pugin
5e7ffe9e56 Remove unused option. 2015-09-07 12:57:02 +03:00
Egor Pugin
252080dbca Do static build with some tools on appveyor. 2015-09-07 12:50:20 +03:00
Egor Pugin
670e0fafb3 Hide pango and cairo includes from targets that do not use it. 2015-09-07 12:49:08 +03:00
Egor Pugin
da3852dc77 Fix cygwin build. 2015-09-07 02:49:18 +03:00
Egor Pugin
c0d8a07b9d Fix a lot of training tool to work on windows with static build. 2015-09-07 01:46:33 +03:00
egorpugin
b1d0cb9692 Update appveyor.yml 2015-09-07 00:40:24 +03:00
Egor Pugin
b375728012 Add BUILD_TRAINING CMake option. 2015-09-06 23:59:54 +03:00
egorpugin
bf36e5200a Update appveyor.yml 2015-09-06 23:35:30 +03:00
egorpugin
9c55472210 Update README.md 2015-09-06 22:59:23 +03:00
Egor Pugin
083639fff9 Add appveyor.yml. 2015-09-06 22:30:11 +03:00
egorpugin
25225117b6 Update .travis.yml 2015-09-06 22:12:45 +03:00
egorpugin
57947cd053 Update .travis.yml 2015-09-06 22:05:54 +03:00
egorpugin
a65f2da409 Update .travis.yml 2015-09-06 21:58:49 +03:00
egorpugin
c3198df368 Update .travis.yml 2015-09-06 21:52:42 +03:00
egorpugin
8d8636a1fc Update CMakeLists.txt 2015-09-06 21:42:47 +03:00
egorpugin
e5fad6432e Update .travis.yml 2015-09-06 21:36:47 +03:00
egorpugin
df2309727d Update .travis.yml 2015-09-06 21:21:53 +03:00
egorpugin
d7059e13fd Update .travis.yml 2015-09-06 21:15:04 +03:00
egorpugin
f9f85b88d0 Update CMakeLists.txt 2015-09-06 21:05:05 +03:00
egorpugin
e67372c849 Update .travis.yml 2015-09-06 20:59:04 +03:00
egorpugin
707888a582 Update README.md 2015-09-06 20:55:05 +03:00
Egor Pugin
0f651c187b Add .travis.yml. 2015-09-06 20:54:05 +03:00
Egor Pugin
03531ba8a5 Fix linux build. 2015-09-06 20:43:28 +03:00
Egor Pugin
5e3b8d33e3 Add source groups. 2015-09-06 13:47:30 +03:00
Egor Pugin
56a5195293 Initial CMake implementation. 2015-09-06 00:47:32 +03:00
Clemens Eisserer
0fd413405f Initialize output parameters of word_char_quality() to zero before early exit 2015-09-02 17:05:14 +02:00
Zdenko Podobný
73b28982aa Merge branch 'master' of https://github.com/tesseract-ocr/tesseract
* 'master' of https://github.com/tesseract-ocr/tesseract:
2015-09-01 17:44:25 +02:00
Zdenko Podobný
c4d52c77be Merge pull request #87 from jbarlow83/master
Get --enable-opencl to compile (but not work)
2015-09-01 17:43:38 +02:00
zdenop
48764964db Merge pull request #87 from jbarlow83/master
Get --enable-opencl to compile (but not work)
2015-08-30 21:41:33 +02:00
Nick White
8e71c79dc2 Remove --bin_dir option from tesstrain.sh (should use $PATH instead)
The --bin_dir option to tesstrain.sh is not useful, as $PATH does the
same job much better, so switch to relying on that instead.

This also makes the code a bit more readable, as it removes the need
to refer to binaries as COMMAND_NAME_EXE rather than just command_name.
2015-08-26 18:49:14 +01:00
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