(no commit message)

diff --git a/magick/composite.c b/magick/composite.c
index 263b6845fafbcb0afce4090940156e4d62e26a47..92896b02f9106678f3e3344fc6863eb583258897 100644 (file)
--- a/magick/composite.c
+++ b/magick/composite.c
@@ -2580,8 +2580,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture)
 
     if (status == MagickFalse)
       continue;
-    p=GetCacheViewVirtualPixels(texture_view,0,y % texture->rows,
-      texture->columns,1,exception);
+    p=GetCacheViewVirtualPixels(texture_view,texture->tile_offset.x,(y+
+      texture->tile_offset.y) % texture->rows,texture->columns,1,exception);
     q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
       exception);
     if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))

diff --git a/magick/image.c b/magick/image.c
index 987e62e49e045f132c2d987f57c06254b5a9c742..2e56974ad07e72aab1c84db2e3e1d8c16adbeed4 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -143,6 +143,9 @@ const double
 */
 MagickExport Image *AcquireImage(const ImageInfo *image_info)
 {
+  const char
+    *option;
+
   Image
     *image;
 
@@ -247,6 +250,16 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info)
   if (image_info->depth != 0)
     image->depth=image_info->depth;
   image->dither=image_info->dither;
+  option=GetImageOption(image_info,"tile-offset");
+  if (option != (const char *) NULL)
+    {
+      char
+        *geometry;
+
+      geometry=GetPageGeometry(option);
+      flags=ParseAbsoluteGeometry(geometry,&image->tile_offset);
+      geometry=DestroyString(geometry);
+    }
   image->background_color=image_info->background_color;
   image->border_color=image_info->border_color;
   image->matte_color=image_info->matte_color;