diff options
| -rw-r--r-- | dmagick/Image.d | 50 | ||||
| -rw-r--r-- | dmagick/c/distort.d | 2 | ||||
| -rw-r--r-- | dmagick/c/magickType.d | 2 | ||||
| -rw-r--r-- | dmagick/c/magickVersion.d | 4 | ||||
| -rw-r--r-- | dmagick/c/pixel.d | 27 |
5 files changed, 43 insertions, 42 deletions
diff --git a/dmagick/Image.d b/dmagick/Image.d index ba9b915..09572e7 100644 --- a/dmagick/Image.d +++ b/dmagick/Image.d @@ -1637,6 +1637,31 @@ class Image } /** + * Replaces the pixels in the specified area with pixel data + * from the supplied array. + * + * Params: + * area = Location in the image to store the pixels. + * pixels = An array of pixels defined by map. + * map = This character string can be any combination + * or order of R = red, G = green, B = blue, A = + * alpha, C = cyan, Y = yellow, M = magenta, and K = black. + * The ordering reflects the order of the pixels in + * the supplied pixel array. + */ + void importPixels(T)(Geometry area, T[] pixels, string map = "RGBA") + { + StorageType storage = getStorageType!(T); + + ImportImagePixels(imageRef, + area.xOffset, area.yOffset, + area.width, area.height, + toStringz(map), storage, pixels.ptr); + + DMagickException.throwException(&(imageRef.exception)); + } + + /** * Adjusts the levels of an image by scaling the colors falling between * specified white and black points to the full available quantum range. * The parameters provided represent the black, mid, and white points. @@ -1921,31 +1946,6 @@ class Image } /** - * Replaces the pixels in the specified area with pixel data - * from the supplied array. - * - * Params: - * area = Location in the image to store the pixels. - * pixels = An array of pixels defined by map. - * map = This character string can be any combination - * or order of R = red, G = green, B = blue, A = - * alpha, C = cyan, Y = yellow, M = magenta, and K = black. - * The ordering reflects the order of the pixels in - * the supplied pixel array. - */ - void importPixels(T)(Geometry area, T[] pixels, string map = "RGBA") - { - StorageType storage = getStorageType!(T); - - ImportImagePixels(imageRef, - area.xOffset, area.yOffset, - area.width, area.height, - toStringz(map), storage, pixels.ptr); - - DMagickException.throwException(&(imageRef.exception)); - } - - /** * Read an Image by reading from the file or * URL specified by filename with the specified size. * Usefull for images that don't specify their size. diff --git a/dmagick/c/distort.d b/dmagick/c/distort.d index ff406e4..5bdd2e2 100644 --- a/dmagick/c/distort.d +++ b/dmagick/c/distort.d @@ -21,6 +21,8 @@ extern(C) ArcDistortion, PolarDistortion, DePolarDistortion, + Cylinder2PlaneDistortion, + Plane2CylinderDistortion, BarrelDistortion, BarrelInverseDistortion, ShepardsDistortion, diff --git a/dmagick/c/magickType.d b/dmagick/c/magickType.d index be49e7d..ee90734 100644 --- a/dmagick/c/magickType.d +++ b/dmagick/c/magickType.d @@ -79,7 +79,7 @@ extern (C) BlackChannel = 0x0020, IndexChannel = 0x0020, CompositeChannels = 0x002F, - AllChannels = ~0UL, + AllChannels = ~0L, 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 bded7db..27afa76 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 = 0x670; + enum MagickLibVersion = 0x671; ///ditto - enum MagickLibVersionText = "6.7.0"; + enum MagickLibVersionText = "6.7.1"; char* GetMagickHomeURL(); diff --git a/dmagick/c/pixel.d b/dmagick/c/pixel.d index 982c90d..fd6ed6e 100644 --- a/dmagick/c/pixel.d +++ b/dmagick/c/pixel.d @@ -26,20 +26,19 @@ extern(C) enum PixelComponent { - RedPixelComponent = 0, - CyanPixelComponent = 0, - GrayPixelComponent = 0, - YPixelComponent = 0, - GreenPixelComponent = 1, - MagentaPixelComponent = 1, - CbPixelComponent = 1, - BluePixelComponent = 2, - YellowPixelComponent = 2, - CrPixelComponent = 2, - AlphaPixelComponent = 3, - BlackPixelComponent = 4, - IndexPixelComponent = 4, - MaskPixelComponent = 5 + PixelRed = 0, + PixelCyan = 0, + PixelGray = 0, + PixelY = 0, + PixelGreen = 1, + PixelMagenta = 1, + PixelCb = 1, + PixelBlue = 2, + PixelYellow = 2, + PixelCr = 2, + PixelAlpha = 3, + PixelBlack = 4, + PixelIndex = 4, } struct DoublePixelPacket |