]> granicus.if.org Git - imagemagick/commitdiff
Restored forward slashes for temp path. Ghostscript does not like backslashes.
authordirk <dirk@git.imagemagick.org>
Wed, 26 Mar 2014 07:19:39 +0000 (07:19 +0000)
committerdirk <dirk@git.imagemagick.org>
Wed, 26 Mar 2014 07:19:39 +0000 (07:19 +0000)
MagickCore/resource.c

index d1d80f633a2883e868ad751f26fba5561750e484..c61db77c350ab04f4e76361a6816a9b8c7a2682e 100644 (file)
@@ -357,6 +357,7 @@ MagickExport MagickBooleanType GetPathTemplate(char *path)
 {
   char
     *directory,
+    *p,
     *value;
 
   ExceptionInfo
@@ -414,9 +415,19 @@ MagickExport MagickBooleanType GetPathTemplate(char *path)
     (void) FormatLocaleString(path,MaxTextExtent,"%smagick-%.20gXXXXXXXXXXXX",
       directory,(double) getpid());
   else
-    (void) FormatLocaleString(path,MaxTextExtent,"%s%smagick-%.20gXXXXXXXXXXXX",
-      directory,DirectorySeparator,(double) getpid());
+    (void) FormatLocaleString(path,MaxTextExtent,
+      "%s%smagick-%.20gXXXXXXXXXXXX",directory,DirectorySeparator,
+      (double) getpid());
   directory=DestroyString(directory);
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
+  /*
+    Ghostscript does not like backslashes so we need to replace them. The
+    forward slash also works under Windows.
+  */
+  for (p=(path[1] == *DirectorySeparator ? path+2 : path); *p != '\0'; p++)
+    if (*p == *DirectorySeparator)
+      *p='/';
+#endif
   return(MagickTrue);
 }