diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h index 3e0fe1dd12..d00b6727ee 100644 --- a/MagickCore/nt-base-private.h +++ b/MagickCore/nt-base-private.h @@ -71,6 +71,7 @@ extern "C" { # define getpid _getpid # define lseek _lseeki64 # define fstat _fstat64 +# define sscanf sscanf_s # define setmode _setmode # define stat _stat64 # define tell _telli64 diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c index 3440bf8888..c28a02bf31 100644 --- a/MagickCore/nt-base.c +++ b/MagickCore/nt-base.c @@ -1107,8 +1107,8 @@ static int NTLocateGhostscript(DWORD flags,int *root_index, major=0; minor=0; patch=0; - if (sscanf_s(key,"%d.%d.%d",&major,&minor,&patch) != 3) - if (sscanf_s(key,"%d.%d",&major,&minor) != 2) + if (sscanf(key,"%d.%d.%d",&major,&minor,&patch) != 3) + if (sscanf(key,"%d.%d",&major,&minor) != 2) continue; if ((major > *major_version) || ((major == *major_version) && (minor > *minor_version)) || diff --git a/MagickCore/property.c b/MagickCore/property.c index cbe1239ef5..f810ac5a4e 100644 --- a/MagickCore/property.c +++ b/MagickCore/property.c @@ -613,8 +613,13 @@ static void Get8BIMProperty(const Image *image,const char *key, profile=GetImageProfile(image,"8bim"); if (profile == (StringInfo *) NULL) return; +#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__) + count=(ssize_t) sscanf(key,"8BIM:%ld,%ld:%1024[^\n]\n%1024[^\n]",&start,&stop, + name,(unsigned int) sizeof(name),format,(unsigned int) sizeof(format)); +#else count=(ssize_t) sscanf(key,"8BIM:%ld,%ld:%1024[^\n]\n%1024[^\n]",&start,&stop, name,format); +#endif if ((count != 2) && (count != 3) && (count != 4)) return; if (count < 4)