Fixed various build errors.

ImageMagick · Apr 15, 2023 · da8c0b2 · da8c0b2
1 parent 0b8553c
commit da8c0b2
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 17 deletions.
diff --git a/coders/djvu.c b/coders/djvu.c
@@ -319,7 +319,7 @@ process_message(ddjvu_message_t *message)
  * we use the RGB format!
  */
 static void
-get_page_image(LoadContext *lc, ddjvu_page_t *page, int x, int y, int w, int h, const ImageInfo *magick_unreferenced(image_info) ) {
+get_page_image(LoadContext *lc, ddjvu_page_t *page, int x, int y, int w, int h, const ImageInfo *magick_unused(image_info) ) {
   ddjvu_format_t
     *format;
 

diff --git a/coders/ghostscript-private.h b/coders/ghostscript-private.h
@@ -59,8 +59,8 @@ static double GhostscriptVersion(const GhostInfo *ghost_info)
 #endif
 
 static inline MagickBooleanType InvokeGhostscriptDelegate(
-  const MagickBooleanType verbose,const char *command,
-  char *magick_unreferenced(message),ExceptionInfo *exception)
+  const MagickBooleanType verbose,const char *command,char *message,
+  ExceptionInfo *exception)
 {
   int
     status;

diff --git a/coders/xcf.c b/coders/xcf.c
@@ -876,7 +876,7 @@ static MagickBooleanType load_hierarchy(Image *image,XCFDocInfo *inDocInfo,
 }
 
 static void InitXCFImage(XCFLayerInfo *outLayer,
-  ExceptionInfo *magick_unreferenced(exception))
+  ExceptionInfo *magick_unused(exception))
 {
   outLayer->image->page.x=outLayer->offset_x;
   outLayer->image->page.y=outLayer->offset_y;

diff --git a/magick/attribute.c b/magick/attribute.c
@@ -1194,10 +1194,11 @@ MagickExport ImageType IdentifyImageType(const Image *image,
 %
 */
 MagickExport MagickBooleanType IsGrayImage(const Image *image,
-  ExceptionInfo *magick_unreferenced(exception))
+  ExceptionInfo *magick_unused(exception))
 {
   assert(image != (Image *) NULL);
   assert(image->signature == MagickCoreSignature);
+  magick_unreferenced(exception);
   if ((image->type == BilevelType) || (image->type == GrayscaleType) ||
       (image->type == GrayscaleMatteType))
     return(MagickTrue);
@@ -1230,10 +1231,11 @@ MagickExport MagickBooleanType IsGrayImage(const Image *image,
 %
 */
 MagickExport MagickBooleanType IsMonochromeImage(const Image *image,
-  ExceptionInfo *magick_unreferenced(exception))
+  ExceptionInfo *magick_unused(exception))
 {
   assert(image != (Image *) NULL);
   assert(image->signature == MagickCoreSignature);
+  magick_unreferenced(exception);
   if (image->type == BilevelType)
     return(MagickTrue);
   return(MagickFalse);

diff --git a/magick/geometry.c b/magick/geometry.c
@@ -722,7 +722,7 @@ MagickExport MagickBooleanType IsSceneGeometry(const char *geometry,
 %
 */
 MagickExport MagickBooleanType ListPagesizes(FILE *file,
-  ExceptionInfo *magick_unreferenced(exception))
+  ExceptionInfo *magick_unused(exception))
 {
 #define MaxMagickSpaces  ((int) sizeof(Pagesizes[0].name))
 
@@ -732,6 +732,7 @@ MagickExport MagickBooleanType ListPagesizes(FILE *file,
   ssize_t
     i;
 
+  magick_unreferenced(exception);
   if (file == (FILE *) NULL)
     file=stdout;
   (void) FormatLocaleFile(file,"\nPagesize    Geometry \n");

diff --git a/magick/histogram.c b/magick/histogram.c
@@ -1012,7 +1012,7 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image,
 %
 */
 MagickExport MagickBooleanType IsPaletteImage(const Image *image,
-  ExceptionInfo *magick_unreferenced(exception))
+  ExceptionInfo *magick_unused(exception))
 {
   assert(image != (Image *) NULL);
   assert(image->signature == MagickCoreSignature);

diff --git a/magick/magick.c b/magick/magick.c
@@ -848,8 +848,7 @@ static void *DestroyMagickNode(void *magick_info)
   return(RelinquishMagickMemory(p));
 }
 
-static MagickBooleanType IsMagickTreeInstantiated(
-  ExceptionInfo *magick_unreferenced(exception))
+static MagickBooleanType IsMagickTreeInstantiated(ExceptionInfo *exception)
 {
   if (magick_list_initialized == MagickFalse)
     {

diff --git a/magick/matrix.c b/magick/matrix.c
@@ -120,8 +120,9 @@ struct _MatrixInfo
 */
 
 #if defined(SIGBUS)
-static void MatrixSignalHandler(int magick_unreferenced(status))
+static void MatrixSignalHandler(int magick_unused(status))
 {
+  magick_unreferenced(status);
   ThrowFatalException(CacheFatalError,"UnableToExtendMatrixCache");
 }
 #endif

diff --git a/magick/property.c b/magick/property.c
@@ -1680,8 +1680,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
   return(status);
 }
 
-static MagickBooleanType GetICCProperty(const Image *image,
-  const char *magick_unreferenced(property))
+static MagickBooleanType GetICCProperty(const Image *image)
 {
   const StringInfo
     *profile;
@@ -2371,7 +2370,7 @@ MagickExport const char *GetImageProperty(const Image *image,
       if ((LocaleNCompare("icc:",property,4) == 0) ||
           (LocaleNCompare("icm:",property,4) == 0))
         {
-          (void) GetICCProperty(image,property);
+          (void) GetICCProperty(image);
           break;
         }
       if (LocaleNCompare("iptc:",property,5) == 0)

diff --git a/magick/threshold.c b/magick/threshold.c
@@ -577,8 +577,7 @@ static double OTSUThreshold(const Image *image,const double *histogram,
   return(100.0*threshold/MaxIntensity);
 }
 
-static double TriangleThreshold(const Image *magick_unreferenced(image),
-   const double *histogram)
+static double TriangleThreshold(const double *histogram)
 {
   double
     a,
@@ -757,7 +756,7 @@ MagickExport MagickBooleanType AutoThresholdImage(Image *image,
     }
     case TriangleThresholdMethod:
     {
-      threshold=TriangleThreshold(image,histogram);
+      threshold=TriangleThreshold(histogram);
       break;
     }
   }