Skip to content

Commit 5e3665c

Browse files
committed
Remove most libtiff dependencies
libtiff is no longer needed for OpenCL, so remove that dependency. It is still suggested for Windows to redirect warning messages from the tesseract executable to the console. Signed-off-by: Stefan Weil <sw@weilnetz.de>
1 parent 2b373d1 commit 5e3665c

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

api/Makefile.am

+1-2
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,8 @@ tesseract_LDFLAGS = $(OPENCL_LDFLAGS)
8585
tesseract_LDADD += $(LEPTONICA_LIBS)
8686
tesseract_LDADD += $(OPENMP_CXXFLAGS)
8787

88-
tesseract_LDADD += -ltiff
89-
9088
if T_WIN
89+
tesseract_LDADD += -ltiff
9190
tesseract_LDADD += -lws2_32
9291
libtesseract_la_LDFLAGS += -no-undefined -Wl,--as-needed -lws2_32
9392
endif

configure.ac

+2-5
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ AM_CONDITIONAL([GRAPHICS_DISABLED], false)
7878
AC_SUBST([AM_CPPFLAGS])
7979

8080
OPENCL_INC="/opt/AMDAPP/include"
81-
OPENCL_LIBS="-lOpenCL -ltiff"
81+
OPENCL_LIBS="-lOpenCL"
8282
#############################
8383
#
8484
# Platform specific setup
@@ -226,7 +226,7 @@ case "${host_os}" in
226226
fi
227227
AM_CPPFLAGS="-DUSE_OPENCL $AM_CPPFLAGS"
228228
OPENCL_CPPFLAGS=""
229-
OPENCL_LDFLAGS="-framework OpenCL -ltiff"
229+
OPENCL_LDFLAGS="-framework OpenCL"
230230
fi
231231
;;
232232
*)
@@ -240,9 +240,6 @@ case "${host_os}" in
240240
if !($have_opencl_lib); then
241241
AC_MSG_ERROR([Required OpenCL library not found!])
242242
fi
243-
if !($have_tiff); then
244-
AC_MSG_ERROR([Required TIFF headers not found! Try to install libtiff-dev?? package.])
245-
fi
246243
AM_CPPFLAGS="-DUSE_OPENCL $AM_CPPFLAGS"
247244
OPENCL_CPPFLAGS="-I${OPENCL_INC}"
248245
OPENCL_LDFLAGS="${OPENCL_LIBS}"

opencl/openclwrapper.h

-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
#include <stdio.h>
1515
#include "allheaders.h"
1616
#include "pix.h"
17-
#ifdef USE_OPENCL
18-
#include "tiff.h"
19-
#include "tiffio.h"
20-
#endif
2117
#include "tprintf.h"
2218

2319
// including CL/cl.h doesn't occur until USE_OPENCL defined below

0 commit comments

Comments
 (0)