Commit c386bae0 authored by cristy's avatar cristy

git-svn-id:...

git-svn-id: https://subversion.imagemagick.org/subversion/ImageMagick/trunk@922 aa41f4f7-0bf4-0310-aa73-e5a19afd5a74
parent 7f40b2f3
......@@ -18631,7 +18631,7 @@ $as_echo "#define LTDL_DELEGATE 1" >>confdefs.h
fi
# Enable build using delegate libraries built in subdirectories rather than installed
# delegate libraries (bzlib fftw fpx jp2 jbig jpeg lcms png tiff ttf wmf xml zlib)
# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms png tiff ttf wmf xml zlib)
# Check whether --enable-delegate-build was given.
if test "${enable_delegate_build+set}" = set; then :
enableval=$enable_delegate_build; enable_delegate_build=$enableval
......@@ -22624,7 +22624,7 @@ if test "$enable_delegate_build" != 'no'; then
# Most delegates have includes in the same directory as the library, but not all...
#
# Includes
for dir in bzlib fftw fpx jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do
for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do
if test -d "$builddir/$dir"; then
CPPFLAGS="$CPPFLAGS -I$builddir/$dir"
else
......@@ -22635,7 +22635,7 @@ if test "$enable_delegate_build" != 'no'; then
done
# Libraries
for dir in bzlib fftw fpx jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do
for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do
if test -d "$builddir/$dir/.libs"; then
LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs"
else
......
......@@ -487,7 +487,7 @@ if test "$with_ltdl" != 'no'; then
fi
# Enable build using delegate libraries built in subdirectories rather than installed
# delegate libraries (bzlib fftw fpx jp2 jbig jpeg lcms png tiff ttf wmf xml zlib)
# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms png tiff ttf wmf xml zlib)
AC_ARG_ENABLE([delegate-build],
[AC_HELP_STRING([--enable-delegate-build],
[look for delegate libraries in build directory])],
......@@ -1065,7 +1065,7 @@ if test "$enable_delegate_build" != 'no'; then
# Most delegates have includes in the same directory as the library, but not all...
#
# Includes
for dir in bzlib fftw fpx jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do
for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do
if test -d "$builddir/$dir"; then
CPPFLAGS="$CPPFLAGS -I$builddir/$dir"
else
......@@ -1076,7 +1076,7 @@ if test "$enable_delegate_build" != 'no'; then
done
# Libraries
for dir in bzlib fftw fpx jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do
for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do
if test -d "$builddir/$dir/.libs"; then
LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs"
else
......
......@@ -162,7 +162,7 @@ static char
"}\n"
"\n"
"__kernel void Convolve(const __global CLPixelType *input,\n"
" __constant double *filter,const uulong width,const ulong height,\n"
" __constant double *filter,const ulong width,const ulong height,\n"
" const bool matte,__global CLPixelType *output)\n"
"{\n"
" const ulong columns = get_global_size(0);\n"
......@@ -547,7 +547,7 @@ ModuleExport unsigned long convolveImage(Image **images,const int argc,
Convolve image.
*/
kernel=AcquireKernelFromString(argv[0]);
if (kernel == (double *) NULL)
if (kernel == (MagickKernel *) NULL)
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",(*images)->filename);
cl_info=GetCLInfo(*images,"Convolve",convolve_program,exception);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment