Commit Graph

1577 Commits

Author SHA1 Message Date
Stefan Weil
9984077798 Change tesseract parameter -oem to --oem
It was introduced recently in commit f24ef67d, so there is no need
to support the old variant for compatibility reasons.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-07 17:12:37 +01:00
Stefan Weil
4789ca2ab8 Simplify new operations
It is not necessary to check for null pointers after new.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-07 17:10:10 +01:00
Stefan Weil
257d6e8156 cube: Simplify new operations
It is not necessary to check for null pointers after new.

Simplify also two delete operations which were missing
in the previous commit.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-07 17:09:52 +01:00
Zdenko Podobn??
5307204f93 Added std:: to vector 2016-12-07 17:05:01 +01:00
Zdenko Podobný
82529e31dd Formatting changes from clang_tidy on latest pull
# Conflicts:
#	ccutil/host.h
2016-12-07 16:58:25 +01:00
Morten Espersen
b169ef5d34 Correcting link for 3rd party wiki pages 2016-12-07 16:23:06 +01:00
Stefan Weil
73c0649d98 cube/char_samp: Fix some memory leaks
Coverity report:

CID 1164722 (#9 of 9): Resource leak (RESOURCE_LEAK)
20. leaked_storage: Variable label32 going out of scope leaks the storage
 it points to.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-07 16:22:48 +01:00
Stefan Weil
a2fa9cab36 cube/char_bigrams: Fix some memory leaks
Coverity report:

CID 1164717 (#1 of 1): Resource leak (RESOURCE_LEAK)
10. leaked_storage: Variable upper_32 going out of scope leaks
 the storage it points to.

CID 1164718 (#1 of 1): Resource leak (RESOURCE_LEAK)
10. leaked_storage: Variable lower_32 going out of scope leaks
 the storage it points to.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-07 16:22:39 +01:00
Stefan Weil
a74c6aa27d cube: Simplify delete operations
It is not necessary to check for null pointers.

Remove also unneeded delete operations and add missing delete operations
in cube/bmp_8.cpp.

Simplify also a conditional statement in cube/cube_object.cpp.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-07 16:22:26 +01:00
Stefan Weil
ca6e64e2c9 mingw-w64: Fix compiler warnings caused by macro redefinition
GNU compiler report (cross build for Windows on Debian):

In file included from ../ccutil/host.h:63:0,
                 from ../arch/dotproductsse.h:22,
                 from ../arch/dotproductsse.cpp:43:
../ccutil/platform.h:27:0: warning: "NOMINMAX" redefined
 #define NOMINMAX

In file included from /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/c++/i686-w64-mingw32/bits/c++config.h:495:0,
                 from /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/c++/cstdlib:41,
                 from /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/c++/stdlib.h:36,
                 from /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/mm_malloc.h:27,
                 from /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/xmmintrin.h:34,
                 from /usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/emmintrin.h:31,
                 from ../arch/dotproductsse.cpp:40:
/usr/lib/gcc/i686-w64-mingw32/6.1-win32/include/c++/i686-w64-mingw32/bits/os_defines.h:45:0:
 note: this is the location of the previous definition
 #define NOMINMAX 1

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-07 16:22:11 +01:00
Zdenko Podobný
f9253c197e Fix build for Mingw-w64 (120a5dbdab) and non C++11 build (VS2010) 2016-12-07 16:21:52 +01:00
Ray Smith
e9be858503 Fixed the memory leak/double free cleanly 2016-12-07 16:04:36 +01:00
Ray Smith
2940b44bcd Missing pdf font file from previous sync 2016-12-07 16:03:05 +01:00
Stefan Weil
743eb8104a Simplify delete operations
It is not necessary to check for null pointers.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-07 15:59:11 +01:00
Stefan Weil
c73f21aa6f Simplify calls of free
It is not necessary to check for null pointers.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-07 15:59:01 +01:00
Stefan Weil
892c007685 opencl: Fix OpenCL kernel code assertion for newer versions
With Debian package beignet-opencl-icd 1.2.1-1, Tesseract + OpenCL fails:

[DS] Profile file not available (tesseract_opencl_profile_devices.dat); performing profiling.

[DS] Device: "Intel(R) HD Graphics IvyBridge M GT2" (OpenCL) evaluation...
ASSERTION FAILED: sel.hasDoubleType()
  at file /home/geier/beignet/backend/src/backend/gen_insn_selection.cpp, function void gbe::ConvertInstructionPattern::convertDoubleToSmallInts(gbe::Selection::Opaque&, const gbe::ir::ConvertInstruction&, bool&) const, line 5269
Trace/breakpoint trap

Using a pure float expression (instead of double) fixes this issue.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-07 15:58:39 +01:00
Stefan Weil
4ade2752fc opencl: Format OpenCL kernel code
* Remove some empty lines to get a more uniform code
* Fix #endif handling at end of file

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-07 15:58:24 +01:00
Stefan Weil
46a84e761f opencl: Clean whitespace issues in OpenCL kernel code
* Remove whitespace at line endings
* Replace tabs by spaces

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-07 15:58:12 +01:00
Zdenko Podobný
c1d37120a5 backport from 4.00: imagedata 2016-12-07 15:55:27 +01:00
Zdenko Podobný
7099358510 backport from 4.00: training 2016-12-04 22:06:52 +01:00
Zdenko Podobný
53152e4221 change VS2010 lib project name 2016-12-02 21:28:31 +01:00
Zdenko Podobný
9ccda80dd6 backport from 4.00: training shell scripts 2016-12-02 21:07:28 +01:00
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