Check for sampling-factor option only if sampling-factor image property is NULL.

[imagemagick] / coders / pattern.c

diff --git a/coders/pattern.c b/coders/pattern.c
index f0e05c0db5d7f20d02204a1f04642403c1d5e12b..c3579bd83799f19fa6080ecb6e5e721161b331e7 100644 (file)
--- a/coders/pattern.c
+++ b/coders/pattern.c
@@ -17,7 +17,7 @@
 %                                 May 2003                                    %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2012 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  %
@@ -39,20 +39,20 @@
 /*
   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.
@@ -577,6 +577,27 @@ static const unsigned char
     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.
 */
@@ -747,6 +768,27 @@ static const unsigned char
     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.
 */
@@ -845,6 +887,8 @@ static const PatternInfo
     { "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) },
@@ -862,6 +906,8 @@ static const PatternInfo
     { "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,
@@ -911,7 +957,7 @@ static Image *ReadPATTERNImage(const ImageInfo *image_info,
   ImageInfo
     *blob_info;
 
-  register long
+  register ssize_t
     i;
 
   size_t
@@ -942,10 +988,8 @@ static Image *ReadPATTERNImage(const ImageInfo *image_info,
         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);
@@ -971,10 +1015,10 @@ static Image *ReadPATTERNImage(const ImageInfo *image_info,
 %
 %  The format of the RegisterPATTERNImage method is:
 %
-%      unsigned long RegisterPATTERNImage(void)
+%      size_t RegisterPATTERNImage(void)
 %
 */
-ModuleExport unsigned long RegisterPATTERNImage(void)
+ModuleExport size_t RegisterPATTERNImage(void)
 {
   MagickInfo
     *entry;