From 8af0328aedbfacb0d2afbb177c49336158cfea7b Mon Sep 17 00:00:00 2001 From: jan Nils Ferner Date: Fri, 2 Dec 2016 17:14:06 +0100 Subject: [PATCH] Work on #313 --- Magick++/lib/Magick++/Drawable.h | 3 +- Magick++/lib/Magick++/STL.h | 257 +++++++++++++++---------------- 2 files changed, 129 insertions(+), 131 deletions(-) diff --git a/Magick++/lib/Magick++/Drawable.h b/Magick++/lib/Magick++/Drawable.h index 7bd529cc4..1fc06bcec 100644 --- a/Magick++/lib/Magick++/Drawable.h +++ b/Magick++/lib/Magick++/Drawable.h @@ -94,8 +94,7 @@ namespace Magick // // Base class for all drawable objects // - class MagickPPExport DrawableBase: - public std::unary_function + class MagickPPExport DrawableBase { public: diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h index 2e535197e..862afc85b 100644 --- a/Magick++/lib/Magick++/STL.h +++ b/Magick++/lib/Magick++/STL.h @@ -44,7 +44,7 @@ namespace Magick // writeImages( images.begin(), images.end(), "animation.gif" ); // Adaptive-blur image with specified blur factor - class MagickPPExport adaptiveBlurImage : public std::unary_function + class MagickPPExport adaptiveBlurImage { public: adaptiveBlurImage( const double radius_ = 1, const double sigma_ = 0.5 ); @@ -60,7 +60,7 @@ namespace Magick // http://www.dai.ed.ac.uk/HIPR2/adpthrsh.htm // Width x height define the size of the pixel neighborhood // offset = constant to subtract from pixel neighborhood mean - class MagickPPExport adaptiveThresholdImage : public std::unary_function + class MagickPPExport adaptiveThresholdImage { public: adaptiveThresholdImage( const size_t width_, @@ -76,7 +76,7 @@ namespace Magick }; // Add noise to image with specified noise type - class MagickPPExport addNoiseImage : public std::unary_function + class MagickPPExport addNoiseImage { public: addNoiseImage ( NoiseType noiseType_ ); @@ -88,7 +88,7 @@ namespace Magick }; // Transform image by specified affine (or free transform) matrix. - class MagickPPExport affineTransformImage : public std::unary_function + class MagickPPExport affineTransformImage { public: affineTransformImage( const DrawableAffine &affine_ ); @@ -100,7 +100,7 @@ namespace Magick }; // Annotate image (draw text on image) - class MagickPPExport annotateImage : public std::unary_function + class MagickPPExport annotateImage { public: // Annotate using specified text, and placement location @@ -135,7 +135,7 @@ namespace Magick }; // Blur image with specified blur factor - class MagickPPExport blurImage : public std::unary_function + class MagickPPExport blurImage { public: blurImage( const double radius_ = 1, const double sigma_ = 0.5 ); @@ -148,7 +148,7 @@ namespace Magick }; // Border image (add border to image) - class MagickPPExport borderImage : public std::unary_function + class MagickPPExport borderImage { public: borderImage( const Geometry &geometry_ = borderGeometryDefault ); @@ -160,7 +160,7 @@ namespace Magick }; // Extract channel from image - class MagickPPExport channelImage : public std::unary_function + class MagickPPExport channelImage { public: channelImage( const ChannelType channel_ ); @@ -172,7 +172,7 @@ namespace Magick }; // Charcoal effect image (looks like charcoal sketch) - class MagickPPExport charcoalImage : public std::unary_function + class MagickPPExport charcoalImage { public: charcoalImage( const double radius_ = 1, const double sigma_ = 0.5 ); @@ -185,7 +185,7 @@ namespace Magick }; // Chop image (remove vertical or horizontal subregion of image) - class MagickPPExport chopImage : public std::unary_function + class MagickPPExport chopImage { public: chopImage( const Geometry &geometry_ ); @@ -199,7 +199,7 @@ namespace Magick // Accepts a lightweight Color Correction Collection (CCC) file which solely // contains one or more color corrections and applies the correction to the // image. - class MagickPPExport cdlImage : public std::unary_function + class MagickPPExport cdlImage { public: cdlImage( const std::string &cdl_ ); @@ -211,7 +211,7 @@ namespace Magick }; // Colorize image using pen color at specified percent alpha - class MagickPPExport colorizeImage : public std::unary_function + class MagickPPExport colorizeImage { public: colorizeImage( const unsigned int alphaRed_, @@ -233,7 +233,7 @@ namespace Magick // Apply a color matrix to the image channels. The user supplied // matrix may be of order 1 to 5 (1x1 through 5x5). - class MagickPPExport colorMatrixImage : public std::unary_function + class MagickPPExport colorMatrixImage { public: colorMatrixImage( const size_t order_, @@ -247,7 +247,7 @@ namespace Magick }; // Convert the image colorspace representation - class MagickPPExport colorSpaceImage : public std::unary_function + class MagickPPExport colorSpaceImage { public: colorSpaceImage( ColorspaceType colorSpace_ ); @@ -259,7 +259,7 @@ namespace Magick }; // Comment image (add comment string to image) - class MagickPPExport commentImage : public std::unary_function + class MagickPPExport commentImage { public: commentImage( const std::string &comment_ ); @@ -272,7 +272,7 @@ namespace Magick // Compose an image onto another at specified offset and using // specified algorithm - class MagickPPExport compositeImage : public std::unary_function + class MagickPPExport compositeImage { public: compositeImage( const Image &compositeImage_, @@ -294,7 +294,7 @@ namespace Magick }; // Contrast image (enhance intensity differences in image) - class MagickPPExport contrastImage : public std::unary_function + class MagickPPExport contrastImage { public: contrastImage( const size_t sharpen_ ); @@ -306,7 +306,7 @@ namespace Magick }; // Crop image (subregion of original image) - class MagickPPExport cropImage : public std::unary_function + class MagickPPExport cropImage { public: cropImage( const Geometry &geometry_ ); @@ -318,7 +318,7 @@ namespace Magick }; // Cycle image colormap - class MagickPPExport cycleColormapImage : public std::unary_function + class MagickPPExport cycleColormapImage { public: cycleColormapImage( const ::ssize_t amount_ ); @@ -330,7 +330,7 @@ namespace Magick }; // Despeckle image (reduce speckle noise) - class MagickPPExport despeckleImage : public std::unary_function + class MagickPPExport despeckleImage { public: despeckleImage( void ); @@ -344,7 +344,7 @@ namespace Magick // mapping color lookups of the source image to a new destination image // usally of the same size as the source image, unless 'bestfit' is set to // true. - class MagickPPExport distortImage : public std::unary_function + class MagickPPExport distortImage { public: distortImage( const Magick::DistortMethod method_, @@ -366,7 +366,7 @@ namespace Magick }; // Draw on image - class MagickPPExport drawImage : public std::unary_function + class MagickPPExport drawImage { public: // Draw on image using a single drawable @@ -383,7 +383,7 @@ namespace Magick }; // Edge image (hilight edges in image) - class MagickPPExport edgeImage : public std::unary_function + class MagickPPExport edgeImage { public: edgeImage( const double radius_ = 0.0 ); @@ -395,7 +395,7 @@ namespace Magick }; // Emboss image (hilight edges with 3D effect) - class MagickPPExport embossImage : public std::unary_function + class MagickPPExport embossImage { public: embossImage( void ); @@ -409,7 +409,7 @@ namespace Magick }; // Enhance image (minimize noise) - class MagickPPExport enhanceImage : public std::unary_function + class MagickPPExport enhanceImage { public: enhanceImage( void ); @@ -420,7 +420,7 @@ namespace Magick }; // Equalize image (histogram equalization) - class MagickPPExport equalizeImage : public std::unary_function + class MagickPPExport equalizeImage { public: equalizeImage( void ); @@ -431,7 +431,7 @@ namespace Magick }; // Color to use when filling drawn objects - class MagickPPExport fillColorImage : public std::unary_function + class MagickPPExport fillColorImage { public: fillColorImage( const Color &fillColor_ ); @@ -443,7 +443,7 @@ namespace Magick }; // Flip image (reflect each scanline in the vertical direction) - class MagickPPExport flipImage : public std::unary_function + class MagickPPExport flipImage { public: flipImage( void ); @@ -455,7 +455,7 @@ namespace Magick // Floodfill designated area with a matte value class MagickPPExport floodFillAlphaImage - : public std::unary_function + { public: floodFillAlphaImage(const ::ssize_t x_,const ::ssize_t y_, @@ -473,7 +473,7 @@ namespace Magick // Flood-fill image with color class MagickPPExport floodFillColorImage - : public std::unary_function + { public: // Flood-fill color across pixels starting at target-pixel and @@ -505,7 +505,7 @@ namespace Magick // Flood-fill image with texture class MagickPPExport floodFillTextureImage - : public std::unary_function + { public: // Flood-fill texture across pixels that match the color of the @@ -537,7 +537,7 @@ namespace Magick }; // Flop image (reflect each scanline in the horizontal direction) - class MagickPPExport flopImage : public std::unary_function + class MagickPPExport flopImage { public: flopImage( void ); @@ -548,7 +548,7 @@ namespace Magick }; // Frame image - class MagickPPExport frameImage : public std::unary_function + class MagickPPExport frameImage { public: frameImage( const Geometry &geometry_ = frameGeometryDefault ); @@ -566,7 +566,7 @@ namespace Magick }; // Gamma correct image - class MagickPPExport gammaImage : public std::unary_function + class MagickPPExport gammaImage { public: gammaImage( const double gamma_ ); @@ -587,7 +587,7 @@ namespace Magick // The number of neighbor pixels to be included in the convolution // mask is specified by 'width_'. The standard deviation of the // gaussian bell curve is specified by 'sigma_'. - class MagickPPExport gaussianBlurImage : public std::unary_function + class MagickPPExport gaussianBlurImage { public: gaussianBlurImage( const double width_, const double sigma_ ); @@ -600,7 +600,7 @@ namespace Magick }; // Apply a color lookup table (Hald CLUT) to the image. - class MagickPPExport haldClutImage : public std::unary_function + class MagickPPExport haldClutImage { public: haldClutImage( const Image &haldClutImage_ ); @@ -612,7 +612,7 @@ namespace Magick }; // Implode image (special effect) - class MagickPPExport implodeImage : public std::unary_function + class MagickPPExport implodeImage { public: implodeImage( const double factor_ = 50 ); @@ -625,7 +625,7 @@ namespace Magick // implements the inverse discrete Fourier transform (IFT) of the image // either as a magnitude / phase or real / imaginary image pair. - class MagickPPExport inverseFourierTransformImage : public std::unary_function + class MagickPPExport inverseFourierTransformImage { public: inverseFourierTransformImage( const Image &phaseImage_ ); @@ -638,7 +638,7 @@ namespace Magick // Set image validity. Valid images become empty (inValid) if // argument is false. - class MagickPPExport isValidImage : public std::unary_function + class MagickPPExport isValidImage { public: isValidImage( const bool isValid_ ); @@ -650,7 +650,7 @@ namespace Magick }; // Label image - class MagickPPExport labelImage : public std::unary_function + class MagickPPExport labelImage { public: labelImage( const std::string &label_ ); @@ -663,7 +663,7 @@ namespace Magick // Level image - class MagickPPExport levelImage : public std::unary_function + class MagickPPExport levelImage { public: levelImage( const double black_point, @@ -679,7 +679,7 @@ namespace Magick }; // Magnify image by integral size - class MagickPPExport magnifyImage : public std::unary_function + class MagickPPExport magnifyImage { public: magnifyImage( void ); @@ -690,7 +690,7 @@ namespace Magick }; // Remap image colors with closest color from reference image - class MagickPPExport mapImage : public std::unary_function + class MagickPPExport mapImage { public: mapImage( const Image &mapImage_ , @@ -705,7 +705,7 @@ namespace Magick // Filter image by replacing each pixel component with the median // color in a circular neighborhood - class MagickPPExport medianConvolveImage : public std::unary_function + class MagickPPExport medianConvolveImage { public: medianConvolveImage( const double radius_ = 0.0 ); @@ -717,8 +717,7 @@ namespace Magick }; // Merge image layers - class MagickPPExport mergeLayersImage : public - std::unary_function + class MagickPPExport mergeLayersImage { public: mergeLayersImage ( LayerMethod layerMethod_ ); @@ -730,7 +729,7 @@ namespace Magick }; // Reduce image by integral size - class MagickPPExport minifyImage : public std::unary_function + class MagickPPExport minifyImage { public: minifyImage( void ); @@ -741,7 +740,7 @@ namespace Magick }; // Modulate percent hue, saturation, and brightness of an image - class MagickPPExport modulateImage : public std::unary_function + class MagickPPExport modulateImage { public: modulateImage( const double brightness_, @@ -758,7 +757,7 @@ namespace Magick // Negate colors in image. Set grayscale to only negate grayscale // values in image. - class MagickPPExport negateImage : public std::unary_function + class MagickPPExport negateImage { public: negateImage( const bool grayscale_ = false ); @@ -771,7 +770,7 @@ namespace Magick // Normalize image (increase contrast by normalizing the pixel // values to span the full range of color values) - class MagickPPExport normalizeImage : public std::unary_function + class MagickPPExport normalizeImage { public: normalizeImage( void ); @@ -782,7 +781,7 @@ namespace Magick }; // Oilpaint image (image looks like oil painting) - class MagickPPExport oilPaintImage : public std::unary_function + class MagickPPExport oilPaintImage { public: oilPaintImage( const double radius_ = 3 ); @@ -800,7 +799,7 @@ namespace Magick // QuantumRange. The defines OpaqueAlpha and TransparentAlpha are // available to specify completely opaque or completely transparent, // respectively. - class MagickPPExport alphaImage : public std::unary_function + class MagickPPExport alphaImage { public: alphaImage( const unsigned int alpha_ ); @@ -812,7 +811,7 @@ namespace Magick }; // Change color of opaque pixel to specified pen color. - class MagickPPExport opaqueImage : public std::unary_function + class MagickPPExport opaqueImage { public: opaqueImage( const Color &opaqueColor_, @@ -826,7 +825,7 @@ namespace Magick }; // Quantize image (reduce number of colors) - class MagickPPExport quantizeImage : public std::unary_function + class MagickPPExport quantizeImage { public: quantizeImage( const bool measureError_ = false ); @@ -839,7 +838,7 @@ namespace Magick // Raise image (lighten or darken the edges of an image to give a // 3-D raised or lowered effect) - class MagickPPExport raiseImage : public std::unary_function + class MagickPPExport raiseImage { public: raiseImage( const Geometry &geometry_ = raiseGeometryDefault, @@ -897,7 +896,7 @@ namespace Magick }; // Reduce noise in image using a noise peak elimination filter - class MagickPPExport reduceNoiseImage : public std::unary_function + class MagickPPExport reduceNoiseImage { public: reduceNoiseImage( void ); @@ -911,7 +910,7 @@ namespace Magick }; // Resize image to specified size. - class MagickPPExport resizeImage : public std::unary_function + class MagickPPExport resizeImage { public: resizeImage( const Geometry &geometry_ ); @@ -924,7 +923,7 @@ namespace Magick // Roll image (rolls image vertically and horizontally) by specified // number of columnms and rows) - class MagickPPExport rollImage : public std::unary_function + class MagickPPExport rollImage { public: rollImage( const Geometry &roll_ ); @@ -939,7 +938,7 @@ namespace Magick }; // Rotate image counter-clockwise by specified number of degrees. - class MagickPPExport rotateImage : public std::unary_function + class MagickPPExport rotateImage { public: rotateImage( const double degrees_ ); @@ -951,7 +950,7 @@ namespace Magick }; // Resize image by using pixel sampling algorithm - class MagickPPExport sampleImage : public std::unary_function + class MagickPPExport sampleImage { public: sampleImage( const Geometry &geometry_ ); @@ -963,7 +962,7 @@ namespace Magick }; // Resize image by using simple ratio algorithm - class MagickPPExport scaleImage : public std::unary_function + class MagickPPExport scaleImage { public: scaleImage( const Geometry &geometry_ ); @@ -978,7 +977,7 @@ namespace Magick // histograms of the color components and identifying units that are // homogeneous with the fuzzy c-means technique. // Also uses QuantizeColorSpace and Verbose image attributes - class MagickPPExport segmentImage : public std::unary_function + class MagickPPExport segmentImage { public: segmentImage( const double clusterThreshold_ = 1.0, @@ -992,7 +991,7 @@ namespace Magick }; // Shade image using distant light source - class MagickPPExport shadeImage : public std::unary_function + class MagickPPExport shadeImage { public: shadeImage( const double azimuth_ = 30, @@ -1008,7 +1007,7 @@ namespace Magick }; // Shadow effect image (simulate an image shadow) - class MagickPPExport shadowImage : public std::unary_function + class MagickPPExport shadowImage { public: shadowImage( const double percent_opacity_ = 80, const double sigma_ = 0.5, @@ -1024,7 +1023,7 @@ namespace Magick }; // Sharpen pixels in image - class MagickPPExport sharpenImage : public std::unary_function + class MagickPPExport sharpenImage { public: sharpenImage( const double radius_ = 1, const double sigma_ = 0.5 ); @@ -1037,7 +1036,7 @@ namespace Magick }; // Shave pixels from image edges. - class MagickPPExport shaveImage : public std::unary_function + class MagickPPExport shaveImage { public: shaveImage( const Geometry &geometry_ ); @@ -1050,7 +1049,7 @@ namespace Magick // Shear image (create parallelogram by sliding image by X or Y axis) - class MagickPPExport shearImage : public std::unary_function + class MagickPPExport shearImage { public: shearImage( const double xShearAngle_, @@ -1065,7 +1064,7 @@ namespace Magick // Solarize image (similar to effect seen when exposing a // photographic film to light during the development process) - class MagickPPExport solarizeImage : public std::unary_function + class MagickPPExport solarizeImage { public: solarizeImage( const double factor_ ); @@ -1077,7 +1076,7 @@ namespace Magick }; // Splice the background color into the image. - class MagickPPExport spliceImage : public std::unary_function + class MagickPPExport spliceImage { public: spliceImage( const Geometry &geometry_ ); @@ -1089,7 +1088,7 @@ namespace Magick }; // Spread pixels randomly within image by specified ammount - class MagickPPExport spreadImage : public std::unary_function + class MagickPPExport spreadImage { public: spreadImage( const size_t amount_ = 3 ); @@ -1101,7 +1100,7 @@ namespace Magick }; // Add a digital watermark to the image (based on second image) - class MagickPPExport steganoImage : public std::unary_function + class MagickPPExport steganoImage { public: steganoImage( const Image &waterMark_ ); @@ -1114,7 +1113,7 @@ namespace Magick // Create an image which appears in stereo when viewed with red-blue glasses // (Red image on left, blue on right) - class MagickPPExport stereoImage : public std::unary_function + class MagickPPExport stereoImage { public: stereoImage( const Image &rightImage_ ); @@ -1126,7 +1125,7 @@ namespace Magick }; // Color to use when drawing object outlines - class MagickPPExport strokeColorImage : public std::unary_function + class MagickPPExport strokeColorImage { public: strokeColorImage( const Color &strokeColor_ ); @@ -1138,7 +1137,7 @@ namespace Magick }; // Swirl image (image pixels are rotated by degrees) - class MagickPPExport swirlImage : public std::unary_function + class MagickPPExport swirlImage { public: swirlImage( const double degrees_ ); @@ -1150,7 +1149,7 @@ namespace Magick }; // Channel a texture on image background - class MagickPPExport textureImage : public std::unary_function + class MagickPPExport textureImage { public: textureImage( const Image &texture_ ); @@ -1162,7 +1161,7 @@ namespace Magick }; // Threshold image - class MagickPPExport thresholdImage : public std::unary_function + class MagickPPExport thresholdImage { public: thresholdImage( const double threshold_ ); @@ -1174,7 +1173,7 @@ namespace Magick }; // Set image color to transparent - class MagickPPExport transparentImage : public std::unary_function + class MagickPPExport transparentImage { public: transparentImage( const Color& color_ ); @@ -1186,7 +1185,7 @@ namespace Magick }; // Trim edges that are the background color from the image - class MagickPPExport trimImage : public std::unary_function + class MagickPPExport trimImage { public: trimImage( void ); @@ -1197,7 +1196,7 @@ namespace Magick }; // Map image pixels to a sine wave - class MagickPPExport waveImage : public std::unary_function + class MagickPPExport waveImage { public: waveImage( const double amplitude_ = 25.0, @@ -1211,7 +1210,7 @@ namespace Magick }; // Zoom image to specified size. - class MagickPPExport zoomImage : public std::unary_function + class MagickPPExport zoomImage { public: zoomImage( const Geometry &geometry_ ); @@ -1227,7 +1226,7 @@ namespace Magick // // Join images into a single multi-image file - class MagickPPExport adjoinImage : public std::unary_function + class MagickPPExport adjoinImage { public: adjoinImage( const bool flag_ ); @@ -1240,7 +1239,7 @@ namespace Magick // Time in 1/100ths of a second which must expire before displaying // the next image in an animated sequence. - class MagickPPExport animationDelayImage : public std::unary_function + class MagickPPExport animationDelayImage { public: animationDelayImage( const size_t delay_ ); @@ -1253,7 +1252,7 @@ namespace Magick // Number of iterations to loop an animation (e.g. Netscape loop // extension) for. - class MagickPPExport animationIterationsImage : public std::unary_function + class MagickPPExport animationIterationsImage { public: animationIterationsImage( const size_t iterations_ ); @@ -1265,7 +1264,7 @@ namespace Magick }; // Image background color - class MagickPPExport backgroundColorImage : public std::unary_function + class MagickPPExport backgroundColorImage { public: backgroundColorImage( const Color &color_ ); @@ -1277,7 +1276,7 @@ namespace Magick }; // Name of texture image to tile onto the image background - class MagickPPExport backgroundTextureImage : public std::unary_function + class MagickPPExport backgroundTextureImage { public: backgroundTextureImage( const std::string &backgroundTexture_ ); @@ -1289,7 +1288,7 @@ namespace Magick }; // Image border color - class MagickPPExport borderColorImage : public std::unary_function + class MagickPPExport borderColorImage { public: borderColorImage( const Color &color_ ); @@ -1301,7 +1300,7 @@ namespace Magick }; // Text bounding-box base color (default none) - class MagickPPExport boxColorImage : public std::unary_function + class MagickPPExport boxColorImage { public: boxColorImage( const Color &boxColor_ ); @@ -1313,7 +1312,7 @@ namespace Magick }; // Chromaticity blue primary point. - class MagickPPExport chromaBluePrimaryImage : public std::unary_function + class MagickPPExport chromaBluePrimaryImage { public: chromaBluePrimaryImage(const double x_,const double y_,const double z_); @@ -1327,7 +1326,7 @@ namespace Magick }; // Chromaticity green primary point. - class MagickPPExport chromaGreenPrimaryImage : public std::unary_function + class MagickPPExport chromaGreenPrimaryImage { public: chromaGreenPrimaryImage(const double x_,const double y_,const double z_); @@ -1341,7 +1340,7 @@ namespace Magick }; // Chromaticity red primary point. - class MagickPPExport chromaRedPrimaryImage : public std::unary_function + class MagickPPExport chromaRedPrimaryImage { public: chromaRedPrimaryImage(const double x_,const double y_,const double z_); @@ -1355,7 +1354,7 @@ namespace Magick }; // Chromaticity white point. - class MagickPPExport chromaWhitePointImage : public std::unary_function + class MagickPPExport chromaWhitePointImage { public: chromaWhitePointImage(const double x_,const double y_,const double z_); @@ -1369,7 +1368,7 @@ namespace Magick }; // Colors within this distance are considered equal - class MagickPPExport colorFuzzImage : public std::unary_function + class MagickPPExport colorFuzzImage { public: colorFuzzImage( const double fuzz_ ); @@ -1381,7 +1380,7 @@ namespace Magick }; // Color at colormap position index_ - class MagickPPExport colorMapImage : public std::unary_function + class MagickPPExport colorMapImage { public: colorMapImage( const size_t index_, const Color &color_ ); @@ -1395,7 +1394,7 @@ namespace Magick // Composition operator to be used when composition is implicitly used // (such as for image flattening). - class MagickPPExport composeImage : public std::unary_function + class MagickPPExport composeImage { public: composeImage( const CompositeOperator compose_ ); @@ -1407,7 +1406,7 @@ namespace Magick }; // Compression type - class MagickPPExport compressTypeImage : public std::unary_function + class MagickPPExport compressTypeImage { public: compressTypeImage( const CompressionType compressType_ ); @@ -1419,7 +1418,7 @@ namespace Magick }; // Vertical and horizontal resolution in pixels of the image - class MagickPPExport densityImage : public std::unary_function + class MagickPPExport densityImage { public: densityImage( const Point &point_ ); @@ -1431,7 +1430,7 @@ namespace Magick }; // Image depth (bits allocated to red/green/blue components) - class MagickPPExport depthImage : public std::unary_function + class MagickPPExport depthImage { public: depthImage( const size_t depth_ ); @@ -1444,7 +1443,7 @@ namespace Magick // Endianness (LSBEndian like Intel or MSBEndian like SPARC) for image // formats which support endian-specific options. - class MagickPPExport endianImage : public std::unary_function + class MagickPPExport endianImage { public: endianImage( const EndianType endian_ ); @@ -1456,7 +1455,7 @@ namespace Magick }; // Image file name - class MagickPPExport fileNameImage : public std::unary_function + class MagickPPExport fileNameImage { public: fileNameImage( const std::string &fileName_ ); @@ -1468,7 +1467,7 @@ namespace Magick }; // Filter to use when resizing image - class MagickPPExport filterTypeImage : public std::unary_function + class MagickPPExport filterTypeImage { public: filterTypeImage( const FilterType filterType_ ); @@ -1480,7 +1479,7 @@ namespace Magick }; // Text rendering font - class MagickPPExport fontImage : public std::unary_function + class MagickPPExport fontImage { public: fontImage( const std::string &font_ ); @@ -1492,7 +1491,7 @@ namespace Magick }; // Font point size - class MagickPPExport fontPointsizeImage : public std::unary_function + class MagickPPExport fontPointsizeImage { public: fontPointsizeImage( const size_t pointsize_ ); @@ -1504,7 +1503,7 @@ namespace Magick }; // GIF disposal method - class MagickPPExport gifDisposeMethodImage : public std::unary_function + class MagickPPExport gifDisposeMethodImage { public: gifDisposeMethodImage( const DisposeType disposeMethod_ ); @@ -1516,7 +1515,7 @@ namespace Magick }; // Type of interlacing to use - class MagickPPExport interlaceTypeImage : public std::unary_function + class MagickPPExport interlaceTypeImage { public: interlaceTypeImage( const InterlaceType interlace_ ); @@ -1528,7 +1527,7 @@ namespace Magick }; // File type magick identifier (.e.g "GIF") - class MagickPPExport magickImage : public std::unary_function + class MagickPPExport magickImage { public: magickImage( const std::string &magick_ ); @@ -1540,7 +1539,7 @@ namespace Magick }; // Image supports transparent color - class MagickPPExport alphaFlagImage : public std::unary_function + class MagickPPExport alphaFlagImage { public: alphaFlagImage( const bool alphaFlag_ ); @@ -1552,7 +1551,7 @@ namespace Magick }; // Transparent color - class MagickPPExport alphaColorImage : public std::unary_function + class MagickPPExport alphaColorImage { public: alphaColorImage( const Color &alphaColor_ ); @@ -1564,7 +1563,7 @@ namespace Magick }; // Indicate that image is black and white - class MagickPPExport monochromeImage : public std::unary_function + class MagickPPExport monochromeImage { public: monochromeImage( const bool monochromeFlag_ ); @@ -1576,7 +1575,7 @@ namespace Magick }; // Pen color - class MagickPPExport penColorImage : public std::unary_function + class MagickPPExport penColorImage { public: penColorImage( const Color &penColor_ ); @@ -1588,7 +1587,7 @@ namespace Magick }; // Pen texture image. - class MagickPPExport penTextureImage : public std::unary_function + class MagickPPExport penTextureImage { public: penTextureImage( const Image &penTexture_ ); @@ -1600,7 +1599,7 @@ namespace Magick }; // Set pixel color at location x & y. - class MagickPPExport pixelColorImage : public std::unary_function + class MagickPPExport pixelColorImage { public: pixelColorImage( const ::ssize_t x_, @@ -1616,7 +1615,7 @@ namespace Magick }; // Postscript page size. - class MagickPPExport pageImage : public std::unary_function + class MagickPPExport pageImage { public: pageImage( const Geometry &pageSize_ ); @@ -1628,7 +1627,7 @@ namespace Magick }; // JPEG/MIFF/PNG compression level (default 75). - class MagickPPExport qualityImage : public std::unary_function + class MagickPPExport qualityImage { public: qualityImage( const size_t quality_ ); @@ -1640,7 +1639,7 @@ namespace Magick }; // Maximum number of colors to quantize to - class MagickPPExport quantizeColorsImage : public std::unary_function + class MagickPPExport quantizeColorsImage { public: quantizeColorsImage( const size_t colors_ ); @@ -1652,7 +1651,7 @@ namespace Magick }; // Colorspace to quantize in. - class MagickPPExport quantizeColorSpaceImage : public std::unary_function + class MagickPPExport quantizeColorSpaceImage { public: quantizeColorSpaceImage( const ColorspaceType colorSpace_ ); @@ -1664,7 +1663,7 @@ namespace Magick }; // Dither image during quantization (default true). - class MagickPPExport quantizeDitherImage : public std::unary_function + class MagickPPExport quantizeDitherImage { public: quantizeDitherImage( const bool ditherFlag_ ); @@ -1676,7 +1675,7 @@ namespace Magick }; // Quantization tree-depth - class MagickPPExport quantizeTreeDepthImage : public std::unary_function + class MagickPPExport quantizeTreeDepthImage { public: quantizeTreeDepthImage( const size_t treeDepth_ ); @@ -1688,7 +1687,7 @@ namespace Magick }; // The type of rendering intent - class MagickPPExport renderingIntentImage : public std::unary_function + class MagickPPExport renderingIntentImage { public: renderingIntentImage( const RenderingIntent renderingIntent_ ); @@ -1700,7 +1699,7 @@ namespace Magick }; // Units of image resolution - class MagickPPExport resolutionUnitsImage : public std::unary_function + class MagickPPExport resolutionUnitsImage { public: resolutionUnitsImage( const ResolutionType resolutionUnits_ ); @@ -1712,7 +1711,7 @@ namespace Magick }; // Image scene number - class MagickPPExport sceneImage : public std::unary_function + class MagickPPExport sceneImage { public: sceneImage( const size_t scene_ ); @@ -1724,7 +1723,7 @@ namespace Magick }; // adjust the image contrast with a non-linear sigmoidal contrast algorithm - class MagickPPExport sigmoidalContrastImage : public std::unary_function + class MagickPPExport sigmoidalContrastImage { public: sigmoidalContrastImage( const size_t sharpen_, @@ -1740,7 +1739,7 @@ namespace Magick }; // Width and height of a raw image - class MagickPPExport sizeImage : public std::unary_function + class MagickPPExport sizeImage { public: sizeImage( const Geometry &geometry_ ); @@ -1752,7 +1751,7 @@ namespace Magick }; // stripImage strips an image of all profiles and comments. - class MagickPPExport stripImage : public std::unary_function + class MagickPPExport stripImage { public: stripImage( void ); @@ -1763,7 +1762,7 @@ namespace Magick }; // Subimage of an image sequence - class MagickPPExport subImageImage : public std::unary_function + class MagickPPExport subImageImage { public: subImageImage( const size_t subImage_ ); @@ -1775,7 +1774,7 @@ namespace Magick }; // Number of images relative to the base image - class MagickPPExport subRangeImage : public std::unary_function + class MagickPPExport subRangeImage { public: subRangeImage( const size_t subRange_ ); @@ -1787,7 +1786,7 @@ namespace Magick }; // Anti-alias Postscript and TrueType fonts (default true) - class MagickPPExport textAntiAliasImage : public std::unary_function + class MagickPPExport textAntiAliasImage { public: textAntiAliasImage( const bool flag_ ); @@ -1799,7 +1798,7 @@ namespace Magick }; // Image storage type - class MagickPPExport typeImage : public std::unary_function + class MagickPPExport typeImage { public: typeImage( const ImageType type_ ); @@ -1812,7 +1811,7 @@ namespace Magick // Print detailed information about the image - class MagickPPExport verboseImage : public std::unary_function + class MagickPPExport verboseImage { public: verboseImage( const bool verbose_ ); @@ -1825,7 +1824,7 @@ namespace Magick // X11 display to display to, obtain fonts from, or to capture // image from - class MagickPPExport x11DisplayImage : public std::unary_function + class MagickPPExport x11DisplayImage { public: x11DisplayImage( const std::string &display_ ); -- 2.49.0