From: dirk <dirk@git.imagemagick.org>
Date: Tue, 8 Apr 2014 22:59:41 +0000 (+0000)
Subject: EnableOpenCL returns true if OpenCL was enabled successfully.
X-Git-Tag: 7.0.1-0~2474
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cec9dd6f1e5d316f539a76675dab5daffe42c4de;p=imagemagick

EnableOpenCL returns true if OpenCL was enabled successfully.
---

diff --git a/Magick++/lib/Functions.cpp b/Magick++/lib/Functions.cpp
index 315321cd9..8fc6926f8 100644
--- 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 ec6ff4fe5..2bd60a32b 100644
--- 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 98c9888d7..4e2b4a662 100644
--- 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;