From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 21 Jun 2015 23:51:58 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~867
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=957f2617c87d8240de46599c265d8495d2a35eac;p=imagemagick

---

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 877a85a64..cfbc881c6 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -986,8 +986,10 @@ MagickExport ImageInfo *CloneImageInfo(const ImageInfo *image_info)
   SetImageInfoFile(clone_info,image_info->file);
   SetImageInfoBlob(clone_info,image_info->blob,image_info->length);
   clone_info->stream=image_info->stream;
-  (void) CopyMagickString(clone_info->magick,image_info->magick,MagickPathExtent);
-  (void) CopyMagickString(clone_info->unique,image_info->unique,MagickPathExtent);
+  (void) CopyMagickString(clone_info->magick,image_info->magick,
+    MagickPathExtent);
+  (void) CopyMagickString(clone_info->unique,image_info->unique,
+    MagickPathExtent);
   (void) CopyMagickString(clone_info->zero,image_info->zero,MagickPathExtent);
   (void) CopyMagickString(clone_info->filename,image_info->filename,
     MagickPathExtent);
@@ -1003,6 +1005,49 @@ MagickExport ImageInfo *CloneImageInfo(const ImageInfo *image_info)
 %                                                                             %
 %                                                                             %
 %                                                                             %
+%   C o p y I m a g e P i x e l s                                             %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  CopyImagePixels() copies pixels from the source image as defined by the
+%  geometry the destination image at the specified offset.
+%
+%  The format of the CopyImagePixels method is:
+%
+%      MagickBooleanType CopyImagePixels(Image *image,const Image *source_image,
+%        const RectangleInfo *geometry,const OffsetInfo *offset);
+%
+%  A description of each parameter follows:
+%
+%    o image: the destination image.
+%
+%    o source_image: the source image.
+%
+%    o geometry: define the dimensions of the source pixel rectangle.
+%
+%    o offset: define the offset in the destination image.
+%
+*/
+MagickExport MagickBooleanType CopyImagePixels(Image *image,
+  const Image *source_image,const RectangleInfo *geometry,
+  const OffsetInfo *offset)
+{
+  assert(image != (Image *) NULL);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
+  assert(source_image != (Image *) NULL);
+  assert(geometry != (RectangleInfo *) NULL);
+  assert(offset != (OffsetInfo *) NULL);
+  return(MagickTrue);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   D e s t r o y I m a g e                                                   %
 %                                                                             %
 %                                                                             %
diff --git a/MagickCore/image.h b/MagickCore/image.h
index d96dc9aaa..60a31b1e6 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -533,6 +533,8 @@ extern MagickExport ImageInfo
 extern MagickExport MagickBooleanType
   ClipImage(Image *,ExceptionInfo *),
   ClipImagePath(Image *,const char *,const MagickBooleanType,ExceptionInfo *),
+  CopyImagePixels(Image *,const Image *,const RectangleInfo *,
+    const OffsetInfo *),
   IsTaintImage(const Image *),
   IsHighDynamicRangeImage(const Image *,ExceptionInfo *),
   IsImageObject(const Image *),