]> granicus.if.org Git - imagemagick/commitdiff
Added check for when OpenCL is disabled.
authorDirk Lemstra <dirk@git.imagemagick.org>
Wed, 7 Dec 2016 17:07:59 +0000 (18:07 +0100)
committerDirk Lemstra <dirk@git.imagemagick.org>
Wed, 7 Dec 2016 17:07:59 +0000 (18:07 +0100)
coders/dng.c

index be2df24769f895f6c22864d7565ea45f393ebe76..2a1ffa453694c72430ef8e89afdee1b3ef77a87d 100644 (file)
@@ -109,6 +109,12 @@ static void InitializeDcrawOpenCL(ExceptionInfo *exception)
 
   (void) SetEnvironmentVariable("DCR_CL_PLATFORM",NULL);
   (void) SetEnvironmentVariable("DCR_CL_DEVICE",NULL);
+  (void) SetEnvironmentVariable("DCR_CL_DISABLED",NULL);
+  if (GetOpenCLEnabled() == MagickFalse)
+    {
+      (void) SetEnvironmentVariable("DCR_CL_DISABLED","1");
+      return;
+    }
   devices=GetOpenCLDevices(&length,exception);
   if (devices == (MagickCLDevice *) NULL)
     return;