From 3de9f8755b4305fc875c90e835edc115ea4f056f Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 2 Jun 2019 19:13:00 -0400 Subject: [PATCH] ... --- MagickCore/nt-base.c | 4 ++++ MagickWand/compare.c | 2 +- coders/djvu.c | 3 +-- coders/mat.c | 11 ++++++++--- coders/png.c | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c index 0cfa8ca1c..6ff7358eb 100644 --- a/MagickCore/nt-base.c +++ b/MagickCore/nt-base.c @@ -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); diff --git a/MagickWand/compare.c b/MagickWand/compare.c index c23530a12..ec6e8a1cf 100644 --- a/MagickWand/compare.c +++ b/MagickWand/compare.c @@ -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]); diff --git a/coders/djvu.c b/coders/djvu.c index 11c40a7e0..d2cff2cf9 100644 --- a/coders/djvu.c +++ b/coders/djvu.c @@ -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[] = { diff --git a/coders/mat.c b/coders/mat.c index 485bd3733..17817371f 100644 --- a/coders/mat.c +++ b/coders/mat.c @@ -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 diff --git a/coders/png.c b/coders/png.c index a8c8b77bd..500f1848b 100644 --- a/coders/png.c +++ b/coders/png.c @@ -955,7 +955,7 @@ LosslessReduceDepthOK(Image *image,ExceptionInfo *exception) } #endif /* MAGICKCORE_QUANTUM_DEPTH >= 16 */ -static const char* PngColorTypeToString(const unsigned int color_type) +static const char *PngColorTypeToString(const unsigned int color_type) { const char *result = "Unknown"; -- 2.40.0