From: Cristy Date: Sun, 14 Jan 2018 19:25:06 +0000 (-0500) Subject: ... X-Git-Tag: 7.0.7-22~71 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3057ddeeb88191c49a3f5032988bd8748b5ea3e8;p=imagemagick ... --- diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 8eae2609d..e3d862a91 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -142,6 +142,7 @@ extern "C" { */ typedef enum { + UndefinedReference = 0, ArrayReference = (~0), RealReference = (~0)-1, FileReference = (~0)-2, @@ -223,24 +224,24 @@ static struct {"height", IntegerReference}, {"x", IntegerReference}, {"y", IntegerReference}, {"fuzz", StringReference}, {"gravity", MagickGravityOptions} } }, - { "Despeckle", }, + { "Despeckle", { { (const char *) NULL, UndefineReference } } }, { "Edge", { {"radius", RealReference} } }, { "Emboss", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference} } }, - { "Enhance", }, - { "Flip", }, - { "Flop", }, + { "Enhance", { { (const char *) NULL, UndefineReference } } }, + { "Flip", { { (const char *) NULL, UndefineReference } } }, + { "Flop", { { (const char *) NULL, UndefineReference } } }, { "Frame", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"inner", IntegerReference}, {"outer", IntegerReference}, {"fill", StringReference}, {"color", StringReference}, {"compose", MagickComposeOptions} } }, { "Implode", { {"amount", RealReference}, {"interpolate", MagickInterpolateOptions} } }, - { "Magnify", }, + { "Magnify", { { (const char *) NULL, UndefineReference } } }, { "MedianFilter", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"channel", MagickChannelOptions} } }, - { "Minify", }, + { "Minify", { { (const char *) NULL, UndefineReference } } }, { "OilPaint", { {"radius", RealReference}, {"sigma", RealReference} } }, { "ReduceNoise", { {"geometry", StringReference}, {"width", IntegerReference},{"height", IntegerReference}, @@ -340,7 +341,7 @@ static struct { "Negate", { {"gray", MagickBooleanOptions}, {"channel", MagickChannelOptions} } }, { "Normalize", { {"channel", MagickChannelOptions} } }, - { "NumberColors", }, + { "NumberColors", { { (const char *) NULL, UndefineReference } } }, { "Opaque", { {"color", StringReference}, {"fill", StringReference}, {"fuzz", StringReference}, {"channel", MagickChannelOptions}, {"invert", MagickBooleanOptions} } }, @@ -356,10 +357,10 @@ static struct {"smoothing-threshold", RealReference}, {"colorspace", MagickColorspaceOptions}, {"verbose", MagickBooleanOptions} } }, - { "Signature", }, + { "Signature", { { (const char *) NULL, UndefineReference } } }, { "Solarize", { {"geometry", StringReference}, {"threshold", StringReference} } }, - { "Sync", }, + { "Sync", { { (const char *) NULL, UndefineReference } } }, { "Texture", { {"texture", ImageReference} } }, { "Evaluate", { {"value", RealReference}, {"operator", MagickEvaluateOptions}, @@ -375,11 +376,11 @@ static struct {"wavelength", RealReference}, {"interpolate", MagickInterpolateOptions} } }, { "Separate", { {"channel", MagickChannelOptions} } }, - { "Condense", }, + { "Condense", { { (const char *) NULL, UndefineReference } } }, { "Stereo", { {"image", ImageReference}, {"x", IntegerReference}, {"y", IntegerReference} } }, { "Stegano", { {"image", ImageReference}, {"offset", IntegerReference} } }, - { "Deconstruct", }, + { "Deconstruct", { { (const char *) NULL, UndefineReference } } }, { "GaussianBlur", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference}, {"channel", MagickChannelOptions} } }, @@ -424,7 +425,7 @@ static struct {"angle", RealReference}, {"channel", MagickChannelOptions} } }, { "Thumbnail", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference} } }, - { "Strip", }, + { "Strip", { { (const char *) NULL, UndefineReference } } }, { "Tint", { {"fill", StringReference}, {"blend", StringReference} } }, { "Channel", { {"channel", MagickChannelOptions} } }, { "Splice", { {"geometry", StringReference}, {"width", IntegerReference}, @@ -452,21 +453,21 @@ static struct { "ContrastStretch", { {"levels", StringReference}, {"black-point", RealReference},{"white-point", RealReference}, {"channel", MagickChannelOptions} } }, - { "Sans0", }, - { "Sans1", }, + { "Sans0", { { (const char *) NULL, UndefineReference } } }, + { "Sans1", { { (const char *) NULL, UndefineReference } } }, { "AdaptiveSharpen", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference}, {"bias", RealReference}, {"channel", MagickChannelOptions} } }, - { "Transpose", }, - { "Transverse", }, - { "AutoOrient", }, + { "Transpose", { { (const char *) NULL, UndefineReference } } }, + { "Transverse", { { (const char *) NULL, UndefineReference } } }, + { "AutoOrient", { { (const char *) NULL, UndefineReference } } }, { "AdaptiveBlur", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference}, {"channel", MagickChannelOptions} } }, { "Sketch", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference}, {"angle", RealReference} } }, - { "UniqueColors", }, + { "UniqueColors", { { (const char *) NULL, UndefineReference } } }, { "AdaptiveResize", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"filter", MagickFilterOptions}, {"support", StringReference }, diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in index 6dac1d85b..e96ac9f29 100644 --- a/PerlMagick/quantum/quantum.xs.in +++ b/PerlMagick/quantum/quantum.xs.in @@ -142,6 +142,7 @@ extern "C" { */ typedef enum { + UndefinedReference = 0, ArrayReference = (~0), RealReference = (~0)-1, FileReference = (~0)-2, @@ -223,24 +224,24 @@ static struct {"height", IntegerReference}, {"x", IntegerReference}, {"y", IntegerReference}, {"fuzz", StringReference}, {"gravity", MagickGravityOptions} } }, - { "Despeckle", }, + { "Despeckle", { { (const char *) NULL, UndefineReference } } }, { "Edge", { {"radius", RealReference} } }, { "Emboss", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference} } }, - { "Enhance", }, - { "Flip", }, - { "Flop", }, + { "Enhance", { { (const char *) NULL, UndefineReference } } }, + { "Flip", { { (const char *) NULL, UndefineReference } } }, + { "Flop", { { (const char *) NULL, UndefineReference } } }, { "Frame", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"inner", IntegerReference}, {"outer", IntegerReference}, {"fill", StringReference}, {"color", StringReference}, {"compose", MagickComposeOptions} } }, { "Implode", { {"amount", RealReference}, {"interpolate", MagickInterpolateOptions} } }, - { "Magnify", }, + { "Magnify", { { (const char *) NULL, UndefineReference } } }, { "MedianFilter", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"channel", MagickChannelOptions} } }, - { "Minify", }, + { "Minify", { { (const char *) NULL, UndefineReference } } }, { "OilPaint", { {"radius", RealReference}, {"sigma", RealReference} } }, { "ReduceNoise", { {"geometry", StringReference}, {"width", IntegerReference},{"height", IntegerReference}, @@ -340,7 +341,7 @@ static struct { "Negate", { {"gray", MagickBooleanOptions}, {"channel", MagickChannelOptions} } }, { "Normalize", { {"channel", MagickChannelOptions} } }, - { "NumberColors", }, + { "NumberColors", { { (const char *) NULL, UndefineReference } } }, { "Opaque", { {"color", StringReference}, {"fill", StringReference}, {"fuzz", StringReference}, {"channel", MagickChannelOptions}, {"invert", MagickBooleanOptions} } }, @@ -356,10 +357,10 @@ static struct {"smoothing-threshold", RealReference}, {"colorspace", MagickColorspaceOptions}, {"verbose", MagickBooleanOptions} } }, - { "Signature", }, + { "Signature", { { (const char *) NULL, UndefineReference } } }, { "Solarize", { {"geometry", StringReference}, {"threshold", StringReference} } }, - { "Sync", }, + { "Sync", { { (const char *) NULL, UndefineReference } } }, { "Texture", { {"texture", ImageReference} } }, { "Evaluate", { {"value", RealReference}, {"operator", MagickEvaluateOptions}, @@ -375,11 +376,11 @@ static struct {"wavelength", RealReference}, {"interpolate", MagickInterpolateOptions} } }, { "Separate", { {"channel", MagickChannelOptions} } }, - { "Condense", }, + { "Condense", { { (const char *) NULL, UndefineReference } } }, { "Stereo", { {"image", ImageReference}, {"x", IntegerReference}, {"y", IntegerReference} } }, { "Stegano", { {"image", ImageReference}, {"offset", IntegerReference} } }, - { "Deconstruct", }, + { "Deconstruct", { { (const char *) NULL, UndefineReference } } }, { "GaussianBlur", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference}, {"channel", MagickChannelOptions} } }, @@ -424,7 +425,7 @@ static struct {"angle", RealReference}, {"channel", MagickChannelOptions} } }, { "Thumbnail", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference} } }, - { "Strip", }, + { "Strip", { { (const char *) NULL, UndefineReference } } }, { "Tint", { {"fill", StringReference}, {"blend", StringReference} } }, { "Channel", { {"channel", MagickChannelOptions} } }, { "Splice", { {"geometry", StringReference}, {"width", IntegerReference}, @@ -452,21 +453,21 @@ static struct { "ContrastStretch", { {"levels", StringReference}, {"black-point", RealReference},{"white-point", RealReference}, {"channel", MagickChannelOptions} } }, - { "Sans0", }, - { "Sans1", }, + { "Sans0", { { (const char *) NULL, UndefineReference } } }, + { "Sans1", { { (const char *) NULL, UndefineReference } } }, { "AdaptiveSharpen", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference}, {"bias", RealReference}, {"channel", MagickChannelOptions} } }, - { "Transpose", }, - { "Transverse", }, - { "AutoOrient", }, + { "Transpose", { { (const char *) NULL, UndefineReference } } }, + { "Transverse", { { (const char *) NULL, UndefineReference } } }, + { "AutoOrient", { { (const char *) NULL, UndefineReference } } }, { "AdaptiveBlur", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference}, {"channel", MagickChannelOptions} } }, { "Sketch", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference}, {"angle", RealReference} } }, - { "UniqueColors", }, + { "UniqueColors", { { (const char *) NULL, UndefineReference } } }, { "AdaptiveResize", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"filter", MagickFilterOptions}, {"support", StringReference },