Commit Graph

2526 Commits

Author SHA1 Message Date
zdenop
ae53ed6a07 Merge pull request #749 from stweil/warn
Fix indentation after conditional [-Wmisleading-indentation]
2017-03-07 19:24:50 +01:00
Stefan Weil
cd925fd812 Fix indentation after conditional [-Wmisleading-indentation]
The indentation is wrong since commit
fd0683f9e0 and results in a gcc warning:

api/baseapi.cpp: In member function 'bool tesseract::TessBaseAPI::ProcessPagesMultipageTiff(const l_uint8*, size_t, const char*, const char*, int, tesseract::TessResultRenderer*, int)':
api/baseapi.cpp:986:5: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
     if (tessedit_page_number >= 0)
     ^~
api/baseapi.cpp:988:7: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
       pix = (data) ? pixReadMemFromMultipageTiff(data, size, &offset)
       ^~~

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-03-07 19:05:40 +01:00
Egor Pugin
b851d47b9c Merge pull request #742 from stweil/doc
Use camel case for GitHub in README.md
2017-03-03 01:05:45 +03:00
Stefan Weil
ef113d1061 Use camel case for GitHub in README.md
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-03-02 15:16:28 +01:00
Egor Pugin
d3a694af77 Merge pull request #741 from solomennikm/fix-reading-carriage-return-in-config-files
Fix reading carriage return in config files
2017-03-01 16:18:07 +03:00
Mikhail Solomennik
ba4b60374d Correct reading config files with \r\n 2017-03-01 14:41:17 +03:00
zdenop
e68e48772d Merge pull request #738 from stweil/avx
Support AVX for 32 bit platforms
2017-02-27 19:35:19 +01:00
Stefan Weil
e663d00fbe Support AVX for 32 bit platforms
_mm256_extract_epi64 is not available for 32 bit platforms,
but it can be replaced by "a very simple workaround".

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-02-27 11:15:28 +01:00
Egor Pugin
6a7831b06d Remove global sse define from cppan. 2017-02-24 11:59:08 +03:00
Egor Pugin
182c6bb9e7 Fix cppan dir. 2017-02-23 20:47:17 +03:00
Egor Pugin
e376ffc5fe Fix avx on windows. 2017-02-23 19:29:48 +03:00
Egor Pugin
4cd5e91171 Update cppan dependencies. 2017-02-23 15:54:56 +03:00
Egor Pugin
5118384542 Fix sse4.1 on windows. 2017-02-23 15:50:09 +03:00
Egor Pugin
0dcb6b3547 Rename cppan/cmake projects. 2017-02-23 15:39:58 +03:00
Zdenko Podobný
a011b15b0d fix #712: Ghostscript mangling Tesseract-produced PDFs 2017-02-15 17:09:37 +01:00
Egor Pugin
2f10be5f6b Update CMakeLists.txt 2017-02-07 17:50:30 +03:00
zdenop
d79c11b648 Merge pull request #702 from stweil/typo
Fix typo in comment
2017-02-05 15:59:22 +01:00
Stefan Weil
f6eed019ab Fix typo in comment
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-02-05 12:51:09 +01:00
zdenop
0ff26ee3de Merge pull request #698 from stweil/configure
configure: Run AVX test only with 64 bit compiler
2017-02-03 08:15:15 +01:00
Leo Arias
cfd8b4a3f3 Add the packaging metadata to build the tesseract snap 2017-02-03 06:37:39 +00:00
Stefan Weil
b7ef3e0193 configure: Run AVX test only with 64 bit compiler
The current implementation for AVX uses 64 bit code,
so run the AVX test only when the compiler is a 64 bit compiler.

This fixes the broken implementation for 32 bit hosts
which provide AVX but call the stub of DotProductAVX.

Simplify also the conditional code for AVX_OPT and SSE41_OPT.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-02-02 21:59:27 +01:00
Jeff Breidenbach
bd45b3ae4f fix #537: Error in pixClone: pixs not defined 2017-01-29 16:59:52 +01:00
Jeff Breidenbach
fd0683f9e0 remove obsolete OpenCl code from TessBaseAPI::ProcessPagesMultipageTiff; fixes #635 2017-01-29 16:43:10 +01:00
zdenop
5291ae967b Merge pull request #680 from voyageur/disable_graphics
Fix GRAPHICS_DISABLED build, issue #679
2017-01-29 16:29:30 +01:00
zdenop
5de844f54c Merge pull request #687 from jwilk/spelling
Fix typos
2017-01-29 16:27:37 +01:00
Jakub Wilk
bf9f40cac6 Fix typos 2017-01-29 13:12:24 +01:00
Bernard Cafarelli
57b7236f7f
Provide SVSync::StartThread() with GRAPHICS_DISABLED 2017-01-27 12:06:15 +01:00
Bernard Cafarelli
4c39775c2d
Fix Network declarations with GRAPHICS_DISABLED 2017-01-27 12:06:15 +01:00
Bernard Cafarelli
8aeb73e507
Partial fix for GRAPHICS_DISABLED build, issue #679
Include automatically generated configuration file if running autoconf
2017-01-26 11:40:35 +01:00
Ray Smith
f566a45b30 clang-tidy changes from sync 2017-01-25 16:20:19 -08:00
Ray Smith
a1c22fb0d0 Fixed issue #557 2017-01-25 16:05:59 -08:00
Ray Smith
b453f74e01 Fixed issue #633 (multi-language mode 2017-01-25 15:58:39 -08:00
Ray Smith
ca16a08c10 Removed dead TODO 2017-01-25 15:54:11 -08:00
Egor Pugin
9b604b1eb9 Fix possible warning when WIN32_LEAN_AND_MEAN is already defined. 2017-01-24 00:22:36 +03:00
Egor Pugin
d6f2ba8df4 Update cppan.yml 2017-01-23 23:52:57 +03:00
zdenop
a8e8bac621 Merge pull request #666 from solomennikm/err-err_exit
err -> err_exit
2017-01-23 21:51:04 +01:00
zdenop
65b3ddeb68 Merge pull request #675 from stweil/macos-simd-detect
Implement SIMD detection on macOS-gcc; complain if no SIMD detection
2017-01-23 21:26:53 +01:00
James R. Barlow
fa677f1ba1 Implement SIMD detection on macOS-gcc; complain if no SIMD detection
Change SIMD detection to instead check for compilers with __get_cpuid.
Verified that this compiles and runs on macOS El Capitan with homebrew gcc.

Also added an #error if SIMD checking is missing. Compilers that have no
SIMD should make that explicit.

[sw: Merged original commits and slightly polished the commit message]
[sw: Removed test for __MINGW32__ which is no longer needed]

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-01-23 13:41:03 +01:00
zdenop
c768b5867d Merge pull request #668 from Wikinaut/chg-textonly-pdf-parameter-description
Improve textonly_pdf parameter description
2017-01-21 16:29:06 +01:00
Wikinaut
c03299e2b4 Improve textonly_pdf parameter description 2017-01-21 16:18:53 +01:00
Egor Pugin
1602234cd3 Merge pull request #671 from stweil/warnings
Fix some compiler warnings (unused variables)
2017-01-21 14:58:11 +03:00
Egor Pugin
ef708652c1 Merge pull request #669 from Wikinaut/fix-typo-in-parameter-description
fix typo in parameter description
2017-01-21 14:56:54 +03:00
Stefan Weil
465e2def7b lstm: Remove unused constant and unused local variables
This fixes three compiler warnings.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-01-21 12:32:06 +01:00
Stefan Weil
134a253758 ccstruct: Remove unused local variable
This fixes a compiler warning.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-01-21 12:32:06 +01:00
Wikinaut
98df78ca8a fix typo in parameter description 2017-01-21 10:48:25 +01:00
Zdenko Podobný
8ce58ac458 Fix C-API 2017-01-21 07:40:54 +01:00
zdenop
3d9fb3bf14 Merge pull request #667 from jbarlow83/slash-xobject
Fix PDF syntax error: "XObject" instead of "/XObject" when textonly_pdf=false
2017-01-21 07:37:54 +01:00
James R. Barlow
bf638b9202 Fix PDF syntax error: "XObject" instead of "/XObject" when textonly_pdf=false 2017-01-20 13:36:38 -08:00
Zdenko Podobný
effa5741e6 Implement invisible text only for PDF 2017-01-20 21:26:34 +01:00
Mikhail Solomennik
e2974cf953 err -> err_exit 2017-01-20 18:50:47 +03:00