Commit Graph

2177 Commits

Author SHA1 Message Date
Mikhail Solomennik
e2974cf953 err -> err_exit 2017-01-20 18:50:47 +03:00
Jeff Breidenbach
a979494897 fix #665 process file list 2017-01-19 15:19:35 +01:00
zdenop
170573f044 Merge pull request #662 from amitdo/remove-hashfn2
Remove code that is no longer needed
2017-01-16 08:27:53 +01:00
Egor Pugin
080eb73ac6 Update cppan.yml 2017-01-16 10:17:13 +03:00
Egor Pugin
1920288a9e Update appveyor.yml 2017-01-16 09:43:30 +03:00
amitdo
5d627aacae Remove code that is no longer needed
The code in ccutil/hashfn.h was needed for some old compilers. Now that we support MSVC >= 2010 and compilers that has good support for C++11, we can drop this code.

As a result of this file removal, we now use:
  std::unordered_map
  std::unordered_set
  std::unique_ptr
directly in the codebase with '#include' for the needed headers.
2017-01-16 01:49:17 +02:00
Egor Pugin
e2ee78061a Uncomment silent options for cppan. 2017-01-13 22:16:17 +03:00
zdenop
fd835d3ed4 Merge pull request #658 from Wikinaut/patch-1
2 typo corrections "specific"
2017-01-13 08:19:12 +01:00
Wikinaut
f06ef543fc typo correction "specific" 2017-01-13 04:24:16 +01:00
Wikinaut
39274d8000 typo correction "specific" 2017-01-13 04:17:32 +01:00
Egor Pugin
89f33c5ad7 Update appveyor.yml 2017-01-12 12:24:33 +03:00
Egor Pugin
809e49afc4 Update appveyor.yml 2017-01-12 03:33:41 +03:00
Egor Pugin
a79d0c936d Update appveyor.yml 2017-01-12 03:31:23 +03:00
Egor Pugin
ef9932ad7c Update appveyor.yml 2017-01-12 03:30:53 +03:00
Egor Pugin
d2bcd00463 Update appveyor.yml 2017-01-12 03:17:26 +03:00
Egor Pugin
f02027d4e4 Update appveyor.yml 2017-01-11 21:48:05 +03:00
Egor Pugin
dc97e924bc Merge branch 'master' of github.com-egorpugin:tesseract-ocr/tesseract 2017-01-11 21:28:12 +03:00
Egor Pugin
7156a7e288 Add text2image binary when building with cppan. 2017-01-11 21:27:45 +03:00
Egor Pugin
429347b3b8 Update appveyor.yml 2017-01-11 20:48:42 +03:00
Egor Pugin
9bdb7110df Update appveyor.yml 2017-01-11 20:48:31 +03:00
Egor Pugin
4d9609dab3 Update appveyor.yml 2017-01-11 20:37:28 +03:00
Egor Pugin
6b3f20b4b9 Update appveyor.yml 2017-01-11 20:13:20 +03:00
Egor Pugin
30e68f995a Update appveyor.yml 2017-01-11 19:31:56 +03:00
Egor Pugin
5b45e5a236 Update cppan.yml 2017-01-09 17:57:40 +03:00
zdenop
8fd8cc758a Merge pull request #643 from amitdo/autoconf-non-cpp11-error
configure.ac: Exit if compiler does not have c++11 support
2017-01-08 19:20:56 +01:00
Amit D
e6829546ae configure.ac: Exit if compiler does not have c++11 support 2017-01-08 19:00:58 +02:00
Egor Pugin
263a4d2601 Update README.md 2017-01-07 19:46:06 +03:00
Egor Pugin
6f83ba0dae Add include dirs to cppan config. 2017-01-02 03:08:55 +03:00
Egor Pugin
2a5a9151f1 Add training tool deps. 2017-01-02 02:12:50 +03:00
Egor Pugin
3817aa3079 Fix windows dll build. 2016-12-28 23:32:52 +03:00
zdenop
e6ccfb2fe2 Merge pull request #625 from stweil/lstm
Move AVX / SSE messages to function PrintVersionInfo (crash fix)
2016-12-28 14:06:00 +01:00
Stefan Weil
534a237015 Move AVX / SSE messages to function PrintVersionInfo (crash fix)
This information is not needed for normal runs, so it is sufficient
to show it on request (like versions and OpenCL information).

This also fixes a crash caused by undefined order of global constructors:

When the global variable SIMDDetect::detector is initialized before the
global variable debug_file, the first tprintf call in simddetect.cpp
crashes because of a NULL pointer in debug_file. This was only seen when
running with a shared library (libtesseract.so).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-28 13:35:44 +01:00
zdenop
38033cebb7 Merge pull request #618 from stweil/lstm
lstm: Move class SIMDDetect to new source file and improve code
2016-12-27 14:13:19 +01:00
Stefan Weil
19616b07ba lstm: Move class SIMDDetect to new source file and improve code
Modify also the code to use a singleton. This simplifies the code as
no locking is needed. It also slightly improves the performance because
no check whether the architecture was tested is needed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-27 13:25:08 +01:00
zdenop
e949812e63 Merge pull request #617 from stweil/lept
Remove code for old versions of Leptonica
2016-12-27 12:05:16 +01:00
Stefan Weil
680bfddb4f Remove code for old versions of Leptonica
Those versions are no longer supported.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-27 11:57:44 +01:00
zdenop
e8d477c538 Merge pull request #616 from stweil/lstm
lstm: Update AVX / SSE support
2016-12-27 11:50:55 +01:00
Stefan Weil
5cfe0c700c lstm: Add AVX / SSE support for Windows
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-27 11:14:15 +01:00
Stefan Weil
b2a0262c59 lstm: Update AVX / SSE support
* Fix compiler warning (see below)

* Use Linux code for Mingw-w64, too

* Simplify conditional code by using X86_BUILD instead of NONX86_BUILD

* Remove unneeded call of __get_cpuid_max (already called by __get_cpuid)

* Remove unneeded #undef statement

gcc report:

lstm/weightmatrix.cpp: In static member function
 'static double tesseract::WeightMatrix::DotProduct(const double*, const double*, int)':
weightmatrix.cpp:67:29: warning:
 'ecx' may be used uninitialized in this function [-Wmaybe-uninitialized]
       avx_available_ = (ecx & 0x10000000) != 0;
                             ^
lstm/weightmatrix.cpp:64:30: note: 'ecx' was declared here
       unsigned int eax, ebx, ecx, edx;
                              ^
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-27 10:21:50 +01:00
Egor Pugin
fc94820a29 Update appveyor.yml 2016-12-27 01:18:27 +03:00
zdenop
25fed52bd5 Merge pull request #614 from stweil/lept
Fix build for non x86
2016-12-26 19:28:06 +01:00
Stefan Weil
9a4a32137c Fix build for non x86
cpuid.h is only available for x86 builds. There are lots of non x86
architectures, so simply checking for PowerPC is not enough.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-26 19:17:03 +01:00
zdenop
21a5c51e58 Update INSTALL.GIT.md
add info about autoconf-archive
2016-12-26 18:03:07 +01:00
Egor Pugin
f4ea71ea22 Update CMakeLists.txt 2016-12-26 17:51:03 +03:00
Egor Pugin
04f43701d9 Update appveyor.yml 2016-12-26 17:36:03 +03:00
Egor Pugin
1127d0145e Update CMakeLists.txt 2016-12-26 17:35:50 +03:00
Egor Pugin
3566a1d467 Merge pull request #613 from stweil/lept
Fix Leptonica version check for cmake
2016-12-26 17:33:53 +03:00
Egor Pugin
c160f80133 Add error message with cmake 3.6. 2016-12-26 17:30:41 +03:00
Stefan Weil
7a9a2f7b33 Fix Leptonica version check for cmake
* The check was missing.
* The check did not work with the given Leptonica version.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-12-26 15:28:31 +01:00
Egor Pugin
c124f87d5b Merge pull request #608 from amitdo/cmake-leptonica-1740
CMake - Set minimum Leptonica version to 1.74.0
2016-12-25 14:05:41 +03:00