Commit Graph

1605 Commits

Author SHA1 Message Date
Zdenko Podobný
948689bd94 Merge branch '3.05' of https://github.com/tesseract-ocr/tesseract into 3.05 2016-12-02 21:02:55 +01:00
Zdenko Podobný
fc3d07b44f backport from 4.00: api changes 2016-12-02 21:01:17 +01:00
Zdenko Podobný
af1d856cd9 backport from 4.00: code improvements 2016-12-02 20:27:29 +01:00
Zdenko Podobný
2f8c1e7b52 backport from 4.00: split Dict::Load to SetupForLoad, Load and FinishLoad 2016-12-02 20:03:41 +01:00
Zdenko Podobný
775a108dc7 backport from 4.00: enable selection of OCR engine mode from command line 2016-12-02 19:50:54 +01:00
Zdenko Podobný
5750e728d9 use TessHashMap instead of hash_map, unordered_map 2016-11-30 21:58:57 +01:00
Zdenko Podobný
0cbbbe6321 backport from 4.00: SkipDeSerialize and changes in ccutil 2016-11-30 19:52:18 +01:00
Zdenko Podobný
9d1db80c69 backport from 4.00: changes from ccstruct excluding imagedata 2016-11-30 19:29:59 +01:00
Zdenko Podobný
3b777159a4 backport from 4.00: changes in classify 2016-11-30 18:44:55 +01:00
Zdenko Podobný
57d38b9270 backport from 4.00: changes in Android.mk 2016-11-30 12:59:42 +01:00
Zdenko Podobn??
e3236f44ce backport from 4.00: changes in textord 2016-11-30 12:01:58 +01:00
Zdenko Podobn??
ed0c60bc65 backport from 4.00: use ".empty()" instead of ".size() > 0" 2016-11-30 11:33:35 +01:00
Zdenko Podobn??
5882261969 backport from 4.00: use "const TBOX&" instead of "TBOX box" in textord 2016-11-30 11:14:34 +01:00
Zdenko Podobn??
6234da6686 backport from 4.00: changes in wordrec + FakeWordFromRatings 2016-11-30 10:56:25 +01:00
Zdenko Podobn??
70ed782ab5 style fix 2016-11-30 10:38:08 +01:00
Zdenko Podobný
382fdd52df backport from 4.00: changes in cube 2016-11-30 09:35:35 +01:00
Zdenko Podobný
493312c06e backport from 4.00: fix of destroy_nodes (oldlist.cpp) 2016-11-29 16:59:26 +01:00
Zdenko Podobný
c778cd50c0 backport from 4.00: changes in scrollviewer 2016-11-29 16:56:04 +01:00
Zdenko Podobný
01cf9c25cf increase GENERIC_MINOR_VERSION 2016-11-29 16:51:12 +01:00
Zdenko Podobný
aa9be096a8 add License info to cmake files 2016-11-29 16:50:57 +01:00
Zdenko Podobný
c8e2be63d0 backport from 4.00: fix pdfrenderer 2016-11-29 11:21:21 +01:00
Zdenko Podobný
d01dd0bdd4 backport from 4.00: show PSM 11-13 2016-11-29 11:18:52 +01:00
Zdenko Podobný
7169545a86 fix code style 2016-11-29 11:16:10 +01:00
Ray Smith
8a7de59f5d Fixed the memory leak/double free cleanly 2016-11-28 19:32:26 +01:00
Ray Smith
fe9fa88f1d Missing pdf font file from previous sync 2016-11-28 19:32:10 +01:00
Zdenko Podobný
6d47e9027d use leptonica from master git repository (1.74) 2016-11-27 21:39:23 +01:00
Amit D
0dccbeddcb AUTHORS: Add more contributors
and fix typo
2016-11-27 21:34:06 +01:00
Zdenko Podobný
6dcafe64f8 revert TessHashMap to hash_map in training/stringrenderer.h from 90651e1 (to fix build) 2016-11-27 21:26:29 +01:00
Zdenko Podobný
bf0f9013ef add license info to autogen.sh 2016-11-25 15:16:39 +01:00
Zdenko Podobný
8e7e27238f Merge branch '3.05' of https://github.com/tesseract-ocr/tesseract into 3.05 2016-11-25 15:15:17 +01:00
Zdenko Podobný
90651e111f backport style changes from 4.00 for better identification of fixes and new code 2016-11-25 15:14:46 +01:00
Zdenko Podobný
e5743fd647 backport style changes from 4.00 for better identification of fixes and new code 2016-11-25 13:43:57 +01:00
Zdenko Podobný
e9785a0018 downgrade to leptonica 1.73 2016-11-25 13:17:23 +01:00
Zdenko Podobný
057b932f02 backport from 4.00: add missing License information 2016-11-25 13:13:28 +01:00
Zdenko Podobný
e8d5152ab7 Increase version number in VS2010 and fix year 2016-11-25 09:37:57 +01:00
Amit D
f8e1c7e2a0 AUTHORS - Add community contributors
... and Jeff
2016-11-25 09:33:34 +01:00
Stefan Weil
054205f8fd Fix compiler warning (-Wmaybe-uninitialized)
gcc report:

ccstruct/blamer.cpp:343:65: warning:
 'truth_x' may be used uninitialized in this function [-Wmaybe-uninitialized]

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-11-25 09:32:59 +01:00
Ray Smith
4f3cc9c795 Fixed failed merge of memory leak 2016-11-25 09:32:16 +01:00
Stefan Weil
b0a2189c25 ccutil/ambigs: Optimize tesseract::UnicharIdArrayUtils::compare
The compare method is called very often, so even small improvements
are important.

The new code avoids one comparison in each loop iteration.
This results in smaller code (60 bytes for x86_64, gcc).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-11-25 09:31:52 +01:00
Zdenko Podobný
b04a910932 opencl: Fix typo in name of local variable
Signed-off-by: Stefan Weil <sw@weilnetz.de>

Conflicts:
	opencl/openclwrapper.cpp
2016-11-25 09:31:22 +01:00
Stefan Weil
56dc7d14b9 Fix typo in documentation
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-11-25 09:18:40 +01:00
Cristian Ciupitu
e5a86c47dd Fix a typo in tesseract(1) man page
C++ needs to escaped as C\+\+ in the AsciiDoc source code.
2016-11-25 09:18:17 +01:00
Zdenko Podobný
07ce98b7fc add option "make training-uninstall" 2016-11-25 09:17:48 +01:00
Stefan Weil
67fa73c95a training: Fix compiler warnings (deprecated register keyword)
training/commontraining.cpp:824:3: warning:
 'register' storage class specifier is deprecated and incompatible with C++1z [-Wdeprecated-register]
...

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-11-25 09:17:08 +01:00
Zdenko Podobný
f8cac770a3 backport from 4.00: issue #242 - different results when same image is lossless-encoded at different bpp 2016-11-25 09:06:58 +01:00
Stefan Weil
c097dd3592 opencl: Fix type of parameter for clGetProgramInfo
CL_PROGRAM_NUM_DEVICES expects a cl_uint.

Passing size_t results in a wrong value for numDevices on hosts where
sizeof(cl_uint) != sizeof(size_t).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-11-24 13:55:21 +01:00
Stefan Weil
0518bb549f opencl: Fix type of parameter for clGetContextInfo
CL_CONTEXT_NUM_DEVICES expects a cl_uint.

Passing size_t results in a wrong value for numDevices on hosts where
sizeof(cl_uint) != sizeof(size_t). This results in errors like these:

  Tesseract Open Source OCR Engine v3.05.00dev with Leptonica
  OpenCL error code is -44 at   when clCreateKernel kernel_HistogramRectAllChannels .
  OpenCL error code is -44 at   when clCreateKernel kernel_HistogramRectAllChannelsReduction .
  OpenCL error code is -48 at   when clSetKernelArg imageBuffer .
  ...

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-11-24 13:55:11 +01:00
Zdenko Podobný
c5fdba596e allow combination of enable/disable 2016-11-24 13:54:56 +01:00
Stefan Weil
c4dbc0e0fd Fix crash caused by undefined value of local variable
Commit b1f03cb697 added a call of function
FreeFeatureSet to fix a memory leak, but introduced a new bug because the
local variable FloatFeatures was not always assigned a value.

Now FloatFeatures is always assigned a value, and we only need a single
place where FreeFeatureSet is called.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-11-24 13:54:38 +01:00
Stefan Weil
5919916bc5 opencl: Remove unused function getNumDeviceWithEmptyScore
This fixes compiler warnings.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-11-24 13:53:49 +01:00