Commit Graph

27 Commits

Author SHA1 Message Date
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
Zdenko Podobný
0c3c3eaba8 fix VS2010 build 2015-08-24 14:54:13 +02:00
gargrahul
5c6a57b727 Fixes for OpenCL issues reported on Apple Mac. Still get -54 on Apple Mac while running on OpenCL CPU, however it is ignored now. 2015-08-24 15:57:18 +05:30
Zdenko Podobný
66a76a9477 Revert "temporary add config/*, configure and Makefile.in for release"
This reverts commits ec9581d8f2, 1afe382c4e, 4b2cfabcc1
2015-07-31 21:44:43 +02:00
Zdenko Podobný
ec9581d8f2 temporary add configure and Makefile.in for release 2015-07-11 09:42:43 +02:00
Ray Smith
bb8cf7b3ae Yet another clang format fix 2015-07-09 14:56:22 -07:00
Ray Smith
a303ab9d00 Misc fixes, mostly clang formatting, but some bug fixes in matrix, werd, and tesstrain_utils. Also updates unicharset to match traineddata files. 2015-07-09 14:28:20 -07:00
Zdenko Podobný
d00d833b9b fix OpenCL on mac thank to mevikas (https://code.google.com/p/tesseract-ocr/issues/detail?id=1479) 2015-06-29 12:39:29 +02:00
Zdenko Podobný
5755a5cecb fix opencl build on OSX (issue 1272) 2014-08-18 09:37:21 +02:00
Zdenop
689c8e5667 fix VS2010 build 2014-08-15 23:00:20 +02:00
zdenop
41bd040ef5 fix issue 1043
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1116 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-06-08 21:26:02 +00:00
rajesh.katikam@gmail.com
3ff108cf45 OpenCL fix for PixMemTiff
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1114 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-06-02 05:42:05 +00:00
zdenop@gmail.com
cbc540a944 fix VS2010 opencl build
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1021 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-27 21:34:41 +00:00
zdenop@gmail.com
ac5a8a871b fix windows builds (mingw and VS2010)
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1017 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-26 22:39:20 +00:00
zdenop
644c817f85 fix opencl endl; fix leptonica warning
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1016 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-26 17:38:37 +00:00
zdenop@gmail.com
71ae509354 fix for mingw32/g++ 4.8.1
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@998 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-22 08:10:15 +00:00
theraysmith@gmail.com
fec09faab9 Some formatting changes only to make it a bit more consistent with the rest of the code
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@991 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-17 18:51:27 +00:00
zdenop
26f8f58042 fix android issues
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@990 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-15 22:47:37 +00:00
zdenop
3d1e1cc23d fix opencl build
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@986 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-13 22:41:52 +00:00
theraysmith@gmail.com
8f08a64b65 Fix for opencl on mac?
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@968 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2014-01-09 18:08:58 +00:00
zdenop
8b3e590123 fix OpenCL build on OSX 10.9; add info about OpenCL to 'tesseract -v'
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@921 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-12-14 08:35:14 +00:00
rajesh.katikam@gmail.com
b8d7a1d139 Fixed all the crashes observed on 24 bit and 8 bit images.
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@919 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-12-10 10:52:54 +00:00
zdenop
38b25b5777 fix issue 1018, 1031
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@918 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-12-06 22:07:46 +00:00
rajesh.katikam@gmail.com
bf0a83907b Cleaned up configure.ac and Makefile.am in multiple folder to use OPENCL paths
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@910 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-11-12 10:40:40 +00:00
rajesh.katikam@gmail.com
983aaabaae Initial version of OpenCL support added.
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@909 d0cd1f9f-072b-0410-8dd7-cf729c803f20
2013-11-11 17:43:13 +00:00