diff --git a/config/config.h.in b/config/config.h.in
index a803bf8..bc3a3f8 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -122,8 +122,8 @@
/* Define to 1 if you have the `closedir' function. */
#undef HAVE_CLOSEDIR
-/* Define to 1 if you have the <CL/opencl.h> header file. */
-#undef HAVE_CL_OPENCL_H
+/* Define to 1 if you have the <CL/cl.h> header file. */
+#undef HAVE_CL_CL_H
/* Define to 1 if you have the <complex.h> header file. */
#undef HAVE_COMPLEX_H
@@ -309,8 +309,8 @@
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
#undef HAVE_NDIR_H
-/* Define to 1 if you have the <OpenCL/OpenCL.h> header file. */
-#undef HAVE_OPENCL_OPENCL_H
+/* Define to 1 if you have the <OpenCL/cl.h> header file. */
+#undef HAVE_OPENCL_CL_H
/* Define to 1 if you have the `opendir' function. */
#undef HAVE_OPENDIR
diff --git a/config/configure.xml b/config/configure.xml
index 4b39cb8..b501744 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
<configure name="NAME" value="ImageMagick"/>
<configure name="LIB_VERSION" value="0x659"/>
<configure name="LIB_VERSION_NUMBER" value="6,5,9,0"/>
- <configure name="RELEASE_DATE" value="2010-01-06"/>
+ <configure name="RELEASE_DATE" value="2010-01-09"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/configure b/configure
index 4d72795..ad92727 100755
--- a/configure
+++ b/configure
@@ -7466,7 +7466,7 @@
ax_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
-for ac_header in CL/opencl.h OpenCL/OpenCL.h
+for ac_header in CL/cl.h OpenCL/cl.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -7525,12 +7525,12 @@
# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
# include <windows.h>
# endif
-# ifdef HAVE_CL_OPENCL_H
-# include <CL/opencl.h>
-# elif defined(HAVE_OPENCL_OPENCL_H)
-# include <OpenCL/OpenCL.h>
+# ifdef HAVE_CL_CL_H
+# include <CL/cl.h>
+# elif defined(HAVE_OPENCL_CL_H)
+# include <OpenCL/cl.h>
# else
-# error no OpenCL.h
+# error no CL.h
# endif
int
main ()
@@ -7550,12 +7550,12 @@
# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
# include <windows.h>
# endif
-# ifdef HAVE_CL_OPENCL_H
-# include <CL/opencl.h>
-# elif defined(HAVE_OPENCL_OPENCL_H)
-# include <OpenCL/OpenCL.h>
+# ifdef HAVE_CL_CL_H
+# include <CL/cl.h>
+# elif defined(HAVE_OPENCL_CL_H)
+# include <OpenCL/cl.h>
# else
-# error no OpenCL.h
+# error no CL.h
# endif
int
main ()
@@ -7575,12 +7575,12 @@
# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
# include <windows.h>
# endif
-# ifdef HAVE_CL_OPENCL_H
-# include <CL/opencl.h>
-# elif defined(HAVE_OPENCL_OPENCL_H)
-# include <OpenCL/OpenCL.h>
+# ifdef HAVE_CL_CL_H
+# include <CL/cl.h>
+# elif defined(HAVE_OPENCL_CL_H)
+# include <OpenCL/cl.h>
# else
-# error no OpenCL.h
+# error no CL.h
# endif
int
main ()
@@ -7611,12 +7611,12 @@
# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
# include <windows.h>
# endif
-# ifdef HAVE_CL_OPENCL_H
-# include <CL/opencl.h>
-# elif defined(HAVE_OPENCL_OPENCL_H)
-# include <OpenCL/OpenCL.h>
+# ifdef HAVE_CL_CL_H
+# include <CL/cl.h>
+# elif defined(HAVE_OPENCL_CL_H)
+# include <OpenCL/cl.h>
# else
-# error no OpenCL.h
+# error no CL.h
# endif
int
main ()
diff --git a/filters/convolve.c b/filters/convolve.c
index d299978..9d486ae 100644
--- a/filters/convolve.c
+++ b/filters/convolve.c
@@ -347,7 +347,9 @@
&cl_info->convolve_pixels);
if (status != CL_SUCCESS)
return(MagickFalse);
- clFinish(cl_info->command_queue);
+ status=clFinish(cl_info->command_queue);
+ if (status != CL_SUCCESS)
+ return(MagickFalse);
return(MagickTrue);
}
diff --git a/m4/ax_check_cl.m4 b/m4/ax_check_cl.m4
index c141f5e..b6a785f 100644
--- a/m4/ax_check_cl.m4
+++ b/m4/ax_check_cl.m4
@@ -46,7 +46,7 @@
ax_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
-AC_CHECK_HEADERS([CL/opencl.h OpenCL/OpenCL.h])
+AC_CHECK_HEADERS([CL/cl.h OpenCL/cl.h])
CPPFLAGS=$ax_save_CPPFLAGS
AC_CHECK_HEADERS([windows.h])
@@ -56,12 +56,12 @@
# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
# include <windows.h>
# endif
-# ifdef HAVE_CL_OPENCL_H
-# include <CL/opencl.h>
-# elif defined(HAVE_OPENCL_OPENCL_H)
-# include <OpenCL/OpenCL.h>
+# ifdef HAVE_CL_CL_H
+# include <CL/cl.h>
+# elif defined(HAVE_OPENCL_CL_H)
+# include <OpenCL/cl.h>
# else
-# error no OpenCL.h
+# error no CL.h
# endif]],
[[clCreateContextFromType(0,0,0,0,0)]])])
diff --git a/magick/magick-config.h b/magick/magick-config.h
index 1b1528e..e8a2706 100644
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -185,8 +185,8 @@
#define MAGICKCORE_HAVE_CLOSEDIR 1
#endif
-/* Define to 1 if you have the <CL/opencl.h> header file. */
-/* #undef HAVE_CL_OPENCL_H */
+/* Define to 1 if you have the <CL/cl.h> header file. */
+/* #undef HAVE_CL_CL_H */
/* Define to 1 if you have the <complex.h> header file. */
#ifndef MAGICKCORE_HAVE_COMPLEX_H
@@ -462,8 +462,8 @@
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
/* #undef HAVE_NDIR_H */
-/* Define to 1 if you have the <OpenCL/OpenCL.h> header file. */
-/* #undef HAVE_OPENCL_OPENCL_H */
+/* Define to 1 if you have the <OpenCL/cl.h> header file. */
+/* #undef HAVE_OPENCL_CL_H */
/* Define to 1 if you have the `opendir' function. */
#ifndef MAGICKCORE_HAVE_OPENDIR
diff --git a/magick/studio.h b/magick/studio.h
index 6b189b4..18a2aeb 100644
--- a/magick/studio.h
+++ b/magick/studio.h
@@ -199,12 +199,12 @@
# include <arm/limits.h>
#endif
-#if defined(MAGICKCORE_HAVE_CL_OPENCL_H)
+#if defined(MAGICKCORE_HAVE_CL_CL_H)
# include <CL/cl.h>
# define MAGICKCORE_OPENCL_SUPPORT 1
#endif
-#if defined(MAGICKCORE_HAVE_OPENCL_OPENCL_H)
+#if defined(MAGICKCORE_HAVE_OPENCL_CL_H)
# include <OpenCL/cl.h>
# define MAGICKCORE_OPENCL_SUPPORT 1
#endif
diff --git a/magick/version.h b/magick/version.h
index 77c8019..b02a5d4 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -32,7 +32,7 @@
#define MagickLibVersionNumber 2,0,1
#define MagickLibSubversion "-0"
#define MagickLibInterface 2
-#define MagickReleaseDate "2010-01-06"
+#define MagickReleaseDate "2010-01-09"
#define MagickChangeDate "20100101"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.5.9/index.html"
diff --git a/wand/studio.h b/wand/studio.h
index 2aab2f7..0831049 100644
--- a/wand/studio.h
+++ b/wand/studio.h
@@ -199,12 +199,12 @@
# include <arm/limits.h>
#endif
-#if defined(MAGICKCORE_HAVE_CL_OPENCL_H)
+#if defined(MAGICKCORE_HAVE_CL_CL_H)
# include <CL/cl.h>
# define MAGICKCORE_OPENCL_SUPPORT 1
#endif
-#if defined(MAGICKCORE_HAVE_OPENCL_OPENCL_H)
+#if defined(MAGICKCORE_HAVE_OPENCL_CL_H)
# include <OpenCL/cl.h>
# define MAGICKCORE_OPENCL_SUPPORT 1
#endif