From de1ca7c3575d108b1aba6f5c67f00cc4e6f20415 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Jun 2021 14:32:22 +0200 Subject: switch to reflection using IM7 --- PHPINFO | 8 +- REFLECTION | 837 ++++++++++++++++++++------------------------------ php-pecl-imagick.spec | 4 + 3 files changed, 336 insertions(+), 513 deletions(-) diff --git a/PHPINFO b/PHPINFO index 13bd026..b64519d 100644 --- a/PHPINFO +++ b/PHPINFO @@ -4,12 +4,12 @@ imagick imagick module => enabled imagick module version => 3.5.0RC2 imagick classes => Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator, ImagickKernel -Imagick compiled with ImageMagick version => ImageMagick 6.9.12-15 Q16 x86_64 2021-06-13 https://imagemagick.org -Imagick using ImageMagick library version => ImageMagick 6.9.12-15 Q16 x86_64 2021-06-13 https://imagemagick.org +Imagick compiled with ImageMagick version => ImageMagick 7.1.0-0 Q16 x86_64 2021-06-13 https://imagemagick.org +Imagick using ImageMagick library version => ImageMagick 7.1.0-0 Q16 x86_64 2021-06-13 https://imagemagick.org ImageMagick copyright => (C) 1999-2021 ImageMagick Studio LLC ImageMagick release date => 2021-06-13 -ImageMagick number of supported formats: => 247 -ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, AVI, AVIF, AVS, BGR, BGRA, BGRO, BIE, BMP, BMP2, BMP3, BRF, CAL, CALS, CANVAS, CAPTION, CIN, CIP, CLIP, CMYK, CMYKA, CR2, CR3, CRW, CUR, CUT, DATA, DCM, DCR, DCX, DDS, DFONT, DJVU, DNG, DOT, DPX, DXT1, DXT5, EPDF, EPI, EPS, EPS2, EPS3, EPSF, EPSI, EPT, EPT2, EPT3, ERF, EXR, FAX, FILE, FITS, FRACTAL, FTP, FTS, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, H, HALD, HDR, HEIC, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, K25, KDC, LABEL, M2V, M4V, MAC, MAGICK, MAP, MASK, MAT, MATTE, MEF, MIFF, MKV, MNG, MONO, MOV, MP4, MPC, MPG, MRW, MSL, MSVG, MTV, MVG, NEF, NRW, NULL, ORF, OTB, OTF, PAL, PALM, PAM, PANGO, PATTERN, PBM, PCD, PCDS, PCL, PCT, PCX, PDB, PDF, PDFA, PEF, PES, PFA, PFB, PFM, PGM, PGX, PICON, PICT, PIX, PJPEG, PLASMA, PNG, PNG00, PNG24, PNG32, PNG48, PNG64, PNG8, PNM, POCKETMOD, PPM, PREVIEW, PS, PS2, PS3, PSB, PSD, PTIF, PWP, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGBA, RGBO, RGF, RLA, RLE, RMF, RW2, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, STEGANO, SUN, SVG, SVGZ, TEXT, TGA, THUMBNAIL, TIFF, TIFF64, TILE, TIM, TTC, TTF, TXT, UBRL, UBRL6, UIL, UYVY, VDA, VICAR, VID, VIDEO, VIFF, VIPS, VST, WBMP, WEBM, WEBP, WMF, WMV, WMZ, WPG, X, X3F, XBM, XC, XCF, XPM, XPS, XV, XWD, YCbCr, YCbCrA, YUV +ImageMagick number of supported formats: => 259 +ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, ASHLAR, AVI, AVIF, AVS, BGR, BGRA, BGRO, BIE, BMP, BMP2, BMP3, BRF, CAL, CALS, CANVAS, CAPTION, CIN, CIP, CLIP, CMYK, CMYKA, CR2, CR3, CRW, CUBE, CUR, CUT, DATA, DCM, DCR, DCRAW, DCX, DDS, DFONT, DJVU, DNG, DOT, DPX, DXT1, DXT5, EPDF, EPI, EPS, EPS2, EPS3, EPSF, EPSI, EPT, EPT2, EPT3, ERF, EXR, FARBFELD, FAX, FF, FILE, FITS, FL32, FLV, FRACTAL, FTP, FTS, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, HALD, HDR, HEIC, HEIF, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, K25, KDC, KERNEL, LABEL, M2V, M4V, MAC, MAP, MASK, MAT, MATTE, MEF, MIFF, MKV, MNG, MONO, MOV, MP4, MPC, MPEG, MPG, MRW, MSL, MSVG, MTV, MVG, NEF, NRW, NULL, ORA, ORF, OTB, OTF, PAL, PALM, PAM, PANGO, PATTERN, PBM, PCD, PCDS, PCL, PCT, PCX, PDB, PDF, PDFA, PEF, PES, PFA, PFB, PFM, PGM, PGX, PHM, PICON, PICT, PIX, PJPEG, PLASMA, PNG, PNG00, PNG24, PNG32, PNG48, PNG64, PNG8, PNM, POCKETMOD, PPM, PS, PS2, PS3, PSB, PSD, PTIF, PWP, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGB565, RGBA, RGBO, RGF, RLA, RLE, RMF, RSVG, RW2, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, STEGANO, SUN, SVG, SVGZ, TEXT, TGA, THUMBNAIL, TIFF, TIFF64, TILE, TIM, TM2, TTC, TTF, TXT, UBRL, UBRL6, UIL, UYVY, VDA, VICAR, VID, VIFF, VIPS, VST, WBMP, WEBM, WEBP, WMF, WMV, WMZ, WPG, X, X3F, XBM, XC, XCF, XPM, XPS, XV, XWD, YAML, YCbCr, YCbCrA, YUV Directive => Local Value => Master Value imagick.locale_fix => 0 => 0 diff --git a/REFLECTION b/REFLECTION index bffeb25..d33b7d3 100644 --- a/REFLECTION +++ b/REFLECTION @@ -315,7 +315,7 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Class [ class Imagick implements Iterator, Traversable, Countable ] { - - Constants [583] { + - Constants [603] { Constant [ public int COLOR_BLACK ] { 11 } Constant [ public int COLOR_BLUE ] { 12 } Constant [ public int COLOR_CYAN ] { 13 } @@ -323,19 +323,17 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int COLOR_RED ] { 15 } Constant [ public int COLOR_YELLOW ] { 16 } Constant [ public int COLOR_MAGENTA ] { 17 } - Constant [ public int COLOR_OPACITY ] { 18 } - Constant [ public int COLOR_ALPHA ] { 19 } - Constant [ public int COLOR_FUZZ ] { 20 } + Constant [ public int COLOR_ALPHA ] { 18 } + Constant [ public int COLOR_FUZZ ] { 19 } Constant [ public int IMAGICK_EXTNUM ] { 30500 } Constant [ public string IMAGICK_EXTVER ] { 3.5.0RC2 } Constant [ public int QUANTUM_RANGE ] { 65535 } Constant [ public int USE_ZEND_MM ] { 0 } - Constant [ public int COMPOSITE_DEFAULT ] { 40 } + Constant [ public int COMPOSITE_DEFAULT ] { 54 } Constant [ public int COMPOSITE_UNDEFINED ] { 0 } - Constant [ public int COMPOSITE_NO ] { 1 } - Constant [ public int COMPOSITE_ADD ] { 2 } - Constant [ public int COMPOSITE_ATOP ] { 3 } - Constant [ public int COMPOSITE_BLEND ] { 4 } + Constant [ public int COMPOSITE_NO ] { 52 } + Constant [ public int COMPOSITE_ATOP ] { 2 } + Constant [ public int COMPOSITE_BLEND ] { 3 } Constant [ public int COMPOSITE_BUMPMAP ] { 5 } Constant [ public int COMPOSITE_CLEAR ] { 7 } Constant [ public int COMPOSITE_COLORBURN ] { 8 } @@ -347,64 +345,70 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int COMPOSITE_COPYCYAN ] { 14 } Constant [ public int COMPOSITE_COPYGREEN ] { 15 } Constant [ public int COMPOSITE_COPYMAGENTA ] { 16 } + Constant [ public int COMPOSITE_COPYALPHA ] { 17 } Constant [ public int COMPOSITE_COPYOPACITY ] { 17 } Constant [ public int COMPOSITE_COPYRED ] { 18 } Constant [ public int COMPOSITE_COPYYELLOW ] { 19 } Constant [ public int COMPOSITE_DARKEN ] { 20 } - Constant [ public int COMPOSITE_DSTATOP ] { 21 } - Constant [ public int COMPOSITE_DST ] { 22 } - Constant [ public int COMPOSITE_DSTIN ] { 23 } - Constant [ public int COMPOSITE_DSTOUT ] { 24 } - Constant [ public int COMPOSITE_DSTOVER ] { 25 } - Constant [ public int COMPOSITE_DIFFERENCE ] { 26 } - Constant [ public int COMPOSITE_DISPLACE ] { 27 } - Constant [ public int COMPOSITE_DISSOLVE ] { 28 } - Constant [ public int COMPOSITE_EXCLUSION ] { 29 } - Constant [ public int COMPOSITE_HARDLIGHT ] { 30 } - Constant [ public int COMPOSITE_HUE ] { 31 } - Constant [ public int COMPOSITE_IN ] { 32 } - Constant [ public int COMPOSITE_LIGHTEN ] { 33 } - Constant [ public int COMPOSITE_LUMINIZE ] { 35 } - Constant [ public int COMPOSITE_MINUS ] { 36 } - Constant [ public int COMPOSITE_MODULATE ] { 37 } - Constant [ public int COMPOSITE_MULTIPLY ] { 38 } - Constant [ public int COMPOSITE_OUT ] { 39 } - Constant [ public int COMPOSITE_OVER ] { 40 } - Constant [ public int COMPOSITE_OVERLAY ] { 41 } - Constant [ public int COMPOSITE_PLUS ] { 42 } - Constant [ public int COMPOSITE_REPLACE ] { 43 } - Constant [ public int COMPOSITE_SATURATE ] { 44 } - Constant [ public int COMPOSITE_SCREEN ] { 45 } - Constant [ public int COMPOSITE_SOFTLIGHT ] { 46 } - Constant [ public int COMPOSITE_SRCATOP ] { 47 } - Constant [ public int COMPOSITE_SRC ] { 48 } - Constant [ public int COMPOSITE_SRCIN ] { 49 } - Constant [ public int COMPOSITE_SRCOUT ] { 50 } - Constant [ public int COMPOSITE_SRCOVER ] { 51 } - Constant [ public int COMPOSITE_SUBTRACT ] { 52 } - Constant [ public int COMPOSITE_THRESHOLD ] { 53 } - Constant [ public int COMPOSITE_XOR ] { 54 } + Constant [ public int COMPOSITE_DSTATOP ] { 28 } + Constant [ public int COMPOSITE_DST ] { 29 } + Constant [ public int COMPOSITE_DSTIN ] { 30 } + Constant [ public int COMPOSITE_DSTOUT ] { 31 } + Constant [ public int COMPOSITE_DSTOVER ] { 32 } + Constant [ public int COMPOSITE_DIFFERENCE ] { 22 } + Constant [ public int COMPOSITE_DISPLACE ] { 23 } + Constant [ public int COMPOSITE_DISSOLVE ] { 24 } + Constant [ public int COMPOSITE_EXCLUSION ] { 33 } + Constant [ public int COMPOSITE_HARDLIGHT ] { 34 } + Constant [ public int COMPOSITE_HUE ] { 36 } + Constant [ public int COMPOSITE_IN ] { 37 } + Constant [ public int COMPOSITE_LIGHTEN ] { 39 } + Constant [ public int COMPOSITE_LUMINIZE ] { 44 } + Constant [ public int COMPOSITE_MODULATE ] { 48 } + Constant [ public int COMPOSITE_MULTIPLY ] { 51 } + Constant [ public int COMPOSITE_OUT ] { 53 } + Constant [ public int COMPOSITE_OVER ] { 54 } + Constant [ public int COMPOSITE_OVERLAY ] { 55 } + Constant [ public int COMPOSITE_PLUS ] { 58 } + Constant [ public int COMPOSITE_REPLACE ] { 59 } + Constant [ public int COMPOSITE_SATURATE ] { 60 } + Constant [ public int COMPOSITE_SCREEN ] { 61 } + Constant [ public int COMPOSITE_SOFTLIGHT ] { 62 } + Constant [ public int COMPOSITE_SRCATOP ] { 63 } + Constant [ public int COMPOSITE_SRC ] { 64 } + Constant [ public int COMPOSITE_SRCIN ] { 65 } + Constant [ public int COMPOSITE_SRCOUT ] { 66 } + Constant [ public int COMPOSITE_SRCOVER ] { 67 } + Constant [ public int COMPOSITE_THRESHOLD ] { 68 } + Constant [ public int COMPOSITE_XOR ] { 70 } Constant [ public int COMPOSITE_CHANGEMASK ] { 6 } - Constant [ public int COMPOSITE_LINEARLIGHT ] { 34 } - Constant [ public int COMPOSITE_DIVIDE ] { 55 } - Constant [ public int COMPOSITE_DISTORT ] { 56 } - Constant [ public int COMPOSITE_BLUR ] { 57 } - Constant [ public int COMPOSITE_PEGTOPLIGHT ] { 58 } - Constant [ public int COMPOSITE_VIVIDLIGHT ] { 59 } - Constant [ public int COMPOSITE_PINLIGHT ] { 60 } - Constant [ public int COMPOSITE_LINEARDODGE ] { 61 } - Constant [ public int COMPOSITE_LINEARBURN ] { 62 } - Constant [ public int COMPOSITE_MATHEMATICS ] { 63 } - Constant [ public int COMPOSITE_MODULUSADD ] { 2 } - Constant [ public int COMPOSITE_MODULUSSUBTRACT ] { 52 } - Constant [ public int COMPOSITE_MINUSDST ] { 36 } - Constant [ public int COMPOSITE_DIVIDEDST ] { 55 } - Constant [ public int COMPOSITE_DIVIDESRC ] { 64 } - Constant [ public int COMPOSITE_MINUSSRC ] { 65 } - Constant [ public int COMPOSITE_DARKENINTENSITY ] { 66 } - Constant [ public int COMPOSITE_LIGHTENINTENSITY ] { 67 } - Constant [ public int COMPOSITE_HARDMIX ] { 68 } - Constant [ public int COMPOSITE_STEREO ] { 69 } + Constant [ public int COMPOSITE_LINEARLIGHT ] { 43 } + Constant [ public int COMPOSITE_DISTORT ] { 25 } + Constant [ public int COMPOSITE_BLUR ] { 4 } + Constant [ public int COMPOSITE_PEGTOPLIGHT ] { 56 } + Constant [ public int COMPOSITE_VIVIDLIGHT ] { 69 } + Constant [ public int COMPOSITE_PINLIGHT ] { 57 } + Constant [ public int COMPOSITE_LINEARDODGE ] { 42 } + Constant [ public int COMPOSITE_LINEARBURN ] { 41 } + Constant [ public int COMPOSITE_MATHEMATICS ] { 45 } + Constant [ public int COMPOSITE_MODULUSADD ] { 49 } + Constant [ public int COMPOSITE_MODULUSSUBTRACT ] { 50 } + Constant [ public int COMPOSITE_MINUSDST ] { 46 } + Constant [ public int COMPOSITE_DIVIDEDST ] { 26 } + Constant [ public int COMPOSITE_DIVIDESRC ] { 27 } + Constant [ public int COMPOSITE_MINUSSRC ] { 47 } + Constant [ public int COMPOSITE_DARKENINTENSITY ] { 21 } + Constant [ public int COMPOSITE_LIGHTENINTENSITY ] { 40 } + Constant [ public int COMPOSITE_HARDMIX ] { 35 } + Constant [ public int COMPOSITE_STEREO ] { 71 } + Constant [ public int COMPOSITE_FREEZE ] { 72 } + Constant [ public int COMPOSITE_INTERPOLATE ] { 73 } + Constant [ public int COMPOSITE_NEGATE ] { 74 } + Constant [ public int COMPOSITE_REFLECT ] { 75 } + Constant [ public int COMPOSITE_SOFTBURN ] { 76 } + Constant [ public int COMPOSITE_SOFTDODGE ] { 77 } + Constant [ public int COMPOSITE_STAMP ] { 78 } + Constant [ public int COMPOSITE_RMSE ] { 79 } Constant [ public int MONTAGEMODE_FRAME ] { 1 } Constant [ public int MONTAGEMODE_UNFRAME ] { 2 } Constant [ public int MONTAGEMODE_CONCATENATE ] { 3 } @@ -419,6 +423,7 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int FILTER_TRIANGLE ] { 3 } Constant [ public int FILTER_HERMITE ] { 4 } Constant [ public int FILTER_HANNING ] { 5 } + Constant [ public int FILTER_HANN ] { 5 } Constant [ public int FILTER_HAMMING ] { 6 } Constant [ public int FILTER_BLACKMAN ] { 7 } Constant [ public int FILTER_GAUSSIAN ] { 8 } @@ -431,9 +436,10 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int FILTER_SINC ] { 14 } Constant [ public int FILTER_KAISER ] { 16 } Constant [ public int FILTER_WELSH ] { 17 } + Constant [ public int FILTER_WELCH ] { 17 } Constant [ public int FILTER_PARZEN ] { 18 } Constant [ public int FILTER_LAGRANGE ] { 21 } - Constant [ public int FILTER_SENTINEL ] { 31 } + Constant [ public int FILTER_SENTINEL ] { 32 } Constant [ public int FILTER_BOHMAN ] { 19 } Constant [ public int FILTER_BARTLETT ] { 20 } Constant [ public int FILTER_JINC ] { 13 } @@ -446,43 +452,53 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int FILTER_COSINE ] { 28 } Constant [ public int FILTER_SPLINE ] { 29 } Constant [ public int FILTER_LANCZOSRADIUS ] { 30 } + Constant [ public int FILTER_CUBIC_SPLINE ] { 31 } Constant [ public int IMGTYPE_UNDEFINED ] { 0 } Constant [ public int IMGTYPE_BILEVEL ] { 1 } Constant [ public int IMGTYPE_GRAYSCALE ] { 2 } + Constant [ public int IMGTYPE_GRAYSCALEALPHA ] { 3 } Constant [ public int IMGTYPE_GRAYSCALEMATTE ] { 3 } Constant [ public int IMGTYPE_PALETTE ] { 4 } Constant [ public int IMGTYPE_PALETTEMATTE ] { 5 } + Constant [ public int IMGTYPE_PALETTEALPHA ] { 5 } Constant [ public int IMGTYPE_TRUECOLOR ] { 6 } + Constant [ public int IMGTYPE_TRUECOLORALPHA ] { 7 } Constant [ public int IMGTYPE_TRUECOLORMATTE ] { 7 } Constant [ public int IMGTYPE_COLORSEPARATION ] { 8 } + Constant [ public int IMGTYPE_COLORSEPARATIONALPHA ] { 9 } Constant [ public int IMGTYPE_COLORSEPARATIONMATTE ] { 9 } Constant [ public int IMGTYPE_OPTIMIZE ] { 10 } + Constant [ public int IMGTYPE_PALETTEBILEVELALPHA ] { 11 } Constant [ public int IMGTYPE_PALETTEBILEVELMATTE ] { 11 } Constant [ public int RESOLUTION_UNDEFINED ] { 0 } Constant [ public int RESOLUTION_PIXELSPERINCH ] { 1 } Constant [ public int RESOLUTION_PIXELSPERCENTIMETER ] { 2 } Constant [ public int COMPRESSION_UNDEFINED ] { 0 } - Constant [ public int COMPRESSION_NO ] { 1 } - Constant [ public int COMPRESSION_BZIP ] { 2 } - Constant [ public int COMPRESSION_FAX ] { 6 } - Constant [ public int COMPRESSION_GROUP4 ] { 7 } - Constant [ public int COMPRESSION_JPEG ] { 8 } - Constant [ public int COMPRESSION_JPEG2000 ] { 9 } - Constant [ public int COMPRESSION_LOSSLESSJPEG ] { 10 } - Constant [ public int COMPRESSION_LZW ] { 11 } - Constant [ public int COMPRESSION_RLE ] { 12 } - Constant [ public int COMPRESSION_ZIP ] { 13 } - Constant [ public int COMPRESSION_DXT1 ] { 3 } - Constant [ public int COMPRESSION_DXT3 ] { 4 } - Constant [ public int COMPRESSION_DXT5 ] { 5 } - Constant [ public int COMPRESSION_ZIPS ] { 14 } - Constant [ public int COMPRESSION_PIZ ] { 15 } - Constant [ public int COMPRESSION_PXR24 ] { 16 } - Constant [ public int COMPRESSION_B44 ] { 17 } - Constant [ public int COMPRESSION_B44A ] { 18 } - Constant [ public int COMPRESSION_LZMA ] { 19 } - Constant [ public int COMPRESSION_JBIG1 ] { 20 } - Constant [ public int COMPRESSION_JBIG2 ] { 21 } + Constant [ public int COMPRESSION_NO ] { 16 } + Constant [ public int COMPRESSION_BZIP ] { 3 } + Constant [ public int COMPRESSION_FAX ] { 7 } + Constant [ public int COMPRESSION_GROUP4 ] { 8 } + Constant [ public int COMPRESSION_JPEG ] { 12 } + Constant [ public int COMPRESSION_JPEG2000 ] { 11 } + Constant [ public int COMPRESSION_LOSSLESSJPEG ] { 13 } + Constant [ public int COMPRESSION_LZW ] { 15 } + Constant [ public int COMPRESSION_RLE ] { 19 } + Constant [ public int COMPRESSION_ZIP ] { 20 } + Constant [ public int COMPRESSION_DXT1 ] { 4 } + Constant [ public int COMPRESSION_DXT3 ] { 5 } + Constant [ public int COMPRESSION_DXT5 ] { 6 } + Constant [ public int COMPRESSION_ZIPS ] { 21 } + Constant [ public int COMPRESSION_PIZ ] { 17 } + Constant [ public int COMPRESSION_PXR24 ] { 18 } + Constant [ public int COMPRESSION_B44 ] { 2 } + Constant [ public int COMPRESSION_B44A ] { 1 } + Constant [ public int COMPRESSION_LZMA ] { 14 } + Constant [ public int COMPRESSION_JBIG1 ] { 9 } + Constant [ public int COMPRESSION_JBIG2 ] { 10 } + Constant [ public int COMPRESSION_ZSTD ] { 22 } + Constant [ public int COMPRESSION_WEBP ] { 23 } + Constant [ public int COMPRESSION_DWAA ] { 24 } + Constant [ public int COMPRESSION_DWAB ] { 25 } Constant [ public int PAINT_POINT ] { 1 } Constant [ public int PAINT_REPLACE ] { 2 } Constant [ public int PAINT_FLOODFILL ] { 3 } @@ -498,7 +514,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int GRAVITY_SOUTH ] { 8 } Constant [ public int GRAVITY_SOUTHEAST ] { 9 } Constant [ public int GRAVITY_FORGET ] { 0 } - Constant [ public int GRAVITY_STATIC ] { 10 } Constant [ public int STRETCH_NORMAL ] { 1 } Constant [ public int STRETCH_ULTRACONDENSED ] { 2 } Constant [ public int STRETCH_EXTRACONDENSED ] { 3 } @@ -533,131 +548,134 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int CHANNEL_MAGENTA ] { 2 } Constant [ public int CHANNEL_BLUE ] { 4 } Constant [ public int CHANNEL_YELLOW ] { 4 } - Constant [ public int CHANNEL_ALPHA ] { 8 } - Constant [ public int CHANNEL_OPACITY ] { 8 } - Constant [ public int CHANNEL_MATTE ] { 8 } - Constant [ public int CHANNEL_BLACK ] { 32 } + Constant [ public int CHANNEL_ALPHA ] { 16 } + Constant [ public int CHANNEL_OPACITY ] { 16 } + Constant [ public int CHANNEL_BLACK ] { 8 } Constant [ public int CHANNEL_INDEX ] { 32 } Constant [ public int CHANNEL_ALL ] { 134217727 } - Constant [ public int CHANNEL_DEFAULT ] { 134217719 } - Constant [ public int CHANNEL_RGBA ] { 15 } - Constant [ public int CHANNEL_TRUEALPHA ] { 64 } - Constant [ public int CHANNEL_RGBS ] { 128 } - Constant [ public int CHANNEL_GRAY_CHANNELS ] { 128 } - Constant [ public int CHANNEL_SYNC ] { 256 } - Constant [ public int CHANNEL_COMPOSITES ] { 47 } - Constant [ public int METRIC_UNDEFINED ] { 0 } + Constant [ public int CHANNEL_DEFAULT ] { 134217727 } + Constant [ public int CHANNEL_RGBA ] { 23 } + Constant [ public int CHANNEL_TRUEALPHA ] { 256 } + Constant [ public int CHANNEL_RGBS ] { 512 } + Constant [ public int CHANNEL_GRAY_CHANNELS ] { 1024 } + Constant [ public int CHANNEL_SYNC ] { 131072 } + Constant [ public int CHANNEL_READ_MASK ] { 64 } + Constant [ public int CHANNEL_WRITE_MASK ] { 128 } + Constant [ public int CHANNEL_META ] { 256 } + Constant [ public int CHANNEL_COMPOSITE_MASK ] { 512 } + Constant [ public int CHANNEL_COMPOSITES ] { 31 } Constant [ public int METRIC_ABSOLUTEERRORMETRIC ] { 1 } - Constant [ public int METRIC_MEANABSOLUTEERROR ] { 2 } - Constant [ public int METRIC_MEANERRORPERPIXELMETRIC ] { 3 } - Constant [ public int METRIC_MEANSQUAREERROR ] { 4 } - Constant [ public int METRIC_PEAKABSOLUTEERROR ] { 5 } - Constant [ public int METRIC_PEAKSIGNALTONOISERATIO ] { 6 } - Constant [ public int METRIC_ROOTMEANSQUAREDERROR ] { 7 } - Constant [ public int METRIC_NORMALIZEDCROSSCORRELATIONERRORMETRIC ] { 8 } - Constant [ public int METRIC_FUZZERROR ] { 9 } - Constant [ public int METRIC_PERCEPTUALHASH_ERROR ] { 255 } + Constant [ public int METRIC_MEANABSOLUTEERROR ] { 3 } + Constant [ public int METRIC_MEANERRORPERPIXELMETRIC ] { 4 } + Constant [ public int METRIC_MEANSQUAREERROR ] { 5 } + Constant [ public int METRIC_PEAKABSOLUTEERROR ] { 7 } + Constant [ public int METRIC_PEAKSIGNALTONOISERATIO ] { 8 } + Constant [ public int METRIC_ROOTMEANSQUAREDERROR ] { 10 } + Constant [ public int METRIC_NORMALIZEDCROSSCORRELATIONERRORMETRIC ] { 6 } + Constant [ public int METRIC_FUZZERROR ] { 2 } + Constant [ public int METRIC_PERCEPTUALHASH_ERROR ] { 9 } + Constant [ public int METRIC_STRUCTURAL_SIMILARITY_ERROR ] { 11 } + Constant [ public int METRIC_STRUCTURAL_DISSIMILARITY_ERROR ] { 12 } Constant [ public int PIXEL_CHAR ] { 1 } Constant [ public int PIXELSTORAGE_CHAR ] { 1 } Constant [ public int PIXEL_DOUBLE ] { 2 } Constant [ public int PIXELSTORAGE_DOUBLE ] { 2 } Constant [ public int PIXEL_FLOAT ] { 3 } Constant [ public int PIXELSTORAGE_FLOAT ] { 3 } - Constant [ public int PIXEL_INTEGER ] { 4 } - Constant [ public int PIXELSTORAGE_INTEGER ] { 4 } - Constant [ public int PIXEL_LONG ] { 5 } - Constant [ public int PIXELSTORAGE_LONG ] { 5 } + Constant [ public int PIXEL_LONG ] { 4 } + Constant [ public int PIXELSTORAGE_LONG ] { 4 } Constant [ public int PIXEL_QUANTUM ] { 6 } Constant [ public int PIXELSTORAGE_QUANTUM ] { 6 } Constant [ public int PIXEL_SHORT ] { 7 } Constant [ public int PIXELSTORAGE_SHORT ] { 7 } Constant [ public int EVALUATE_UNDEFINED ] { 0 } - Constant [ public int EVALUATE_ADD ] { 1 } - Constant [ public int EVALUATE_AND ] { 2 } - Constant [ public int EVALUATE_DIVIDE ] { 3 } - Constant [ public int EVALUATE_LEFTSHIFT ] { 4 } - Constant [ public int EVALUATE_MAX ] { 5 } - Constant [ public int EVALUATE_MIN ] { 6 } - Constant [ public int EVALUATE_MULTIPLY ] { 7 } - Constant [ public int EVALUATE_OR ] { 8 } - Constant [ public int EVALUATE_RIGHTSHIFT ] { 9 } - Constant [ public int EVALUATE_SET ] { 10 } - Constant [ public int EVALUATE_SUBTRACT ] { 11 } - Constant [ public int EVALUATE_XOR ] { 12 } - Constant [ public int EVALUATE_POW ] { 13 } - Constant [ public int EVALUATE_LOG ] { 14 } - Constant [ public int EVALUATE_THRESHOLD ] { 15 } - Constant [ public int EVALUATE_THRESHOLDBLACK ] { 16 } - Constant [ public int EVALUATE_THRESHOLDWHITE ] { 17 } - Constant [ public int EVALUATE_GAUSSIANNOISE ] { 18 } - Constant [ public int EVALUATE_IMPULSENOISE ] { 19 } - Constant [ public int EVALUATE_LAPLACIANNOISE ] { 20 } - Constant [ public int EVALUATE_MULTIPLICATIVENOISE ] { 21 } - Constant [ public int EVALUATE_POISSONNOISE ] { 22 } - Constant [ public int EVALUATE_UNIFORMNOISE ] { 23 } - Constant [ public int EVALUATE_COSINE ] { 24 } + Constant [ public int EVALUATE_ADD ] { 2 } + Constant [ public int EVALUATE_AND ] { 4 } + Constant [ public int EVALUATE_DIVIDE ] { 6 } + Constant [ public int EVALUATE_LEFTSHIFT ] { 11 } + Constant [ public int EVALUATE_MAX ] { 13 } + Constant [ public int EVALUATE_MIN ] { 16 } + Constant [ public int EVALUATE_MULTIPLY ] { 18 } + Constant [ public int EVALUATE_OR ] { 19 } + Constant [ public int EVALUATE_RIGHTSHIFT ] { 22 } + Constant [ public int EVALUATE_SET ] { 24 } + Constant [ public int EVALUATE_SUBTRACT ] { 26 } + Constant [ public int EVALUATE_XOR ] { 32 } + Constant [ public int EVALUATE_POW ] { 21 } + Constant [ public int EVALUATE_LOG ] { 12 } + Constant [ public int EVALUATE_THRESHOLD ] { 29 } + Constant [ public int EVALUATE_THRESHOLDBLACK ] { 28 } + Constant [ public int EVALUATE_THRESHOLDWHITE ] { 30 } + Constant [ public int EVALUATE_GAUSSIANNOISE ] { 8 } + Constant [ public int EVALUATE_IMPULSENOISE ] { 9 } + Constant [ public int EVALUATE_LAPLACIANNOISE ] { 10 } + Constant [ public int EVALUATE_MULTIPLICATIVENOISE ] { 17 } + Constant [ public int EVALUATE_POISSONNOISE ] { 20 } + Constant [ public int EVALUATE_UNIFORMNOISE ] { 31 } + Constant [ public int EVALUATE_COSINE ] { 5 } Constant [ public int EVALUATE_SINE ] { 25 } - Constant [ public int EVALUATE_ADDMODULUS ] { 26 } - Constant [ public int EVALUATE_MEAN ] { 27 } - Constant [ public int EVALUATE_ABS ] { 28 } - Constant [ public int EVALUATE_EXPONENTIAL ] { 29 } - Constant [ public int EVALUATE_MEDIAN ] { 30 } - Constant [ public int EVALUATE_SUM ] { 31 } - Constant [ public int EVALUATE_ROOT_MEAN_SQUARE ] { 32 } + Constant [ public int EVALUATE_ADDMODULUS ] { 3 } + Constant [ public int EVALUATE_MEAN ] { 14 } + Constant [ public int EVALUATE_ABS ] { 1 } + Constant [ public int EVALUATE_EXPONENTIAL ] { 7 } + Constant [ public int EVALUATE_MEDIAN ] { 15 } + Constant [ public int EVALUATE_SUM ] { 27 } + Constant [ public int EVALUATE_ROOT_MEAN_SQUARE ] { 23 } + Constant [ public int EVALUATE_INVERSE_LOG ] { 33 } Constant [ public int COLORSPACE_UNDEFINED ] { 0 } - Constant [ public int COLORSPACE_RGB ] { 1 } - Constant [ public int COLORSPACE_GRAY ] { 2 } - Constant [ public int COLORSPACE_TRANSPARENT ] { 3 } - Constant [ public int COLORSPACE_OHTA ] { 4 } - Constant [ public int COLORSPACE_LAB ] { 5 } - Constant [ public int COLORSPACE_XYZ ] { 6 } - Constant [ public int COLORSPACE_YCBCR ] { 7 } - Constant [ public int COLORSPACE_YCC ] { 8 } - Constant [ public int COLORSPACE_YIQ ] { 9 } - Constant [ public int COLORSPACE_YPBPR ] { 10 } - Constant [ public int COLORSPACE_YUV ] { 11 } - Constant [ public int COLORSPACE_CMYK ] { 12 } - Constant [ public int COLORSPACE_SRGB ] { 13 } - Constant [ public int COLORSPACE_HSB ] { 14 } - Constant [ public int COLORSPACE_HSL ] { 15 } - Constant [ public int COLORSPACE_HWB ] { 16 } - Constant [ public int COLORSPACE_REC601LUMA ] { 17 } - Constant [ public int COLORSPACE_REC709LUMA ] { 19 } - Constant [ public int COLORSPACE_LOG ] { 21 } - Constant [ public int COLORSPACE_CMY ] { 22 } - Constant [ public int COLORSPACE_LUV ] { 23 } - Constant [ public int COLORSPACE_HCL ] { 24 } - Constant [ public int COLORSPACE_LCH ] { 25 } - Constant [ public int COLORSPACE_LMS ] { 26 } - Constant [ public int COLORSPACE_LCHAB ] { 27 } - Constant [ public int COLORSPACE_LCHUV ] { 28 } - Constant [ public int COLORSPACE_SCRGB ] { 29 } - Constant [ public int COLORSPACE_HSI ] { 30 } - Constant [ public int COLORSPACE_HSV ] { 31 } - Constant [ public int COLORSPACE_HCLP ] { 32 } - Constant [ public int COLORSPACE_YDBDR ] { 33 } - Constant [ public int COLORSPACE_REC601YCBCR ] { 18 } + Constant [ public int COLORSPACE_RGB ] { 21 } + Constant [ public int COLORSPACE_GRAY ] { 3 } + Constant [ public int COLORSPACE_TRANSPARENT ] { 24 } + Constant [ public int COLORSPACE_OHTA ] { 18 } + Constant [ public int COLORSPACE_XYZ ] { 26 } + Constant [ public int COLORSPACE_YCBCR ] { 27 } + Constant [ public int COLORSPACE_YCC ] { 28 } + Constant [ public int COLORSPACE_YIQ ] { 30 } + Constant [ public int COLORSPACE_YPBPR ] { 31 } + Constant [ public int COLORSPACE_YUV ] { 32 } + Constant [ public int COLORSPACE_CMYK ] { 2 } + Constant [ public int COLORSPACE_SRGB ] { 23 } + Constant [ public int COLORSPACE_HSB ] { 6 } + Constant [ public int COLORSPACE_HSL ] { 8 } + Constant [ public int COLORSPACE_HWB ] { 10 } + Constant [ public int COLORSPACE_LOG ] { 15 } + Constant [ public int COLORSPACE_CMY ] { 1 } + Constant [ public int COLORSPACE_LUV ] { 17 } + Constant [ public int COLORSPACE_HCL ] { 4 } + Constant [ public int COLORSPACE_LCH ] { 12 } + Constant [ public int COLORSPACE_LMS ] { 16 } + Constant [ public int COLORSPACE_LCHAB ] { 13 } + Constant [ public int COLORSPACE_LCHUV ] { 14 } + Constant [ public int COLORSPACE_SCRGB ] { 22 } + Constant [ public int COLORSPACE_HSI ] { 7 } + Constant [ public int COLORSPACE_HSV ] { 9 } + Constant [ public int COLORSPACE_HCLP ] { 5 } + Constant [ public int COLORSPACE_YDBDR ] { 29 } + Constant [ public int COLORSPACE_REC601YCBCR ] { 19 } Constant [ public int COLORSPACE_REC709YCBCR ] { 20 } - Constant [ public int COLORSPACE_XYY ] { 34 } - Constant [ public int COLORSPACE_LINEARGRAY ] { 35 } + Constant [ public int COLORSPACE_XYY ] { 25 } + Constant [ public int COLORSPACE_LINEARGRAY ] { 33 } + Constant [ public int COLORSPACE_DISPLAYP3 ] { 35 } + Constant [ public int COLORSPACE_ADOBE98 ] { 36 } + Constant [ public int COLORSPACE_PROPHOTO ] { 37 } + Constant [ public int COLORSPACE_JZAZBZ ] { 34 } Constant [ public int VIRTUALPIXELMETHOD_UNDEFINED ] { 0 } Constant [ public int VIRTUALPIXELMETHOD_BACKGROUND ] { 1 } - Constant [ public int VIRTUALPIXELMETHOD_CONSTANT ] { 2 } - Constant [ public int VIRTUALPIXELMETHOD_EDGE ] { 4 } - Constant [ public int VIRTUALPIXELMETHOD_MIRROR ] { 5 } - Constant [ public int VIRTUALPIXELMETHOD_TILE ] { 7 } - Constant [ public int VIRTUALPIXELMETHOD_TRANSPARENT ] { 8 } - Constant [ public int VIRTUALPIXELMETHOD_MASK ] { 9 } - Constant [ public int VIRTUALPIXELMETHOD_BLACK ] { 10 } - Constant [ public int VIRTUALPIXELMETHOD_GRAY ] { 11 } - Constant [ public int VIRTUALPIXELMETHOD_WHITE ] { 12 } - Constant [ public int VIRTUALPIXELMETHOD_HORIZONTALTILE ] { 13 } - Constant [ public int VIRTUALPIXELMETHOD_VERTICALTILE ] { 14 } - Constant [ public int VIRTUALPIXELMETHOD_HORIZONTALTILEEDGE ] { 15 } - Constant [ public int VIRTUALPIXELMETHOD_VERTICALTILEEDGE ] { 16 } - Constant [ public int VIRTUALPIXELMETHOD_CHECKERTILE ] { 17 } - Constant [ public int VIRTUALPIXELMETHOD_DITHER ] { 3 } - Constant [ public int VIRTUALPIXELMETHOD_RANDOM ] { 6 } + Constant [ public int VIRTUALPIXELMETHOD_EDGE ] { 3 } + Constant [ public int VIRTUALPIXELMETHOD_MIRROR ] { 4 } + Constant [ public int VIRTUALPIXELMETHOD_TILE ] { 6 } + Constant [ public int VIRTUALPIXELMETHOD_TRANSPARENT ] { 7 } + Constant [ public int VIRTUALPIXELMETHOD_MASK ] { 8 } + Constant [ public int VIRTUALPIXELMETHOD_BLACK ] { 9 } + Constant [ public int VIRTUALPIXELMETHOD_GRAY ] { 10 } + Constant [ public int VIRTUALPIXELMETHOD_WHITE ] { 11 } + Constant [ public int VIRTUALPIXELMETHOD_HORIZONTALTILE ] { 12 } + Constant [ public int VIRTUALPIXELMETHOD_VERTICALTILE ] { 13 } + Constant [ public int VIRTUALPIXELMETHOD_HORIZONTALTILEEDGE ] { 14 } + Constant [ public int VIRTUALPIXELMETHOD_VERTICALTILEEDGE ] { 15 } + Constant [ public int VIRTUALPIXELMETHOD_CHECKERTILE ] { 16 } + Constant [ public int VIRTUALPIXELMETHOD_DITHER ] { 2 } + Constant [ public int VIRTUALPIXELMETHOD_RANDOM ] { 5 } Constant [ public int PREVIEW_UNDEFINED ] { 0 } Constant [ public int PREVIEW_ROTATE ] { 1 } Constant [ public int PREVIEW_SHEAR ] { 2 } @@ -720,13 +738,13 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int RESOURCETYPE_AREA ] { 1 } Constant [ public int RESOURCETYPE_DISK ] { 2 } Constant [ public int RESOURCETYPE_FILE ] { 3 } - Constant [ public int RESOURCETYPE_MAP ] { 4 } - Constant [ public int RESOURCETYPE_MEMORY ] { 5 } - Constant [ public int RESOURCETYPE_TIME ] { 7 } + Constant [ public int RESOURCETYPE_MAP ] { 5 } + Constant [ public int RESOURCETYPE_MEMORY ] { 6 } + Constant [ public int RESOURCETYPE_TIME ] { 9 } Constant [ public int RESOURCETYPE_THROTTLE ] { 8 } - Constant [ public int RESOURCETYPE_THREAD ] { 6 } - Constant [ public int RESOURCETYPE_WIDTH ] { 9 } - Constant [ public int RESOURCETYPE_HEIGHT ] { 10 } + Constant [ public int RESOURCETYPE_THREAD ] { 7 } + Constant [ public int RESOURCETYPE_WIDTH ] { 10 } + Constant [ public int RESOURCETYPE_HEIGHT ] { 4 } Constant [ public int RESOURCETYPE_LISTLENGTH ] { 11 } Constant [ public int DISPOSE_UNRECOGNIZED ] { 0 } Constant [ public int DISPOSE_UNDEFINED ] { 0 } @@ -735,18 +753,16 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int DISPOSE_PREVIOUS ] { 3 } Constant [ public int INTERPOLATE_UNDEFINED ] { 0 } Constant [ public int INTERPOLATE_AVERAGE ] { 1 } - Constant [ public int INTERPOLATE_BICUBIC ] { 2 } - Constant [ public int INTERPOLATE_BILINEAR ] { 3 } - Constant [ public int INTERPOLATE_FILTER ] { 4 } - Constant [ public int INTERPOLATE_INTEGER ] { 5 } - Constant [ public int INTERPOLATE_MESH ] { 6 } - Constant [ public int INTERPOLATE_NEARESTNEIGHBOR ] { 7 } - Constant [ public int INTERPOLATE_SPLINE ] { 8 } - Constant [ public int INTERPOLATE_AVERAGE_9 ] { 9 } - Constant [ public int INTERPOLATE_AVERAGE_16 ] { 10 } - Constant [ public int INTERPOLATE_BLEND ] { 11 } - Constant [ public int INTERPOLATE_BACKGROUND_COLOR ] { 12 } - Constant [ public int INTERPOLATE_CATROM ] { 13 } + Constant [ public int INTERPOLATE_BILINEAR ] { 5 } + Constant [ public int INTERPOLATE_INTEGER ] { 8 } + Constant [ public int INTERPOLATE_MESH ] { 9 } + Constant [ public int INTERPOLATE_SPLINE ] { 11 } + Constant [ public int INTERPOLATE_AVERAGE_9 ] { 2 } + Constant [ public int INTERPOLATE_AVERAGE_16 ] { 3 } + Constant [ public int INTERPOLATE_BLEND ] { 6 } + Constant [ public int INTERPOLATE_BACKGROUND_COLOR ] { 4 } + Constant [ public int INTERPOLATE_CATROM ] { 7 } + Constant [ public int INTERPOLATE_NEAREST_PIXEL ] { 10 } Constant [ public int LAYERMETHOD_UNDEFINED ] { 0 } Constant [ public int LAYERMETHOD_COALESCE ] { 1 } Constant [ public int LAYERMETHOD_COMPAREANY ] { 2 } @@ -784,6 +800,7 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int DISTORTION_BARREL ] { 14 } Constant [ public int DISTORTION_SHEPARDS ] { 16 } Constant [ public int DISTORTION_SENTINEL ] { 18 } + Constant [ public int DISTORTION_RIGID_AFFINE ] { 19 } Constant [ public int DISTORTION_BARRELINVERSE ] { 15 } Constant [ public int DISTORTION_BILINEARFORWARD ] { 6 } Constant [ public int DISTORTION_BILINEARREVERSE ] { 7 } @@ -794,17 +811,17 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int LAYERMETHOD_FLATTEN ] { 14 } Constant [ public int LAYERMETHOD_MOSAIC ] { 15 } Constant [ public int ALPHACHANNEL_ACTIVATE ] { 1 } - Constant [ public int ALPHACHANNEL_RESET ] { 7 } - Constant [ public int ALPHACHANNEL_SET ] { 8 } + Constant [ public int ALPHACHANNEL_ON ] { 10 } + Constant [ public int ALPHACHANNEL_SET ] { 13 } Constant [ public int ALPHACHANNEL_UNDEFINED ] { 0 } - Constant [ public int ALPHACHANNEL_COPY ] { 3 } - Constant [ public int ALPHACHANNEL_DEACTIVATE ] { 4 } - Constant [ public int ALPHACHANNEL_EXTRACT ] { 5 } - Constant [ public int ALPHACHANNEL_OPAQUE ] { 6 } - Constant [ public int ALPHACHANNEL_SHAPE ] { 9 } - Constant [ public int ALPHACHANNEL_TRANSPARENT ] { 10 } - Constant [ public int ALPHACHANNEL_ASSOCIATE ] { 13 } - Constant [ public int ALPHACHANNEL_DISSOCIATE ] { 14 } + Constant [ public int ALPHACHANNEL_DISCRETE ] { 6 } + Constant [ public int ALPHACHANNEL_DEACTIVATE ] { 5 } + Constant [ public int ALPHACHANNEL_EXTRACT ] { 8 } + Constant [ public int ALPHACHANNEL_OFF ] { 9 } + Constant [ public int ALPHACHANNEL_SHAPE ] { 14 } + Constant [ public int ALPHACHANNEL_TRANSPARENT ] { 15 } + Constant [ public int ALPHACHANNEL_ASSOCIATE ] { 2 } + Constant [ public int ALPHACHANNEL_DISSOCIATE ] { 7 } Constant [ public int SPARSECOLORMETHOD_UNDEFINED ] { 0 } Constant [ public int SPARSECOLORMETHOD_BARYCENTRIC ] { 1 } Constant [ public int SPARSECOLORMETHOD_BILINEAR ] { 7 } @@ -818,12 +835,11 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int DITHERMETHOD_RIEMERSMA ] { 2 } Constant [ public int DITHERMETHOD_FLOYDSTEINBERG ] { 3 } Constant [ public int FUNCTION_UNDEFINED ] { 0 } - Constant [ public int FUNCTION_POLYNOMIAL ] { 1 } - Constant [ public int FUNCTION_SINUSOID ] { 2 } - Constant [ public int ALPHACHANNEL_BACKGROUND ] { 2 } - Constant [ public int FUNCTION_ARCSIN ] { 3 } - Constant [ public int FUNCTION_ARCTAN ] { 4 } - Constant [ public int ALPHACHANNEL_FLATTEN ] { 11 } + Constant [ public int FUNCTION_POLYNOMIAL ] { 3 } + Constant [ public int FUNCTION_SINUSOID ] { 4 } + Constant [ public int ALPHACHANNEL_BACKGROUND ] { 3 } + Constant [ public int FUNCTION_ARCSIN ] { 1 } + Constant [ public int FUNCTION_ARCTAN ] { 2 } Constant [ public int ALPHACHANNEL_REMOVE ] { 12 } Constant [ public int STATISTIC_GRADIENT ] { 1 } Constant [ public int STATISTIC_MAXIMUM ] { 2 } @@ -832,15 +848,16 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int STATISTIC_MINIMUM ] { 5 } Constant [ public int STATISTIC_MODE ] { 6 } Constant [ public int STATISTIC_NONPEAK ] { 7 } - Constant [ public int STATISTIC_STANDARD_DEVIATION ] { 8 } - Constant [ public int STATISTIC_ROOT_MEAN_SQUARE ] { 9 } + Constant [ public int STATISTIC_STANDARD_DEVIATION ] { 9 } + Constant [ public int STATISTIC_ROOT_MEAN_SQUARE ] { 8 } + Constant [ public int STATISTIC_CONTRAST ] { 10 } Constant [ public int MORPHOLOGY_CONVOLVE ] { 1 } Constant [ public int MORPHOLOGY_CORRELATE ] { 2 } Constant [ public int MORPHOLOGY_ERODE ] { 3 } Constant [ public int MORPHOLOGY_DILATE ] { 4 } Constant [ public int MORPHOLOGY_ERODE_INTENSITY ] { 5 } Constant [ public int MORPHOLOGY_DILATE_INTENSITY ] { 6 } - Constant [ public int MORPHOLOGY_DISTANCE ] { 7 } + Constant [ public int MORPHOLOGY_DISTANCE ] { 21 } Constant [ public int MORPHOLOGY_OPEN ] { 8 } Constant [ public int MORPHOLOGY_CLOSE ] { 9 } Constant [ public int MORPHOLOGY_OPEN_INTENSITY ] { 10 } @@ -854,51 +871,54 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Constant [ public int MORPHOLOGY_HIT_AND_MISS ] { 18 } Constant [ public int MORPHOLOGY_THINNING ] { 19 } Constant [ public int MORPHOLOGY_THICKEN ] { 20 } - Constant [ public int MORPHOLOGY_VORONOI ] { 21 } - Constant [ public int MORPHOLOGY_ITERATIVE ] { 22 } + Constant [ public int MORPHOLOGY_VORONOI ] { 22 } + Constant [ public int MORPHOLOGY_ITERATIVE ] { 7 } Constant [ public int KERNEL_UNITY ] { 1 } Constant [ public int KERNEL_GAUSSIAN ] { 2 } Constant [ public int KERNEL_DIFFERENCE_OF_GAUSSIANS ] { 3 } Constant [ public int KERNEL_LAPLACIAN_OF_GAUSSIANS ] { 4 } Constant [ public int KERNEL_BLUR ] { 5 } Constant [ public int KERNEL_COMET ] { 6 } - Constant [ public int KERNEL_LAPLACIAN ] { 7 } - Constant [ public int KERNEL_SOBEL ] { 8 } - Constant [ public int KERNEL_FREI_CHEN ] { 9 } - Constant [ public int KERNEL_ROBERTS ] { 10 } - Constant [ public int KERNEL_PREWITT ] { 11 } - Constant [ public int KERNEL_COMPASS ] { 12 } - Constant [ public int KERNEL_KIRSCH ] { 13 } - Constant [ public int KERNEL_DIAMOND ] { 14 } - Constant [ public int KERNEL_SQUARE ] { 15 } - Constant [ public int KERNEL_RECTANGLE ] { 16 } - Constant [ public int KERNEL_OCTAGON ] { 17 } - Constant [ public int KERNEL_DISK ] { 18 } - Constant [ public int KERNEL_PLUS ] { 19 } - Constant [ public int KERNEL_CROSS ] { 20 } - Constant [ public int KERNEL_RING ] { 21 } - Constant [ public int KERNEL_PEAKS ] { 22 } - Constant [ public int KERNEL_EDGES ] { 23 } - Constant [ public int KERNEL_CORNERS ] { 24 } - Constant [ public int KERNEL_DIAGONALS ] { 25 } - Constant [ public int KERNEL_LINE_ENDS ] { 26 } - Constant [ public int KERNEL_LINE_JUNCTIONS ] { 27 } - Constant [ public int KERNEL_RIDGES ] { 28 } - Constant [ public int KERNEL_CONVEX_HULL ] { 29 } - Constant [ public int KERNEL_THIN_SE ] { 30 } - Constant [ public int KERNEL_SKELETON ] { 31 } - Constant [ public int KERNEL_CHEBYSHEV ] { 32 } - Constant [ public int KERNEL_MANHATTAN ] { 33 } - Constant [ public int KERNEL_OCTAGONAL ] { 34 } - Constant [ public int KERNEL_EUCLIDEAN ] { 35 } - Constant [ public int KERNEL_USER_DEFINED ] { 36 } - Constant [ public int KERNEL_BINOMIAL ] { 37 } + Constant [ public int KERNEL_LAPLACIAN ] { 8 } + Constant [ public int KERNEL_SOBEL ] { 9 } + Constant [ public int KERNEL_FREI_CHEN ] { 10 } + Constant [ public int KERNEL_ROBERTS ] { 11 } + Constant [ public int KERNEL_PREWITT ] { 12 } + Constant [ public int KERNEL_COMPASS ] { 13 } + Constant [ public int KERNEL_KIRSCH ] { 14 } + Constant [ public int KERNEL_DIAMOND ] { 15 } + Constant [ public int KERNEL_SQUARE ] { 16 } + Constant [ public int KERNEL_RECTANGLE ] { 17 } + Constant [ public int KERNEL_OCTAGON ] { 18 } + Constant [ public int KERNEL_DISK ] { 19 } + Constant [ public int KERNEL_PLUS ] { 20 } + Constant [ public int KERNEL_CROSS ] { 21 } + Constant [ public int KERNEL_RING ] { 22 } + Constant [ public int KERNEL_PEAKS ] { 23 } + Constant [ public int KERNEL_EDGES ] { 24 } + Constant [ public int KERNEL_CORNERS ] { 25 } + Constant [ public int KERNEL_DIAGONALS ] { 26 } + Constant [ public int KERNEL_LINE_ENDS ] { 27 } + Constant [ public int KERNEL_LINE_JUNCTIONS ] { 28 } + Constant [ public int KERNEL_RIDGES ] { 29 } + Constant [ public int KERNEL_CONVEX_HULL ] { 30 } + Constant [ public int KERNEL_THIN_SE ] { 31 } + Constant [ public int KERNEL_SKELETON ] { 32 } + Constant [ public int KERNEL_CHEBYSHEV ] { 33 } + Constant [ public int KERNEL_MANHATTAN ] { 34 } + Constant [ public int KERNEL_OCTAGONAL ] { 35 } + Constant [ public int KERNEL_EUCLIDEAN ] { 36 } + Constant [ public int KERNEL_USER_DEFINED ] { 37 } + Constant [ public int KERNEL_BINOMIAL ] { 7 } Constant [ public int DIRECTION_LEFT_TO_RIGHT ] { 2 } Constant [ public int DIRECTION_RIGHT_TO_LEFT ] { 1 } Constant [ public int NORMALIZE_KERNEL_NONE ] { 0 } Constant [ public int NORMALIZE_KERNEL_VALUE ] { 8192 } Constant [ public int NORMALIZE_KERNEL_CORRELATE ] { 65536 } Constant [ public int NORMALIZE_KERNEL_PERCENT ] { 4096 } + Constant [ public int PIXELMASK_READ ] { 1 } + Constant [ public int PIXELMASK_WRITE ] { 2 } + Constant [ public int PIXELMASK_COMPOSITE ] { 4 } } - Static properties [0] { @@ -1044,7 +1064,7 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { - Properties [0] { } - - Methods [353] { + - Methods [327] { Method [ public method optimizeImageLayers ] { - Parameters [0] { @@ -1116,12 +1136,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method getImageMatte ] { - - - Parameters [0] { - } - } - Method [ public method setImageMatte ] { - Parameters [1] { @@ -1208,28 +1222,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method roundCornersImage ] { - - - Parameters [5] { - Parameter #0 [ $x_rounding ] - Parameter #1 [ $y_rounding ] - Parameter #2 [ $stroke_width ] - Parameter #3 [ $displace ] - Parameter #4 [ $size_correction ] - } - } - - Method [ public method roundCorners ] { - - - Parameters [5] { - Parameter #0 [ $x_rounding ] - Parameter #1 [ $y_rounding ] - Parameter #2 [ $stroke_width ] - Parameter #3 [ $displace ] - Parameter #4 [ $size_correction ] - } - } - Method [ public method setIteratorIndex ] { - Parameters [1] { @@ -1243,26 +1235,10 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method transformImage ] { - - - Parameters [2] { - Parameter #0 [ $crop ] - Parameter #1 [ $geometry ] - } - } - - Method [ public method setImageOpacity ] { + Method [ public method setImageAlpha ] { - Parameters [1] { - Parameter #0 [ $opacity ] - } - } - - Method [ public method orderedPosterizeImage ] { - - - Parameters [2] { - Parameter #0 [ $threshold_map ] - Parameter #1 [ $channel ] + Parameter #0 [ $alpha ] } } @@ -1353,18 +1329,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method paintFloodfillImage ] { - - - Parameters [6] { - Parameter #0 [ $fill_color ] - Parameter #1 [ $fuzz ] - Parameter #2 [ $border_color ] - Parameter #3 [ $x ] - Parameter #4 [ $y ] - Parameter #5 [ $channel ] - } - } - Method [ public method clutImage ] { - Parameters [2] { @@ -1421,19 +1385,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method setImageClipMask ] { - - - Parameters [1] { - Parameter #0 [ imagick $clip_mask ] - } - } - - Method [ public method getImageClipMask ] { - - - Parameters [0] { - } - } - Method [ public method animateImages ] { - Parameters [1] { @@ -1441,13 +1392,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method recolorImage ] { - - - Parameters [1] { - Parameter #0 [ $matrix ] - } - } - Method [ public method setFont ] { - Parameters [1] { @@ -1641,6 +1585,15 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } + Method [ public method houghLineImage ] { + + - Parameters [3] { + Parameter #0 [ $width ] + Parameter #1 [ $height ] + Parameter #2 [ $threshold ] + } + } + Method [ public method exportImagePixels ] { - Parameters [6] { @@ -1916,12 +1869,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method getImageSize ] { - - - Parameters [0] { - } - } - Method [ public method getImageBlob ] { - Parameters [0] { @@ -1976,19 +1923,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method setImageIndex ] { - - - Parameters [1] { - Parameter #0 [ $index ] - } - } - - Method [ public method getImageIndex ] { - - - Parameters [0] { - } - } - Method [ public method commentImage ] { - Parameters [1] { @@ -2175,14 +2109,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method radialBlurImage ] { - - - Parameters [2] { - Parameter #0 [ $angle ] - Parameter #1 [ $channel ] - } - } - Method [ public method raiseImage ] { - Parameters [5] { @@ -2257,18 +2183,17 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method setImageAttribute ] { + Method [ public method setImageBackgroundColor ] { - - Parameters [2] { - Parameter #0 [ $key ] - Parameter #1 [ $value ] + - Parameters [1] { + Parameter #0 [ $background_color ] } } - Method [ public method setImageBackgroundColor ] { + Method [ public method setImageChannelMask ] { - Parameters [1] { - Parameter #0 [ $background_color ] + Parameter #0 [ $channel ] } } @@ -2307,13 +2232,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method setImageMatteColor ] { - - - Parameters [1] { - Parameter #0 [ $matte_color ] - } - } - Method [ public method setImagePage ] { - Parameters [4] { @@ -2494,12 +2412,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method mosaicImages ] { - - - Parameters [0] { - } - } - Method [ public method morphImages ] { - Parameters [1] { @@ -2520,12 +2432,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method averageImages ] { - - - Parameters [0] { - } - } - Method [ public method borderImage ] { - Parameters [3] { @@ -2573,17 +2479,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method colorFloodfillImage ] { - - - Parameters [5] { - Parameter #0 [ $fill_color ] - Parameter #1 [ $fuzz ] - Parameter #2 [ $border_color ] - Parameter #3 [ $x ] - Parameter #4 [ $y ] - } - } - Method [ public method colorizeImage ] { - Parameters [3] { @@ -2694,12 +2589,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method flattenImages ] { - - - Parameters [0] { - } - } - Method [ public method flipImage ] { - Parameters [0] { @@ -2755,13 +2644,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method getImageAttribute ] { - - - Parameters [1] { - Parameter #0 [ $key ] - } - } - Method [ public method getImageBackgroundColor ] { - Parameters [0] { @@ -2796,13 +2678,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method getImageChannelExtrema ] { - - - Parameters [1] { - Parameter #0 [ $channel ] - } - } - Method [ public method getImageChannelMean ] { - Parameters [1] { @@ -2855,12 +2730,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method getImageExtrema ] { - - - Parameters [0] { - } - } - Method [ public method getImageDispose ] { - Parameters [0] { @@ -2903,23 +2772,26 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method getImageMatteColor ] { + Method [ public method getImagePage ] { - Parameters [0] { } } - Method [ public method getImagePage ] { + Method [ public method getImagePixelColor ] { - - Parameters [0] { + - Parameters [2] { + Parameter #0 [ $x ] + Parameter #1 [ $y ] } } - Method [ public method getImagePixelColor ] { + Method [ public method setImagePixelColor ] { - - Parameters [2] { + - Parameters [3] { Parameter #0 [ $x ] Parameter #1 [ $y ] + Parameter #2 [ $color ] } } @@ -3049,32 +2921,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method mapImage ] { - - - Parameters [2] { - Parameter #0 [ imagick $map ] - Parameter #1 [ $dither ] - } - } - - Method [ public method matteFloodfillImage ] { - - - Parameters [5] { - Parameter #0 [ $alpha ] - Parameter #1 [ $fuzz ] - Parameter #2 [ $border_color ] - Parameter #3 [ $x ] - Parameter #4 [ $y ] - } - } - - Method [ public method medianFilterImage ] { - - - Parameters [1] { - Parameter #0 [ $radius ] - } - } - Method [ public method negateImage ] { - Parameters [2] { @@ -3083,25 +2929,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method paintOpaqueImage ] { - - - Parameters [4] { - Parameter #0 [ $target_color ] - Parameter #1 [ $fill_color ] - Parameter #2 [ $fuzz ] - Parameter #3 [ $channel ] - } - } - - Method [ public method paintTransparentImage ] { - - - Parameters [3] { - Parameter #0 [ $target_color ] - Parameter #1 [ $alpha ] - Parameter #2 [ $fuzz ] - } - } - Method [ public method previewImages ] { - Parameters [1] { @@ -3139,13 +2966,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method reduceNoiseImage ] { - - - Parameters [1] { - Parameter #0 [ $radius ] - } - } - Method [ public method removeImageProfile ] { - Parameters [1] { @@ -3167,20 +2987,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method setImageBias ] { - - - Parameters [1] { - Parameter #0 [ $bias ] - } - } - - Method [ public method setImageBiasQuantum ] { - - - Parameters [1] { - Parameter #0 [ $bias ] - } - } - Method [ public method setImageBluePrimary ] { - Parameters [2] { @@ -3621,14 +3427,6 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method filter ] { - - - Parameters [2] { - Parameter #0 [ ImagickKernel $kernel ] - Parameter #1 [ $channel ] - } - } - Method [ public method setAntialias ] { - Parameters [1] { @@ -3690,6 +3488,27 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { Parameter #1 [ $strength ] } } + + Method [ public method identifyImageType ] { + + - Parameters [0] { + } + } + + Method [ public method getImageMask ] { + + - Parameters [1] { + Parameter #0 [ $pixelmask ] + } + } + + Method [ public method setImageMask ] { + + - Parameters [2] { + Parameter #0 [ Imagick $clip_mask ] + Parameter #1 [ $pixelmask ] + } + } } } @@ -3990,7 +3809,7 @@ Extension [ extension #75 imagick version 3.5.0RC2 ] { } } - Method [ public method matte ] { + Method [ public method alpha ] { - Parameters [3] { Parameter #0 [ $x ] diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec index fe3a8a6..bdf121c 100644 --- a/php-pecl-imagick.spec +++ b/php-pecl-imagick.spec @@ -10,6 +10,10 @@ %bcond_with im7 %bcond_without tests +# 2 builds needed to get the full set +# --with im7 +# --with im6 (default) + # we don't want -z defs linker flag %undefine _strict_symbol_defs_build -- cgit