]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <mikayla-grace@urban-warrior.org>
Sun, 2 Jun 2019 23:13:00 +0000 (19:13 -0400)
committerCristy <mikayla-grace@urban-warrior.org>
Sun, 2 Jun 2019 23:13:00 +0000 (19:13 -0400)
MagickCore/nt-base.c
MagickWand/compare.c
coders/djvu.c
coders/mat.c
coders/png.c

index 0cfa8ca1c35bdbe489dc8e90f954510593f7edd0..6ff7358eb0e6d8e655c5fa32d78eb18ac9275dac 100644 (file)
@@ -1503,6 +1503,10 @@ MagickPrivate int NTGhostscriptFonts(char *path,int length)
       DirectorySeparator);
     if (IsPathAccessible(filename) != MagickFalse)
       return(TRUE);
+    (void) FormatLocaleString(filename,MagickPathExtent,"%s%sn019003l.pfb",path,
+      DirectorySeparator);
+    if (IsPathAccessible(filename) != MagickFalse)
+      return(TRUE);
   }
   *path='\0';
   return(FALSE);
index c23530a12968b6e564deaf739e174bbf9810b362..ec6e8a1cf73c5499f8e158f772ca55332aa7ccbc 100644 (file)
@@ -688,7 +688,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
             if (i == (ssize_t) argc)
               ThrowCompareException(OptionError,"MissingArgument",option);
             gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,
-              argv[i]); 
+              argv[i]);
             if (gravity < 0)
               ThrowCompareException(OptionError,"UnrecognizedGravityType",
                 argv[i]);
index 11c40a7e0d19a0ce0c2730e0f7f1b40707b629db..d2cff2cf9e9e6b4a65eeebeb66d3a769316eb9fb 100644 (file)
@@ -186,8 +186,7 @@ pump_data_until_message(LoadContext *lc,Image *image) /* ddjvu_context_t *contex
 #define DEBUG 0
 
 #if DEBUG
-static const char*
-message_tag_name(ddjvu_message_tag_t tag)
+static const char *message_tag_name(ddjvu_message_tag_t tag)
 {
    static char* names[] =
       {
index 485bd373386f2ea6d0a41a8ddaee2a9495066539..17817371f549ff85da5dc7a7a1c5c64cc9dece2c 100644 (file)
@@ -118,9 +118,14 @@ typedef struct
 }
 MATHeader;
 
-static const char MonthsTab[12][4] = {"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
-static const char DayOfWTab[7][4] = {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
-static const char OsDesc[] =
+static const char
+  MonthsTab[12][4] = {"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
+
+static const char
+   DayOfWTab[7][4] = {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
+
+static const char
+  OsDesc[] =
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
     "PCWIN";
 #else
index a8c8b77bd48a7333deccdd85e348ede7c7ed9f33..500f1848b5dd36328a77cd4428ddb37f2aadb8c4 100644 (file)
@@ -955,7 +955,7 @@ LosslessReduceDepthOK(Image *image,ExceptionInfo *exception)
 }
 #endif /* MAGICKCORE_QUANTUM_DEPTH >= 16 */
 
-static const charPngColorTypeToString(const unsigned int color_type)
+static const char *PngColorTypeToString(const unsigned int color_type)
 {
   const char
     *result = "Unknown";