]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 25 Dec 2014 18:13:29 +0000 (18:13 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 25 Dec 2014 18:13:29 +0000 (18:13 +0000)
MagickCore/display.c
MagickCore/opencl.c
coders/hdr.c
coders/msl.c

index 9fdebf18c0c0e2a5a9c1a91d16f77e3baf8b15e2..21d5788f8567ed963c75f760bf246b23861c95aa 100644 (file)
@@ -7828,7 +7828,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
       */
       XSetCursorState(display,windows,MagickTrue);
       XCheckRefreshWindows(display,windows);
-      (void) GammaImage(*image,atof(factor),exception);
+      (void) GammaImage(*image,strtod(factor,(char **) NULL),exception);
       XSetCursorState(display,windows,MagickFalse);
       if (IfMagickTrue(windows->image.orphan) )
         break;
index e7a1e1c0af894d0b9978ec5514fd243b096e16b2..3f5237ca5bc00d59dd4720c78c8e878db5e94a5a 100644 (file)
@@ -2000,7 +2000,7 @@ RestoreMSCWarning
         }
         memcpy(tmp,tmpStart,tmpEnd-tmpStart);
         tmp[tmpEnd-tmpStart] = '\0';
-        maxComputeUnits = atoi(tmp);
+        maxComputeUnits = strtol(tmp,(char **) NULL,10);
 
 
         tmpStart = findString(dataStart, contentEnd, DS_TAG_DEVICE_MAX_CLOCK_FREQ);
@@ -2016,7 +2016,7 @@ RestoreMSCWarning
         }
         memcpy(tmp,tmpStart,tmpEnd-tmpStart);
         tmp[tmpEnd-tmpStart] = '\0';
-        maxClockFrequency = atoi(tmp);
+        maxClockFrequency = strtol(tmp,(char **) NULL,10);
 
 
         /* check if this device is on the system */
@@ -2241,7 +2241,8 @@ ds_status AccelerateScoreDeserializer(ds_device* device, const unsigned char* se
     memcpy(s, serializedScore, serializedScoreSize);
     s[serializedScoreSize] = (char)'\0';
     device->score = malloc(sizeof(AccelerateScoreType));
-    *((AccelerateScoreType*)device->score) = (AccelerateScoreType)atof(s);
+    *((AccelerateScoreType*)device->score) = (AccelerateScoreType)
+       strtod(s,(char **) NULL));
     free(s);
     return DS_SUCCESS;
   }
index 9a03ecad65d1b320a37de63c3dd149da948fba59..ccea763916669652f63982abbb1278d3d75708a8 100644 (file)
@@ -712,7 +712,7 @@ static MagickBooleanType WriteHDRImage(const ImageInfo *image_info,Image *image,
   if (property != (const char *) NULL)
     {
       count=FormatLocaleString(header,MaxTextExtent,"EXPOSURE=%g\n",
-        atof(property));
+        strtod(property,(char **) NULL));
       (void) WriteBlob(image,(size_t) count,(unsigned char *) header);
     }
   if (image->gamma != 0.0)
index 97ad50276fd8efd22a5e06457ed4455756de1ca1..b85e1b07b2dbb6fd2ae434c73edf0a8a7d694b91 100644 (file)
@@ -3278,7 +3278,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
           if (*gamma == '\0')
             (void) FormatLocaleString(gamma,MaxTextExtent,"%g,%g,%g",
               (double) pixel.red,(double) pixel.green,(double) pixel.blue);
-          (void) GammaImage(msl_info->image[n],atof(gamma),
+          (void) GammaImage(msl_info->image[n],strtod(gamma,(char **) NULL),
             msl_info->exception);
           break;
         }