From 751a6671c9b7480f3672a7ef6aa6e392f064b46d Mon Sep 17 00:00:00 2001 From: dirk Date: Sat, 19 Mar 2016 11:09:53 +0100 Subject: [PATCH] Fixes for unused parameters. --- MagickCore/annotate.c | 2 ++ MagickCore/resize.c | 25 +++++++++++++++++++++++++ MagickCore/statistic.c | 7 +++---- MagickCore/stream.c | 2 ++ MagickCore/thread.c | 1 + MagickWand/mogrify.c | 2 ++ MagickWand/operation.c | 4 +++- coders/jpeg.c | 4 ++-- 8 files changed, 40 insertions(+), 7 deletions(-) diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index 9ed6c1050..60c8fd051 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -1116,6 +1116,8 @@ cleanup: ssize_t last_glyph; + magick_unreferenced(exception); + /* Simple layout for bi-directional text (right-to-left or left-to-right). */ diff --git a/MagickCore/resize.c b/MagickCore/resize.c index d10a4835d..c5fc90cc8 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -149,6 +149,8 @@ static double static double Blackman(const double x, const ResizeFilter *magick_unused(resize_filter)) { + magick_unreferenced(resize_filter); + /* Blackman: 2nd order cosine windowing function: 0.42 + 0.5 cos(pi x) + 0.08 cos(2pi x) @@ -163,6 +165,8 @@ static double Blackman(const double x, static double Bohman(const double x, const ResizeFilter *magick_unused(resize_filter)) { + magick_unreferenced(resize_filter); + /* Bohman: 2rd Order cosine windowing function: (1-x) cos(pi x) + sin(pi x) / pi. @@ -179,6 +183,9 @@ static double Bohman(const double x, static double Box(const double magick_unused(x), const ResizeFilter *magick_unused(resize_filter)) { + magick_unreferenced(x); + magick_unreferenced(resize_filter); + /* A Box filter is a equal weighting function (all weights equal). DO NOT LIMIT results by support or resize point sampling will work @@ -190,6 +197,8 @@ static double Box(const double magick_unused(x), static double Cosine(const double x, const ResizeFilter *magick_unused(resize_filter)) { + magick_unreferenced(resize_filter); + /* Cosine window function: cos((pi/2)*x). @@ -275,6 +284,8 @@ static double Gaussian(const double x,const ResizeFilter *resize_filter) static double Hann(const double x, const ResizeFilter *magick_unused(resize_filter)) { + magick_unreferenced(resize_filter); + /* Cosine window function: 0.5+0.5*cos(pi*x). @@ -286,6 +297,8 @@ static double Hann(const double x, static double Hamming(const double x, const ResizeFilter *magick_unused(resize_filter)) { + magick_unreferenced(resize_filter); + /* Offset cosine window function: .54 + .46 cos(pi x). @@ -297,6 +310,8 @@ static double Hamming(const double x, static double Jinc(const double x, const ResizeFilter *magick_unused(resize_filter)) { + magick_unreferenced(resize_filter); + /* See Pratt "Digital Image Processing" p.97 for Jinc/Bessel functions. http://mathworld.wolfram.com/JincFunction.html and page 11 of @@ -364,6 +379,8 @@ static double Lagrange(const double x,const ResizeFilter *resize_filter) static double Quadratic(const double x, const ResizeFilter *magick_unused(resize_filter)) { + magick_unreferenced(resize_filter); + /* 2rd order (quadratic) B-Spline approximation of Gaussian. */ @@ -377,6 +394,8 @@ static double Quadratic(const double x, static double Sinc(const double x, const ResizeFilter *magick_unused(resize_filter)) { + magick_unreferenced(resize_filter); + /* Scaled sinc(x) function using a trig call: sinc(x) == sin(pi x)/(pi x). @@ -392,6 +411,8 @@ static double Sinc(const double x, static double SincFast(const double x, const ResizeFilter *magick_unused(resize_filter)) { + magick_unreferenced(resize_filter); + /* Approximations of the sinc function sin(pi x)/(pi x) over the interval [-4,4] constructed by Nicolas Robidoux and Chantal Racette with funding @@ -486,6 +507,8 @@ static double SincFast(const double x, static double Triangle(const double x, const ResizeFilter *magick_unused(resize_filter)) { + magick_unreferenced(resize_filter); + /* 1st order (linear) B-Spline, bilinear interpolation, Tent 1D filter, or a Bartlett 2D Cone filter. Also used as a Bartlett Windowing function @@ -499,6 +522,8 @@ static double Triangle(const double x, static double Welch(const double x, const ResizeFilter *magick_unused(resize_filter)) { + magick_unreferenced(resize_filter); + /* Welch parabolic windowing filter. */ diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 01a88518f..068c4dd07 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -149,8 +149,7 @@ static PixelChannels **DestroyPixelThreadSet(PixelChannels **pixels) return(pixels); } -static PixelChannels **AcquirePixelThreadSet(const Image *image, - const size_t number_images) +static PixelChannels **AcquirePixelThreadSet(const Image *image) { PixelChannels **pixels; @@ -466,7 +465,7 @@ MagickExport Image *EvaluateImages(const Image *images, return((Image *) NULL); } number_images=GetImageListLength(images); - evaluate_pixels=AcquirePixelThreadSet(images,number_images); + evaluate_pixels=AcquirePixelThreadSet(images); if (evaluate_pixels == (PixelChannels **) NULL) { image=DestroyImage(image); @@ -2313,7 +2312,7 @@ MagickExport Image *PolynomialImage(const Image *images, return((Image *) NULL); } number_images=GetImageListLength(images); - polynomial_pixels=AcquirePixelThreadSet(images,number_images); + polynomial_pixels=AcquirePixelThreadSet(images); if (polynomial_pixels == (PixelChannels **) NULL) { image=DestroyImage(image); diff --git a/MagickCore/stream.c b/MagickCore/stream.c index ef5fd74ae..a0e1d5d8e 100644 --- a/MagickCore/stream.c +++ b/MagickCore/stream.c @@ -718,6 +718,8 @@ static const Quantum *GetVirtualPixelStream(const Image *image, size_t length; + magick_unreferenced(virtual_pixel_method); + /* Validate pixel cache geometry. */ diff --git a/MagickCore/thread.c b/MagickCore/thread.c index 8d3a7e6c3..2242df539 100644 --- a/MagickCore/thread.c +++ b/MagickCore/thread.c @@ -87,6 +87,7 @@ MagickExport MagickBooleanType CreateMagickThreadKey(MagickThreadKey *key, #if defined(MAGICKCORE_THREAD_SUPPORT) return(pthread_key_create(key,destructor) == 0 ? MagickTrue : MagickFalse); #elif defined(MAGICKCORE_WINDOWS_SUPPORT) + magick_unreferenced(destructor); *key=TlsAlloc(); return(*key != TLS_OUT_OF_INDEXES ? MagickTrue : MagickFalse); #else diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 8c22c82b1..97a9a05d0 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -395,6 +395,8 @@ static MagickBooleanType MonitorProgress(const char *text, register char *p; + magick_unreferenced(client_data); + if ((extent <= 1) || (offset < 0) || (offset >= (MagickOffsetType) extent)) return(MagickTrue); if ((offset != (MagickOffsetType) (extent-1)) && ((offset % 50) != 0)) diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 9667be67a..afbe661c9 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -89,7 +89,7 @@ static const char */ static MagickBooleanType MonitorProgress(const char *text, const MagickOffsetType offset,const MagickSizeType extent, - void *wand_unused(cli_wandent_data)) + void *wand_unused(client_data)) { char message[MagickPathExtent], @@ -101,6 +101,8 @@ static MagickBooleanType MonitorProgress(const char *text, register char *p; + magick_unreferenced(client_data); + if ((extent <= 1) || (offset < 0) || (offset >= (MagickOffsetType) extent)) return(MagickTrue); if ((offset != (MagickOffsetType) (extent-1)) && ((offset % 50) != 0)) diff --git a/coders/jpeg.c b/coders/jpeg.c index 802350f84..6a848cbd7 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -793,7 +793,7 @@ static void JPEGSourceManager(j_decompress_ptr cinfo,Image *image) } static void JPEGSetImageQuality(struct jpeg_decompress_struct *jpeg_info, - Image *image, ExceptionInfo *exception) + Image *image) { image->quality=UndefinedCompressionQuality; #if defined(D_PROGRESSIVE_SUPPORTED) @@ -1284,7 +1284,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, (void) LogMagickEvent(CoderEvent,GetMagickModule(),"Geometry: %dx%d", (int) jpeg_info.output_width,(int) jpeg_info.output_height); } - JPEGSetImageQuality(&jpeg_info,image,exception); + JPEGSetImageQuality(&jpeg_info,image); JPEGSetImageSamplingFactor(&jpeg_info,image,exception); (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double) jpeg_info.out_color_space); -- 2.40.0