]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/798
authorCristy <urban-warrior@imagemagick.org>
Sat, 30 Sep 2017 13:56:36 +0000 (09:56 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sat, 30 Sep 2017 13:56:36 +0000 (09:56 -0400)
MagickCore/opencl.c
MagickCore/segment.c

index 9bd262902fe522ff27b22c57ad6417cba25563ee..b913d66797ffe9800a2d13eae3b9db40b5b57c8c 100644 (file)
@@ -2333,7 +2333,7 @@ static void LoadOpenCLDevices(MagickCLEnv clEnv)
 
       openCL_library->clGetDeviceInfo(devices[j],CL_DRIVER_VERSION,0,NULL,
         &length);
-      device->version=AcquireQuantumMemory(length,sizeof(*device->version));
+      device->version=AcquireCriticalMemory(length*sizeof(*device->version));
       openCL_library->clGetDeviceInfo(devices[j],CL_DRIVER_VERSION,length,
         device->version,NULL);
 
index 7bb25dba344c4efe56d99f6cb3f5d7bd9f03dfda..e47d0cd4ba49a8cf7280f0f25e884dfeeb5741c5 100644 (file)
@@ -1364,7 +1364,7 @@ static IntervalTree *InitializeIntervalTree(const ZeroCrossing *zero_crossing,
   /*
     The root is the entire histogram.
   */
-  root=(IntervalTree *) AcquireMagickMemory(sizeof(*root));
+  root=(IntervalTree *) AcquireCriticalMemory(sizeof(*root));
   root->child=(IntervalTree *) NULL;
   root->sibling=(IntervalTree *) NULL;
   root->tau=0.0;