From 89e83491e2909ad22df4d3a951d692401753efce Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 12 Nov 2017 08:09:05 -0500 Subject: [PATCH] ... --- MagickCore/accelerate.c | 6 ------ MagickCore/layer.c | 12 ++++-------- MagickCore/opencl.c | 5 ++++- config/config.h.in | 3 ++- configure | 30 +++++++++++++++--------------- configure.ac | 8 ++++---- version.sh | 2 +- 7 files changed, 30 insertions(+), 36 deletions(-) diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c index 4ce3dbafd..53d3c290e 100644 --- a/MagickCore/accelerate.c +++ b/MagickCore/accelerate.c @@ -259,9 +259,6 @@ static cl_mem createKernelInfo(MagickCLDevice device,const double radius, char geometry[MagickPathExtent]; - cl_int - status; - cl_mem imageKernelBuffer; @@ -822,9 +819,6 @@ static MagickBooleanType ComputeContrastImage(Image *image,MagickCLEnv clEnv, cl_kernel contrastKernel; - cl_event - event; - cl_mem imageBuffer; diff --git a/MagickCore/layer.c b/MagickCore/layer.c index 64d02ccca..7787d7c48 100644 --- a/MagickCore/layer.c +++ b/MagickCore/layer.c @@ -616,8 +616,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1, { p=GetVirtualPixels(image1,x,0,1,image1->rows,exception); q=GetVirtualPixels(image2,x,0,1,image2->rows,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (y=0; y < (ssize_t) image1->rows; y++) { @@ -647,8 +646,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1, { p=GetVirtualPixels(image1,x,0,1,image1->rows,exception); q=GetVirtualPixels(image2,x,0,1,image2->rows,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (y=0; y < (ssize_t) image1->rows; y++) { @@ -667,8 +665,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1, { p=GetVirtualPixels(image1,0,y,image1->columns,1,exception); q=GetVirtualPixels(image2,0,y,image2->columns,1,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (x=0; x < (ssize_t) image1->columns; x++) { @@ -687,8 +684,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1, { p=GetVirtualPixels(image1,0,y,image1->columns,1,exception); q=GetVirtualPixels(image2,0,y,image2->columns,1,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (x=0; x < (ssize_t) image1->columns; x++) { diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c index 1f8815f8c..313df1799 100644 --- a/MagickCore/opencl.c +++ b/MagickCore/opencl.c @@ -88,6 +88,9 @@ #include "MagickCore/utility-private.h" #if defined(MAGICKCORE_OPENCL_SUPPORT) +#if defined(MAGICKCORE_LTDL_DELEGATE) +#include "ltdl.h" +#endif #ifndef MAGICKCORE_WINDOWS_SUPPORT #include @@ -1369,7 +1372,7 @@ static MagickBooleanType CompileOpenCLKernel(MagickCLDevice device, } (void) FormatLocaleString(filename,MagickPathExtent, "%s%s%s_%s_%08x_%.20g.bin",GetOpenCLCacheDirectory(), - DirectorySeparator,"magick_opencl",deviceName,signature, + DirectorySeparator,"magick_opencl",deviceName,(unsigned int) signature, (double) sizeof(char*)*8); loaded=LoadCachedOpenCLKernel(device,filename); if (loaded == MagickFalse) diff --git a/config/config.h.in b/config/config.h.in index 15cbf9db2..1ea471325 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -759,7 +759,8 @@ /* Define if you have LQR library */ #undef LQR_DELEGATE -/* Define if using libltdl to support dynamically loadable modules */ +/* Define if using libltdl to support dynamically loadable modules and OpenCL + */ #undef LTDL_DELEGATE /* Define to the sub-directory where libtool stores uninstalled libraries. */ diff --git a/configure b/configure index 7de19c8a2..3c131a3ec 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.7-11. +# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.7-12. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' PACKAGE_TARNAME='ImageMagick' -PACKAGE_VERSION='7.0.7-11' -PACKAGE_STRING='ImageMagick 7.0.7-11' +PACKAGE_VERSION='7.0.7-12' +PACKAGE_STRING='ImageMagick 7.0.7-12' PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues' PACKAGE_URL='https://www.imagemagick.org' @@ -1828,7 +1828,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ImageMagick 7.0.7-11 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.0.7-12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1903,7 +1903,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ImageMagick 7.0.7-11:";; + short | recursive ) echo "Configuration of ImageMagick 7.0.7-12:";; esac cat <<\_ACEOF @@ -2183,7 +2183,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 7.0.7-11 +ImageMagick configure 7.0.7-12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3234,7 +3234,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ImageMagick $as_me 7.0.7-11, which was +It was created by ImageMagick $as_me 7.0.7-12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4220,7 +4220,7 @@ fi # Define the identity of the package. PACKAGE='ImageMagick' - VERSION='7.0.7-11' + VERSION='7.0.7-12' cat >>confdefs.h <<_ACEOF @@ -4530,11 +4530,11 @@ MAGICK_MINOR_VERSION=0 MAGICK_MICRO_VERSION=7 -MAGICK_PATCHLEVEL_VERSION=11 +MAGICK_PATCHLEVEL_VERSION=12 -MAGICK_VERSION=7.0.7-11 +MAGICK_VERSION=7.0.7-12 -MAGICK_GIT_REVISION=21613:7be0c046e:20171105 +MAGICK_GIT_REVISION=21636:315d854ad:20171112 # Substitute library versioning @@ -31191,7 +31191,7 @@ fi with_ltdl='yes' have_ltdl='no' LTDL_LIBS='' -if test "$build_modules" != 'no' ; then +if test "$build_modules" != 'yes' || test "$enable_opencl" != 'no' ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 $as_echo "-------------------------------------------------------------" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libltdl" >&5 @@ -31274,7 +31274,7 @@ $as_echo "no" >&6; } if test "$have_ltdl" != 'yes' ; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 1 "libltdl is required for modules build +as_fn_error 1 "libltdl is required for modules and OpenCL builds See \`config.log' for more details" "$LINENO" 5; } fi fi @@ -38963,7 +38963,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ImageMagick $as_me 7.0.7-11, which was +This file was extended by ImageMagick $as_me 7.0.7-12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -39030,7 +39030,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ImageMagick config.status 7.0.7-11 +ImageMagick config.status 7.0.7-12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 13d19e373..96a6f9ead 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_PREREQ(2.69) m4_define([magick_major_version], [7]) m4_define([magick_minor_version], [0]) m4_define([magick_micro_version], [7]) -m4_define([magick_patchlevel_version], [11]) +m4_define([magick_patchlevel_version], [12]) m4_define([magick_version], [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version]) m4_define([magick_git_revision], esyscmd([sh -c "(gitversion.sh .) | tr -d '\n'"])) @@ -1686,7 +1686,7 @@ dnl =========================================================================== with_ltdl='yes' have_ltdl='no' LTDL_LIBS='' -if test "$build_modules" != 'no' ; then +if test "$build_modules" != 'yes' || test "$enable_opencl" != 'no' ; then AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for libltdl]) AC_MSG_RESULT([]) @@ -1702,7 +1702,7 @@ if test "$build_modules" != 'no' ; then else LTDL_LIBS='-lltdl' LIBS="$LTDL_LIBS $LIBS" - AC_DEFINE(LTDL_DELEGATE,1,[Define if using libltdl to support dynamically loadable modules]) + AC_DEFINE(LTDL_DELEGATE,1,[Define if using libltdl to support dynamically loadable modules and OpenCL]) AC_MSG_RESULT([yes]) have_ltdl='yes' fi @@ -1710,7 +1710,7 @@ if test "$build_modules" != 'no' ; then AC_MSG_RESULT([no]) fi if test "$have_ltdl" != 'yes' ; then - AC_MSG_FAILURE([libltdl is required for modules build],[1]) + AC_MSG_FAILURE([libltdl is required for modules and OpenCL builds],[1]) fi fi AM_CONDITIONAL(WITH_LTDL, test "$have_ltdl" != 'no') diff --git a/version.sh b/version.sh index a891716bc..21b913fc9 100644 --- a/version.sh +++ b/version.sh @@ -18,7 +18,7 @@ PACKAGE_CHANGE_DATE=`awk '/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { print PACKAGE_VERSION='7.0.7' PACKAGE_PERL_VERSION='7.07' PACKAGE_LIB_VERSION="0x707" -PACKAGE_RELEASE="11" +PACKAGE_RELEASE="12" PACKAGE_LIB_VERSION_NUMBER="7,0,7,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE_RAW=`date +%F` PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}" -- 2.40.0