% May 2003 %
% %
% %
-% Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
\f
/*
Bricks pattern.
0x50, 0x34, 0x0A, 0x38, 0x20, 0x34, 0x0A, 0xFF, 0x00, 0x00, 0x00
};
+/*
+ Horizontal-2 pattern.
+*/
+static const unsigned char
+ Horizontal2Image[] =
+ {
+ 0x50, 0x34, 0x0A, 0x38, 0x20, 0x38, 0x0A, 0xFF, 0x00, 0xFF, 0x00, 0xFF,
+ 0x00, 0xFF, 0x00
+ };
+
+/*
+ Horizontal-3 pattern.
+*/
+static const unsigned char
+ Horizontal3Image[] =
+ {
+ 0x50, 0x34, 0x0A, 0x39, 0x20, 0x39, 0x0A, 0x00, 0x00, 0x00, 0x00, 0xFF,
+ 0x80, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0xFF,
+ 0x80,
+ };
+
/*
HorizontalSaw pattern.
*/
0x11, 0x11, 0x11
};
+/*
+ Vertical-2 pattern.
+*/
+static const unsigned char
+ Vertical2Image[] =
+ {
+ 0x50, 0x34, 0x0A, 0x38, 0x20, 0x38, 0x0A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+ 0xAA, 0xAA, 0xAA
+ };
+
+/*
+ Vertical-2 pattern.
+*/
+static const unsigned char
+ Vertical3Image[] =
+ {
+ 0x50, 0x34, 0x0A, 0x39, 0x20, 0x39, 0x0A, 0x24, 0x80, 0x24, 0x80, 0x24,
+ 0x80, 0x24, 0x80, 0x24, 0x80, 0x24, 0x80, 0x24, 0x80, 0x24, 0x80, 0x24,
+ 0x80
+ };
+
/*
VerticalBricks pattern.
*/
{ "GRAY100", "PBM", Gray100Image, sizeof(Gray100Image) },
{ "HEXAGONS", "PBM", HexagonsImage, sizeof(HexagonsImage) },
{ "HORIZONTAL", "PBM", HorizontalImage, sizeof(HorizontalImage) },
+ { "HORIZONTAL2", "PBM", Horizontal2Image, sizeof(Horizontal2Image) },
+ { "HORIZONTAL3", "PBM", Horizontal3Image, sizeof(Horizontal3Image) },
{ "HORIZONTALSAW", "PBM", HorizontalSawImage, sizeof(HorizontalSawImage) },
{ "HS_BDIAGONAL", "PBM", HS_BDIAGONALImage, sizeof(HS_BDIAGONALImage) },
{ "HS_CROSS", "PBM", HS_CROSSImage, sizeof(HS_CROSSImage) },
{ "SMALLFISHSCALES", "PBM", SmallFishScalesImage,
sizeof(SmallFishScalesImage) },
{ "VERTICAL", "PBM", VerticalImage, sizeof(VerticalImage) },
+ { "VERTICAL2", "PBM", Vertical2Image, sizeof(Vertical2Image) },
+ { "VERTICAL3", "PBM", Vertical3Image, sizeof(Vertical3Image) },
{ "VERTICALBRICKS", "PBM", VerticalBricksImage,
sizeof(VerticalBricksImage) },
{ "VERTICALLEFTSHINGLE", "PBM", VerticalLeftShingleImage,
Tile pattern across image canvas.
*/
pattern_image=image;
- image=AcquireImage(blob_info);
- image->background_color=pattern_image->background_color;
- (void) SetImageBackgroundColor(image);
- (void) TextureImage(image,pattern_image);
+ image=AcquireImage(image_info,exception);
+ (void) TextureImage(image,pattern_image,exception);
pattern_image=DestroyImage(pattern_image);
}
blob_info=DestroyImageInfo(blob_info);