Reset path in NTGhostscriptFonts.

diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index 7dc2812ead12ee418f9439b9136b96654debc62e..bb54c27141b0aae7d54a49e0b1b432c50edbdeab 100644 (file)
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -988,7 +988,7 @@ static int NTLocateGhostscript(DWORD flags,int *root_index,
       mode;
 
     (void) FormatLocaleString(key,MaxTextExtent,"SOFTWARE\\%s",products[i]);
-    for (j=0; j < (ssize_t) (sizeof(registry_roots)/sizeof(registry_roots[0]));\r
+    for (j=0; j < (ssize_t) (sizeof(registry_roots)/sizeof(registry_roots[0]));
          j++)
     {
       mode=KEY_READ | flags;
@@ -1042,8 +1042,8 @@ static int NTLocateGhostscript(DWORD flags,int *root_index,
 static int NTGhostscriptGetString(const char *name,BOOL *is_64_bit,
   char *value,const size_t length)
 {
-  char\r
-    buffer[MaxTextExtent],\r
+  char
+    buffer[MaxTextExtent],
     *directory;
 
   int
@@ -1064,33 +1064,33 @@ static int NTGhostscriptGetString(const char *name,BOOL *is_64_bit,
   /*
     Get a string from the installed Ghostscript.
   */
-  *value='\0';\r
-  directory=(char *) NULL;\r
-  if (LocaleCompare(name, "GS_DLL") == 0)\r
-    {\r
-      directory=GetEnvironmentValue("MAGICK_GHOSTSCRIPT_PATH");\r
-      if (directory != (char *) NULL)\r
-        {\r
-          (void) FormatLocaleString(buffer,MaxTextExtent,"%s%sgsdll32.dll",\r
-            directory,DirectorySeparator);\r
-          if (IsPathAccessible(buffer) != MagickFalse)\r
-            {\r
-              (void) CopyMagickString(value,buffer,length);\r
-              if (is_64_bit != NULL)\r
-                *is_64_bit=FALSE;\r
-              return(TRUE);\r
-            }\r
-          (void) FormatLocaleString(buffer,MaxTextExtent,"%s%sgsdll64.dll",\r
-            directory,DirectorySeparator);\r
-          if (IsPathAccessible(buffer) != MagickFalse)\r
-            {\r
-              (void) CopyMagickString(value,buffer,length);\r
-              if (is_64_bit != NULL)\r
-                *is_64_bit=TRUE;\r
-              return(TRUE);\r
-            }\r
-          return(FALSE);\r
-        }\r
+  *value='\0';
+  directory=(char *) NULL;
+  if (LocaleCompare(name, "GS_DLL") == 0)
+    {
+      directory=GetEnvironmentValue("MAGICK_GHOSTSCRIPT_PATH");
+      if (directory != (char *) NULL)
+        {
+          (void) FormatLocaleString(buffer,MaxTextExtent,"%s%sgsdll32.dll",
+            directory,DirectorySeparator);
+          if (IsPathAccessible(buffer) != MagickFalse)
+            {
+              (void) CopyMagickString(value,buffer,length);
+              if (is_64_bit != NULL)
+                *is_64_bit=FALSE;
+              return(TRUE);
+            }
+          (void) FormatLocaleString(buffer,MaxTextExtent,"%s%sgsdll64.dll",
+            directory,DirectorySeparator);
+          if (IsPathAccessible(buffer) != MagickFalse)
+            {
+              (void) CopyMagickString(value,buffer,length);
+              if (is_64_bit != NULL)
+                *is_64_bit=TRUE;
+              return(TRUE);
+            }
+          return(FALSE);
+        }
     }
   if (product_family == NULL)
     {
@@ -1277,17 +1277,17 @@ MagickPrivate int NTGhostscriptFonts(char *path,int length)
     *p,
     *q;
 
-  *path='\0';\r
-  directory=GetEnvironmentValue("MAGICK_GHOSTSCRIPT_FONT_PATH");\r
-  if (directory != (char *) NULL)\r
-    {\r
-      (void) CopyMagickString(buffer,directory,MaxTextExtent);\r
-      directory=DestroyString(directory);\r
-    }\r
-  else\r
-    {\r
-      if (NTGhostscriptGetString("GS_LIB",NULL,buffer,MaxTextExtent) == FALSE)\r
-        return(FALSE);\r
+  *path='\0';
+  directory=GetEnvironmentValue("MAGICK_GHOSTSCRIPT_FONT_PATH");
+  if (directory != (char *) NULL)
+    {
+      (void) CopyMagickString(buffer,directory,MaxTextExtent);
+      directory=DestroyString(directory);
+    }
+  else
+    {
+      if (NTGhostscriptGetString("GS_LIB",NULL,buffer,MaxTextExtent) == FALSE)
+        return(FALSE);
     }
   for (p=buffer-1; p != (char *) NULL; p=strchr(p+1,DirectoryListSeparator))
   {
@@ -1300,6 +1300,7 @@ MagickPrivate int NTGhostscriptFonts(char *path,int length)
     if (IsPathAccessible(filename) != MagickFalse)
       return(TRUE);
   }
+  *path='\0';
   return(FALSE);
 }
 \f