From 0575024ee81530a499dd4199aa07d608ec1c87e1 Mon Sep 17 00:00:00 2001 From: dirk Date: Tue, 9 Feb 2016 20:29:50 +0100 Subject: [PATCH] Added missing consts. --- Magick++/lib/Magick++/Options.h | 74 +++++++++++++++---------------- Magick++/lib/Options.cpp | 78 ++++++++++++++++----------------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/Magick++/lib/Magick++/Options.h b/Magick++/lib/Magick++/Options.h index d6d729d19..57f09adac 100644 --- a/Magick++/lib/Magick++/Options.h +++ b/Magick++/lib/Magick++/Options.h @@ -39,7 +39,7 @@ namespace Magick ~Options(); // Join images into a single multi-image file - void adjoin(bool flag_); + void adjoin(const bool flag_); bool adjoin(void) const; // Transparent color @@ -63,21 +63,21 @@ namespace Magick Color boxColor(void) const; // Colors within this distance are considered equal - void colorFuzz(double fuzz_); + void colorFuzz(const double fuzz_); double colorFuzz(void) const; // Image colorspace scheme - void colorspaceType(ColorspaceType colorspace_); + void colorspaceType(const ColorspaceType colorspace_); ColorspaceType colorspaceType(void) const; // Compression type ( NoCompression, BZipCompression, // FaxCompression, JPEGCompression, LZWCompression, // RLECompression, or ZipCompression ) - void compressType(CompressionType compressType_); + void compressType(const CompressionType compressType_); CompressionType compressType(void) const; // Enable printing of debug messages from ImageMagick - void debug(bool flag_); + void debug(const bool flag_); bool debug(void) const; // Vertical and horizontal resolution in pixels of the image @@ -85,12 +85,12 @@ namespace Magick Point density(void) const; // Image depth (8 or 16) - void depth(size_t depth_); + void depth(const size_t depth_); size_t depth(void) const; // Endianness (little like Intel or big like SPARC) for image // formats which support endian-specific options. - void endian(EndianType endian_); + void endian(const EndianType endian_); EndianType endian(void) const; // Image filename to read or write @@ -122,7 +122,7 @@ namespace Magick std::string fontFamily(void) const; // Font point size - void fontPointsize(double pointSize_); + void fontPointsize(const double pointSize_); double fontPointsize(void) const; // Font style @@ -136,7 +136,7 @@ namespace Magick std::string format(void) const; // Image interlace scheme - void interlaceType(InterlaceType interlace_); + void interlaceType(const InterlaceType interlace_); InterlaceType interlaceType(void) const; // Image format to write or read @@ -144,7 +144,7 @@ namespace Magick std::string magick(void) const; // Write as a monochrome image - void monochrome(bool monochromeFlag_); + void monochrome(const bool monochromeFlag_); bool monochrome(void) const; // Preferred size and location of an image canvas. @@ -152,27 +152,27 @@ namespace Magick Geometry page(void) const; // Desired image quality factor - void quality(size_t quality_); + void quality(const size_t quality_); size_t quality(void) const; // Maximum number of colors to quantize to - void quantizeColors(size_t colors_); + void quantizeColors(const size_t colors_); size_t quantizeColors(void) const; // Colorspace to quantize in. - void quantizeColorSpace(ColorspaceType colorSpace_); + void quantizeColorSpace(const ColorspaceType colorSpace_); ColorspaceType quantizeColorSpace(void) const; // Dither image during quantization. - void quantizeDither(bool ditherFlag_); + void quantizeDither(const bool ditherFlag_); bool quantizeDither(void) const; // Dither method - void quantizeDitherMethod(DitherMethod ditherMethod_); + void quantizeDitherMethod(const DitherMethod ditherMethod_); DitherMethod quantizeDitherMethod(void) const; // Quantization tree-depth - void quantizeTreeDepth(size_t treeDepth_); + void quantizeTreeDepth(const size_t treeDepth_); size_t quantizeTreeDepth(void) const; // Suppress all warning messages. Error messages are still reported. @@ -180,7 +180,7 @@ namespace Magick bool quiet(void) const; // Units of resolution to interpret density - void resolutionUnits(ResolutionType resolutionUnits_); + void resolutionUnits(const ResolutionType resolutionUnits_); ResolutionType resolutionUnits(void) const; // Image sampling factor @@ -192,7 +192,7 @@ namespace Magick Geometry size(void) const; // enabled/disable stroke anti-aliasing - void strokeAntiAlias(bool flag_); + void strokeAntiAlias(const bool flag_); bool strokeAntiAlias(void) const ; // Color to use when drawing object outlines @@ -209,19 +209,19 @@ namespace Magick // While drawing using strokeDashArray, specify distance into the dash // pattern to start the dash (default 0). - void strokeDashOffset(double strokeDashOffset_); + void strokeDashOffset(const double strokeDashOffset_); double strokeDashOffset(void) const; // Specify the shape to be used at the end of open subpaths when // they are stroked. Values of LineCap are UndefinedCap, ButtCap, // RoundCap, and SquareCap. - void strokeLineCap(LineCap lineCap_); + void strokeLineCap(const LineCap lineCap_); LineCap strokeLineCap(void) const; // Specify the shape to be used at the corners of paths (or other // vector shapes) when they are stroked. Values of LineJoin are // UndefinedJoin, MiterJoin, RoundJoin, and BevelJoin. - void strokeLineJoin(LineJoin lineJoin_); + void strokeLineJoin(const LineJoin lineJoin_); LineJoin strokeLineJoin(void) const; // Specify miter limit. When two line segments meet at a sharp @@ -230,7 +230,7 @@ namespace Magick // the line stroking the path. The miterLimit' imposes a limit on // the ratio of the miter length to the 'stroke_width'. The default // value of this parameter is 4. - void strokeMiterLimit(size_t miterLimit_); + void strokeMiterLimit(const size_t miterLimit_); size_t strokeMiterLimit(void) const; // Pattern image to use for stroked outlines @@ -238,22 +238,22 @@ namespace Magick const MagickCore::Image *strokePattern(void) const; // Stroke width for drawing vector objects (default one) - void strokeWidth(double strokeWidth_); + void strokeWidth(const double strokeWidth_); double strokeWidth(void) const; - void subImage(size_t subImage_); + void subImage(const size_t subImage_); size_t subImage(void) const; // Sub-frame number to return - void subRange(size_t subRange_); + void subRange(const size_t subRange_); size_t subRange(void) const; // Remove pixel aliasing - void textAntiAlias(bool flag_); + void textAntiAlias(const bool flag_); bool textAntiAlias(void) const; // Render text right-to-left or left-to-right. - void textDirection(DirectionType direction_); + void textDirection(const DirectionType direction_); DirectionType textDirection() const; // Annotation text encoding (e.g. "UTF-16") @@ -261,19 +261,19 @@ namespace Magick std::string textEncoding(void) const; // Text gravity. - void textGravity(GravityType gravity_); + void textGravity(const GravityType gravity_); GravityType textGravity() const; // Text inter-line spacing - void textInterlineSpacing(double spacing_); + void textInterlineSpacing(const double spacing_); double textInterlineSpacing(void) const; // Text inter-word spacing - void textInterwordSpacing(double spacing_); + void textInterwordSpacing(const double spacing_); double textInterwordSpacing(void) const; // Text inter-character kerning - void textKerning(double kerning_); + void textKerning(const double kerning_); double textKerning(void) const; // Text undercolor box @@ -281,29 +281,29 @@ namespace Magick Color textUnderColor(void) const; // Origin of coordinate system to use when annotating with text or drawing - void transformOrigin(double tx_,double ty_); + void transformOrigin(const double tx_,const double ty_); // Reset transformation parameters to default void transformReset(void); // Rotation to use when annotating with text or drawing - void transformRotation(double angle_); + void transformRotation(const double angle_); // Scale to use when annotating with text or drawing - void transformScale(double sx_,double sy_); + void transformScale(const double sx_,const double sy_); // Skew to use in X axis when annotating with text or drawing - void transformSkewX(double skewx_); + void transformSkewX(const double skewx_); // Skew to use in Y axis when annotating with text or drawing - void transformSkewY(double skewy_); + void transformSkewY(const double skewy_); // Image representation type void type(const ImageType type_); ImageType type(void) const; // Return verbose information about an image, or an operation - void verbose(bool verboseFlag_); + void verbose(const bool verboseFlag_); bool verbose(void) const; // X11 display name diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp index 9acd7339f..8cb0fec3a 100644 --- a/Magick++/lib/Options.cpp +++ b/Magick++/lib/Options.cpp @@ -62,7 +62,7 @@ Magick::Options::~Options() _drawInfo=DestroyDrawInfo(_drawInfo); } -void Magick::Options::adjoin(bool flag_) +void Magick::Options::adjoin(const bool flag_) { _imageInfo->adjoin=static_cast( flag_ ? MagickTrue : MagickFalse); @@ -130,7 +130,7 @@ Magick::Color Magick::Options::boxColor(void) const return(Color(_drawInfo->undercolor)); } -void Magick::Options::colorspaceType(ColorspaceType colorspace_) +void Magick::Options::colorspaceType(const ColorspaceType colorspace_) { _imageInfo->colorspace=colorspace_; } @@ -140,7 +140,7 @@ Magick::ColorspaceType Magick::Options::colorspaceType(void) const return(static_cast(_imageInfo->colorspace)); } -void Magick::Options::compressType(CompressionType compressType_) +void Magick::Options::compressType(const CompressionType compressType_) { _imageInfo->compression=compressType_; } @@ -150,7 +150,7 @@ Magick::CompressionType Magick::Options::compressType(void) const return(static_cast(_imageInfo->compression)); } -void Magick::Options::colorFuzz(double fuzz_) +void Magick::Options::colorFuzz(const double fuzz_) { _imageInfo->fuzz=fuzz_; } @@ -160,7 +160,7 @@ double Magick::Options::colorFuzz(void) const return(_imageInfo->fuzz); } -void Magick::Options::debug(bool flag_) +void Magick::Options::debug(const bool flag_) { if (flag_) SetLogEventMask("All"); @@ -191,7 +191,7 @@ Magick::Point Magick::Options::density(void) const return(Point()); } -void Magick::Options::depth(size_t depth_) +void Magick::Options::depth(const size_t depth_) { _imageInfo->depth=depth_; } @@ -201,7 +201,7 @@ size_t Magick::Options::depth(void) const return(_imageInfo->depth); } -void Magick::Options::endian(Magick::EndianType endian_) +void Magick::Options::endian(const Magick::EndianType endian_) { _imageInfo->endian=endian_; } @@ -322,7 +322,7 @@ std::string Magick::Options::fontFamily(void) const return(std::string()); } -void Magick::Options::fontPointsize(double pointSize_) +void Magick::Options::fontPointsize(const double pointSize_) { _imageInfo->pointsize=pointSize_; _drawInfo->pointsize=pointSize_; @@ -333,7 +333,7 @@ double Magick::Options::fontPointsize(void) const return(_imageInfo->pointsize); } -void Magick::Options::fontStyle(StyleType style_) +void Magick::Options::fontStyle(const StyleType style_) { _drawInfo->style=style_; (void) SetImageOption(_imageInfo,"style",CommandOptionToMnemonic( @@ -345,7 +345,7 @@ Magick::StyleType Magick::Options::fontStyle(void) const return(_drawInfo->style); } -void Magick::Options::fontWeight(size_t weight_) +void Magick::Options::fontWeight(const size_t weight_) { _drawInfo->weight=weight_; setOption("weight",(double) weight_); @@ -372,7 +372,7 @@ std::string Magick::Options::format(void) const return(std::string()); } -void Magick::Options::interlaceType(InterlaceType interlace_) +void Magick::Options::interlaceType(const InterlaceType interlace_) { _imageInfo->interlace=interlace_; } @@ -408,7 +408,7 @@ std::string Magick::Options::magick(void) const return(std::string()); } -void Magick::Options::monochrome(bool monochromeFlag_) +void Magick::Options::monochrome(const bool monochromeFlag_) { _imageInfo->monochrome=(MagickBooleanType) monochromeFlag_; } @@ -434,7 +434,7 @@ Magick::Geometry Magick::Options::page(void) const return(Geometry()); } -void Magick::Options::quality(size_t quality_) +void Magick::Options::quality(const size_t quality_) { _imageInfo->quality=quality_; } @@ -444,7 +444,7 @@ size_t Magick::Options::quality(void) const return(_imageInfo->quality); } -void Magick::Options::quantizeColors(size_t colors_) +void Magick::Options::quantizeColors(const size_t colors_) { _quantizeInfo->number_colors=colors_; } @@ -454,7 +454,7 @@ size_t Magick::Options::quantizeColors(void) const return(_quantizeInfo->number_colors); } -void Magick::Options::quantizeColorSpace(ColorspaceType colorSpace_) +void Magick::Options::quantizeColorSpace(const ColorspaceType colorSpace_) { _quantizeInfo->colorspace=colorSpace_; } @@ -464,7 +464,7 @@ Magick::ColorspaceType Magick::Options::quantizeColorSpace(void) const return(static_cast(_quantizeInfo->colorspace)); } -void Magick::Options::quantizeDither(bool ditherFlag_) +void Magick::Options::quantizeDither(const bool ditherFlag_) { _imageInfo->dither=(MagickBooleanType) ditherFlag_; _quantizeInfo->dither_method=ditherFlag_ ? RiemersmaDitherMethod : @@ -476,7 +476,7 @@ bool Magick::Options::quantizeDither(void) const return(static_cast(_imageInfo->dither)); } -void Magick::Options::quantizeDitherMethod(DitherMethod ditherMethod_) +void Magick::Options::quantizeDitherMethod(const DitherMethod ditherMethod_) { _quantizeInfo->dither_method=ditherMethod_; } @@ -486,7 +486,7 @@ MagickCore::DitherMethod Magick::Options::quantizeDitherMethod(void) const return(_quantizeInfo->dither_method); } -void Magick::Options::quantizeTreeDepth(size_t treeDepth_) +void Magick::Options::quantizeTreeDepth(const size_t treeDepth_) { _quantizeInfo->tree_depth=treeDepth_; } @@ -506,7 +506,7 @@ bool Magick::Options::quiet(void) const return(_quiet); } -void Magick::Options::resolutionUnits(ResolutionType resolutionUnits_) +void Magick::Options::resolutionUnits(const ResolutionType resolutionUnits_) { _imageInfo->units=resolutionUnits_; } @@ -549,7 +549,7 @@ Magick::Geometry Magick::Options::size(void) const return(Geometry()); } -void Magick::Options::strokeAntiAlias(bool flag_) +void Magick::Options::strokeAntiAlias(const bool flag_) { flag_ ? _drawInfo->stroke_antialias=MagickTrue : _drawInfo->stroke_antialias=MagickFalse; @@ -598,7 +598,7 @@ const double *Magick::Options::strokeDashArray(void) const return(_drawInfo->dash_pattern); } -void Magick::Options::strokeDashOffset(double strokeDashOffset_) +void Magick::Options::strokeDashOffset(const double strokeDashOffset_) { _drawInfo->dash_offset=strokeDashOffset_; } @@ -608,7 +608,7 @@ double Magick::Options::strokeDashOffset(void) const return(_drawInfo->dash_offset); } -void Magick::Options::strokeLineCap(LineCap lineCap_) +void Magick::Options::strokeLineCap(const LineCap lineCap_) { _drawInfo->linecap=lineCap_; } @@ -618,7 +618,7 @@ Magick::LineCap Magick::Options::strokeLineCap(void) const return(_drawInfo->linecap); } -void Magick::Options::strokeLineJoin(LineJoin lineJoin_) +void Magick::Options::strokeLineJoin(const LineJoin lineJoin_) { _drawInfo->linejoin=lineJoin_; } @@ -628,7 +628,7 @@ Magick::LineJoin Magick::Options::strokeLineJoin(void) const return(_drawInfo->linejoin); } -void Magick::Options::strokeMiterLimit(size_t miterLimit_) +void Magick::Options::strokeMiterLimit(const size_t miterLimit_) { _drawInfo->miterlimit=miterLimit_; } @@ -657,7 +657,7 @@ const MagickCore::Image *Magick::Options::strokePattern(void) const return(_drawInfo->stroke_pattern); } -void Magick::Options::strokeWidth(double strokeWidth_) +void Magick::Options::strokeWidth(const double strokeWidth_) { _drawInfo->stroke_width=strokeWidth_; setOption("strokewidth",strokeWidth_); @@ -668,7 +668,7 @@ double Magick::Options::strokeWidth(void) const return(_drawInfo->stroke_width); } -void Magick::Options::subImage(size_t subImage_) +void Magick::Options::subImage(const size_t subImage_) { _imageInfo->scene=subImage_; } @@ -678,7 +678,7 @@ size_t Magick::Options::subImage(void) const return(_imageInfo->scene); } -void Magick::Options::subRange(size_t subRange_) +void Magick::Options::subRange(const size_t subRange_) { _imageInfo->number_scenes=subRange_; } @@ -688,7 +688,7 @@ size_t Magick::Options::subRange(void) const return(_imageInfo->number_scenes); } -void Magick::Options::textAntiAlias(bool flag_) +void Magick::Options::textAntiAlias(const bool flag_) { _drawInfo->text_antialias=static_cast( flag_ ? MagickTrue : MagickFalse); @@ -699,7 +699,7 @@ bool Magick::Options::textAntiAlias(void) const return(static_cast(_drawInfo->text_antialias)); } -void Magick::Options::textDirection(DirectionType direction_) +void Magick::Options::textDirection(const DirectionType direction_) { _drawInfo->direction=direction_; (void) SetImageOption(_imageInfo,"direction",CommandOptionToMnemonic( @@ -725,7 +725,7 @@ std::string Magick::Options::textEncoding(void) const return(std::string()); } -void Magick::Options::textGravity(GravityType gravity_) +void Magick::Options::textGravity(const GravityType gravity_) { _drawInfo->gravity=gravity_; (void) SetImageOption(_imageInfo,"gravity",CommandOptionToMnemonic( @@ -737,7 +737,7 @@ Magick::GravityType Magick::Options::textGravity() const return(_drawInfo->gravity); } -void Magick::Options::textInterlineSpacing(double spacing_) +void Magick::Options::textInterlineSpacing(const double spacing_) { _drawInfo->interline_spacing=spacing_; setOption("interline-spacing",spacing_); @@ -748,7 +748,7 @@ double Magick::Options::textInterlineSpacing(void) const return(_drawInfo->interline_spacing); } -void Magick::Options::textInterwordSpacing(double spacing_) +void Magick::Options::textInterwordSpacing(const double spacing_) { _drawInfo->interword_spacing=spacing_; setOption("interword-spacing",spacing_); @@ -759,7 +759,7 @@ double Magick::Options::textInterwordSpacing(void) const return(_drawInfo->interword_spacing); } -void Magick::Options::textKerning(double kerning_) +void Magick::Options::textKerning(const double kerning_) { _drawInfo->kerning=kerning_; setOption("kerning",kerning_); @@ -781,7 +781,7 @@ Magick::Color Magick::Options::textUnderColor(void) const return(_drawInfo->undercolor); } -void Magick::Options::transformOrigin(double tx_,double ty_) +void Magick::Options::transformOrigin(const double tx_,const double ty_) { AffineMatrix affine, @@ -815,7 +815,7 @@ void Magick::Options::transformReset(void) _drawInfo->affine.ty=0.0; } -void Magick::Options::transformRotation(double angle_) +void Magick::Options::transformRotation(const double angle_) { AffineMatrix affine, @@ -841,7 +841,7 @@ void Magick::Options::transformRotation(double angle_) _drawInfo->affine.ty=current.rx*affine.tx+current.sy*affine.ty+current.ty; } -void Magick::Options::transformScale(double sx_,double sy_) +void Magick::Options::transformScale(const double sx_,const double sy_) { AffineMatrix affine, @@ -865,7 +865,7 @@ void Magick::Options::transformScale(double sx_,double sy_) _drawInfo->affine.ty=current.rx*affine.tx+current.sy*affine.ty+current.ty; } -void Magick::Options::transformSkewX(double skewx_) +void Magick::Options::transformSkewX(const double skewx_) { AffineMatrix affine, @@ -890,7 +890,7 @@ void Magick::Options::transformSkewX(double skewx_) _drawInfo->affine.ty=current.rx*affine.tx+current.sy*affine.ty+current.ty; } -void Magick::Options::transformSkewY(double skewy_) +void Magick::Options::transformSkewY(const double skewy_) { AffineMatrix affine, @@ -925,7 +925,7 @@ Magick::ImageType Magick::Options::type(void) const return(_imageInfo->type); } -void Magick::Options::verbose(bool verboseFlag_) +void Magick::Options::verbose(const bool verboseFlag_) { _imageInfo->verbose=(MagickBooleanType) verboseFlag_; } -- 2.40.0