diff options
| author | Mike Wey | 2012-08-19 16:02:52 +0200 |
|---|---|---|
| committer | Mike Wey | 2012-08-19 16:02:52 +0200 |
| commit | 1c6c2ab96cfe81bf99eaca6290d29231e011f869 (patch) | |
| tree | fb17b0b8dfab5991665a0aff6b6d49e402919477 | |
| parent | a09c2accd9987aecc1aacac557aedc00eb69a465 (diff) | |
Update the headers for ImageMagick 6.7.9.ImageMagick_6.7.9
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | dmagick/c/colorspace.d | 14 | ||||
| -rw-r--r-- | dmagick/c/gem.d | 13 | ||||
| -rw-r--r-- | dmagick/c/image.d | 6 | ||||
| -rw-r--r-- | dmagick/c/magickType.d | 7 | ||||
| -rw-r--r-- | dmagick/c/magickVersion.d | 9 | ||||
| -rw-r--r-- | dmagick/c/morphology.d | 9 |
7 files changed, 50 insertions, 10 deletions
diff --git a/GNUmakefile b/GNUmakefile index f836940..e974bbf 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -49,7 +49,7 @@ ifneq ("$(QUANTUMDEPTH)","Q16") VERSIONS+= -version=$(subst Q,Quantum,$(QUANTUMDEPTH)) endif -ifneq ("$(MAGICKVERSION)","678") +ifneq ("$(MAGICKVERSION)","679") VERSIONS+= -version=MagickCore_$(MAGICKVERSION) endif diff --git a/dmagick/c/colorspace.d b/dmagick/c/colorspace.d index 9986a47..7f5a060 100644 --- a/dmagick/c/colorspace.d +++ b/dmagick/c/colorspace.d @@ -143,7 +143,19 @@ extern(C) * system used by printers and photographers for the rendering of * colors with ink or emulsion, normally on a white surface. */ - CMYColorspace + CMYColorspace, + + /** + * CIE 1976 (L*, u*, v*) color space. + */ + LuvColorspace, + + /** + * HCL is a color space that tries to combine the advantages of + * perceptual uniformity of Luv, and the simplicity of specification + * of HSV and HSL. + */ + HCLColorspace } MagickBooleanType RGBTransformImage(Image*, const ColorspaceType); diff --git a/dmagick/c/gem.d b/dmagick/c/gem.d index 43bcad4..4ece84d 100644 --- a/dmagick/c/gem.d +++ b/dmagick/c/gem.d @@ -14,9 +14,20 @@ extern(C) size_t GetOptimalKernelWidth1D(const double, const double); size_t GetOptimalKernelWidth2D(const double, const double); + static if (MagickLibVersion >= 0x679) + { + void ConvertHCLToRGB(const double, const double, const double, Quantum*, Quantum*, Quantum*); + } + void ConvertHSBToRGB(const double, const double, const double, Quantum*, Quantum*, Quantum*); void ConvertHSLToRGB(const double, const double, const double, Quantum*, Quantum*, Quantum*); - void ConvertHWBToRGB(const double, const double, const double, Quantum*, Quantum *,Quantum*); + void ConvertHWBToRGB(const double, const double, const double, Quantum*, Quantum*, Quantum*); + + static if (MagickLibVersion >= 0x679) + { + void ConvertRGBToHCL(const Quantum, const Quantum, const Quantum, double*, double*, double*); + } + void ConvertRGBToHSB(const Quantum, const Quantum, const Quantum, double*, double*, double*); void ConvertRGBToHSL(const Quantum, const Quantum, const Quantum, double*, double*, double*); void ConvertRGBToHWB(const Quantum, const Quantum, const Quantum, double*, double*, double*); diff --git a/dmagick/c/image.d b/dmagick/c/image.d index 08382c0..656a8bc 100644 --- a/dmagick/c/image.d +++ b/dmagick/c/image.d @@ -427,9 +427,9 @@ extern(C) signature; Image* - previous, /* Image sequence list links */ - list, - next; + previous, /* Image list links */ + list, /* Undo/Redo image processing list (for display) */ + next; /* Image list links */ InterpolatePixelMethod interpolate; /* Interpolation of color for between pixel lookups */ diff --git a/dmagick/c/magickType.d b/dmagick/c/magickType.d index 52378ca..4e770ea 100644 --- a/dmagick/c/magickType.d +++ b/dmagick/c/magickType.d @@ -99,11 +99,16 @@ extern (C) } } - static if ( MagickLibVersion >= 0x678 ) + static if ( MagickLibVersion == 0x678 ) { enum MagickRealType MagickEpsilon = 2.220446e-16; enum MagickRealType MagickHuge = 1.0/MagickEpsilon; } + else static if ( MagickLibVersion >= 0x679 ) + { + enum MagickRealType MagickEpsilon = 1.0e-16; + enum MagickRealType MagickHuge = 1.0/MagickEpsilon; + } alias uint MagickStatusType; alias long MagickOffsetType; diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d index 9d0c8cf..551033d 100644 --- a/dmagick/c/magickVersion.d +++ b/dmagick/c/magickVersion.d @@ -130,13 +130,20 @@ extern(C) ///ditto enum MagickLibVersionText = "6.7.7"; } - else + else version(MagickCore_678) { /// Defines the version of ImageMagick where these headers are based on. enum MagickLibVersion = 0x678; ///ditto enum MagickLibVersionText = "6.7.8"; } + else + { + /// Defines the version of ImageMagick where these headers are based on. + enum MagickLibVersion = 0x679; + ///ditto + enum MagickLibVersionText = "6.7.9"; + } /* * With ImageMagick 6.6.3 long and unsinged long were changed to diff --git a/dmagick/c/morphology.d b/dmagick/c/morphology.d index 16918ed..692a833 100644 --- a/dmagick/c/morphology.d +++ b/dmagick/c/morphology.d @@ -107,8 +107,13 @@ extern(C) info ~= "ChebyshevKernel, /* Distance Measuring Kernels */ ManhattanKernel, EuclideanKernel, - UserDefinedKernel /* User Specified Kernel Array */ - }"; + UserDefinedKernel, /* User Specified Kernel Array */"; + + static if ( MagickLibVersion >= 0x679 ) + { + info ~= "BinomialKernel"; + } + info ~= "}"; return info; }()); |
