From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 25 Dec 2014 18:13:29 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1554
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79d053159ee1309bf7f9e6f346c9af5143d0af46;p=imagemagick

---

diff --git a/MagickCore/display.c b/MagickCore/display.c
index 9fdebf18c..21d5788f8 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -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;
diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c
index e7a1e1c0a..3f5237ca5 100644
--- a/MagickCore/opencl.c
+++ b/MagickCore/opencl.c
@@ -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;
   }
diff --git a/coders/hdr.c b/coders/hdr.c
index 9a03ecad6..ccea76391 100644
--- a/coders/hdr.c
+++ b/coders/hdr.c
@@ -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)
diff --git a/coders/msl.c b/coders/msl.c
index 97ad50276..b85e1b07b 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -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;
         }