EnableOpenCL returns true if OpenCL was enabled successfully.

diff --git a/Magick++/lib/Functions.cpp b/Magick++/lib/Functions.cpp
index 315321cd9e18b0123bfe3de381104c31ec972c79..8fc6926f8a01ce4dc25f03345eb5e28ffcef1683 100644 (file)
--- a/Magick++/lib/Functions.cpp
+++ b/Magick++/lib/Functions.cpp
@@ -32,17 +32,22 @@ MagickPPExport void Magick::DisableOpenCL(void)
   ThrowPPException;
 }
 
-MagickPPExport void Magick::EnableOpenCL(const bool useCache_)
+MagickPPExport bool Magick::EnableOpenCL(const bool useCache_)
 {
+  bool
+    status;
+
   GetPPException;
   if (useCache_)
-    MagickCore::InitImageMagickOpenCL(
-      MagickCore::MAGICK_OPENCL_DEVICE_SELECT_AUTO,NULL,NULL,&exceptionInfo);
+    status=MagickCore::InitImageMagickOpenCL(
+      MagickCore::MAGICK_OPENCL_DEVICE_SELECT_AUTO,NULL,NULL,&exceptionInfo) ==
+      MagickTrue;
   else
-    MagickCore::InitImageMagickOpenCL(
+    status=MagickCore::InitImageMagickOpenCL(
       MagickCore::MAGICK_OPENCL_DEVICE_SELECT_AUTO_CLEAR_CACHE,NULL,NULL,
-      &exceptionInfo);
+      &exceptionInfo) == MagickTrue;
   ThrowPPException;
+  return(status);
 }
 
 MagickPPExport void Magick::InitializeMagick(const char *path_)

diff --git a/Magick++/lib/Magick++/Functions.h b/Magick++/lib/Magick++/Functions.h
index ec6ff4fe567238d83d5ae4d2af82f1a456b6f03f..2bd60a32bd7eb2154287823f82c1aab9d76abb82 100644 (file)
--- a/Magick++/lib/Magick++/Functions.h
+++ b/Magick++/lib/Magick++/Functions.h
@@ -22,7 +22,7 @@ namespace Magick
   MagickPPExport void DisableOpenCL(void);
 
   // Enable OpenCL acceleration (only works when build with OpenCL support)
-  MagickPPExport void EnableOpenCL(const bool useCache_=true);
+  MagickPPExport bool EnableOpenCL(const bool useCache_=true);
 
   // C library initialization routine
   MagickPPExport void InitializeMagick(const char *path_);

diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c
index 98c9888d7af3ba6190d633a2310909e0e7198d3d..4e2b4a66287f8b2f23f998df88704ded85123131 100644 (file)
--- a/MagickCore/opencl.c
+++ b/MagickCore/opencl.c
@@ -2385,7 +2385,7 @@ MagickExport MagickBooleanType InitImageMagickOpenCL(
   ImageMagickOpenCLMode mode,void *userSelectedDevice,void *selectedDevice,
   ExceptionInfo *exception)
 {
-  MagickBooleanType status = MagickTrue;
+  MagickBooleanType status = MagickFalse;
   MagickCLEnv clEnv = NULL;
   MagickBooleanType flag;