summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dmagick/c/deprecate.d11
-rw-r--r--dmagick/c/magickType.d2
-rw-r--r--dmagick/c/magickVersion.d4
-rw-r--r--dmagick/c/morphology.d2
4 files changed, 10 insertions, 9 deletions
diff --git a/dmagick/c/deprecate.d b/dmagick/c/deprecate.d
index 69c54a5..04d826b 100644
--- a/dmagick/c/deprecate.d
+++ b/dmagick/c/deprecate.d
@@ -94,11 +94,6 @@ deprecated extern(C)
int GetImageGeometry(Image*, const(char)*, const uint, RectangleInfo*);
int ParseImageGeometry(const(char)*, ssize_t*, ssize_t*, size_t*, size_t*);
- ssize_t FormatMagickString(char*, const size_t, const(char)*, ...);
- ssize_t FormatMagickStringList(char*, const size_t, const(char)*, va_list);
- ssize_t GetImageListIndex(const(Image)*);
- ssize_t SetMagickRegistry(const RegistryType, const(void)*, const size_t, ExceptionInfo*);
-
MagickBooleanType AcquireOneCacheViewPixel(const(CacheView)*, const ssize_t, const ssize_t, PixelPacket*, ExceptionInfo*);
MagickBooleanType AcquireOneCacheViewVirtualPixel(const(CacheView)*, const VirtualPixelMethod, const ssize_t, const ssize_t, PixelPacket*, ExceptionInfo*);
MagickBooleanType AffinityImage(const(QuantizeInfo)*, Image*, const(Image)*);
@@ -112,6 +107,7 @@ deprecated extern(C)
MagickBooleanType DescribeImage(Image*, FILE*, const MagickBooleanType);
MagickBooleanType FormatImageAttribute(Image*, const(char)*, const(char)*, ...);
MagickBooleanType FormatImageAttributeList(Image*, const(char)*, const(char)*, va_list);
+ MagickBooleanType FormatImagePropertyList(Image*, const(char)*, const(char)*, va_list);
MagickBooleanType FuzzyColorCompare(const(Image)*, const(PixelPacket)*, const(PixelPacket)*);
MagickBooleanType FuzzyOpacityCompare(const(Image)*, const(PixelPacket)*, const(PixelPacket)*);
MagickBooleanType LevelImageColors(Image*, const ChannelType, const(MagickPixelPacket)*, const(MagickPixelPacket)*, const MagickBooleanType);
@@ -155,6 +151,11 @@ deprecated extern(C)
size_t PopImagePixels(Image*, const QuantumType, ubyte*);
size_t PushImagePixels(Image*, const QuantumType, const(byte)*);
+ ssize_t FormatMagickString(char*, const size_t, const(char)*, ...);
+ ssize_t FormatMagickStringList(char*, const size_t, const(char)*, va_list);
+ ssize_t GetImageListIndex(const(Image)*);
+ ssize_t SetMagickRegistry(const RegistryType, const(void)*, const size_t, ExceptionInfo*);
+
uint ChannelImage(Image*, const ChannelType);
uint ChannelThresholdImage(Image*, const(char)*);
uint DispatchImage(const(Image)*, const ssize_t, const ssize_t, const size_t, const size_t, const(char)*, const StorageType, void*, ExceptionInfo*);
diff --git a/dmagick/c/magickType.d b/dmagick/c/magickType.d
index 9547312..9d92e4c 100644
--- a/dmagick/c/magickType.d
+++ b/dmagick/c/magickType.d
@@ -79,7 +79,7 @@ extern (C)
BlackChannel = 0x0020,
IndexChannel = 0x0020,
CompositeChannels = 0x002F,
- AllChannels = ~0L,
+ AllChannels = 0x7FFFFFF,
TrueAlphaChannel = 0x0040, // extract actual alpha channel from opacity
RGBChannels = 0x0080, // set alpha from grayscale mask in RGB
diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d
index 27afa76..4b9a0e5 100644
--- a/dmagick/c/magickVersion.d
+++ b/dmagick/c/magickVersion.d
@@ -3,9 +3,9 @@ module dmagick.c.magickVersion;
extern(C)
{
/// Defines the version of ImageMagick where these headers are based on.
- enum MagickLibVersion = 0x671;
+ enum MagickLibVersion = 0x672;
///ditto
- enum MagickLibVersionText = "6.7.1";
+ enum MagickLibVersionText = "6.7.2";
char* GetMagickHomeURL();
diff --git a/dmagick/c/morphology.d b/dmagick/c/morphology.d
index 3abc668..fa6ffd3 100644
--- a/dmagick/c/morphology.d
+++ b/dmagick/c/morphology.d
@@ -125,5 +125,5 @@ extern(C)
Image* MorphologyImageChannel(const(Image)*, const ChannelType, const MorphologyMethod, const ssize_t, const(KernelInfo)*, ExceptionInfo*);
void ScaleGeometryKernelInfo(KernelInfo*, const(char)*);
- void ShowKernelInfo(KernelInfo*);
+ void ShowKernelInfo(const(KernelInfo)*);
}