From e1c94d9d25db6b0dd7a5028ffee31d1057855d73 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 28 Jun 2015 12:16:33 +0000
Subject: [PATCH]
---
Magick++/lib/Montage.cpp | 2 +-
MagickCore/accelerate.c | 8 +-
MagickCore/animate.c | 12 +-
MagickCore/annotate.c | 12 +-
MagickCore/artifact.c | 18 +-
MagickCore/attribute.c | 20 +-
MagickCore/blob.c | 122 ++++----
MagickCore/cache-view.c | 48 +--
MagickCore/cache.c | 184 ++++++------
MagickCore/channel.c | 18 +-
MagickCore/cipher.c | 32 +-
MagickCore/coder.c | 4 +-
MagickCore/color.c | 8 +-
MagickCore/colormap.c | 6 +-
MagickCore/colorspace.c | 6 +-
MagickCore/compare.c | 20 +-
MagickCore/composite.c | 6 +-
MagickCore/compress.c | 22 +-
MagickCore/configure.c | 6 +-
MagickCore/constitute.c | 18 +-
MagickCore/decorate.c | 6 +-
MagickCore/delegate.c | 16 +-
MagickCore/display.c | 16 +-
MagickCore/distort.c | 20 +-
MagickCore/distribute-cache.c | 28 +-
MagickCore/draw.c | 24 +-
MagickCore/effect.c | 64 ++--
MagickCore/enhance.c | 40 +--
MagickCore/exception.c | 20 +-
MagickCore/feature.c | 14 +-
MagickCore/fourier.c | 6 +-
MagickCore/fx.c | 74 ++---
MagickCore/geometry.c | 2 +-
MagickCore/hashmap.c | 58 ++--
MagickCore/histogram.c | 6 +-
MagickCore/identify.c | 4 +-
MagickCore/image-view.c | 44 +--
MagickCore/image.c | 80 ++---
MagickCore/layer.c | 38 +--
MagickCore/list.c | 64 ++--
MagickCore/locale.c | 4 +-
MagickCore/log.c | 4 +-
MagickCore/magic.c | 6 +-
MagickCore/magick.c | 30 +-
MagickCore/matrix.c | 18 +-
MagickCore/memory.c | 8 +-
MagickCore/method-attribute.h | 2 +-
MagickCore/mime.c | 6 +-
MagickCore/module.c | 8 +-
MagickCore/montage.c | 14 +-
MagickCore/morphology.c | 24 +-
MagickCore/nt-feature.c | 6 +-
MagickCore/opencl.c | 2 +-
MagickCore/option.c | 20 +-
MagickCore/paint.c | 16 +-
MagickCore/pixel.c | 16 +-
MagickCore/policy.c | 4 +-
MagickCore/prepress.c | 2 +-
MagickCore/profile.c | 20 +-
MagickCore/property.c | 22 +-
MagickCore/quantize.c | 38 +--
MagickCore/quantum-export.c | 32 +-
MagickCore/quantum-import.c | 32 +-
MagickCore/quantum.c | 52 ++--
MagickCore/random.c | 6 +-
MagickCore/registry.c | 6 +-
MagickCore/resample.c | 20 +-
MagickCore/resize.c | 66 ++---
MagickCore/segment.c | 4 +-
MagickCore/semaphore.c | 10 +-
MagickCore/shear.c | 12 +-
MagickCore/signature.c | 22 +-
MagickCore/splay-tree.c | 26 +-
MagickCore/static.c | 2 +-
MagickCore/statistic.c | 36 +--
MagickCore/stream.c | 68 ++---
MagickCore/string.c | 38 +--
MagickCore/threshold.c | 22 +-
MagickCore/timer.c | 20 +-
MagickCore/token.c | 6 +-
MagickCore/transform.c | 58 ++--
MagickCore/type.c | 4 +-
MagickCore/vision.c | 4 +-
MagickCore/xml-tree.c | 72 ++---
MagickCore/xwindow.c | 6 +-
MagickWand/animate.c | 2 +-
MagickWand/compare.c | 2 +-
MagickWand/composite.c | 8 +-
MagickWand/conjure.c | 2 +-
MagickWand/convert.c | 2 +-
MagickWand/display.c | 2 +-
MagickWand/drawing-wand.c | 288 +++++++++---------
MagickWand/identify.c | 2 +-
MagickWand/import.c | 2 +-
MagickWand/magick-cli.c | 4 +-
MagickWand/magick-image.c | 532 +++++++++++++++++-----------------
MagickWand/magick-property.c | 118 ++++----
MagickWand/magick-wand.c | 34 +--
MagickWand/method-attribute.h | 2 +-
MagickWand/mogrify.c | 20 +-
MagickWand/montage.c | 2 +-
MagickWand/operation.c | 28 +-
MagickWand/pixel-iterator.c | 40 +--
MagickWand/pixel-wand.c | 126 ++++----
MagickWand/script-token.c | 4 +-
MagickWand/stream.c | 2 +-
MagickWand/wand-view.c | 38 +--
MagickWand/wandcli.c | 16 +-
coders/aai.c | 10 +-
coders/art.c | 10 +-
coders/avs.c | 10 +-
coders/bgr.c | 10 +-
coders/bmp.c | 14 +-
coders/braille.c | 6 +-
coders/cals.c | 10 +-
coders/caption.c | 4 +-
coders/cin.c | 10 +-
coders/cip.c | 6 +-
coders/clip.c | 4 +-
coders/clipboard.c | 8 +-
coders/cmyk.c | 8 +-
coders/cut.c | 4 +-
coders/dcm.c | 4 +-
coders/dds.c | 8 +-
coders/debug.c | 4 +-
coders/dib.c | 14 +-
coders/djvu.c | 4 +-
coders/dng.c | 4 +-
coders/dot.c | 4 +-
coders/dps.c | 4 +-
coders/dpx.c | 10 +-
coders/emf.c | 2 +-
coders/ept.c | 10 +-
coders/exr.c | 10 +-
coders/fax.c | 10 +-
coders/fd.c | 4 +-
coders/fits.c | 10 +-
coders/fpx.c | 10 +-
coders/gif.c | 16 +-
coders/gradient.c | 4 +-
coders/gray.c | 10 +-
coders/hald.c | 4 +-
coders/hdr.c | 10 +-
coders/histogram.c | 4 +-
coders/hrz.c | 10 +-
coders/html.c | 6 +-
coders/icon.c | 10 +-
coders/info.c | 4 +-
coders/inline.c | 8 +-
coders/ipl.c | 10 +-
coders/jbig.c | 10 +-
coders/jnx.c | 4 +-
coders/jp2.c | 10 +-
coders/jpeg.c | 10 +-
coders/json.c | 27 +-
coders/label.c | 4 +-
coders/mac.c | 4 +-
coders/magick.c | 4 +-
coders/map.c | 10 +-
coders/mask.c | 4 +-
coders/mat.c | 10 +-
coders/meta.c | 20 +-
coders/miff.c | 10 +-
coders/mono.c | 10 +-
coders/mpc.c | 10 +-
coders/mpeg.c | 10 +-
coders/mpr.c | 8 +-
coders/msl.c | 10 +-
coders/mtv.c | 10 +-
coders/mvg.c | 8 +-
coders/null.c | 8 +-
coders/otb.c | 10 +-
coders/palm.c | 10 +-
coders/pango.c | 4 +-
coders/pcd.c | 10 +-
coders/pcl.c | 10 +-
coders/pcx.c | 10 +-
coders/pdb.c | 10 +-
coders/pdf.c | 10 +-
coders/pes.c | 4 +-
coders/pict.c | 12 +-
coders/pix.c | 4 +-
coders/png.c | 26 +-
coders/pnm.c | 10 +-
coders/preview.c | 4 +-
coders/ps.c | 10 +-
coders/ps2.c | 6 +-
coders/ps3.c | 16 +-
coders/psd.c | 12 +-
coders/pwp.c | 4 +-
coders/raw.c | 10 +-
coders/rgb.c | 8 +-
coders/rgf.c | 10 +-
coders/rla.c | 4 +-
coders/rle.c | 4 +-
coders/scr.c | 4 +-
coders/screenshot.c | 4 +-
coders/sct.c | 4 +-
coders/sfw.c | 4 +-
coders/sgi.c | 10 +-
coders/sixel.c | 8 +-
coders/stegano.c | 4 +-
coders/sun.c | 10 +-
coders/svg.c | 10 +-
coders/tga.c | 10 +-
coders/tiff.c | 20 +-
coders/tile.c | 4 +-
coders/tim.c | 4 +-
coders/ttf.c | 4 +-
coders/txt.c | 12 +-
coders/uil.c | 6 +-
coders/uyvy.c | 10 +-
coders/vicar.c | 10 +-
coders/vid.c | 4 +-
coders/viff.c | 10 +-
coders/vips.c | 8 +-
coders/wbmp.c | 10 +-
coders/webp.c | 8 +-
coders/wmf.c | 2 +-
coders/wpg.c | 4 +-
coders/xbm.c | 10 +-
coders/xc.c | 4 +-
coders/xcf.c | 6 +-
coders/xpm.c | 16 +-
coders/xps.c | 4 +-
coders/xwd.c | 10 +-
coders/ycbcr.c | 10 +-
coders/yuv.c | 8 +-
filters/analyze.c | 2 +-
utilities/convert.1 | 2 +
utilities/mogrify.1 | 2 +
231 files changed, 2183 insertions(+), 2182 deletions(-)
diff --git a/Magick++/lib/Montage.cpp b/Magick++/lib/Montage.cpp
index 8ecd358ce..2856f1135 100644
--- a/Magick++/lib/Montage.cpp
+++ b/Magick++/lib/Montage.cpp
@@ -222,7 +222,7 @@ void Magick::Montage::updateMontageInfo(MontageInfo &montageInfo_ ) const
montageInfo_.shadow=static_cast<MagickBooleanType>
(_shadow ? MagickTrue : MagickFalse);
// signature (validity stamp)
- montageInfo_.signature=MagickSignature;
+ montageInfo_.signature=MagickCoreSignature;
// stroke
montageInfo_.stroke=_stroke;
// texture
diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index bc47dca6a..19502900c 100644
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -4049,7 +4049,7 @@ MagickBooleanType ComputeModulateImage(Image *image,
modulateKernel = NULL;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
@@ -4263,7 +4263,7 @@ MagickBooleanType ComputeGrayscaleImage(Image *image,
grayscaleKernel = NULL;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
@@ -4574,7 +4574,7 @@ MagickExport MagickBooleanType ComputeEqualizeImage(Image *image,
outputReady = MagickFalse;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
@@ -5068,7 +5068,7 @@ MagickExport MagickBooleanType ComputeContrastStretchImageChannel(Image *image,
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
diff --git a/MagickCore/animate.c b/MagickCore/animate.c
index b5124e664..cf4788103 100644
--- a/MagickCore/animate.c
+++ b/MagickCore/animate.c
@@ -296,9 +296,9 @@ MagickExport MagickBooleanType AnimateImages(const ImageInfo *image_info,
resource_info;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
display=XOpenDisplay(image_info->server_name);
@@ -792,7 +792,7 @@ MagickExport void XAnimateBackgroundImage(Display *display,
Determine target window.
*/
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
resources=(*resource_info);
@@ -1403,7 +1403,7 @@ MagickExport Image *XAnimateImages(Display *display,
*manager_hints;
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
warning_handler=(WarningHandler) NULL;
@@ -3030,10 +3030,10 @@ MagickExport MagickBooleanType AnimateImages(const ImageInfo *image_info,
Image *image,ExceptionInfo *exception)
{
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
(void) image_info;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
(void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError,
diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 1b1e81e43..e702b155c 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -289,11 +289,11 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
number_lines;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(draw_info != (DrawInfo *) NULL);
- assert(draw_info->signature == MagickSignature);
+ assert(draw_info->signature == MagickCoreSignature);
if (draw_info->text == (char *) NULL)
return(MagickFalse);
if (*draw_info->text == '\0')
@@ -719,12 +719,12 @@ MagickExport MagickBooleanType GetMultilineTypeMetrics(Image *image,
extent;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(draw_info != (DrawInfo *) NULL);
assert(draw_info->text != (char *) NULL);
- assert(draw_info->signature == MagickSignature);
+ assert(draw_info->signature == MagickCoreSignature);
if (*draw_info->text == '\0')
return(MagickFalse);
annotate_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
@@ -824,12 +824,12 @@ MagickExport MagickBooleanType GetTypeMetrics(Image *image,
offset;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(draw_info != (DrawInfo *) NULL);
assert(draw_info->text != (char *) NULL);
- assert(draw_info->signature == MagickSignature);
+ assert(draw_info->signature == MagickCoreSignature);
annotate_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
annotate_info->render=MagickFalse;
annotate_info->direction=UndefinedDirection;
diff --git a/MagickCore/artifact.c b/MagickCore/artifact.c
index df92fbf72..33b36c384 100644
--- a/MagickCore/artifact.c
+++ b/MagickCore/artifact.c
@@ -103,11 +103,11 @@ MagickExport MagickBooleanType CloneImageArtifacts(Image *image,
const Image *clone_image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(clone_image != (const Image *) NULL);
- assert(clone_image->signature == MagickSignature);
+ assert(clone_image->signature == MagickCoreSignature);
if (clone_image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
clone_image->filename);
@@ -199,7 +199,7 @@ MagickExport MagickBooleanType DeleteImageArtifact(Image *image,
const char *artifact)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->artifacts == (void *) NULL)
@@ -233,7 +233,7 @@ MagickExport MagickBooleanType DeleteImageArtifact(Image *image,
MagickExport void DestroyImageArtifacts(Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->artifacts != (void *) NULL)
@@ -277,7 +277,7 @@ MagickExport const char *GetImageArtifact(const Image *image,
*p;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
p=(const char *) NULL;
@@ -327,7 +327,7 @@ MagickExport const char *GetImageArtifact(const Image *image,
MagickExport char *GetNextImageArtifact(const Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->artifacts == (void *) NULL)
@@ -369,7 +369,7 @@ MagickExport char *RemoveImageArtifact(Image *image,const char *artifact)
*value;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->artifacts == (void *) NULL)
@@ -409,7 +409,7 @@ MagickExport char *RemoveImageArtifact(Image *image,const char *artifact)
MagickExport void ResetImageArtifactIterator(const Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->artifacts == (void *) NULL)
@@ -452,7 +452,7 @@ MagickExport MagickBooleanType SetImageArtifact(Image *image,
status;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
/*
diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index 8ae173546..fcb64f75f 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -145,7 +145,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
bounds.width=0;
@@ -294,7 +294,7 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception)
Compute image depth.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
@@ -592,7 +592,7 @@ MagickExport size_t GetImageQuantumDepth(const Image *image,
MagickExport ImageType GetImageType(const Image *image,ExceptionInfo *exception)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->colorspace == CMYKColorspace)
@@ -646,7 +646,7 @@ MagickExport ImageType GetImageType(const Image *image,ExceptionInfo *exception)
MagickExport MagickBooleanType IsImageGray(const Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if ((image->type == BilevelType) || (image->type == GrayscaleType) ||
(image->type == GrayscaleAlphaType))
return(MagickTrue);
@@ -678,7 +678,7 @@ MagickExport MagickBooleanType IsImageGray(const Image *image)
MagickExport MagickBooleanType IsImageMonochrome(const Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->type == BilevelType)
return(MagickTrue);
return(MagickFalse);
@@ -731,7 +731,7 @@ MagickExport MagickBooleanType IsImageOpaque(const Image *image,
Determine if image is opaque.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->alpha_trait == UndefinedPixelTrait)
@@ -802,7 +802,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image,
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (depth >= MAGICKCORE_QUANTUM_DEPTH)
{
image->depth=depth;
@@ -1024,7 +1024,7 @@ MagickExport MagickBooleanType SetImageGray(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (IsImageGray(image))
@@ -1112,7 +1112,7 @@ MagickExport MagickBooleanType SetImageMonochrome(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->type == BilevelType)
@@ -1199,7 +1199,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
status=MagickTrue;
image_info=AcquireImageInfo();
image_info->dither=image->dither;
diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index cfdeec9bb..99936ac70 100644
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -330,7 +330,7 @@ MagickExport Image *BlobToImage(const ImageInfo *image_info,const void *blob,
status;
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -499,7 +499,7 @@ MagickExport MagickBooleanType CloseBlob(Image *image)
Close image file.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->blob != (BlobInfo *) NULL);
@@ -628,11 +628,11 @@ MagickExport void DestroyBlob(Image *image)
destroy;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->blob != (BlobInfo *) NULL);
- assert(image->blob->signature == MagickSignature);
+ assert(image->blob->signature == MagickCoreSignature);
destroy=MagickFalse;
LockSemaphoreInfo(image->blob->semaphore);
image->blob->reference_count--;
@@ -650,7 +650,7 @@ MagickExport void DestroyBlob(Image *image)
}
if (image->blob->semaphore != (SemaphoreInfo *) NULL)
RelinquishSemaphoreInfo(&image->blob->semaphore);
- image->blob->signature=(~MagickSignature);
+ image->blob->signature=(~MagickCoreSignature);
image->blob=(BlobInfo *) RelinquishMagickMemory(image->blob);
}
@@ -737,11 +737,11 @@ MagickPrivate void DisassociateBlob(Image *image)
clone;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->blob != (BlobInfo *) NULL);
- assert(image->blob->signature == MagickSignature);
+ assert(image->blob->signature == MagickCoreSignature);
clone=MagickFalse;
LockSemaphoreInfo(image->blob->semaphore);
assert(image->blob->reference_count >= 0);
@@ -796,7 +796,7 @@ MagickExport MagickBooleanType DiscardBlobBytes(Image *image,
buffer[16384];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (length != (MagickSizeType) ((MagickOffsetType) length))
return(MagickFalse);
count=0;
@@ -841,11 +841,11 @@ MagickExport MagickBooleanType DiscardBlobBytes(Image *image,
MagickExport void DuplicateBlob(Image *image,const Image *duplicate)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(duplicate != (Image *) NULL);
- assert(duplicate->signature == MagickSignature);
+ assert(duplicate->signature == MagickCoreSignature);
DestroyBlob(image);
image->blob=ReferenceBlob(duplicate->blob);
}
@@ -876,7 +876,7 @@ MagickExport void DuplicateBlob(Image *image,const Image *duplicate)
MagickExport int EOFBlob(const Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(image->blob != (BlobInfo *) NULL);
@@ -1172,7 +1172,7 @@ MagickExport MagickBooleanType FileToImage(Image *image,const char *filename,
*blob;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(filename != (const char *) NULL);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename);
file=fileno(stdin);
@@ -1245,7 +1245,7 @@ MagickExport MagickBooleanType FileToImage(Image *image,const char *filename,
MagickPrivate MagickBooleanType GetBlobError(const Image *image)
{
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
return(image->blob->status);
@@ -1276,7 +1276,7 @@ MagickPrivate MagickBooleanType GetBlobError(const Image *image)
MagickExport FILE *GetBlobFileHandle(const Image *image)
{
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
return(image->blob->file_info.file);
}
@@ -1313,7 +1313,7 @@ MagickPrivate void GetBlobInfo(BlobInfo *blob_info)
blob_info->debug=IsEventLogging();
blob_info->reference_count=1;
blob_info->semaphore=AcquireSemaphoreInfo();
- blob_info->signature=MagickSignature;
+ blob_info->signature=MagickCoreSignature;
}
/*
@@ -1341,7 +1341,7 @@ MagickPrivate void GetBlobInfo(BlobInfo *blob_info)
MagickPrivate const struct stat *GetBlobProperties(const Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
return(&image->blob->properties);
@@ -1376,7 +1376,7 @@ MagickExport MagickSizeType GetBlobSize(const Image *image)
extent;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->blob != (BlobInfo *) NULL);
@@ -1451,7 +1451,7 @@ MagickExport MagickSizeType GetBlobSize(const Image *image)
MagickExport void *GetBlobStreamData(const Image *image)
{
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
return(image->blob->data);
}
@@ -1480,7 +1480,7 @@ MagickExport void *GetBlobStreamData(const Image *image)
MagickPrivate StreamHandler GetBlobStreamHandler(const Image *image)
{
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
return(image->blob->stream);
@@ -1535,12 +1535,12 @@ MagickExport void *ImageToBlob(const ImageInfo *image_info,
*blob;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
*length=0;
blob=(unsigned char *) NULL;
@@ -1675,7 +1675,7 @@ MagickExport MagickBooleanType ImageToFile(Image *image,char *filename,
*buffer;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->blob != (BlobInfo *) NULL);
assert(image->blob->type != UndefinedStream);
if (image->debug != MagickFalse)
@@ -1787,12 +1787,12 @@ MagickExport void *ImagesToBlob(const ImageInfo *image_info,Image *images,
*blob;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
*length=0;
blob=(unsigned char *) NULL;
@@ -1951,13 +1951,13 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info,
Write inject image to a temporary file.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(inject_image != (Image *) NULL);
- assert(inject_image->signature == MagickSignature);
+ assert(inject_image->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
unique_file=(FILE *) NULL;
file=AcquireUniqueFileResource(filename);
@@ -2059,7 +2059,7 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info,
MagickPrivate MagickBooleanType IsBlobExempt(const Image *image)
{
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
return(image->blob->exempt);
@@ -2093,7 +2093,7 @@ MagickPrivate MagickBooleanType IsBlobSeekable(const Image *image)
seekable;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
switch (image->blob->type)
@@ -2139,7 +2139,7 @@ MagickPrivate MagickBooleanType IsBlobSeekable(const Image *image)
MagickPrivate MagickBooleanType IsBlobTemporary(const Image *image)
{
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
return(image->blob->temporary);
@@ -2401,12 +2401,12 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info,
rights;
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image_info->blob != (void *) NULL)
{
if (image_info->stream != (StreamHandler) NULL)
@@ -2749,7 +2749,7 @@ MagickExport Image *PingBlob(const ImageInfo *image_info,const void *blob,
*ping_info;
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -2820,7 +2820,7 @@ MagickExport ssize_t ReadBlob(Image *image,const size_t length,void *data)
count;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->blob != (BlobInfo *) NULL);
assert(image->blob->type != UndefinedStream);
if (length == 0)
@@ -2995,7 +2995,7 @@ MagickExport int ReadBlobByte(Image *image)
buffer[1];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
p=(const unsigned char *) ReadBlobStream(image,1,buffer,&count);
if (count != 1)
return(EOF);
@@ -3118,7 +3118,7 @@ MagickExport unsigned int ReadBlobLong(Image *image)
value;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
*buffer='\0';
p=(const unsigned char *) ReadBlobStream(image,4,buffer,&count);
if (count != 4)
@@ -3176,7 +3176,7 @@ MagickExport MagickSizeType ReadBlobLongLong(Image *image)
buffer[8];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
*buffer='\0';
p=(const unsigned char *) ReadBlobStream(image,8,buffer,&count);
if (count != 8)
@@ -3242,7 +3242,7 @@ MagickExport unsigned short ReadBlobShort(Image *image)
buffer[2];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
*buffer='\0';
p=(const unsigned char *) ReadBlobStream(image,2,buffer,&count);
if (count != 2)
@@ -3296,7 +3296,7 @@ MagickExport unsigned int ReadBlobLSBLong(Image *image)
buffer[4];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
*buffer='\0';
p=(const unsigned char *) ReadBlobStream(image,4,buffer,&count);
if (count != 4)
@@ -3346,7 +3346,7 @@ MagickExport unsigned short ReadBlobLSBShort(Image *image)
buffer[2];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
*buffer='\0';
p=(const unsigned char *) ReadBlobStream(image,2,buffer,&count);
if (count != 2)
@@ -3394,7 +3394,7 @@ MagickExport unsigned int ReadBlobMSBLong(Image *image)
buffer[4];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
*buffer='\0';
p=(const unsigned char *) ReadBlobStream(image,4,buffer,&count);
if (count != 4)
@@ -3444,7 +3444,7 @@ MagickExport MagickSizeType ReadBlobMSBLongLong(Image *image)
buffer[8];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
*buffer='\0';
p=(const unsigned char *) ReadBlobStream(image,8,buffer,&count);
if (count != 8)
@@ -3498,7 +3498,7 @@ MagickExport unsigned short ReadBlobMSBShort(Image *image)
buffer[2];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
*buffer='\0';
p=(const unsigned char *) ReadBlobStream(image,2,buffer,&count);
if (count != 2)
@@ -3547,7 +3547,7 @@ MagickExport const void *ReadBlobStream(Image *image,const size_t length,
void *data,ssize_t *count)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->blob != (BlobInfo *) NULL);
assert(image->blob->type != UndefinedStream);
assert(count != (ssize_t *) NULL);
@@ -3612,7 +3612,7 @@ MagickExport char *ReadBlobString(Image *image,char *string)
buffer[1];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
for (i=0; i < (MagickPathExtent-1L); i++)
{
p=(const unsigned char *) ReadBlobStream(image,1,buffer,&count);
@@ -3658,7 +3658,7 @@ MagickExport char *ReadBlobString(Image *image,char *string)
MagickExport BlobInfo *ReferenceBlob(BlobInfo *blob)
{
assert(blob != (BlobInfo *) NULL);
- assert(blob->signature == MagickSignature);
+ assert(blob->signature == MagickCoreSignature);
if (blob->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
LockSemaphoreInfo(blob->semaphore);
@@ -3704,7 +3704,7 @@ MagickExport MagickOffsetType SeekBlob(Image *image,
const MagickOffsetType offset,const int whence)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->blob != (BlobInfo *) NULL);
@@ -3823,7 +3823,7 @@ MagickExport MagickOffsetType SeekBlob(Image *image,
MagickPrivate void SetBlobExempt(Image *image,const MagickBooleanType exempt)
{
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
image->blob->exempt=exempt;
@@ -3859,7 +3859,7 @@ MagickPrivate MagickBooleanType SetBlobExtent(Image *image,
const MagickSizeType extent)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->blob != (BlobInfo *) NULL);
@@ -4005,7 +4005,7 @@ static int SyncBlob(Image *image)
status;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->blob != (BlobInfo *) NULL);
@@ -4072,7 +4072,7 @@ MagickExport MagickOffsetType TellBlob(const Image *image)
offset;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->blob != (BlobInfo *) NULL);
@@ -4191,7 +4191,7 @@ MagickExport ssize_t WriteBlob(Image *image,const size_t length,
count;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(data != (const void *) NULL);
assert(image->blob != (BlobInfo *) NULL);
assert(image->blob->type != UndefinedStream);
@@ -4366,7 +4366,7 @@ MagickExport ssize_t WriteBlob(Image *image,const size_t length,
MagickExport ssize_t WriteBlobByte(Image *image,const unsigned char value)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
return(WriteBlobStream(image,1,&value));
}
@@ -4442,7 +4442,7 @@ MagickExport ssize_t WriteBlobLong(Image *image,const unsigned int value)
buffer[4];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->endian == LSBEndian)
{
buffer[0]=(unsigned char) value;
@@ -4489,7 +4489,7 @@ MagickExport ssize_t WriteBlobShort(Image *image,const unsigned short value)
buffer[2];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->endian == LSBEndian)
{
buffer[0]=(unsigned char) value;
@@ -4532,7 +4532,7 @@ MagickExport ssize_t WriteBlobLSBLong(Image *image,const unsigned int value)
buffer[4];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
buffer[0]=(unsigned char) value;
buffer[1]=(unsigned char) (value >> 8);
buffer[2]=(unsigned char) (value >> 16);
@@ -4571,7 +4571,7 @@ MagickExport ssize_t WriteBlobLSBShort(Image *image,const unsigned short value)
buffer[2];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
buffer[0]=(unsigned char) value;
buffer[1]=(unsigned char) (value >> 8);
return(WriteBlobStream(image,2,buffer));
@@ -4608,7 +4608,7 @@ MagickExport ssize_t WriteBlobMSBLong(Image *image,const unsigned int value)
buffer[4];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
buffer[0]=(unsigned char) (value >> 24);
buffer[1]=(unsigned char) (value >> 16);
buffer[2]=(unsigned char) (value >> 8);
@@ -4648,7 +4648,7 @@ MagickExport ssize_t WriteBlobMSBLongLong(Image *image,
buffer[8];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
buffer[0]=(unsigned char) (value >> 56);
buffer[1]=(unsigned char) (value >> 48);
buffer[2]=(unsigned char) (value >> 40);
@@ -4691,7 +4691,7 @@ MagickExport ssize_t WriteBlobMSBShort(Image *image,const unsigned short value)
buffer[2];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
buffer[0]=(unsigned char) (value >> 8);
buffer[1]=(unsigned char) value;
return(WriteBlobStream(image,2,buffer));
@@ -4725,7 +4725,7 @@ MagickExport ssize_t WriteBlobMSBShort(Image *image,const unsigned short value)
MagickExport ssize_t WriteBlobString(Image *image,const char *string)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(string != (const char *) NULL);
return(WriteBlobStream(image,strlen(string),(const unsigned char *) string));
}
diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c
index 3fda69051..7453aee9b 100644
--- a/MagickCore/cache-view.c
+++ b/MagickCore/cache-view.c
@@ -154,7 +154,7 @@ MagickExport CacheView *AcquireVirtualCacheView(const Image *image,
*restrict cache_view;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
(void) exception;
@@ -172,7 +172,7 @@ MagickExport CacheView *AcquireVirtualCacheView(const Image *image,
cache_view->nexus_info=AcquirePixelCacheNexus(cache_view->number_threads);
cache_view->virtual_pixel_method=GetImageVirtualPixelMethod(image);
cache_view->debug=IsEventLogging();
- cache_view->signature=MagickSignature;
+ cache_view->signature=MagickCoreSignature;
if (cache_view->nexus_info == (NexusInfo **) NULL)
ThrowFatalException(CacheFatalError,"UnableToAcquireCacheView");
return(cache_view);
@@ -206,7 +206,7 @@ MagickExport CacheView *CloneCacheView(const CacheView *cache_view)
*restrict clone_view;
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
if (cache_view->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_view->image->filename);
@@ -220,7 +220,7 @@ MagickExport CacheView *CloneCacheView(const CacheView *cache_view)
clone_view->nexus_info=AcquirePixelCacheNexus(cache_view->number_threads);
clone_view->virtual_pixel_method=cache_view->virtual_pixel_method;
clone_view->debug=cache_view->debug;
- clone_view->signature=MagickSignature;
+ clone_view->signature=MagickCoreSignature;
return(clone_view);
}
@@ -250,7 +250,7 @@ MagickExport CacheView *CloneCacheView(const CacheView *cache_view)
MagickExport CacheView *DestroyCacheView(CacheView *cache_view)
{
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
if (cache_view->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_view->image->filename);
@@ -258,7 +258,7 @@ MagickExport CacheView *DestroyCacheView(CacheView *cache_view)
cache_view->nexus_info=DestroyPixelCacheNexus(cache_view->nexus_info,
cache_view->number_threads);
cache_view->image=DestroyImage(cache_view->image);
- cache_view->signature=(~MagickSignature);
+ cache_view->signature=(~MagickCoreSignature);
cache_view=(CacheView *) RelinquishAlignedMemory(cache_view);
return(cache_view);
}
@@ -305,7 +305,7 @@ MagickExport Quantum *GetCacheViewAuthenticPixels(CacheView *cache_view,
*restrict pixels;
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
assert(id < (int) cache_view->number_threads);
pixels=GetAuthenticPixelCacheNexus(cache_view->image,x,y,columns,rows,
cache_view->nexus_info[id],exception);
@@ -343,7 +343,7 @@ MagickExport void *GetCacheViewAuthenticMetacontent(CacheView *cache_view)
id = GetOpenMPThreadId();
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
assert(cache_view->image->cache != (Cache) NULL);
assert(id < (int) cache_view->number_threads);
return(cache_view->nexus_info[id]->metacontent);
@@ -380,7 +380,7 @@ MagickExport Quantum *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
id = GetOpenMPThreadId();
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
assert(cache_view->image->cache != (Cache) NULL);
assert(id < (int) cache_view->number_threads);
return(cache_view->nexus_info[id]->pixels);
@@ -412,7 +412,7 @@ MagickExport Quantum *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
MagickExport ColorspaceType GetCacheViewColorspace(const CacheView *cache_view)
{
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
if (cache_view->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_view->image->filename);
@@ -452,7 +452,7 @@ MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
extent;
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
if (cache_view->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_view->image->filename);
@@ -488,7 +488,7 @@ MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
MagickExport const Image *GetCacheViewImage(const CacheView *cache_view)
{
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
if (cache_view->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_view->image->filename);
@@ -521,7 +521,7 @@ MagickExport const Image *GetCacheViewImage(const CacheView *cache_view)
MagickExport ClassType GetCacheViewStorageClass(const CacheView *cache_view)
{
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
if (cache_view->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_view->image->filename);
@@ -563,7 +563,7 @@ MagickExport const void *GetCacheViewVirtualMetacontent(
*restrict metacontent;
assert(cache_view != (const CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
assert(cache_view->image->cache != (Cache) NULL);
assert(id < (int) cache_view->number_threads);
metacontent=GetVirtualMetacontentFromNexus(cache_view->image->cache,
@@ -606,7 +606,7 @@ MagickExport const Quantum *GetCacheViewVirtualPixelQueue(
*restrict pixels;
assert(cache_view != (const CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
assert(cache_view->image->cache != (Cache) NULL);
assert(id < (int) cache_view->number_threads);
pixels=GetVirtualPixelsNexus(cache_view->image->cache,
@@ -657,7 +657,7 @@ MagickExport const Quantum *GetCacheViewVirtualPixels(
*restrict pixels;
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
assert(id < (int) cache_view->number_threads);
pixels=GetVirtualPixelsFromNexus(cache_view->image,
cache_view->virtual_pixel_method,x,y,columns,rows,
@@ -710,7 +710,7 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel(
i;
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
assert(id < (int) cache_view->number_threads);
(void) memset(pixel,0,MaxPixelChannels*sizeof(*pixel));
q=GetAuthenticPixelCacheNexus(cache_view->image,x,y,1,1,
@@ -782,7 +782,7 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixel(
i;
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
assert(id < (int) cache_view->number_threads);
(void) memset(pixel,0,MaxPixelChannels*sizeof(*pixel));
p=GetVirtualPixelsFromNexus(cache_view->image,
@@ -852,7 +852,7 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixelInfo(
*restrict p;
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
assert(id < (int) cache_view->number_threads);
GetPixelInfo(cache_view->image,pixel);
p=GetVirtualPixelsFromNexus(cache_view->image,
@@ -914,7 +914,7 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualMethodPixel(
i;
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
assert(id < (int) cache_view->number_threads);
(void) memset(pixel,0,MaxPixelChannels*sizeof(*pixel));
p=GetVirtualPixelsFromNexus(cache_view->image,virtual_pixel_method,x,y,1,1,
@@ -983,7 +983,7 @@ MagickExport Quantum *QueueCacheViewAuthenticPixels(CacheView *cache_view,
*restrict pixels;
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
assert(id < (int) cache_view->number_threads);
pixels=QueueAuthenticPixelCacheNexus(cache_view->image,x,y,columns,rows,
MagickFalse,cache_view->nexus_info[id],exception);
@@ -1022,7 +1022,7 @@ MagickExport MagickBooleanType SetCacheViewStorageClass(CacheView *cache_view,
const ClassType storage_class,ExceptionInfo *exception)
{
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
if (cache_view->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_view->image->filename);
@@ -1059,7 +1059,7 @@ MagickExport MagickBooleanType SetCacheViewVirtualPixelMethod(
CacheView *restrict cache_view,const VirtualPixelMethod virtual_pixel_method)
{
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
if (cache_view->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_view->image->filename);
@@ -1104,7 +1104,7 @@ MagickExport MagickBooleanType SyncCacheViewAuthenticPixels(
status;
assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
+ assert(cache_view->signature == MagickCoreSignature);
assert(id < (int) cache_view->number_threads);
status=SyncAuthenticPixelCacheNexus(cache_view->image,
cache_view->nexus_info[id],exception);
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 4a3233be8..aacbf8b9e 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -208,7 +208,7 @@ MagickPrivate Cache AcquirePixelCache(const size_t number_threads)
cache_info->reference_count=1;
cache_info->file_semaphore=AcquireSemaphoreInfo();
cache_info->debug=IsEventLogging();
- cache_info->signature=MagickSignature;
+ cache_info->signature=MagickCoreSignature;
return((Cache ) cache_info);
}
@@ -254,7 +254,7 @@ MagickPrivate NexusInfo **AcquirePixelCacheNexus(const size_t number_threads)
for (i=0; i < (ssize_t) number_threads; i++)
{
nexus_info[i]=(&nexus_info[0][i]);
- nexus_info[i]->signature=MagickSignature;
+ nexus_info[i]->signature=MagickCoreSignature;
}
return(nexus_info);
}
@@ -294,12 +294,12 @@ MagickPrivate const void *AcquirePixelCachePixels(const Image *image,
*restrict cache_info;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
*length=0;
if ((cache_info->type != MemoryCache) && (cache_info->type != MapCache))
return((const void *) NULL);
@@ -392,7 +392,7 @@ MagickPrivate Cache ClonePixelCache(const Cache cache)
assert(cache != NULL);
cache_info=(const CacheInfo *) cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_info->filename);
@@ -436,13 +436,13 @@ MagickPrivate void ClonePixelCacheMethods(Cache clone,const Cache cache)
assert(clone != (Cache) NULL);
source_info=(CacheInfo *) clone;
- assert(source_info->signature == MagickSignature);
+ assert(source_info->signature == MagickCoreSignature);
if (source_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
source_info->filename);
assert(cache != (Cache) NULL);
cache_info=(CacheInfo *) cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
source_info->methods=cache_info->methods;
}
@@ -766,7 +766,7 @@ static MagickBooleanType ClonePixelCacheRepository(
static void DestroyImagePixelCache(Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->cache == (void *) NULL)
@@ -802,12 +802,12 @@ MagickExport void DestroyImagePixels(Image *image)
*restrict cache_info;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->methods.destroy_pixel_handler != (DestroyPixelHandler) NULL)
{
cache_info->methods.destroy_pixel_handler(image);
@@ -912,7 +912,7 @@ MagickPrivate Cache DestroyPixelCache(Cache cache)
assert(cache != (Cache) NULL);
cache_info=(CacheInfo *) cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_info->filename);
@@ -946,7 +946,7 @@ MagickPrivate Cache DestroyPixelCache(Cache cache)
RelinquishSemaphoreInfo(&cache_info->file_semaphore);
if (cache_info->semaphore != (SemaphoreInfo *) NULL)
RelinquishSemaphoreInfo(&cache_info->semaphore);
- cache_info->signature=(~MagickSignature);
+ cache_info->signature=(~MagickCoreSignature);
cache_info=(CacheInfo *) RelinquishMagickMemory(cache_info);
cache=(Cache) NULL;
return(cache);
@@ -1002,7 +1002,7 @@ MagickPrivate NexusInfo **DestroyPixelCacheNexus(NexusInfo **nexus_info,
{
if (nexus_info[i]->cache != (Quantum *) NULL)
RelinquishCacheNexusPixels(nexus_info[i]);
- nexus_info[i]->signature=(~MagickSignature);
+ nexus_info[i]->signature=(~MagickCoreSignature);
}
nexus_info[0]=(NexusInfo *) RelinquishMagickMemory(nexus_info[0]);
nexus_info=(NexusInfo **) RelinquishAlignedMemory(nexus_info);
@@ -1042,10 +1042,10 @@ MagickExport void *GetAuthenticMetacontent(const Image *image)
id = GetOpenMPThreadId();
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->methods.get_authentic_metacontent_from_handler !=
(GetAuthenticMetacontentFromHandler) NULL)
{
@@ -1093,10 +1093,10 @@ static void *GetAuthenticMetacontentFromCache(const Image *image)
id = GetOpenMPThreadId();
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
assert(id < (int) cache_info->number_threads);
return(cache_info->nexus_info[id]->metacontent);
}
@@ -1150,13 +1150,13 @@ MagickPrivate Quantum *GetAuthenticPixelCacheNexus(Image *image,const ssize_t x,
Transfer pixels from the cache.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
pixels=QueueAuthenticPixelCacheNexus(image,x,y,columns,rows,MagickTrue,
nexus_info,exception);
if (pixels == (Quantum *) NULL)
return((Quantum *) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (nexus_info->authentic_pixel_cache != MagickFalse)
return(pixels);
if (ReadPixelCachePixels(cache_info,nexus_info,exception) == MagickFalse)
@@ -1199,10 +1199,10 @@ static Quantum *GetAuthenticPixelsFromCache(const Image *image)
id = GetOpenMPThreadId();
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
assert(id < (int) cache_info->number_threads);
return(cache_info->nexus_info[id]->pixels);
}
@@ -1240,10 +1240,10 @@ MagickExport Quantum *GetAuthenticPixelQueue(const Image *image)
id = GetOpenMPThreadId();
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->methods.get_authentic_pixels_from_handler !=
(GetAuthenticPixelsFromHandler) NULL)
return(cache_info->methods.get_authentic_pixels_from_handler(image));
@@ -1309,10 +1309,10 @@ MagickExport Quantum *GetAuthenticPixels(Image *image,const ssize_t x,
*pixels;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->methods.get_authentic_pixels_handler !=
(GetAuthenticPixelsHandler) NULL)
{
@@ -1371,12 +1371,12 @@ static Quantum *GetAuthenticPixelsCache(Image *image,const ssize_t x,
*restrict pixels;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
if (cache_info == (Cache) NULL)
return((Quantum *) NULL);
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
assert(id < (int) cache_info->number_threads);
pixels=GetAuthenticPixelCacheNexus(image,x,y,columns,rows,
cache_info->nexus_info[id],exception);
@@ -1415,12 +1415,12 @@ MagickExport MagickSizeType GetImageExtent(const Image *image)
id = GetOpenMPThreadId();
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
assert(id < (int) cache_info->number_threads);
return(GetPixelCacheNexusExtent(cache_info,cache_info->nexus_info[id]));
}
@@ -1617,10 +1617,10 @@ MagickExport CacheType GetImagePixelCacheType(const Image *image)
*restrict cache_info;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
return(cache_info->type);
}
@@ -1688,10 +1688,10 @@ MagickExport MagickBooleanType GetOneAuthenticPixel(Image *image,
*restrict q;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
(void) memset(pixel,0,MaxPixelChannels*sizeof(*pixel));
if (cache_info->methods.get_one_authentic_pixel_from_handler !=
(GetOneAuthenticPixelFromHandler) NULL)
@@ -1745,10 +1745,10 @@ static MagickBooleanType GetOneAuthenticPixelFromCache(Image *image,
*restrict q;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
assert(id < (int) cache_info->number_threads);
(void) memset(pixel,0,MaxPixelChannels*sizeof(*pixel));
q=GetAuthenticPixelCacheNexus(image,x,y,1UL,1UL,cache_info->nexus_info[id],
@@ -1800,10 +1800,10 @@ MagickExport MagickBooleanType GetOneVirtualPixel(const Image *image,
*p;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
(void) memset(pixel,0,MaxPixelChannels*sizeof(*pixel));
if (cache_info->methods.get_one_virtual_pixel_from_handler !=
(GetOneVirtualPixelFromHandler) NULL)
@@ -1863,10 +1863,10 @@ static MagickBooleanType GetOneVirtualPixelFromCache(const Image *image,
*p;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
assert(id < (int) cache_info->number_threads);
(void) memset(pixel,0,MaxPixelChannels*sizeof(*pixel));
p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,1UL,1UL,
@@ -1922,10 +1922,10 @@ MagickExport MagickBooleanType GetOneVirtualPixelInfo(const Image *image,
*restrict p;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
assert(id < (int) cache_info->number_threads);
GetPixelInfo(image,pixel);
p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,1UL,1UL,
@@ -1965,7 +1965,7 @@ MagickPrivate ColorspaceType GetPixelCacheColorspace(const Cache cache)
assert(cache != (Cache) NULL);
cache_info=(CacheInfo *) cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_info->filename);
@@ -2050,7 +2050,7 @@ MagickPrivate MagickSizeType GetPixelCacheNexusExtent(const Cache cache,
assert(cache != NULL);
cache_info=(CacheInfo *) cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
extent=(MagickSizeType) nexus_info->region.width*nexus_info->region.height;
if (extent == 0)
return((MagickSizeType) cache_info->columns*cache_info->rows);
@@ -2091,13 +2091,13 @@ MagickPrivate void *GetPixelCachePixels(Image *image,MagickSizeType *length,
*restrict cache_info;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
assert(length != (MagickSizeType *) NULL);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
*length=0;
if ((cache_info->type != MemoryCache) && (cache_info->type != MapCache))
return((void *) NULL);
@@ -2136,7 +2136,7 @@ MagickPrivate ClassType GetPixelCacheStorageClass(const Cache cache)
assert(cache != (Cache) NULL);
cache_info=(CacheInfo *) cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_info->filename);
@@ -2177,11 +2177,11 @@ MagickPrivate void GetPixelCacheTileSize(const Image *image,size_t *width,
*restrict cache_info;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
*width=2048UL/(cache_info->number_channels*sizeof(Quantum));
if (GetImagePixelCacheType(image) == DiskCache)
*width=8192UL/(cache_info->number_channels*sizeof(Quantum));
@@ -2218,10 +2218,10 @@ MagickPrivate VirtualPixelMethod GetPixelCacheVirtualMethod(const Image *image)
*restrict cache_info;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
return(cache_info->virtual_pixel_method);
}
@@ -2260,10 +2260,10 @@ static const void *GetVirtualMetacontentFromCache(const Image *image)
*restrict metacontent;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
assert(id < (int) cache_info->number_threads);
metacontent=GetVirtualMetacontentFromNexus(cache_info,
cache_info->nexus_info[id]);
@@ -2304,7 +2304,7 @@ MagickPrivate const void *GetVirtualMetacontentFromNexus(const Cache cache,
assert(cache != (Cache) NULL);
cache_info=(CacheInfo *) cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->storage_class == UndefinedClass)
return((void *) NULL);
return(nexus_info->metacontent);
@@ -2346,10 +2346,10 @@ MagickExport const void *GetVirtualMetacontent(const Image *image)
*restrict metacontent;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
metacontent=cache_info->methods.get_virtual_metacontent_from_handler(image);
if (metacontent != (void *) NULL)
return(metacontent);
@@ -2534,10 +2534,10 @@ MagickPrivate const Quantum *GetVirtualPixelsFromNexus(const Image *image,
Acquire pixels.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->type == UndefinedCache)
return((const Quantum *) NULL);
region.x=x;
@@ -2925,10 +2925,10 @@ static const Quantum *GetVirtualPixelCache(const Image *image,
*restrict p;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
assert(id < (int) cache_info->number_threads);
p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,columns,rows,
cache_info->nexus_info[id],exception);
@@ -2967,10 +2967,10 @@ MagickExport const Quantum *GetVirtualPixelQueue(const Image *image)
id = GetOpenMPThreadId();
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->methods.get_virtual_pixels_handler !=
(GetVirtualPixelsHandler) NULL)
return(cache_info->methods.get_virtual_pixels_handler(image));
@@ -3040,10 +3040,10 @@ MagickExport const Quantum *GetVirtualPixels(const Image *image,
*restrict p;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->methods.get_virtual_pixel_handler !=
(GetVirtualPixelHandler) NULL)
return(cache_info->methods.get_virtual_pixel_handler(image,
@@ -3086,10 +3086,10 @@ static const Quantum *GetVirtualPixelsCache(const Image *image)
id = GetOpenMPThreadId();
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
assert(id < (int) cache_info->number_threads);
return(GetVirtualPixelsNexus(image->cache,cache_info->nexus_info[id]));
}
@@ -3128,7 +3128,7 @@ MagickPrivate const Quantum *GetVirtualPixelsNexus(const Cache cache,
assert(cache != (Cache) NULL);
cache_info=(CacheInfo *) cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->storage_class == UndefinedClass)
return((Quantum *) NULL);
return((const Quantum *) nexus_info->pixels);
@@ -3344,14 +3344,14 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
packet_size;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((image->columns == 0) || (image->rows == 0))
ThrowBinaryException(CacheError,"NoPixelsDefinedInCache",image->filename);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if ((AcquireMagickResource(WidthResource,image->columns) == MagickFalse) ||
(AcquireMagickResource(HeightResource,image->rows) == MagickFalse))
ThrowBinaryException(ResourceLimitError,"PixelCacheAllocationFailed",
@@ -3661,7 +3661,7 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image,
page_size;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->cache != (void *) NULL);
@@ -3669,7 +3669,7 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image,
assert(offset != (MagickOffsetType *) NULL);
page_size=GetMagickPageSize();
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (attach != MagickFalse)
{
/*
@@ -3799,12 +3799,12 @@ MagickPrivate Quantum *QueueAuthenticPixelCacheNexus(Image *image,
Validate pixel cache geometry.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) GetImagePixelCache(image,clone,exception);
if (cache_info == (Cache) NULL)
return((Quantum *) NULL);
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if ((cache_info->columns == 0) || (cache_info->rows == 0) || (x < 0) ||
(y < 0) || (x >= (ssize_t) cache_info->columns) ||
(y >= (ssize_t) cache_info->rows))
@@ -3879,10 +3879,10 @@ static Quantum *QueueAuthenticPixelsCache(Image *image,const ssize_t x,
*restrict pixels;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
assert(id < (int) cache_info->number_threads);
pixels=QueueAuthenticPixelCacheNexus(image,x,y,columns,rows,MagickFalse,
cache_info->nexus_info[id],exception);
@@ -3959,10 +3959,10 @@ MagickExport Quantum *QueueAuthenticPixels(Image *image,const ssize_t x,
*restrict pixels;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->methods.queue_authentic_pixels_handler !=
(QueueAuthenticPixelsHandler) NULL)
{
@@ -4377,7 +4377,7 @@ MagickPrivate Cache ReferencePixelCache(Cache cache)
assert(cache != (Cache *) NULL);
cache_info=(CacheInfo *) cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
LockSemaphoreInfo(cache_info->semaphore);
cache_info->reference_count++;
UnlockSemaphoreInfo(cache_info->semaphore);
@@ -4425,7 +4425,7 @@ MagickPrivate void SetPixelCacheMethods(Cache cache,CacheMethods *cache_methods)
assert(cache != (Cache) NULL);
assert(cache_methods != (CacheMethods *) NULL);
cache_info=(CacheInfo *) cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
cache_info->filename);
@@ -4577,7 +4577,7 @@ static Quantum *SetPixelCacheNexusPixels(const CacheInfo *cache_info,
number_pixels;
assert(cache_info != (const CacheInfo *) NULL);
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->type == UndefinedCache)
return((Quantum *) NULL);
nexus_info->region=(*region);
@@ -4702,12 +4702,12 @@ static MagickBooleanType SetCacheAlphaChannel(Image *image,const Quantum alpha,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
image->alpha_trait=BlendPixelTrait;
status=MagickTrue;
image_view=AcquireVirtualCacheView(image,exception); /* must be virtual */
@@ -4752,12 +4752,12 @@ MagickPrivate VirtualPixelMethod SetPixelCacheVirtualMethod(Image *image,
method;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
method=cache_info->virtual_pixel_method;
cache_info->virtual_pixel_method=virtual_pixel_method;
if ((image->columns != 0) && (image->rows != 0))
@@ -4827,11 +4827,11 @@ MagickPrivate MagickBooleanType SyncAuthenticPixelCacheNexus(Image *image,
Transfer pixels to the cache.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->cache == (Cache) NULL)
ThrowBinaryException(CacheError,"PixelCacheIsNotOpen",image->filename);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->type == UndefinedCache)
return(MagickFalse);
if (nexus_info->authentic_pixel_cache != MagickFalse)
@@ -4839,7 +4839,7 @@ MagickPrivate MagickBooleanType SyncAuthenticPixelCacheNexus(Image *image,
image->taint=MagickTrue;
return(MagickTrue);
}
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
status=WritePixelCachePixels(cache_info,nexus_info,exception);
if ((cache_info->metacontent_extent != 0) &&
(WritePixelCacheMetacontent(cache_info,nexus_info,exception) == MagickFalse))
@@ -4889,10 +4889,10 @@ static MagickBooleanType SyncAuthenticPixelsCache(Image *image,
status;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
assert(id < (int) cache_info->number_threads);
status=SyncAuthenticPixelCacheNexus(image,cache_info->nexus_info[id],
exception);
@@ -4939,10 +4939,10 @@ MagickExport MagickBooleanType SyncAuthenticPixels(Image *image,
status;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if (cache_info->methods.sync_authentic_pixels_handler !=
(SyncAuthenticPixelsHandler) NULL)
{
diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index 2194c4e47..34ce618fa 100644
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -228,11 +228,11 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression,
channels;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
source_image=image;
destination_image=CloneImage(source_image,0,0,MagickTrue,exception);
if (destination_image == (Image *) NULL)
@@ -490,11 +490,11 @@ MagickExport Image *CombineImages(const Image *image,
Ensure the image are the same size.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
combine_image=CloneImage(image,0,0,MagickTrue,exception);
if (combine_image == (Image *) NULL)
return((Image *) NULL);
@@ -621,7 +621,7 @@ MagickExport MagickBooleanType GetImageAlphaChannel(const Image *image)
assert(image != (const Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
return(image->alpha_trait != UndefinedPixelTrait ? MagickTrue : MagickFalse);
}
@@ -679,11 +679,11 @@ MagickExport Image *SeparateImage(const Image *image,
Initialize separate image attributes.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
separate_image=CloneImage(image,image->columns,image->rows,MagickTrue,
exception);
if (separate_image == (Image *) NULL)
@@ -810,7 +810,7 @@ MagickExport Image *SeparateImages(const Image *image,ExceptionInfo *exception)
i;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
images=NewImageList();
@@ -940,7 +940,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
status=MagickTrue;
switch (alpha_type)
{
diff --git a/MagickCore/cipher.c b/MagickCore/cipher.c
index e26b4aa2c..22e54751c 100644
--- a/MagickCore/cipher.c
+++ b/MagickCore/cipher.c
@@ -205,7 +205,7 @@ static AESInfo *AcquireAESInfo(void)
(aes_info->decipher_key == (unsigned int *) NULL))
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
aes_info->timestamp=(ssize_t) time(0);
- aes_info->signature=MagickSignature;
+ aes_info->signature=MagickCoreSignature;
return(aes_info);
}
@@ -235,7 +235,7 @@ static AESInfo *DestroyAESInfo(AESInfo *aes_info)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(aes_info != (AESInfo *) NULL);
- assert(aes_info->signature == MagickSignature);
+ assert(aes_info->signature == MagickCoreSignature);
if (aes_info->decipher_key != (unsigned int *) NULL)
aes_info->decipher_key=(unsigned int *) RelinquishMagickMemory(
aes_info->decipher_key);
@@ -244,7 +244,7 @@ static AESInfo *DestroyAESInfo(AESInfo *aes_info)
aes_info->encipher_key);
if (aes_info->key != (StringInfo *) NULL)
aes_info->key=DestroyStringInfo(aes_info->key);
- aes_info->signature=(~MagickSignature);
+ aes_info->signature=(~MagickCoreSignature);
aes_info=(AESInfo *) RelinquishMagickMemory(aes_info);
return(aes_info);
}
@@ -604,11 +604,11 @@ MagickExport MagickBooleanType PasskeyDecipherImage(Image *image,
Generate decipher key and nonce.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (passkey == (const StringInfo *) NULL)
return(MagickTrue);
aes_info=AcquireAESInfo();
@@ -817,11 +817,11 @@ MagickExport MagickBooleanType PasskeyEncipherImage(Image *image,
Generate encipher key and nonce.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (passkey == (const StringInfo *) NULL)
return(MagickTrue);
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
@@ -1011,7 +1011,7 @@ static void SetAESKey(AESInfo *aes_info,const StringInfo *key)
*/
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(aes_info != (AESInfo *) NULL);
- assert(aes_info->signature == MagickSignature);
+ assert(aes_info->signature == MagickCoreSignature);
assert(key != (StringInfo *) NULL);
n=4;
aes_info->rounds=10;
@@ -1107,11 +1107,11 @@ MagickExport MagickBooleanType DecipherImage(Image *image,
const char *passphrase,ExceptionInfo *exception)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
(void) passphrase;
ThrowBinaryException(ImageError,"CipherSupportNotEnabled",image->filename);
}
@@ -1120,11 +1120,11 @@ MagickExport MagickBooleanType PasskeyDecipherImage(Image *image,
const StringInfo *passkey,ExceptionInfo *exception)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
(void) passkey;
ThrowBinaryException(ImageError,"CipherSupportNotEnabled",image->filename);
}
@@ -1163,11 +1163,11 @@ MagickExport MagickBooleanType EncipherImage(Image *image,
const char *passphrase,ExceptionInfo *exception)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
(void) passphrase;
ThrowBinaryException(ImageError,"CipherSupportNotEnabled",image->filename);
}
@@ -1176,11 +1176,11 @@ MagickExport MagickBooleanType PasskeyEncipherImage(Image *image,
const StringInfo *passkey,ExceptionInfo *exception)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
(void) passkey;
ThrowBinaryException(ImageError,"CipherSupportNotEnabled",image->filename);
}
diff --git a/MagickCore/coder.c b/MagickCore/coder.c
index 46a40d109..71274ded0 100644
--- a/MagickCore/coder.c
+++ b/MagickCore/coder.c
@@ -357,7 +357,7 @@ static SplayTreeInfo *AcquireCoderCache(const char *filename,
coder_info->magick=(char *) p->magick;
coder_info->name=(char *) p->name;
coder_info->exempt=MagickTrue;
- coder_info->signature=MagickSignature;
+ coder_info->signature=MagickCoreSignature;
status&=AddValueToSplayTree(coder_cache,ConstantString(coder_info->magick),
coder_info);
if (status == MagickFalse)
@@ -890,7 +890,7 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
(void) ResetMagickMemory(coder_info,0,sizeof(*coder_info));
coder_info->path=ConstantString(filename);
coder_info->exempt=MagickFalse;
- coder_info->signature=MagickSignature;
+ coder_info->signature=MagickCoreSignature;
continue;
}
if (coder_info == (CoderInfo *) NULL)
diff --git a/MagickCore/color.c b/MagickCore/color.c
index a2da78f1f..c0b9bc2f4 100644
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -886,7 +886,7 @@ static LinkedListInfo *AcquireColorCache(const char *filename,
color_info->color.alpha=(double) (QuantumRange*p->alpha);
color_info->compliance=(ComplianceType) p->compliance;
color_info->exempt=MagickTrue;
- color_info->signature=MagickSignature;
+ color_info->signature=MagickCoreSignature;
status&=AppendValueToLinkedList(color_cache,color_info);
if (IfMagickFalse(status))
(void) ThrowMagickException(exception,GetMagickModule(),
@@ -1744,11 +1744,11 @@ MagickExport MagickBooleanType IsEquivalentImage(const Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (IfMagickTrue(image->debug))
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(target_image != (Image *) NULL);
- assert(target_image->signature == MagickSignature);
+ assert(target_image->signature == MagickCoreSignature);
assert(x_offset != (ssize_t *) NULL);
assert(y_offset != (ssize_t *) NULL);
assert(exception != (ExceptionInfo *) NULL);
@@ -2079,7 +2079,7 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
(void) ResetMagickMemory(color_info,0,sizeof(*color_info));
color_info->path=ConstantString(filename);
color_info->exempt=MagickFalse;
- color_info->signature=MagickSignature;
+ color_info->signature=MagickCoreSignature;
continue;
}
if (color_info == (ColorInfo *) NULL)
diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c
index e84eee10c..e6152338d 100644
--- a/MagickCore/colormap.c
+++ b/MagickCore/colormap.c
@@ -111,7 +111,7 @@ MagickExport MagickBooleanType AcquireImageColormap(Image *image,
Allocate image colormap.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
image->colors=MagickMax(colors,2);
@@ -189,7 +189,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->storage_class == DirectClass)
@@ -307,7 +307,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image,
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->storage_class != PseudoClass)
return(MagickTrue);
/*
diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 66938c944..350fbfb1d 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -248,7 +248,7 @@ static MagickBooleanType sRGBTransformImage(Image *image,
*z_map;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(colorspace != sRGBColorspace);
@@ -1154,7 +1154,7 @@ MagickExport MagickBooleanType TransformImageColorspace(Image *image,
status;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->colorspace == colorspace)
@@ -1601,7 +1601,7 @@ static MagickBooleanType TransformsRGBImage(Image *image,
*z_map;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=MagickTrue;
diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 2ceffd8bf..a0ba5dd44 100644
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -169,11 +169,11 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(reconstruct_image != (const Image *) NULL);
- assert(reconstruct_image->signature == MagickSignature);
+ assert(reconstruct_image->signature == MagickCoreSignature);
assert(distortion != (double *) NULL);
*distortion=0.0;
if (image->debug != MagickFalse)
@@ -1270,11 +1270,11 @@ MagickExport MagickBooleanType GetImageDistortion(Image *image,
length;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(reconstruct_image != (const Image *) NULL);
- assert(reconstruct_image->signature == MagickSignature);
+ assert(reconstruct_image->signature == MagickCoreSignature);
assert(distortion != (double *) NULL);
*distortion=0.0;
if (image->debug != MagickFalse)
@@ -1409,11 +1409,11 @@ MagickExport double *GetImageDistortions(Image *image,
length;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(reconstruct_image != (const Image *) NULL);
- assert(reconstruct_image->signature == MagickSignature);
+ assert(reconstruct_image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (metric != PerceptualHashErrorMetric)
@@ -1579,9 +1579,9 @@ MagickExport MagickBooleanType IsImagesEqual(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(reconstruct_image != (const Image *) NULL);
- assert(reconstruct_image->signature == MagickSignature);
+ assert(reconstruct_image->signature == MagickCoreSignature);
if (ValidateImageMorphology(image,reconstruct_image) == MagickFalse)
ThrowBinaryException(ImageError,"ImageMorphologyDiffers",image->filename);
area=0.0;
@@ -1747,11 +1747,11 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference,
y;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
assert(offset != (RectangleInfo *) NULL);
SetGeometry(reference,offset);
*similarity_metric=MagickMaximumValue;
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index c1b86a156..27ac6c66b 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -556,11 +556,11 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(composite!= (Image *) NULL);
- assert(composite->signature == MagickSignature);
+ assert(composite->signature == MagickCoreSignature);
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
source_image=CloneImage(composite,0,0,MagickTrue,exception);
@@ -2397,7 +2397,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture,
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (texture == (const Image *) NULL)
return(MagickFalse);
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
diff --git a/MagickCore/compress.c b/MagickCore/compress.c
index 735c7fa67..ae87e9ce4 100644
--- a/MagickCore/compress.c
+++ b/MagickCore/compress.c
@@ -281,7 +281,7 @@ MagickExport void Ascii85Flush(Image *image)
*tuple;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->ascii85 != (Ascii85Info *) NULL);
@@ -311,7 +311,7 @@ MagickExport void Ascii85Encode(Image *image,const unsigned char code)
n;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image->ascii85 != (Ascii85Info *) NULL);
image->ascii85->buffer[image->ascii85->offset]=code;
image->ascii85->offset++;
@@ -446,7 +446,7 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image,
Allocate buffers.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
mb_hash=(HuffmanTable **) AcquireQuantumMemory(HashSize,sizeof(*mb_hash));
@@ -735,13 +735,13 @@ RestoreMSCWarning \
Allocate scanline buffer.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(inject_image != (Image *) NULL);
- assert(inject_image->signature == MagickSignature);
+ assert(inject_image->signature == MagickCoreSignature);
one=1;
width=inject_image->columns;
if (LocaleCompare(image_info->magick,"FAX") == 0)
@@ -951,12 +951,12 @@ MagickExport MagickBooleanType LZWEncodeImage(Image *image,const size_t length,
Allocate string table.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(pixels != (unsigned char *) NULL);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
table=(TableType *) AcquireQuantumMemory(1UL << 12,sizeof(*table));
if (table == (TableType *) NULL)
return(MagickFalse);
@@ -1087,7 +1087,7 @@ MagickExport MagickBooleanType PackbitsEncodeImage(Image *image,
Compress pixels with Packbits encoding.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(pixels != (unsigned char *) NULL);
@@ -1241,7 +1241,7 @@ MagickExport MagickBooleanType ZLIBEncodeImage(Image *image,const size_t length,
stream;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
compress_packets=(size_t) (1.001*length+12);
@@ -1281,7 +1281,7 @@ MagickExport MagickBooleanType ZLIBEncodeImage(Image *image,
ExceptionInfo *exception)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
(void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError,
diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index 53575539e..99ac01bca 100644
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -204,7 +204,7 @@ static LinkedListInfo *AcquireConfigureCache(const char *filename,
configure_info->name=(char *) p->name;
configure_info->value=(char *) p->value;
configure_info->exempt=MagickTrue;
- configure_info->signature=MagickSignature;
+ configure_info->signature=MagickCoreSignature;
status&=AppendValueToLinkedList(configure_cache,configure_info);
if (status == MagickFalse)
(void) ThrowMagickException(exception,GetMagickModule(),
@@ -963,7 +963,7 @@ MagickExport const char *GetConfigureValue(const ConfigureInfo *configure_info)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(configure_info != (ConfigureInfo *) NULL);
- assert(configure_info->signature == MagickSignature);
+ assert(configure_info->signature == MagickCoreSignature);
return(configure_info->value);
}
@@ -1227,7 +1227,7 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
(void) ResetMagickMemory(configure_info,0,sizeof(*configure_info));
configure_info->path=ConstantString(filename);
configure_info->exempt=MagickFalse;
- configure_info->signature=MagickSignature;
+ configure_info->signature=MagickCoreSignature;
continue;
}
if (configure_info == (ConfigureInfo *) NULL)
diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index 0526f1727..555be54c7 100644
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -146,7 +146,7 @@ MagickExport Image *ConstituteImage(const size_t columns,const size_t rows,
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",map);
assert(pixels != (void *) NULL);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage((ImageInfo *) NULL,exception);
if (image == (Image *) NULL)
return((Image *) NULL);
@@ -214,7 +214,7 @@ MagickExport Image *PingImage(const ImageInfo *image_info,
*ping_info;
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -276,7 +276,7 @@ MagickExport Image *PingImages(ImageInfo *image_info,const char *filename,
Ping image list from a file.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -395,7 +395,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
Determine image type from filename prefix or suffix (e.g. image.jpg).
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image_info->filename != (char *) NULL);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
@@ -797,7 +797,7 @@ MagickExport Image *ReadImages(ImageInfo *image_info,const char *filename,
Read image list from a file.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -985,12 +985,12 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
Determine image type from filename prefix or suffix (e.g. image.jpg).
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
sans_exception=AcquireExceptionInfo();
write_info=CloneImageInfo(image_info);
@@ -1253,9 +1253,9 @@ MagickExport MagickBooleanType WriteImages(const ImageInfo *image_info,
*p;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index 86aba42d6..01b8cb77e 100644
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -112,7 +112,7 @@ MagickExport Image *BorderImage(const Image *image,
frame_info;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(border_info != (RectangleInfo *) NULL);
@@ -207,7 +207,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
Check frame geometry.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(frame_info != (FrameInfo *) NULL);
@@ -681,7 +681,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(raise_info != (RectangleInfo *) NULL);
diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index 33e46f60a..359a6b157 100644
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -542,9 +542,9 @@ MagickExport char *GetDelegateCommand(const ImageInfo *image_info,Image *image,
i;
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
@@ -604,7 +604,7 @@ MagickExport const char *GetDelegateCommands(const DelegateInfo *delegate_info)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(delegate_info != (DelegateInfo *) NULL);
- assert(delegate_info->signature == MagickSignature);
+ assert(delegate_info->signature == MagickCoreSignature);
return(delegate_info->commands);
}
@@ -924,7 +924,7 @@ MagickExport ssize_t GetDelegateMode(const DelegateInfo *delegate_info)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(delegate_info != (DelegateInfo *) NULL);
- assert(delegate_info->signature == MagickSignature);
+ assert(delegate_info->signature == MagickCoreSignature);
return(delegate_info->mode);
}
@@ -958,7 +958,7 @@ MagickExport MagickBooleanType GetDelegateThreadSupport(
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(delegate_info != (DelegateInfo *) NULL);
- assert(delegate_info->signature == MagickSignature);
+ assert(delegate_info->signature == MagickCoreSignature);
return(delegate_info->thread_support);
}
@@ -1128,9 +1128,9 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info,
Get delegate.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
@@ -1593,7 +1593,7 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache,
(void) ResetMagickMemory(delegate_info,0,sizeof(*delegate_info));
delegate_info->path=ConstantString(filename);
delegate_info->thread_support=MagickTrue;
- delegate_info->signature=MagickSignature;
+ delegate_info->signature=MagickCoreSignature;
continue;
}
if (delegate_info == (DelegateInfo *) NULL)
diff --git a/MagickCore/display.c b/MagickCore/display.c
index ea91355e5..a9deae303 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -1674,9 +1674,9 @@ MagickExport MagickBooleanType DisplayImages(const ImageInfo *image_info,
resource_info;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (IfMagickTrue(images->debug) )
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
display=XOpenDisplay(image_info->server_name);
@@ -1754,7 +1754,7 @@ MagickExport MagickBooleanType RemoteDisplayCommand(const ImageInfo *image_info,
status;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(filename != (char *) NULL);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename);
display=XOpenDisplay(image_info->server_name);
@@ -13817,7 +13817,7 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display,
Determine target window.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (IfMagickTrue(image->debug) )
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
resources=(*resource_info);
@@ -14512,7 +14512,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info,
*manager_hints;
assert(image != (Image **) NULL);
- assert((*image)->signature == MagickSignature);
+ assert((*image)->signature == MagickCoreSignature);
if (IfMagickTrue((*image)->debug) )
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*image)->filename);
display_image=(*image);
@@ -16183,9 +16183,9 @@ MagickExport MagickBooleanType DisplayImages(const ImageInfo *image_info,
Image *image,ExceptionInfo *exception)
{
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
(void) image_info;
if (IfMagickTrue(image->debug) )
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
@@ -16228,7 +16228,7 @@ MagickExport MagickBooleanType RemoteDisplayCommand(const ImageInfo *image_info,
const char *window,const char *filename,ExceptionInfo *exception)
{
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(filename != (char *) NULL);
(void) window;
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename);
diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index dbdca0823..0d92b3586 100644
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -293,12 +293,12 @@ MagickExport Image *AffineTransformImage(const Image *image,
/*
Affine transform image.
*/
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(affine_matrix != (AffineMatrix *) NULL);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
distort[0]=affine_matrix->sx;
distort[1]=affine_matrix->rx;
distort[2]=affine_matrix->ry;
@@ -1479,11 +1479,11 @@ MagickExport Image *DistortResizeImage(const Image *image,
Distort resize image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if ((columns == 0) || (rows == 0))
return((Image *) NULL);
/* Do not short-circuit this resize if final image size is unchanged */
@@ -1686,11 +1686,11 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
viewport_given;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
/*
Handle Special Compound Distortions
@@ -2810,11 +2810,11 @@ MagickExport Image *RotateImage(const Image *image,const double degrees,
Adjust rotation angle.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
angle=degrees;
while (angle < -45.0)
angle+=360.0;
@@ -2894,11 +2894,11 @@ MagickExport Image *SparseColorImage(const Image *image,
number_colors;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
/* Determine number of color values needed per control point */
number_colors=0;
diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index adf1507d6..e73c585b1 100644
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -338,7 +338,7 @@ MagickPrivate DistributeCacheInfo *AcquireDistributeCacheInfo(
if (server_info == (DistributeCacheInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
(void) ResetMagickMemory(server_info,0,sizeof(*server_info));
- server_info->signature=MagickSignature;
+ server_info->signature=MagickCoreSignature;
server_info->port=0;
hostname=GetHostname(&server_info->port,exception);
session_key=0;
@@ -384,10 +384,10 @@ MagickPrivate DistributeCacheInfo *DestroyDistributeCacheInfo(
DistributeCacheInfo *server_info)
{
assert(server_info != (DistributeCacheInfo *) NULL);
- assert(server_info->signature == MagickSignature);
+ assert(server_info->signature == MagickCoreSignature);
if (server_info->file > 0)
CLOSE_SOCKET(server_info->file);
- server_info->signature=(~MagickSignature);
+ server_info->signature=(~MagickCoreSignature);
server_info=(DistributeCacheInfo *) RelinquishMagickMemory(server_info);
return(server_info);
}
@@ -920,7 +920,7 @@ MagickExport void DistributePixelCacheServer(const int port,
Launch distributed pixel cache server.
*/
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
NTInitializeWinsock(MagickFalse);
#endif
@@ -1024,7 +1024,7 @@ MagickExport void DistributePixelCacheServer(const int port,
MagickPrivate int GetDistributeCacheFile(const DistributeCacheInfo *server_info)
{
assert(server_info != (DistributeCacheInfo *) NULL);
- assert(server_info->signature == MagickSignature);
+ assert(server_info->signature == MagickCoreSignature);
return(server_info->file);
}
@@ -1056,7 +1056,7 @@ MagickPrivate const char *GetDistributeCacheHostname(
const DistributeCacheInfo *server_info)
{
assert(server_info != (DistributeCacheInfo *) NULL);
- assert(server_info->signature == MagickSignature);
+ assert(server_info->signature == MagickCoreSignature);
return(server_info->hostname);
}
@@ -1086,7 +1086,7 @@ MagickPrivate const char *GetDistributeCacheHostname(
MagickPrivate int GetDistributeCachePort(const DistributeCacheInfo *server_info)
{
assert(server_info != (DistributeCacheInfo *) NULL);
- assert(server_info->signature == MagickSignature);
+ assert(server_info->signature == MagickCoreSignature);
return(server_info->port);
}
@@ -1134,9 +1134,9 @@ MagickPrivate MagickBooleanType OpenDistributePixelCache(
Open distributed pixel cache.
*/
assert(server_info != (DistributeCacheInfo *) NULL);
- assert(server_info->signature == MagickSignature);
+ assert(server_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
p=message;
*p++='o'; /* open */
/*
@@ -1225,7 +1225,7 @@ MagickPrivate MagickOffsetType ReadDistributePixelCacheMetacontent(
Read distributed pixel cache metacontent.
*/
assert(server_info != (DistributeCacheInfo *) NULL);
- assert(server_info->signature == MagickSignature);
+ assert(server_info->signature == MagickCoreSignature);
assert(region != (RectangleInfo *) NULL);
assert(metacontent != (unsigned char *) NULL);
if (length > (MagickSizeType) SSIZE_MAX)
@@ -1300,7 +1300,7 @@ MagickPrivate MagickOffsetType ReadDistributePixelCachePixels(
Read distributed pixel cache pixels.
*/
assert(server_info != (DistributeCacheInfo *) NULL);
- assert(server_info->signature == MagickSignature);
+ assert(server_info->signature == MagickCoreSignature);
assert(region != (RectangleInfo *) NULL);
assert(pixels != (unsigned char *) NULL);
if (length > (MagickSizeType) SSIZE_MAX)
@@ -1368,7 +1368,7 @@ MagickPrivate MagickBooleanType RelinquishDistributePixelCache(
Delete distributed pixel cache.
*/
assert(server_info != (DistributeCacheInfo *) NULL);
- assert(server_info->signature == MagickSignature);
+ assert(server_info->signature == MagickCoreSignature);
p=message;
*p++='d';
(void) memcpy(p,&server_info->session_key,sizeof(server_info->session_key));
@@ -1432,7 +1432,7 @@ MagickPrivate MagickOffsetType WriteDistributePixelCacheMetacontent(
Write distributed pixel cache metacontent.
*/
assert(server_info != (DistributeCacheInfo *) NULL);
- assert(server_info->signature == MagickSignature);
+ assert(server_info->signature == MagickCoreSignature);
assert(region != (RectangleInfo *) NULL);
assert(metacontent != (unsigned char *) NULL);
if (length > (MagickSizeType) SSIZE_MAX)
@@ -1507,7 +1507,7 @@ MagickPrivate MagickOffsetType WriteDistributePixelCachePixels(
Write distributed pixel cache pixels.
*/
assert(server_info != (DistributeCacheInfo *) NULL);
- assert(server_info->signature == MagickSignature);
+ assert(server_info->signature == MagickCoreSignature);
assert(region != (RectangleInfo *) NULL);
assert(pixels != (const unsigned char *) NULL);
if (length > (MagickSizeType) SSIZE_MAX)
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index e6b6de52b..4ce90d899 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -823,7 +823,7 @@ MagickExport DrawInfo *DestroyDrawInfo(DrawInfo *draw_info)
if (draw_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(draw_info != (DrawInfo *) NULL);
- assert(draw_info->signature == MagickSignature);
+ assert(draw_info->signature == MagickCoreSignature);
if (draw_info->primitive != (char *) NULL)
draw_info->primitive=DestroyString(draw_info->primitive);
if (draw_info->text != (char *) NULL)
@@ -855,7 +855,7 @@ MagickExport DrawInfo *DestroyDrawInfo(DrawInfo *draw_info)
draw_info->gradient.stops);
if (draw_info->clip_mask != (char *) NULL)
draw_info->clip_mask=DestroyString(draw_info->clip_mask);
- draw_info->signature=(~MagickSignature);
+ draw_info->signature=(~MagickCoreSignature);
draw_info=(DrawInfo *) RelinquishMagickMemory(draw_info);
return(draw_info);
}
@@ -1106,11 +1106,11 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image,
Determine bounding box.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(source != (const Image *) NULL);
- assert(source->signature == MagickSignature);
+ assert(source->signature == MagickCoreSignature);
assert(affine != (AffineMatrix *) NULL);
extent[0].x=0.0;
extent[0].y=0.0;
@@ -1404,7 +1404,7 @@ MagickExport MagickBooleanType DrawClipPath(Image *image,
status;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(draw_info != (const DrawInfo *) NULL);
@@ -1731,11 +1731,11 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
Ensure the annotation info is valid.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(draw_info != (DrawInfo *) NULL);
- assert(draw_info->signature == MagickSignature);
+ assert(draw_info->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if ((draw_info->primitive == (char *) NULL) ||
@@ -3250,7 +3250,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image,
Draw linear or radial gradient on image.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(draw_info != (const DrawInfo *) NULL);
@@ -3498,7 +3498,7 @@ MagickExport MagickBooleanType DrawPatternPath(Image *image,
status;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(draw_info != (const DrawInfo *) NULL);
@@ -3818,11 +3818,11 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image,
Compute bounding box.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(draw_info != (DrawInfo *) NULL);
- assert(draw_info->signature == MagickSignature);
+ assert(draw_info->signature == MagickCoreSignature);
assert(primitive_info != (PrimitiveInfo *) NULL);
if (primitive_info->coordinates == 0)
return(MagickTrue);
@@ -4857,7 +4857,7 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
draw_info->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
MagickFalse,option);
exception=DestroyExceptionInfo(exception);
- draw_info->signature=MagickSignature;
+ draw_info->signature=MagickCoreSignature;
clone_info=DestroyImageInfo(clone_info);
}
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index c5831fe54..4b0cac041 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -168,11 +168,11 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius,
y;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
blur_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (blur_image == (Image *) NULL)
return((Image *) NULL);
@@ -491,11 +491,11 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius,
y;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
sharp_image=CloneImage(image,0,0,MagickTrue,exception);
if (sharp_image == (Image *) NULL)
return((Image *) NULL);
@@ -784,11 +784,11 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
*blur_image;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
(void) FormatLocaleString(geometry,MagickPathExtent,
"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
kernel_info=AcquireKernelInfo(geometry,exception);
@@ -881,7 +881,7 @@ static void Hull(const Image *image,const ssize_t x_offset,
y;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(f != (Quantum *) NULL);
@@ -999,11 +999,11 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
Allocate despeckled image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
despeckle_image=CloneImage(image,0,0,MagickTrue,exception);
if (despeckle_image == (Image *) NULL)
return((Image *) NULL);
@@ -1186,11 +1186,11 @@ MagickExport Image *EdgeImage(const Image *image,const double radius,
width;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
width=GetOptimalKernelWidth1D(radius,0.5);
kernel_info=AcquireKernelInfo((const char *) NULL,exception);
if (kernel_info == (KernelInfo *) NULL)
@@ -1200,7 +1200,7 @@ MagickExport Image *EdgeImage(const Image *image,const double radius,
kernel_info->height=width;
kernel_info->x=(ssize_t) (kernel_info->width-1)/2;
kernel_info->y=(ssize_t) (kernel_info->height-1)/2;
- kernel_info->signature=MagickSignature;
+ kernel_info->signature=MagickCoreSignature;
kernel_info->values=(MagickRealType *) MagickAssumeAligned(
AcquireAlignedMemory(kernel_info->width,kernel_info->height*
sizeof(*kernel_info->values)));
@@ -1277,11 +1277,11 @@ MagickExport Image *EmbossImage(const Image *image,const double radius,
v;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
width=GetOptimalKernelWidth1D(radius,sigma);
kernel_info=AcquireKernelInfo((const char *) NULL,exception);
if (kernel_info == (KernelInfo *) NULL)
@@ -1374,11 +1374,11 @@ MagickExport Image *GaussianBlurImage(const Image *image,const double radius,
*blur_image;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
(void) FormatLocaleString(geometry,MagickPathExtent,"gaussian:%.20gx%.20g",
radius,sigma);
kernel_info=AcquireKernelInfo(geometry,exception);
@@ -1459,11 +1459,11 @@ MagickExport Image *KuwaharaImage(const Image *image,const double radius,
Initialize Kuwahara image attributes.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
width=(size_t) radius+1;
gaussian_image=BlurImage(image,radius,sigma,exception);
if (gaussian_image == (Image *) NULL)
@@ -1740,7 +1740,7 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
@@ -2001,7 +2001,7 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
Open output image file.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
colors=2;
@@ -2515,11 +2515,11 @@ MagickExport Image *RotationalBlurImage(const Image *image,const double angle,
Allocate blur image.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
blur_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (blur_image == (Image *) NULL)
return((Image *) NULL);
@@ -2783,11 +2783,11 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius,
Initialize blur image attributes.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
width=GetOptimalKernelWidth1D(radius,sigma);
kernel=(MagickRealType *) MagickAssumeAligned(AcquireAlignedMemory((size_t)
width,width*sizeof(*kernel)));
@@ -3104,11 +3104,11 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray,
Initialize shaded image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
linear_image=CloneImage(image,0,0,MagickTrue,exception);
shade_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if ((linear_image == (Image *) NULL) || (shade_image == (Image *) NULL))
@@ -3345,11 +3345,11 @@ MagickExport Image *SharpenImage(const Image *image,const double radius,
v;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
width=GetOptimalKernelWidth2D(radius,sigma);
kernel_info=AcquireKernelInfo((const char *) NULL,exception);
if (kernel_info == (KernelInfo *) NULL)
@@ -3359,7 +3359,7 @@ MagickExport Image *SharpenImage(const Image *image,const double radius,
kernel_info->height=width;
kernel_info->x=(ssize_t) (width-1)/2;
kernel_info->y=(ssize_t) (width-1)/2;
- kernel_info->signature=MagickSignature;
+ kernel_info->signature=MagickCoreSignature;
kernel_info->values=(MagickRealType *) MagickAssumeAligned(
AcquireAlignedMemory(kernel_info->width,kernel_info->height*
sizeof(*kernel_info->values)));
@@ -3460,11 +3460,11 @@ MagickExport Image *SpreadImage(const Image *image,const double radius,
Initialize spread image attributes.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
spread_image=CloneImage(image,image->columns,image->rows,MagickTrue,
exception);
if (spread_image == (Image *) NULL)
@@ -3608,7 +3608,7 @@ MagickExport Image *UnsharpMaskImage(const Image *image,const double radius,
y;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 2f46a445e..37da4093d 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -235,7 +235,7 @@ MagickExport MagickBooleanType BrightnessContrastImage(Image *image,
Compute slope and intercept.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
alpha=contrast;
@@ -319,11 +319,11 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(clut_image != (Image *) NULL);
- assert(clut_image->signature == MagickSignature);
+ assert(clut_image->signature == MagickCoreSignature);
if( IfMagickFalse(SetImageStorageClass(image,DirectClass,exception)) )
return(MagickFalse);
if( IfMagickTrue(IsGrayColorspace(image->colorspace)) &&
@@ -537,7 +537,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image,
Allocate and initialize cdl maps.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (color_correction_collection == (const char *) NULL)
@@ -885,7 +885,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
sign=IfMagickTrue(sharpen) ? 1 : -1;
@@ -1039,7 +1039,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image,
Allocate histogram and stretch map.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (SetImageGray(image,exception) != MagickFalse)
@@ -1345,11 +1345,11 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
Initialize enhanced image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
enhance_image=CloneImage(image,image->columns,image->rows,MagickTrue,
exception);
if (enhance_image == (Image *) NULL)
@@ -1524,7 +1524,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image,
Allocate and initialize histogram arrays.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
equalize_map=(double *) AcquireQuantumMemory(MaxMap+1UL,
@@ -1795,7 +1795,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma,
Allocate and initialize gamma maps.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (gamma == 1.0)
@@ -1961,7 +1961,7 @@ MagickExport MagickBooleanType GrayscaleImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->storage_class == PseudoClass)
@@ -2184,11 +2184,11 @@ MagickExport MagickBooleanType HaldClutImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(hald_image != (Image *) NULL);
- assert(hald_image->signature == MagickSignature);
+ assert(hald_image->signature == MagickCoreSignature);
if( IfMagickFalse(SetImageStorageClass(image,DirectClass,exception)) )
return(MagickFalse);
if (image->alpha_trait == UndefinedPixelTrait)
@@ -2384,7 +2384,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point,
Allocate and initialize levels map.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->storage_class == PseudoClass)
@@ -2542,7 +2542,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image,
Allocate and initialize levels map.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->storage_class == PseudoClass)
@@ -2682,7 +2682,7 @@ MagickExport MagickBooleanType LevelImageColors(Image *image,
Allocate and initialize levels map.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if( IfMagickTrue(IsGrayColorspace(image->colorspace)) &&
@@ -2828,7 +2828,7 @@ MagickExport MagickBooleanType LinearStretchImage(Image *image,
Allocate histogram and linear map.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
histogram=(double *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*histogram));
if (histogram == (double *) NULL)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
@@ -3163,7 +3163,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate,
Initialize modulate table.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (modulate == (char *) NULL)
@@ -3422,7 +3422,7 @@ MagickExport MagickBooleanType NegateImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->storage_class == PseudoClass)
@@ -3762,7 +3762,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image,
Convenience macros.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
/*
diff --git a/MagickCore/exception.c b/MagickCore/exception.c
index c9a4cf478..973741a89 100644
--- a/MagickCore/exception.c
+++ b/MagickCore/exception.c
@@ -153,7 +153,7 @@ static void *DestroyExceptionElement(void *exception)
MagickExport void ClearMagickException(ExceptionInfo *exception)
{
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (exception->exceptions == (void *) NULL)
return;
LockSemaphoreInfo(exception->semaphore);
@@ -195,7 +195,7 @@ MagickExport void CatchException(ExceptionInfo *exception)
*p;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (exception->exceptions == (void *) NULL)
return;
LockSemaphoreInfo(exception->semaphore);
@@ -403,14 +403,14 @@ MagickExport ExceptionInfo *DestroyExceptionInfo(ExceptionInfo *exception)
relinquish;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (exception->semaphore == (SemaphoreInfo *) NULL)
ActivateSemaphoreInfo(&exception->semaphore);
LockSemaphoreInfo(exception->semaphore);
exception->severity=UndefinedException;
if (exception->relinquish != MagickFalse)
{
- exception->signature=(~MagickSignature);
+ exception->signature=(~MagickCoreSignature);
if (exception->exceptions != (void *) NULL)
exception->exceptions=(void *) DestroyLinkedList((LinkedListInfo *)
exception->exceptions,DestroyExceptionElement);
@@ -620,9 +620,9 @@ MagickExport void InheritException(ExceptionInfo *exception,
*p;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
assert(relative != (ExceptionInfo *) NULL);
- assert(relative->signature == MagickSignature);
+ assert(relative->signature == MagickCoreSignature);
assert(exception != relative);
if (relative->exceptions == (void *) NULL)
return;
@@ -668,7 +668,7 @@ MagickPrivate void InitializeExceptionInfo(ExceptionInfo *exception)
exception->severity=UndefinedException;
exception->exceptions=(void *) NewLinkedList(0);
exception->semaphore=AcquireSemaphoreInfo();
- exception->signature=MagickSignature;
+ exception->signature=MagickCoreSignature;
}
/*
@@ -913,7 +913,7 @@ MagickExport MagickBooleanType ThrowException(ExceptionInfo *exception,
*p;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
LockSemaphoreInfo(exception->semaphore);
p=(ExceptionInfo *) GetLastValueInLinkedList((LinkedListInfo *)
exception->exceptions);
@@ -936,7 +936,7 @@ MagickExport MagickBooleanType ThrowException(ExceptionInfo *exception,
p->reason=ConstantString(reason);
if (description != (const char *) NULL)
p->description=ConstantString(description);
- p->signature=MagickSignature;
+ p->signature=MagickCoreSignature;
(void) AppendValueToLinkedList((LinkedListInfo *) exception->exceptions,p);
if (p->severity >= exception->severity)
{
@@ -1011,7 +1011,7 @@ MagickExport MagickBooleanType ThrowMagickExceptionList(
length;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
locale=GetLocaleExceptionMessage(severity,tag);
(void) CopyMagickString(reason,locale,MagickPathExtent);
(void) ConcatenateMagickString(reason," ",MagickPathExtent);
diff --git a/MagickCore/feature.c b/MagickCore/feature.c
index 340d836bf..4f5b23700 100644
--- a/MagickCore/feature.c
+++ b/MagickCore/feature.c
@@ -274,11 +274,11 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius,
y;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
/*
Filter out noise.
*/
@@ -672,7 +672,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
number_grays;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((image->columns < (distance+1)) || (image->rows < (distance+1)))
@@ -1815,11 +1815,11 @@ MagickExport Image *HoughLineImage(const Image *image,const size_t width,
Create the accumulator.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
accumulator_width=180;
hough_height=((sqrt(2.0)*(double) (image->rows > image->columns ?
image->rows : image->columns))/2.0);
@@ -2110,11 +2110,11 @@ MagickExport Image *MeanShiftImage(const Image *image,const size_t width,
y;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
mean_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (mean_image == (Image *) NULL)
return((Image *) NULL);
diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c
index 2074cc148..0ce45fdf8 100644
--- a/MagickCore/fourier.c
+++ b/MagickCore/fourier.c
@@ -168,11 +168,11 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op,
y;
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (images->next == (Image *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),ImageError,
@@ -1484,7 +1484,7 @@ MagickExport Image *InverseFourierTransformImage(const Image *magnitude_image,
*fourier_image;
assert(magnitude_image != (Image *) NULL);
- assert(magnitude_image->signature == MagickSignature);
+ assert(magnitude_image->signature == MagickCoreSignature);
if (magnitude_image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
magnitude_image->filename);
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 6a2a17082..458a2be54 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -294,11 +294,11 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type,
Initialize noise image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
noise_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (noise_image == (Image *) NULL)
return((Image *) NULL);
@@ -451,11 +451,11 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor,
Allocate blue shift image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
shift_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (shift_image == (Image *) NULL)
return((Image *) NULL);
@@ -593,11 +593,11 @@ MagickExport Image *CharcoalImage(const Image *image,const double radius,
*edge_image;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
clone_image=CloneImage(image,0,0,MagickTrue,exception);
if (clone_image == (Image *) NULL)
return((Image *) NULL);
@@ -683,11 +683,11 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend,
Allocate colorized image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
colorize_image=CloneImage(image,0,0,MagickTrue,exception);
if (colorize_image == (Image *) NULL)
return((Image *) NULL);
@@ -876,11 +876,11 @@ MagickExport Image *ColorMatrixImage(const Image *image,
Map given color_matrix, into a 6x6 matrix RGBKA and a constant
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
i=0;
for (v=0; v < (ssize_t) color_matrix->height; v++)
for (u=0; u < (ssize_t) color_matrix->width; u++)
@@ -3044,7 +3044,7 @@ MagickExport Image *FxImage(const Image *image,const char *expression,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
fx_info=AcquireFxThreadSet(image,expression,exception);
@@ -3218,11 +3218,11 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
Initialize implode image attributes.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
implode_image=CloneImage(image,image->columns,image->rows,MagickTrue,
exception);
if (implode_image == (Image *) NULL)
@@ -3423,11 +3423,11 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames,
Clone first frame in sequence.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
morph_images=CloneImage(image,0,0,MagickTrue,exception);
if (morph_images == (Image *) NULL)
return((Image *) NULL);
@@ -3873,7 +3873,7 @@ MagickExport MagickBooleanType PlasmaImage(Image *image,
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
@@ -3948,11 +3948,11 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
Simulate a Polaroid picture.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
quantum=(ssize_t) MagickMax(MagickMax((double) image->columns,(double)
image->rows)/25.0,10.0);
height=image->rows+2*quantum;
@@ -4138,11 +4138,11 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold,
Initialize sepia-toned image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
sepia_image=CloneImage(image,0,0,MagickTrue,exception);
if (sepia_image == (Image *) NULL)
return((Image *) NULL);
@@ -4293,11 +4293,11 @@ MagickExport Image *ShadowImage(const Image *image,const double alpha,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
clone_image=CloneImage(image,0,0,MagickTrue,exception);
if (clone_image == (Image *) NULL)
return((Image *) NULL);
@@ -4591,7 +4591,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (IsGrayColorspace(image->colorspace) != MagickFalse)
@@ -4753,13 +4753,13 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark,
Initialize steganographic image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(watermark != (const Image *) NULL);
- assert(watermark->signature == MagickSignature);
+ assert(watermark->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
one=1UL;
stegano_image=CloneImage(image,0,0,MagickTrue,exception);
if (stegano_image == (Image *) NULL)
@@ -4915,14 +4915,14 @@ MagickExport Image *StereoAnaglyphImage(const Image *left_image,
y;
assert(left_image != (const Image *) NULL);
- assert(left_image->signature == MagickSignature);
+ assert(left_image->signature == MagickCoreSignature);
if (left_image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
left_image->filename);
assert(right_image != (const Image *) NULL);
- assert(right_image->signature == MagickSignature);
+ assert(right_image->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
assert(right_image != (const Image *) NULL);
image=left_image;
if ((left_image->columns != right_image->columns) ||
@@ -5058,11 +5058,11 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
Initialize swirl image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
swirl_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (swirl_image == (Image *) NULL)
return((Image *) NULL);
@@ -5268,11 +5268,11 @@ MagickExport Image *TintImage(const Image *image,const char *blend,
Allocate tint image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
tint_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (tint_image == (Image *) NULL)
return((Image *) NULL);
@@ -5460,11 +5460,11 @@ MagickExport Image *VignetteImage(const Image *image,const double radius,
*vignette_image;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
canvas_image=CloneImage(image,0,0,MagickTrue,exception);
if (canvas_image == (Image *) NULL)
return((Image *) NULL);
@@ -5578,11 +5578,11 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
Initialize wave image attributes.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
wave_image=CloneImage(image,image->columns,(size_t) (image->rows+2.0*
fabs(amplitude)),MagickTrue,exception);
if (wave_image == (Image *) NULL)
diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c
index 761718fa5..472a99636 100644
--- a/MagickCore/geometry.c
+++ b/MagickCore/geometry.c
@@ -1527,7 +1527,7 @@ MagickExport MagickStatusType ParseRegionGeometry(const Image *image,
MagickExport void SetGeometry(const Image *image,RectangleInfo *geometry)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(geometry != (RectangleInfo *) NULL);
diff --git a/MagickCore/hashmap.c b/MagickCore/hashmap.c
index 43d09d5f9..d0abfff8f 100644
--- a/MagickCore/hashmap.c
+++ b/MagickCore/hashmap.c
@@ -153,7 +153,7 @@ MagickExport MagickBooleanType AppendValueToLinkedList(
*next;
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
if (list_info->elements == list_info->capacity)
return(MagickFalse);
next=(ElementInfo *) AcquireMagickMemory(sizeof(*next));
@@ -210,7 +210,7 @@ MagickExport void ClearLinkedList(LinkedListInfo *list_info,
*next;
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
LockSemaphoreInfo(list_info->semaphore);
next=list_info->head;
while (next != (ElementInfo *) NULL)
@@ -333,7 +333,7 @@ MagickExport HashmapInfo *DestroyHashmap(HashmapInfo *hashmap_info)
i;
assert(hashmap_info != (HashmapInfo *) NULL);
- assert(hashmap_info->signature == MagickSignature);
+ assert(hashmap_info->signature == MagickCoreSignature);
LockSemaphoreInfo(hashmap_info->semaphore);
for (i=0; i < (ssize_t) hashmap_info->capacity; i++)
{
@@ -356,7 +356,7 @@ MagickExport HashmapInfo *DestroyHashmap(HashmapInfo *hashmap_info)
}
hashmap_info->map=(LinkedListInfo **) RelinquishMagickMemory(
hashmap_info->map);
- hashmap_info->signature=(~MagickSignature);
+ hashmap_info->signature=(~MagickCoreSignature);
UnlockSemaphoreInfo(hashmap_info->semaphore);
RelinquishSemaphoreInfo(&hashmap_info->semaphore);
hashmap_info=(HashmapInfo *) RelinquishMagickMemory(hashmap_info);
@@ -399,7 +399,7 @@ MagickExport LinkedListInfo *DestroyLinkedList(LinkedListInfo *list_info,
*next;
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
LockSemaphoreInfo(list_info->semaphore);
for (next=list_info->head; next != (ElementInfo *) NULL; )
{
@@ -409,7 +409,7 @@ MagickExport LinkedListInfo *DestroyLinkedList(LinkedListInfo *list_info,
next=next->next;
entry=(ElementInfo *) RelinquishMagickMemory(entry);
}
- list_info->signature=(~MagickSignature);
+ list_info->signature=(~MagickCoreSignature);
UnlockSemaphoreInfo(list_info->semaphore);
RelinquishSemaphoreInfo(&list_info->semaphore);
list_info=(LinkedListInfo *) RelinquishMagickMemory(list_info);
@@ -444,7 +444,7 @@ MagickExport void *GetLastValueInLinkedList(LinkedListInfo *list_info)
*value;
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
if (list_info->elements == 0)
return((void *) NULL);
LockSemaphoreInfo(list_info->semaphore);
@@ -487,7 +487,7 @@ MagickExport void *GetNextKeyInHashmap(HashmapInfo *hashmap_info)
*key;
assert(hashmap_info != (HashmapInfo *) NULL);
- assert(hashmap_info->signature == MagickSignature);
+ assert(hashmap_info->signature == MagickCoreSignature);
LockSemaphoreInfo(hashmap_info->semaphore);
while (hashmap_info->next < hashmap_info->capacity)
{
@@ -548,7 +548,7 @@ MagickExport void *GetNextValueInHashmap(HashmapInfo *hashmap_info)
*value;
assert(hashmap_info != (HashmapInfo *) NULL);
- assert(hashmap_info->signature == MagickSignature);
+ assert(hashmap_info->signature == MagickCoreSignature);
LockSemaphoreInfo(hashmap_info->semaphore);
while (hashmap_info->next < hashmap_info->capacity)
{
@@ -603,7 +603,7 @@ MagickExport void *GetNextValueInLinkedList(LinkedListInfo *list_info)
*value;
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
LockSemaphoreInfo(list_info->semaphore);
if (list_info->next == (ElementInfo *) NULL)
{
@@ -642,7 +642,7 @@ MagickExport size_t GetNumberOfEntriesInHashmap(
const HashmapInfo *hashmap_info)
{
assert(hashmap_info != (HashmapInfo *) NULL);
- assert(hashmap_info->signature == MagickSignature);
+ assert(hashmap_info->signature == MagickCoreSignature);
return(hashmap_info->entries);
}
@@ -674,7 +674,7 @@ MagickExport size_t GetNumberOfElementsInLinkedList(
const LinkedListInfo *list_info)
{
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
return(list_info->elements);
}
@@ -718,7 +718,7 @@ MagickExport void *GetValueFromHashmap(HashmapInfo *hashmap_info,
*value;
assert(hashmap_info != (HashmapInfo *) NULL);
- assert(hashmap_info->signature == MagickSignature);
+ assert(hashmap_info->signature == MagickCoreSignature);
if (key == (const void *) NULL)
return((void *) NULL);
LockSemaphoreInfo(hashmap_info->semaphore);
@@ -792,7 +792,7 @@ MagickExport void *GetValueFromLinkedList(LinkedListInfo *list_info,
*value;
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
if (index >= list_info->elements)
return((void *) NULL);
LockSemaphoreInfo(list_info->semaphore);
@@ -991,7 +991,7 @@ MagickExport MagickBooleanType InsertValueInLinkedList(
i;
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
if (value == (const void *) NULL)
return(MagickFalse);
if ((index > list_info->elements) ||
@@ -1096,7 +1096,7 @@ MagickExport MagickBooleanType InsertValueInSortedLinkedList(
i;
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
if ((compare == (int (*)(const void *,const void *)) NULL) ||
(value == (const void *) NULL))
return(MagickFalse);
@@ -1170,7 +1170,7 @@ MagickExport MagickBooleanType InsertValueInSortedLinkedList(
MagickExport MagickBooleanType IsHashmapEmpty(const HashmapInfo *hashmap_info)
{
assert(hashmap_info != (HashmapInfo *) NULL);
- assert(hashmap_info->signature == MagickSignature);
+ assert(hashmap_info->signature == MagickCoreSignature);
return(IsMagickTrue(hashmap_info->entries == 0));
}
@@ -1200,7 +1200,7 @@ MagickExport MagickBooleanType IsLinkedListEmpty(
const LinkedListInfo *list_info)
{
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
return(IsMagickTrue(list_info->elements == 0));
}
@@ -1239,7 +1239,7 @@ MagickExport MagickBooleanType LinkedListToArray(LinkedListInfo *list_info,
i;
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
if (array == (void **) NULL)
return(MagickFalse);
LockSemaphoreInfo(list_info->semaphore);
@@ -1327,7 +1327,7 @@ MagickExport HashmapInfo *NewHashmap(const size_t capacity,
(void) ResetMagickMemory(hashmap_info->map,0,(size_t) capacity*
sizeof(*hashmap_info->map));
hashmap_info->semaphore=AcquireSemaphoreInfo();
- hashmap_info->signature=MagickSignature;
+ hashmap_info->signature=MagickCoreSignature;
return(hashmap_info);
}
@@ -1369,7 +1369,7 @@ MagickExport LinkedListInfo *NewLinkedList(const size_t capacity)
list_info->tail=(ElementInfo *) NULL;
list_info->next=(ElementInfo *) NULL;
list_info->semaphore=AcquireSemaphoreInfo();
- list_info->signature=MagickSignature;
+ list_info->signature=MagickCoreSignature;
return(list_info);
}
@@ -1474,7 +1474,7 @@ static MagickBooleanType IncreaseHashmapCapacity(HashmapInfo *hashmap_info)
map_info->head=element;
map_info->elements++;
}
- list_info->signature=(~MagickSignature);
+ list_info->signature=(~MagickCoreSignature);
UnlockSemaphoreInfo(list_info->semaphore);
RelinquishSemaphoreInfo(&list_info->semaphore);
list_info=(LinkedListInfo *) RelinquishMagickMemory(list_info);
@@ -1500,7 +1500,7 @@ MagickExport MagickBooleanType PutEntryInHashmap(HashmapInfo *hashmap_info,
i;
assert(hashmap_info != (HashmapInfo *) NULL);
- assert(hashmap_info->signature == MagickSignature);
+ assert(hashmap_info->signature == MagickCoreSignature);
if ((key == (void *) NULL) || (value == (void *) NULL))
return(MagickFalse);
next=(EntryInfo *) AcquireMagickMemory(sizeof(*next));
@@ -1595,7 +1595,7 @@ MagickExport void *RemoveElementByValueFromLinkedList(LinkedListInfo *list_info,
*next;
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
if ((list_info->elements == 0) || (value == (const void *) NULL))
return((void *) NULL);
LockSemaphoreInfo(list_info->semaphore);
@@ -1673,7 +1673,7 @@ MagickExport void *RemoveElementFromLinkedList(LinkedListInfo *list_info,
*value;
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
if (index >= list_info->elements)
return((void *) NULL);
LockSemaphoreInfo(list_info->semaphore);
@@ -1751,7 +1751,7 @@ MagickExport void *RemoveEntryFromHashmap(HashmapInfo *hashmap_info,
*value;
assert(hashmap_info != (HashmapInfo *) NULL);
- assert(hashmap_info->signature == MagickSignature);
+ assert(hashmap_info->signature == MagickCoreSignature);
if (key == (const void *) NULL)
return((void *) NULL);
LockSemaphoreInfo(hashmap_info->semaphore);
@@ -1825,7 +1825,7 @@ MagickExport void *RemoveLastElementFromLinkedList(LinkedListInfo *list_info)
*value;
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
if (list_info->elements == 0)
return((void *) NULL);
LockSemaphoreInfo(list_info->semaphore);
@@ -1881,7 +1881,7 @@ MagickExport void *RemoveLastElementFromLinkedList(LinkedListInfo *list_info)
MagickExport void ResetHashmapIterator(HashmapInfo *hashmap_info)
{
assert(hashmap_info != (HashmapInfo *) NULL);
- assert(hashmap_info->signature == MagickSignature);
+ assert(hashmap_info->signature == MagickCoreSignature);
LockSemaphoreInfo(hashmap_info->semaphore);
hashmap_info->next=0;
hashmap_info->head_of_list=MagickFalse;
@@ -1915,7 +1915,7 @@ MagickExport void ResetHashmapIterator(HashmapInfo *hashmap_info)
MagickExport void ResetLinkedListIterator(LinkedListInfo *list_info)
{
assert(list_info != (LinkedListInfo *) NULL);
- assert(list_info->signature == MagickSignature);
+ assert(list_info->signature == MagickCoreSignature);
LockSemaphoreInfo(list_info->semaphore);
list_info->next=list_info->head;
UnlockSemaphoreInfo(list_info->semaphore);
diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c
index 5cf3ba409..b3d8a2734 100644
--- a/MagickCore/histogram.c
+++ b/MagickCore/histogram.c
@@ -212,7 +212,7 @@ static CubeInfo *ClassifyImageColors(const Image *image,
Initialize color description tree.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
cube_info=GetCubeInfo();
@@ -667,7 +667,7 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((image->storage_class == PseudoClass) && (image->colors <= 256))
@@ -827,7 +827,7 @@ MagickExport MagickBooleanType IsPaletteImage(const Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((image->storage_class == PseudoClass) && (image->colors <= 256))
diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 98b220133..33565438a 100644
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -141,7 +141,7 @@ static ChannelStatistics *GetLocationStatistics(const Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
channel_statistics=(ChannelStatistics *) AcquireQuantumMemory(
@@ -484,7 +484,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (file == (FILE *) NULL)
diff --git a/MagickCore/image-view.c b/MagickCore/image-view.c
index ce2a0248b..0bea8beb0 100644
--- a/MagickCore/image-view.c
+++ b/MagickCore/image-view.c
@@ -106,7 +106,7 @@ MagickExport ImageView *CloneImageView(const ImageView *image_view)
*clone_view;
assert(image_view != (ImageView *) NULL);
- assert(image_view->signature == MagickSignature);
+ assert(image_view->signature == MagickCoreSignature);
clone_view=(ImageView *) AcquireMagickMemory(sizeof(*clone_view));
if (clone_view == (ImageView *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
@@ -117,7 +117,7 @@ MagickExport ImageView *CloneImageView(const ImageView *image_view)
clone_view->exception=AcquireExceptionInfo();
InheritException(clone_view->exception,image_view->exception);
clone_view->debug=image_view->debug;
- clone_view->signature=MagickSignature;
+ clone_view->signature=MagickCoreSignature;
return(clone_view);
}
@@ -146,12 +146,12 @@ MagickExport ImageView *CloneImageView(const ImageView *image_view)
MagickExport ImageView *DestroyImageView(ImageView *image_view)
{
assert(image_view != (ImageView *) NULL);
- assert(image_view->signature == MagickSignature);
+ assert(image_view->signature == MagickCoreSignature);
if (image_view->description != (char *) NULL)
image_view->description=DestroyString(image_view->description);
image_view->view=DestroyCacheView(image_view->view);
image_view->exception=DestroyExceptionInfo(image_view->exception);
- image_view->signature=(~MagickSignature);
+ image_view->signature=(~MagickCoreSignature);
image_view=(ImageView *) RelinquishMagickMemory(image_view);
return(image_view);
}
@@ -230,7 +230,7 @@ MagickExport MagickBooleanType DuplexTransferImageViewIterator(
y;
assert(source != (ImageView *) NULL);
- assert(source->signature == MagickSignature);
+ assert(source->signature == MagickCoreSignature);
if (transfer == (DuplexTransferImageViewMethod) NULL)
return(MagickFalse);
source_image=source->image;
@@ -335,7 +335,7 @@ MagickExport void *GetImageViewAuthenticMetacontent(
const ImageView *image_view)
{
assert(image_view != (ImageView *) NULL);
- assert(image_view->signature == MagickSignature);
+ assert(image_view->signature == MagickCoreSignature);
return(GetCacheViewAuthenticMetacontent(image_view->view));
}
@@ -365,7 +365,7 @@ MagickExport Quantum *GetImageViewAuthenticPixels(
const ImageView *image_view)
{
assert(image_view != (ImageView *) NULL);
- assert(image_view->signature == MagickSignature);
+ assert(image_view->signature == MagickCoreSignature);
return(GetCacheViewAuthenticPixelQueue(image_view->view));
}
@@ -402,7 +402,7 @@ MagickExport char *GetImageViewException(const ImageView *image_view,
*description;
assert(image_view != (const ImageView *) NULL);
- assert(image_view->signature == MagickSignature);
+ assert(image_view->signature == MagickCoreSignature);
assert(severity != (ExceptionType *) NULL);
*severity=image_view->exception->severity;
description=(char *) AcquireQuantumMemory(2UL*MagickPathExtent,
@@ -450,7 +450,7 @@ MagickExport char *GetImageViewException(const ImageView *image_view,
MagickExport RectangleInfo GetImageViewExtent(const ImageView *image_view)
{
assert(image_view != (ImageView *) NULL);
- assert(image_view->signature == MagickSignature);
+ assert(image_view->signature == MagickCoreSignature);
return(image_view->extent);
}
@@ -479,7 +479,7 @@ MagickExport RectangleInfo GetImageViewExtent(const ImageView *image_view)
MagickExport Image *GetImageViewImage(const ImageView *image_view)
{
assert(image_view != (ImageView *) NULL);
- assert(image_view->signature == MagickSignature);
+ assert(image_view->signature == MagickCoreSignature);
return(image_view->image);
}
@@ -547,7 +547,7 @@ MagickExport MagickBooleanType GetImageViewIterator(ImageView *source,
y;
assert(source != (ImageView *) NULL);
- assert(source->signature == MagickSignature);
+ assert(source->signature == MagickCoreSignature);
if (get == (GetImageViewMethod) NULL)
return(MagickFalse);
source_image=source->image;
@@ -622,7 +622,7 @@ MagickExport const void *GetImageViewVirtualMetacontent(
const ImageView *image_view)
{
assert(image_view != (ImageView *) NULL);
- assert(image_view->signature == MagickSignature);
+ assert(image_view->signature == MagickCoreSignature);
return(GetCacheViewVirtualMetacontent(image_view->view));
}
@@ -652,7 +652,7 @@ MagickExport const Quantum *GetImageViewVirtualPixels(
const ImageView *image_view)
{
assert(image_view != (ImageView *) NULL);
- assert(image_view->signature == MagickSignature);
+ assert(image_view->signature == MagickCoreSignature);
return(GetCacheViewVirtualPixelQueue(image_view->view));
}
@@ -683,7 +683,7 @@ MagickExport MagickBooleanType IsImageView(const ImageView *image_view)
{
if (image_view == (const ImageView *) NULL)
return(MagickFalse);
- if (image_view->signature != MagickSignature)
+ if (image_view->signature != MagickCoreSignature)
return(MagickFalse);
return(MagickTrue);
}
@@ -719,7 +719,7 @@ MagickExport ImageView *NewImageView(Image *image,ExceptionInfo *exception)
*image_view;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
image_view=(ImageView *) AcquireMagickMemory(sizeof(*image_view));
if (image_view == (ImageView *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
@@ -733,7 +733,7 @@ MagickExport ImageView *NewImageView(Image *image,ExceptionInfo *exception)
image_view->extent.y=0;
image_view->exception=AcquireExceptionInfo();
image_view->debug=IsEventLogging();
- image_view->signature=MagickSignature;
+ image_view->signature=MagickCoreSignature;
return(image_view);
}
@@ -775,7 +775,7 @@ MagickExport ImageView *NewImageViewRegion(Image *image,const ssize_t x,
*image_view;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
image_view=(ImageView *) AcquireMagickMemory(sizeof(*image_view));
if (image_view == (ImageView *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
@@ -789,7 +789,7 @@ MagickExport ImageView *NewImageViewRegion(Image *image,const ssize_t x,
image_view->extent.y=y;
image_view->exception=AcquireExceptionInfo();
image_view->debug=IsEventLogging();
- image_view->signature=MagickSignature;
+ image_view->signature=MagickCoreSignature;
return(image_view);
}
@@ -822,7 +822,7 @@ MagickExport void SetImageViewDescription(ImageView *image_view,
const char *description)
{
assert(image_view != (ImageView *) NULL);
- assert(image_view->signature == MagickSignature);
+ assert(image_view->signature == MagickCoreSignature);
image_view->description=ConstantString(description);
}
@@ -891,7 +891,7 @@ MagickExport MagickBooleanType SetImageViewIterator(ImageView *destination,
y;
assert(destination != (ImageView *) NULL);
- assert(destination->signature == MagickSignature);
+ assert(destination->signature == MagickCoreSignature);
if (set == (SetImageViewMethod) NULL)
return(MagickFalse);
destination_image=destination->image;
@@ -1018,7 +1018,7 @@ MagickExport MagickBooleanType TransferImageViewIterator(ImageView *source,
y;
assert(source != (ImageView *) NULL);
- assert(source->signature == MagickSignature);
+ assert(source->signature == MagickCoreSignature);
if (transfer == (TransferImageViewMethod) NULL)
return(MagickFalse);
source_image=source->image;
@@ -1151,7 +1151,7 @@ MagickExport MagickBooleanType UpdateImageViewIterator(ImageView *source,
y;
assert(source != (ImageView *) NULL);
- assert(source->signature == MagickSignature);
+ assert(source->signature == MagickCoreSignature);
if (update == (UpdateImageViewMethod) NULL)
return(MagickFalse);
source_image=source->image;
diff --git a/MagickCore/image.c b/MagickCore/image.c
index ebd487eff..efa5ba44d 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -209,7 +209,7 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info,
image->debug=IsEventLogging();
image->reference_count=1;
image->semaphore=AcquireSemaphoreInfo();
- image->signature=MagickSignature;
+ image->signature=MagickCoreSignature;
if (image_info == (ImageInfo *) NULL)
return(image);
/*
@@ -387,7 +387,7 @@ MagickExport void AcquireNextImage(const ImageInfo *image_info,Image *image,
Allocate image structure.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
image->next=AcquireImage(image_info,exception);
@@ -477,11 +477,11 @@ MagickExport Image *AppendImages(const Image *images,
Compute maximum area of appended area.
*/
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
alpha_trait=images->alpha_trait;
number_images=1;
width=images->columns;
@@ -649,7 +649,7 @@ MagickExport ExceptionType CatchImageException(Image *image)
severity;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
exception=AcquireExceptionInfo();
@@ -715,7 +715,7 @@ MagickExport MagickBooleanType ClipImagePath(Image *image,const char *pathname,
*image_info;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(pathname != NULL);
@@ -807,11 +807,11 @@ MagickExport Image *CloneImage(const Image *image,const size_t columns,
Clone the image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if ((image->columns == 0) || (image->rows == 0))
{
(void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError,
@@ -822,7 +822,7 @@ MagickExport Image *CloneImage(const Image *image,const size_t columns,
if (clone_image == (Image *) NULL)
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
(void) ResetMagickMemory(clone_image,0,sizeof(*clone_image));
- clone_image->signature=MagickSignature;
+ clone_image->signature=MagickCoreSignature;
clone_image->storage_class=image->storage_class;
clone_image->number_channels=image->number_channels;
clone_image->number_meta_channels=image->number_meta_channels;
@@ -1172,7 +1172,7 @@ MagickExport Image *DestroyImage(Image *image)
Dereference image.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
destroy=MagickFalse;
@@ -1204,7 +1204,7 @@ MagickExport Image *DestroyImage(Image *image)
DestroyBlob(image);
if (image->semaphore != (SemaphoreInfo *) NULL)
RelinquishSemaphoreInfo(&image->semaphore);
- image->signature=(~MagickSignature);
+ image->signature=(~MagickCoreSignature);
image=(Image *) RelinquishMagickMemory(image);
return(image);
}
@@ -1235,7 +1235,7 @@ MagickExport Image *DestroyImage(Image *image)
MagickExport ImageInfo *DestroyImageInfo(ImageInfo *image_info)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -1267,7 +1267,7 @@ MagickExport ImageInfo *DestroyImageInfo(ImageInfo *image_info)
image_info->profile=(void *) DestroyStringInfo((StringInfo *)
image_info->profile);
DestroyImageOptions(image_info);
- image_info->signature=(~MagickSignature);
+ image_info->signature=(~MagickCoreSignature);
image_info=(ImageInfo *) RelinquishMagickMemory(image_info);
return(image_info);
}
@@ -1299,7 +1299,7 @@ MagickExport ImageInfo *DestroyImageInfo(ImageInfo *image_info)
MagickExport void DisassociateImageStream(Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
DisassociateBlob(image);
@@ -1364,7 +1364,7 @@ MagickExport void GetImageInfo(ImageInfo *image_info)
&image_info->transparent_color,exception);
exception=DestroyExceptionInfo(exception);
image_info->debug=IsEventLogging();
- image_info->signature=MagickSignature;
+ image_info->signature=MagickCoreSignature;
}
/*
@@ -1437,7 +1437,7 @@ MagickExport Image *GetImageMask(const Image *image,ExceptionInfo *exception)
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
mask_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (mask_image == (Image *) NULL)
return((Image *) NULL);
@@ -1511,7 +1511,7 @@ MagickExport ssize_t GetImageReferenceCount(Image *image)
reference_count;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
LockSemaphoreInfo(image->semaphore);
@@ -1547,7 +1547,7 @@ MagickExport ssize_t GetImageReferenceCount(Image *image)
MagickExport VirtualPixelMethod GetImageVirtualPixelMethod(const Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
return(GetPixelCacheVirtualMethod(image));
@@ -1779,7 +1779,7 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=MagickTrue;
@@ -1874,7 +1874,7 @@ MagickExport MagickBooleanType IsImageObject(const Image *image)
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
for (p=image; p != (Image *) NULL; p=GetNextImageInList(p))
- if (p->signature != MagickSignature)
+ if (p->signature != MagickCoreSignature)
return(MagickFalse);
return(MagickTrue);
}
@@ -1914,7 +1914,7 @@ MagickExport MagickBooleanType IsTaintImage(const Image *image)
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
(void) CopyMagickString(magick,image->magick,MagickPathExtent);
(void) CopyMagickString(filename,image->filename,MagickPathExtent);
for (p=image; p != (Image *) NULL; p=GetNextImageInList(p))
@@ -1963,7 +1963,7 @@ MagickExport MagickBooleanType ModifyImage(Image **image,
assert(image != (Image **) NULL);
assert(*image != (Image *) NULL);
- assert((*image)->signature == MagickSignature);
+ assert((*image)->signature == MagickCoreSignature);
if ((*image)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*image)->filename);
if (GetImageReferenceCount(*image) <= 1)
@@ -2028,7 +2028,7 @@ MagickExport Image *NewMagickImage(const ImageInfo *image_info,
assert(image_info != (const ImageInfo *) NULL);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(background != (const PixelInfo *) NULL);
image=AcquireImage(image_info,exception);
image->columns=width;
@@ -2101,7 +2101,7 @@ MagickExport Image *ReferenceImage(Image *image)
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
LockSemaphoreInfo(image->semaphore);
image->reference_count++;
UnlockSemaphoreInfo(image->semaphore);
@@ -2141,7 +2141,7 @@ MagickExport MagickBooleanType ResetImagePage(Image *image,const char *page)
geometry;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
flags=ParseAbsoluteGeometry(page,&geometry);
@@ -2222,7 +2222,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image,
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
ConformPixelInfo(image,&image->background_color,&background,exception);
@@ -2333,7 +2333,7 @@ MagickExport MagickBooleanType SetImageColor(Image *image,
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(color != (const PixelInfo *) NULL);
image->colorspace=color->colorspace;
image->alpha_trait=color->alpha_trait;
@@ -2514,7 +2514,7 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info,
Look for 'image.format' in filename.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -2839,7 +2839,7 @@ MagickExport void SetImageInfoBlob(ImageInfo *image_info,const void *blob,
const size_t length)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -2874,7 +2874,7 @@ MagickExport void SetImageInfoBlob(ImageInfo *image_info,const void *blob,
MagickExport void SetImageInfoFile(ImageInfo *image_info,FILE *file)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -2928,7 +2928,7 @@ MagickExport MagickBooleanType SetImageMask(Image *image,const Image *mask,
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (mask == (const Image *) NULL)
{
image->read_mask=MagickFalse;
@@ -3019,7 +3019,7 @@ MagickExport MagickBooleanType SetImageAlpha(Image *image,const Quantum alpha,
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
image->alpha_trait=BlendPixelTrait;
status=MagickTrue;
image_view=AcquireAuthenticCacheView(image,exception);
@@ -3093,7 +3093,7 @@ MagickExport VirtualPixelMethod SetImageVirtualPixelMethod(Image *image,
const VirtualPixelMethod virtual_pixel_method,ExceptionInfo *exception)
{
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
return(SetPixelCacheVirtualMethod(image,virtual_pixel_method,exception));
@@ -3316,11 +3316,11 @@ MagickExport Image *SmushImages(const Image *images,
Compute maximum area of smushed area.
*/
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=images;
alpha_trait=image->alpha_trait;
number_images=1;
@@ -3496,7 +3496,7 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception)
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->storage_class == DirectClass)
return(MagickFalse);
range_exception=MagickFalse;
@@ -3587,9 +3587,9 @@ MagickExport MagickBooleanType SyncImagesSettings(ImageInfo *image_info,
*image;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
image=images;
@@ -3618,9 +3618,9 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
Sync image options.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
option=GetImageOption(image_info,"background");
diff --git a/MagickCore/layer.c b/MagickCore/layer.c
index 451292c72..737cee959 100644
--- a/MagickCore/layer.c
+++ b/MagickCore/layer.c
@@ -243,11 +243,11 @@ MagickExport Image *CoalesceImages(const Image *image,ExceptionInfo *exception)
Coalesce the image sequence.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
next=GetFirstImageInList(image);
bounds=next->page;
if (bounds.width == 0)
@@ -390,11 +390,11 @@ MagickExport Image *DisposeImages(const Image *images,ExceptionInfo *exception)
Run the image through the animation sequence
*/
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=GetFirstImageInList(images);
dispose_image=CloneImage(image,image->page.width,image->page.height,
MagickTrue,exception);
@@ -761,11 +761,11 @@ MagickExport Image *CompareImagesLayers(const Image *image,
i;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
assert((method == CompareAnyLayer) ||
(method == CompareClearLayer) ||
(method == CompareOverlayLayer));
@@ -945,11 +945,11 @@ static Image *OptimizeLayerFrames(const Image *image,
i;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
assert(method == OptimizeLayer ||
method == OptimizeImageLayer ||
method == OptimizePlusLayer);
@@ -1473,11 +1473,11 @@ MagickExport void OptimizeImageTransparency(const Image *image,
Run the image through the animation sequence
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
next=GetFirstImageInList(image);
dispose_image=CloneImage(next,next->page.width,next->page.height,
MagickTrue,exception);
@@ -1598,11 +1598,11 @@ MagickExport void RemoveDuplicateLayers(Image **images,
bounds;
assert((*images) != (const Image *) NULL);
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
if ((*images)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*images)->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
curr=GetFirstImageInList(*images);
for (; (next=GetNextImageInList(curr)) != (Image *) NULL; curr=next)
@@ -1675,11 +1675,11 @@ MagickExport void RemoveZeroDelayLayers(Image **images,
*i;
assert((*images) != (const Image *) NULL);
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
if ((*images)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*images)->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
i=GetFirstImageInList(*images);
for ( ; i != (Image *) NULL; i=GetNextImageInList(i))
@@ -1773,11 +1773,11 @@ MagickExport void CompositeLayers(Image *destination,
const ssize_t y_offset,ExceptionInfo *exception)
{
assert(destination != (Image *) NULL);
- assert(destination->signature == MagickSignature);
+ assert(destination->signature == MagickCoreSignature);
assert(source != (Image *) NULL);
- assert(source->signature == MagickSignature);
+ assert(source->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (source->debug != MagickFalse || destination->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s - %s",
source->filename, destination->filename);
@@ -1922,11 +1922,11 @@ MagickExport Image *MergeImageLayers(Image *image,const LayerMethod method,
scene;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
/*
Determine canvas image size, and its virtual canvas size and offset
*/
diff --git a/MagickCore/list.c b/MagickCore/list.c
index 55ce18427..04c7c0632 100644
--- a/MagickCore/list.c
+++ b/MagickCore/list.c
@@ -83,7 +83,7 @@ MagickExport void AppendImageToList(Image **images,const Image *append)
assert(images != (Image **) NULL);
if (append == (Image *) NULL)
return;
- assert(append->signature == MagickSignature);
+ assert(append->signature == MagickCoreSignature);
if (append->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",append->filename);
if ((*images) == (Image *) NULL)
@@ -91,7 +91,7 @@ MagickExport void AppendImageToList(Image **images,const Image *append)
*images=(Image *) append;
return;
}
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
p=GetLastImageInList(*images);
q=GetFirstImageInList(append);
p->next=q;
@@ -133,7 +133,7 @@ MagickExport Image *CloneImageList(const Image *images,ExceptionInfo *exception)
if (images == (Image *) NULL)
return((Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
while (images->previous != (Image *) NULL)
images=images->previous;
image=(Image *) NULL;
@@ -221,12 +221,12 @@ MagickExport Image *CloneImages(const Image *images,const char *scenes,
length;
assert(images != (const Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
assert(scenes != (char *) NULL);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
clone_images=NewImageList();
images=GetFirstImageInList(images);
length=GetImageListLength(images);
@@ -357,13 +357,13 @@ MagickExport void DeleteImages(Image **images,const char *scenes,
length;
assert(images != (Image **) NULL);
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
assert(scenes != (char *) NULL);
if ((*images)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
(*images)->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
*images=GetFirstImageInList(*images);
length=GetImageListLength(*images);
delete_list=(MagickBooleanType *) AcquireQuantumMemory(length,
@@ -444,7 +444,7 @@ MagickExport Image *DestroyImageList(Image *images)
{
if (images == (Image *) NULL)
return((Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
while (images != (Image *) NULL)
@@ -502,12 +502,12 @@ MagickExport Image *DuplicateImages(Image *images,
Duplicate images.
*/
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
assert(scenes != (char *) NULL);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
duplicate_images=NewImageList();
for (i=0; i < (ssize_t) number_duplicates; i++)
{
@@ -546,7 +546,7 @@ MagickExport Image *GetFirstImageInList(const Image *images)
if (images == (Image *) NULL)
return((Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
for (p=images; p->previous != (Image *) NULL; p=p->previous) ;
return((Image *) p);
}
@@ -593,7 +593,7 @@ MagickExport Image *GetImageFromList(const Image *images,const ssize_t index)
if (images == (Image *) NULL)
return((Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
@@ -649,7 +649,7 @@ MagickExport ssize_t GetImageIndexInList(const Image *images)
if (images == (const Image *) NULL)
return(-1);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
for (i=0; images->previous != (Image *) NULL; i++)
images=images->previous;
return(i);
@@ -685,7 +685,7 @@ MagickExport size_t GetImageListLength(const Image *images)
if (images == (Image *) NULL)
return(0);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
images=GetLastImageInList(images);
@@ -723,7 +723,7 @@ MagickExport Image *GetLastImageInList(const Image *images)
if (images == (Image *) NULL)
return((Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
for (p=images; p->next != (Image *) NULL; p=p->next) ;
return((Image *) p);
}
@@ -754,7 +754,7 @@ MagickExport Image *GetNextImageInList(const Image *images)
{
if (images == (Image *) NULL)
return((Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
return(images->next);
@@ -786,7 +786,7 @@ MagickExport Image *GetPreviousImageInList(const Image *images)
{
if (images == (Image *) NULL)
return((Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
return(images->previous);
}
@@ -834,7 +834,7 @@ MagickExport Image **ImageListToArray(const Image *images,
if (images == (Image *) NULL)
return((Image **) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
group=(Image **) AcquireQuantumMemory((size_t) GetImageListLength(images)+1UL,
@@ -885,12 +885,12 @@ MagickExport void InsertImageInList(Image **images,Image *insert)
assert(images != (Image **) NULL);
assert(insert != (Image *) NULL);
- assert(insert->signature == MagickSignature);
+ assert(insert->signature == MagickCoreSignature);
if (insert->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",insert->filename);
if ((*images) == (Image *) NULL)
return;
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
split=SplitImageList(*images);
AppendImageToList(images,insert);
AppendImageToList(images,split);
@@ -987,7 +987,7 @@ MagickExport Image *RemoveImageFromList(Image **images)
assert(images != (Image **) NULL);
if ((*images) == (Image *) NULL)
return((Image *) NULL);
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
if ((*images)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
(*images)->filename);
@@ -1046,7 +1046,7 @@ MagickExport Image *RemoveFirstImageFromList(Image **images)
assert(images != (Image **) NULL);
if ((*images) == (Image *) NULL)
return((Image *) NULL);
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
if ((*images)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
(*images)->filename);
@@ -1097,7 +1097,7 @@ MagickExport Image *RemoveLastImageFromList(Image **images)
assert(images != (Image **) NULL);
if ((*images) == (Image *) NULL)
return((Image *) NULL);
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
if ((*images)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
(*images)->filename);
@@ -1146,12 +1146,12 @@ MagickExport void ReplaceImageInList(Image **images,Image *replace)
{
assert(images != (Image **) NULL);
assert(replace != (Image *) NULL);
- assert(replace->signature == MagickSignature);
+ assert(replace->signature == MagickCoreSignature);
if (replace->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",replace->filename);
if ((*images) == (Image *) NULL)
return;
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
/* link next pointer */
replace=GetLastImageInList(replace);
@@ -1204,12 +1204,12 @@ MagickExport void ReplaceImageInListReturnLast(Image **images,Image *replace)
{
assert(images != (Image **) NULL);
assert(replace != (Image *) NULL);
- assert(replace->signature == MagickSignature);
+ assert(replace->signature == MagickCoreSignature);
if (replace->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",replace->filename);
if ((*images) == (Image *) NULL)
return;
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
/* link previous pointer */
replace=GetFirstImageInList(replace);
@@ -1262,7 +1262,7 @@ MagickExport void ReverseImageList(Image **images)
assert(images != (Image **) NULL);
if ((*images) == (Image *) NULL)
return;
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
if ((*images)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
(*images)->filename);
@@ -1316,10 +1316,10 @@ MagickExport Image *SpliceImageIntoList(Image **images,
assert(images != (Image **) NULL);
assert(splice != (Image *) NULL);
- assert(splice->signature == MagickSignature);
+ assert(splice->signature == MagickCoreSignature);
if ((*images) == (Image *) NULL)
return((Image *) NULL);
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
if ((*images)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
(*images)->filename);
@@ -1395,7 +1395,7 @@ MagickExport void SyncImageList(Image *images)
if (images == (Image *) NULL)
return;
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
for (p=images; p != (Image *) NULL; p=p->next)
{
for (q=p->next; q != (Image *) NULL; q=q->next)
@@ -1437,7 +1437,7 @@ MagickExport Image *SyncNextImageInList(const Image *images)
{
if (images == (Image *) NULL)
return((Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->next == (Image *) NULL)
return((Image *) NULL);
if (images->blob != images->next->blob)
diff --git a/MagickCore/locale.c b/MagickCore/locale.c
index 76fade021..a9e9adefd 100644
--- a/MagickCore/locale.c
+++ b/MagickCore/locale.c
@@ -882,7 +882,7 @@ MagickExport const char *GetLocaleValue(const LocaleInfo *locale_info)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(locale_info != (LocaleInfo *) NULL);
- assert(locale_info->signature == MagickSignature);
+ assert(locale_info->signature == MagickCoreSignature);
return(locale_info->message);
}
@@ -1329,7 +1329,7 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
locale_info->path=ConstantString(filename);
locale_info->tag=ConstantString(tag);
locale_info->message=ConstantString(message);
- locale_info->signature=MagickSignature;
+ locale_info->signature=MagickCoreSignature;
status=AddValueToSplayTree(locale_cache,locale_info->tag,locale_info);
if (status == MagickFalse)
(void) ThrowMagickException(exception,GetMagickModule(),
diff --git a/MagickCore/log.c b/MagickCore/log.c
index 40ed0b8fa..673fb5010 100644
--- a/MagickCore/log.c
+++ b/MagickCore/log.c
@@ -310,7 +310,7 @@ static LinkedListInfo *AcquireLogCache(const char *filename,
log_info->handler_mask=p->handler_mask;
log_info->filename=ConstantString(p->filename);
log_info->format=ConstantString(p->format);
- log_info->signature=MagickSignature;
+ log_info->signature=MagickCoreSignature;
status&=AppendValueToLinkedList(log_cache,log_info);
if (status == MagickFalse)
(void) ThrowMagickException(exception,GetMagickModule(),
@@ -1525,7 +1525,7 @@ static MagickBooleanType LoadLogCache(LinkedListInfo *log_cache,const char *xml,
(void) ResetMagickMemory(log_info,0,sizeof(*log_info));
log_info->path=ConstantString(filename);
GetTimerInfo((TimerInfo *) &log_info->timer);
- log_info->signature=MagickSignature;
+ log_info->signature=MagickCoreSignature;
continue;
}
if (log_info == (LogInfo *) NULL)
diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 3ca21e166..83be1e68a 100644
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -318,7 +318,7 @@ static LinkedListInfo *AcquireMagicCache(const char *filename,
magic_info->magic=(unsigned char *) p->magic;
magic_info->length=p->length;
magic_info->exempt=MagickTrue;
- magic_info->signature=MagickSignature;
+ magic_info->signature=MagickCoreSignature;
status&=InsertValueInSortedLinkedList(magic_cache,CompareMagickInfoSize,
NULL,magic_info);
if (status == MagickFalse)
@@ -652,7 +652,7 @@ MagickExport const char *GetMagicName(const MagicInfo *magic_info)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(magic_info != (MagicInfo *) NULL);
- assert(magic_info->signature == MagickSignature);
+ assert(magic_info->signature == MagickCoreSignature);
return(magic_info->name);
}
@@ -919,7 +919,7 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *magic_cache,
(void) ResetMagickMemory(magic_info,0,sizeof(*magic_info));
magic_info->path=ConstantString(filename);
magic_info->exempt=MagickFalse;
- magic_info->signature=MagickSignature;
+ magic_info->signature=MagickCoreSignature;
continue;
}
if (magic_info == (MagicInfo *) NULL)
diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 965c0ca1b..44b076894 100644
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -181,7 +181,7 @@ MagickExport MagickInfo *AcquireMagickInfo(const char *module,
magick_info->flags=CoderAdjoinFlag | CoderBlobSupportFlag |
CoderDecoderThreadSupportFlag | CoderEncoderThreadSupportFlag |
CoderUseExtensionFlag;
- magick_info->signature=MagickSignature;
+ magick_info->signature=MagickCoreSignature;
return(magick_info);
}
@@ -210,7 +210,7 @@ MagickExport MagickInfo *AcquireMagickInfo(const char *module,
MagickExport DecodeImageHandler *GetImageDecoder(const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(magick_info->decoder);
}
@@ -239,7 +239,7 @@ MagickExport DecodeImageHandler *GetImageDecoder(const MagickInfo *magick_info)
MagickExport EncodeImageHandler *GetImageEncoder(const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(magick_info->encoder);
}
@@ -335,7 +335,7 @@ MagickExport MagickBooleanType GetImageMagick(const unsigned char *magick,
MagickExport MagickBooleanType GetMagickAdjoin(const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(((magick_info->flags & CoderAdjoinFlag) == 0) ? MagickFalse :
MagickTrue);
}
@@ -366,7 +366,7 @@ MagickExport MagickBooleanType GetMagickBlobSupport(
const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(((magick_info->flags & CoderBlobSupportFlag) == 0) ? MagickFalse :
MagickTrue);
}
@@ -399,7 +399,7 @@ MagickExport MagickBooleanType GetMagickDecoderThreadSupport(
const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(((magick_info->flags & CoderDecoderThreadSupportFlag) == 0) ?
MagickFalse : MagickTrue);
}
@@ -429,7 +429,7 @@ MagickExport MagickBooleanType GetMagickDecoderThreadSupport(
MagickExport const char *GetMagickDescription(const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(magick_info->description);
}
@@ -461,7 +461,7 @@ MagickExport MagickBooleanType GetMagickEncoderThreadSupport(
const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(((magick_info->flags & CoderDecoderThreadSupportFlag) == 0) ?
MagickFalse : MagickTrue);
}
@@ -493,7 +493,7 @@ MagickExport MagickBooleanType GetMagickEndianSupport(
const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(((magick_info->flags & CoderEndianSupportFlag) == 0) ? MagickFalse :
MagickTrue);
}
@@ -784,7 +784,7 @@ MagickExport char **GetMagickList(const char *pattern,
MagickExport const char *GetMagickMimeType(const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(magick_info->mime_type);
}
@@ -839,7 +839,7 @@ MagickExport MagickBooleanType GetMagickRawSupport(
const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(((magick_info->flags & CoderRawSupportFlag) == 0) ? MagickFalse :
MagickTrue);
}
@@ -871,7 +871,7 @@ MagickExport MagickBooleanType GetMagickSeekableStream(
const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(((magick_info->flags & CoderSeekableStreamFlag) == 0) ? MagickFalse :
MagickTrue);
}
@@ -901,7 +901,7 @@ MagickExport MagickBooleanType GetMagickSeekableStream(
MagickExport MagickBooleanType GetMagickStealth(const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(((magick_info->flags & CoderStealthFlag) == 0) ? MagickFalse :
MagickTrue);
}
@@ -934,7 +934,7 @@ MagickExport MagickBooleanType GetMagickUseExtension(
const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
return(((magick_info->flags & CoderUseExtensionFlag) == 0) ? MagickFalse :
MagickTrue);
}
@@ -1589,7 +1589,7 @@ MagickExport MagickBooleanType RegisterMagickInfo(MagickInfo *magick_info)
Register a new image format.
*/
assert(magick_info != (MagickInfo *) NULL);
- assert(magick_info->signature == MagickSignature);
+ assert(magick_info->signature == MagickCoreSignature);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",magick_info->name);
if (magick_list == (SplayTreeInfo *) NULL)
return(MagickFalse);
diff --git a/MagickCore/matrix.c b/MagickCore/matrix.c
index dfda1fb67..1bee45461 100644
--- a/MagickCore/matrix.c
+++ b/MagickCore/matrix.c
@@ -212,7 +212,7 @@ MagickExport MatrixInfo *AcquireMatrixInfo(const size_t columns,
if (matrix_info == (MatrixInfo *) NULL)
return((MatrixInfo *) NULL);
(void) ResetMagickMemory(matrix_info,0,sizeof(*matrix_info));
- matrix_info->signature=MagickSignature;
+ matrix_info->signature=MagickCoreSignature;
matrix_info->columns=columns;
matrix_info->rows=rows;
matrix_info->stride=stride;
@@ -371,7 +371,7 @@ MagickExport double **AcquireMagickMatrix(const size_t number_rows,
MagickExport MatrixInfo *DestroyMatrixInfo(MatrixInfo *matrix_info)
{
assert(matrix_info != (MatrixInfo *) NULL);
- assert(matrix_info->signature == MagickSignature);
+ assert(matrix_info->signature == MagickCoreSignature);
LockSemaphoreInfo(matrix_info->semaphore);
switch (matrix_info->type)
{
@@ -611,7 +611,7 @@ MagickExport MagickBooleanType GaussJordanElimination(double **matrix,
MagickExport size_t GetMatrixColumns(const MatrixInfo *matrix_info)
{
assert(matrix_info != (MatrixInfo *) NULL);
- assert(matrix_info->signature == MagickSignature);
+ assert(matrix_info->signature == MagickCoreSignature);
return(matrix_info->columns);
}
@@ -712,7 +712,7 @@ MagickExport MagickBooleanType GetMatrixElement(const MatrixInfo *matrix_info,
i;
assert(matrix_info != (const MatrixInfo *) NULL);
- assert(matrix_info->signature == MagickSignature);
+ assert(matrix_info->signature == MagickCoreSignature);
i=(MagickOffsetType) EdgeY(y,matrix_info->rows)*matrix_info->columns+
EdgeX(x,matrix_info->columns);
if (matrix_info->type != DiskCache)
@@ -753,7 +753,7 @@ MagickExport MagickBooleanType GetMatrixElement(const MatrixInfo *matrix_info,
MagickExport size_t GetMatrixRows(const MatrixInfo *matrix_info)
{
assert(matrix_info != (const MatrixInfo *) NULL);
- assert(matrix_info->signature == MagickSignature);
+ assert(matrix_info->signature == MagickCoreSignature);
return(matrix_info->rows);
}
@@ -893,9 +893,9 @@ MagickExport Image *MatrixToImage(const MatrixInfo *matrix_info,
y;
assert(matrix_info != (const MatrixInfo *) NULL);
- assert(matrix_info->signature == MagickSignature);
+ assert(matrix_info->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (matrix_info->stride < sizeof(double))
return((Image *) NULL);
/*
@@ -1014,7 +1014,7 @@ MagickExport MagickBooleanType NullMatrix(MatrixInfo *matrix_info)
value;
assert(matrix_info != (const MatrixInfo *) NULL);
- assert(matrix_info->signature == MagickSignature);
+ assert(matrix_info->signature == MagickCoreSignature);
if (matrix_info->type != DiskCache)
{
(void) ResetMagickMemory(matrix_info->elements,0,(size_t)
@@ -1116,7 +1116,7 @@ MagickExport MagickBooleanType SetMatrixElement(const MatrixInfo *matrix_info,
i;
assert(matrix_info != (const MatrixInfo *) NULL);
- assert(matrix_info->signature == MagickSignature);
+ assert(matrix_info->signature == MagickCoreSignature);
i=(MagickOffsetType) y*matrix_info->columns+x;
if ((i < 0) ||
((MagickSizeType) (i*matrix_info->stride) >= matrix_info->length))
diff --git a/MagickCore/memory.c b/MagickCore/memory.c
index 50755a91a..e61c5b4f0 100644
--- a/MagickCore/memory.c
+++ b/MagickCore/memory.c
@@ -585,7 +585,7 @@ MagickExport MemoryInfo *AcquireVirtualMemory(const size_t count,
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
(void) ResetMagickMemory(memory_info,0,sizeof(*memory_info));
memory_info->length=length;
- memory_info->signature=MagickSignature;
+ memory_info->signature=MagickCoreSignature;
if (AcquireMagickResource(MemoryResource,length) != MagickFalse)
{
memory_info->blob=AcquireAlignedMemory(1,length);
@@ -895,7 +895,7 @@ MagickExport void GetMagickMemoryMethods(
MagickExport void *GetVirtualMemoryBlob(const MemoryInfo *memory_info)
{
assert(memory_info != (const MemoryInfo *) NULL);
- assert(memory_info->signature == MagickSignature);
+ assert(memory_info->signature == MagickCoreSignature);
return(memory_info->blob);
}
@@ -1029,7 +1029,7 @@ MagickExport void *RelinquishMagickMemory(void *memory)
MagickExport MemoryInfo *RelinquishVirtualMemory(MemoryInfo *memory_info)
{
assert(memory_info != (MemoryInfo *) NULL);
- assert(memory_info->signature == MagickSignature);
+ assert(memory_info->signature == MagickCoreSignature);
if (memory_info->blob != (void *) NULL)
switch (memory_info->type)
{
@@ -1058,7 +1058,7 @@ MagickExport MemoryInfo *RelinquishVirtualMemory(MemoryInfo *memory_info)
break;
}
}
- memory_info->signature=(~MagickSignature);
+ memory_info->signature=(~MagickCoreSignature);
memory_info=(MemoryInfo *) RelinquishAlignedMemory(memory_info);
return(memory_info);
}
diff --git a/MagickCore/method-attribute.h b/MagickCore/method-attribute.h
index 7ed0ecb68..7e620a4da 100644
--- a/MagickCore/method-attribute.h
+++ b/MagickCore/method-attribute.h
@@ -101,7 +101,7 @@ extern "C" {
# define ModuleExport MagickExport
#endif
-#define MagickSignature 0xabacadabUL
+#define MagickCoreSignature 0xabacadabUL
#if !defined(MagickPathExtent)
# define MagickPathExtent 4096 /* always >= 4096 */
#endif
diff --git a/MagickCore/mime.c b/MagickCore/mime.c
index 6c8e80d36..b60e20a8a 100644
--- a/MagickCore/mime.c
+++ b/MagickCore/mime.c
@@ -604,7 +604,7 @@ MagickExport const char *GetMimeDescription(const MimeInfo *mime_info)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(mime_info != (MimeInfo *) NULL);
- assert(mime_info->signature == MagickSignature);
+ assert(mime_info->signature == MagickCoreSignature);
return(mime_info->description);
}
@@ -634,7 +634,7 @@ MagickExport const char *GetMimeType(const MimeInfo *mime_info)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(mime_info != (MimeInfo *) NULL);
- assert(mime_info->signature == MagickSignature);
+ assert(mime_info->signature == MagickCoreSignature);
return(mime_info->type);
}
@@ -869,7 +869,7 @@ static MagickBooleanType LoadMimeCache(LinkedListInfo *mime_cache,
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
(void) ResetMagickMemory(mime_info,0,sizeof(*mime_info));
mime_info->path=ConstantString(filename);
- mime_info->signature=MagickSignature;
+ mime_info->signature=MagickCoreSignature;
attribute=GetXMLTreeAttribute(mime,"data-type");
if (attribute != (const char *) NULL)
mime_info->data_type=(DataType) ParseCommandOption(MagickDataTypeOptions,
diff --git a/MagickCore/module.c b/MagickCore/module.c
index e685f8b6c..78ccd8a88 100644
--- a/MagickCore/module.c
+++ b/MagickCore/module.c
@@ -149,7 +149,7 @@ MagickExport ModuleInfo *AcquireModuleInfo(const char *path,const char *tag)
if (tag != (const char *) NULL)
module_info->tag=ConstantString(tag);
module_info->timestamp=time(0);
- module_info->signature=MagickSignature;
+ module_info->signature=MagickCoreSignature;
return(module_info);
}
@@ -941,7 +941,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag,
Find the module.
*/
assert(images != (Image **) NULL);
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
if ((*images)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
(*images)->filename);
@@ -1400,7 +1400,7 @@ static const ModuleInfo *RegisterModule(const ModuleInfo *module_info,
status;
assert(module_info != (ModuleInfo *) NULL);
- assert(module_info->signature == MagickSignature);
+ assert(module_info->signature == MagickCoreSignature);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",module_info->tag);
if (module_list == (SplayTreeInfo *) NULL)
return((const ModuleInfo *) NULL);
@@ -1618,7 +1618,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag,
rights;
assert(image != (Image **) NULL);
- assert((*image)->signature == MagickSignature);
+ assert((*image)->signature == MagickCoreSignature);
if ((*image)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*image)->filename);
rights=ReadPolicyRights;
diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index 32d2b9cb7..a8dca371c 100644
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -167,7 +167,7 @@ MagickExport MontageInfo *DestroyMontageInfo(MontageInfo *montage_info)
if (montage_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(montage_info != (MontageInfo *) NULL);
- assert(montage_info->signature == MagickSignature);
+ assert(montage_info->signature == MagickCoreSignature);
if (montage_info->geometry != (char *) NULL)
montage_info->geometry=(char *)
RelinquishMagickMemory(montage_info->geometry);
@@ -182,7 +182,7 @@ MagickExport MontageInfo *DestroyMontageInfo(MontageInfo *montage_info)
montage_info->texture);
if (montage_info->font != (char *) NULL)
montage_info->font=DestroyString(montage_info->font);
- montage_info->signature=(~MagickSignature);
+ montage_info->signature=(~MagickCoreSignature);
montage_info=(MontageInfo *) RelinquishMagickMemory(montage_info);
return(montage_info);
}
@@ -216,7 +216,7 @@ MagickExport void GetMontageInfo(const ImageInfo *image_info,
MontageInfo *montage_info)
{
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -235,7 +235,7 @@ MagickExport void GetMontageInfo(const ImageInfo *image_info,
montage_info->border_color=image_info->border_color;
montage_info->matte_color=image_info->matte_color;
montage_info->debug=IsEventLogging();
- montage_info->signature=MagickSignature;
+ montage_info->signature=MagickCoreSignature;
}
/*
@@ -403,13 +403,13 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
Create image tiles.
*/
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(montage_info != (MontageInfo *) NULL);
- assert(montage_info->signature == MagickSignature);
+ assert(montage_info->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
number_images=GetImageListLength(images);
master_list=ImageListToArray(images,exception);
image_list=master_list;
diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 7445ff73a..b375168cd 100644
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -243,7 +243,7 @@ static KernelInfo *ParseKernelArray(const char *kernel_string)
kernel->negative_range = kernel->positive_range = 0.0;
kernel->type = UserDefinedKernel;
kernel->next = (KernelInfo *) NULL;
- kernel->signature = MagickSignature;
+ kernel->signature=MagickCoreSignature;
if (kernel_string == (const char *) NULL)
return(kernel);
@@ -1022,7 +1022,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
kernel->negative_range = kernel->positive_range = 0.0;
kernel->type = type;
kernel->next = (KernelInfo *) NULL;
- kernel->signature = MagickSignature;
+ kernel->signature=MagickCoreSignature;
break;
}
@@ -2580,13 +2580,13 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
progress;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(morphology_image != (Image *) NULL);
- assert(morphology_image->signature == MagickSignature);
+ assert(morphology_image->signature == MagickCoreSignature);
assert(kernel != (KernelInfo *) NULL);
- assert(kernel->signature == MagickSignature);
+ assert(kernel->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=MagickTrue;
progress=0;
image_view=AcquireVirtualCacheView(image,exception);
@@ -3257,11 +3257,11 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(kernel != (KernelInfo *) NULL);
- assert(kernel->signature == MagickSignature);
+ assert(kernel->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=MagickTrue;
changed=0;
progress=0;
@@ -3670,11 +3670,11 @@ MagickPrivate Image *MorphologyApply(const Image *image,
v_info[MagickPathExtent];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(kernel != (KernelInfo *) NULL);
- assert(kernel->signature == MagickSignature);
+ assert(kernel->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
count = 0; /* number of low-level morphology primitives performed */
if ( iterations == 0 )
diff --git a/MagickCore/nt-feature.c b/MagickCore/nt-feature.c
index 60497c4a7..cd4921ef9 100644
--- a/MagickCore/nt-feature.c
+++ b/MagickCore/nt-feature.c
@@ -131,12 +131,12 @@ MagickExport void *CropImageToHBITMAP(Image *image,
Check crop geometry.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(geometry != (const RectangleInfo *) NULL);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (((geometry->x+(ssize_t) geometry->width) < 0) ||
((geometry->y+(ssize_t) geometry->height) < 0) ||
(geometry->x >= (ssize_t) image->columns) ||
@@ -381,7 +381,7 @@ MagickExport MagickBooleanType NTAcquireTypeCache(SplayTreeInfo *type_cache,
(void) ResetMagickMemory(type_info,0,sizeof(TypeInfo));
type_info->path=ConstantString("Windows Fonts");
- type_info->signature=MagickSignature;
+ type_info->signature=MagickCoreSignature;
/* Name */
(void) CopyMagickString(buffer,value_name,MagickPathExtent);
diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c
index 479efc50b..a703f27e3 100644
--- a/MagickCore/opencl.c
+++ b/MagickCore/opencl.c
@@ -2506,7 +2506,7 @@ MagickBooleanType OpenCLThrowMagickException(ExceptionInfo *exception,
clEnv = GetDefaultOpenCLEnv();
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (severity!=0) {
cl_device_type dType;
diff --git a/MagickCore/option.c b/MagickCore/option.c
index 255179299..1bc86fe28 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1764,12 +1764,12 @@ MagickExport MagickBooleanType CloneImageOptions(ImageInfo *image_info,
const ImageInfo *clone_info)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(clone_info != (const ImageInfo *) NULL);
- assert(clone_info->signature == MagickSignature);
+ assert(clone_info->signature == MagickCoreSignature);
if (clone_info->options != (void *) NULL)
{
if (image_info->options != (void *) NULL)
@@ -1861,7 +1861,7 @@ MagickExport MagickBooleanType DeleteImageOption(ImageInfo *image_info,
const char *option)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -1896,7 +1896,7 @@ MagickExport MagickBooleanType DeleteImageOption(ImageInfo *image_info,
MagickExport void DestroyImageOptions(ImageInfo *image_info)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -1936,7 +1936,7 @@ MagickExport const char *GetImageOption(const ImageInfo *image_info,
const char *option)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -2231,7 +2231,7 @@ MagickExport char **GetCommandOptions(const CommandOption option)
MagickExport char *GetNextImageOption(const ImageInfo *image_info)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -2748,7 +2748,7 @@ MagickExport char *RemoveImageOption(ImageInfo *image_info,const char *option)
*value;
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -2785,7 +2785,7 @@ MagickExport char *RemoveImageOption(ImageInfo *image_info,const char *option)
MagickExport void ResetImageOptions(const ImageInfo *image_info)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -2821,7 +2821,7 @@ MagickExport void ResetImageOptions(const ImageInfo *image_info)
MagickExport void ResetImageOptionIterator(const ImageInfo *image_info)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -2861,7 +2861,7 @@ MagickExport MagickBooleanType SetImageOption(ImageInfo *image_info,
const char *option,const char *value)
{
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index f6334a750..74bdb3660 100644
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -165,11 +165,11 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
Check boundary conditions.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(draw_info != (DrawInfo *) NULL);
- assert(draw_info->signature == MagickSignature);
+ assert(draw_info->signature == MagickCoreSignature);
if ((x_offset < 0) || (x_offset >= (ssize_t) image->columns))
return(MagickFalse);
if ((y_offset < 0) || (y_offset >= (ssize_t) image->rows))
@@ -426,7 +426,7 @@ MagickExport MagickBooleanType GradientImage(Image *image,
Set gradient start-stop end points.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(start_color != (const PixelInfo *) NULL);
@@ -570,11 +570,11 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius,
Initialize painted image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
width=GetOptimalKernelWidth2D(radius,sigma);
linear_image=CloneImage(image,0,0,MagickTrue,exception);
paint_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
@@ -783,7 +783,7 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(target != (PixelInfo *) NULL);
assert(fill != (PixelInfo *) NULL);
if (image->debug != MagickFalse)
@@ -911,7 +911,7 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(target != (PixelInfo *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
@@ -1038,7 +1038,7 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(high != (PixelInfo *) NULL);
assert(low != (PixelInfo *) NULL);
if (image->debug != MagickFalse)
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 7224657e3..009ab1ab5 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -212,7 +212,7 @@ MagickExport void ConformPixelInfo(Image *image,const PixelInfo *source,
PixelInfo *destination,ExceptionInfo *exception)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(destination != (const PixelInfo *) NULL);
*destination=(*source);
if (image->colorspace == CMYKColorspace)
@@ -1970,7 +1970,7 @@ MagickExport MagickBooleanType ExportImagePixels(Image *image,const ssize_t x,
length;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
length=strlen(map);
@@ -4149,7 +4149,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,const ssize_t x,
Allocate image structure.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
length=strlen(map);
@@ -4430,7 +4430,7 @@ MagickExport void InitializePixelChannelMap(Image *image)
n;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
(void) ResetMagickMemory(image->channel_map,0,MaxPixelChannels*
sizeof(*image->channel_map));
trait=UpdatePixelTrait;
@@ -4603,7 +4603,7 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image,
y_offset;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image_view != (CacheView *) NULL);
status=MagickTrue;
*pixel=0.0;
@@ -5024,7 +5024,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source,
interpolate;
assert(source != (Image *) NULL);
- assert(source->signature == MagickSignature);
+ assert(source->signature == MagickCoreSignature);
assert(source_view != (CacheView *) NULL);
status=MagickTrue;
x_offset=(ssize_t) floor(x);
@@ -5589,7 +5589,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
interpolate;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(image_view != (CacheView *) NULL);
status=MagickTrue;
x_offset=(ssize_t) floor(x);
@@ -6268,7 +6268,7 @@ MagickExport ChannelType SetPixelChannelMask(Image *image,
i;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(PixelEvent,GetMagickModule(),"%s[%08x]",
image->filename,channel_mask);
diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index 14c3d5473..f3d1be3d1 100644
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -219,7 +219,7 @@ static LinkedListInfo *AcquirePolicyCache(const char *filename,
policy_info->pattern=(char *) p->pattern;
policy_info->value=(char *) p->value;
policy_info->exempt=MagickTrue;
- policy_info->signature=MagickSignature;
+ policy_info->signature=MagickCoreSignature;
status&=AppendValueToLinkedList(policy_cache,policy_info);
if (status == MagickFalse)
(void) ThrowMagickException(exception,GetMagickModule(),
@@ -839,7 +839,7 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache,
(void) ResetMagickMemory(policy_info,0,sizeof(*policy_info));
policy_info->path=ConstantString(filename);
policy_info->exempt=MagickFalse;
- policy_info->signature=MagickSignature;
+ policy_info->signature=MagickCoreSignature;
continue;
}
if (policy_info == (PolicyInfo *) NULL)
diff --git a/MagickCore/prepress.c b/MagickCore/prepress.c
index 4ea726492..c67538119 100644
--- a/MagickCore/prepress.c
+++ b/MagickCore/prepress.c
@@ -101,7 +101,7 @@ MagickExport double GetImageTotalInkDensity(Image *image,
assert(image != (Image *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->colorspace != CMYKColorspace)
{
(void) ThrowMagickException(exception,GetMagickModule(),ImageError,
diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index dc1d92e51..d332da9e9 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -168,11 +168,11 @@ MagickExport MagickBooleanType CloneImageProfiles(Image *image,
const Image *clone_image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(clone_image != (const Image *) NULL);
- assert(clone_image->signature == MagickSignature);
+ assert(clone_image->signature == MagickCoreSignature);
if (clone_image->profiles != (void *) NULL)
{
if (image->profiles != (void *) NULL)
@@ -210,7 +210,7 @@ MagickExport MagickBooleanType CloneImageProfiles(Image *image,
MagickExport MagickBooleanType DeleteImageProfile(Image *image,const char *name)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->profiles == (SplayTreeInfo *) NULL)
@@ -278,7 +278,7 @@ MagickExport const StringInfo *GetImageProfile(const Image *image,
*profile;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->profiles == (SplayTreeInfo *) NULL)
@@ -313,7 +313,7 @@ MagickExport const StringInfo *GetImageProfile(const Image *image,
MagickExport char *GetNextImageProfile(const Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->profiles == (SplayTreeInfo *) NULL)
@@ -771,7 +771,7 @@ static MagickBooleanType SetsRGBImageProfile(Image *image,
status;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (GetImageProfile(image,"icc") != (const StringInfo *) NULL)
return(MagickFalse);
profile=AcquireStringInfo(sizeof(sRGBProfile));
@@ -801,7 +801,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
*profile;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(name != (const char *) NULL);
@@ -1298,7 +1298,7 @@ MagickExport StringInfo *RemoveImageProfile(Image *image,const char *name)
*profile;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->profiles == (SplayTreeInfo *) NULL)
@@ -1336,7 +1336,7 @@ MagickExport StringInfo *RemoveImageProfile(Image *image,const char *name)
MagickExport void ResetImageProfileIterator(const Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->profiles == (SplayTreeInfo *) NULL)
@@ -1684,7 +1684,7 @@ static MagickBooleanType SetImageProfileInternal(Image *image,const char *name,
status;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->profiles == (SplayTreeInfo *) NULL)
diff --git a/MagickCore/property.c b/MagickCore/property.c
index 259f20947..fb287a584 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -134,11 +134,11 @@ MagickExport MagickBooleanType CloneImageProperties(Image *image,
const Image *clone_image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(clone_image != (const Image *) NULL);
- assert(clone_image->signature == MagickSignature);
+ assert(clone_image->signature == MagickCoreSignature);
if( IfMagickTrue(clone_image->debug) )
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
clone_image->filename);
@@ -278,7 +278,7 @@ MagickExport MagickBooleanType DeleteImageProperty(Image *image,
const char *property)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image->filename);
@@ -313,7 +313,7 @@ MagickExport MagickBooleanType DeleteImageProperty(Image *image,
MagickExport void DestroyImageProperties(Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image->filename);
@@ -2083,7 +2083,7 @@ MagickExport const char *GetImageProperty(const Image *image,
*p;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (IfMagickTrue(image->debug))
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
p=(const char *) NULL;
@@ -3103,7 +3103,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
MagickExport char *GetNextImageProperty(const Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image->filename);
@@ -3232,8 +3232,8 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info,
MagickBooleanType
number;
- assert(image == NULL || image->signature == MagickSignature);
- assert(image_info == NULL || image_info->signature == MagickSignature);
+ assert(image == NULL || image->signature == MagickCoreSignature);
+ assert(image_info == NULL || image_info->signature == MagickCoreSignature);
if (image != (Image *) NULL && IfMagickTrue(image->debug))
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
@@ -3702,7 +3702,7 @@ MagickExport char *RemoveImageProperty(Image *image,
*value;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image->filename);
@@ -3740,7 +3740,7 @@ MagickExport char *RemoveImageProperty(Image *image,
MagickExport void ResetImagePropertyIterator(const Image *image)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image->filename);
@@ -3792,7 +3792,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
flags;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->properties == (void *) NULL)
diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index b3a1cce55..b5ea65e85 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -1200,7 +1200,7 @@ MagickExport MagickBooleanType CompressImageColormap(Image *image,
quantize_info;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (IsPaletteImage(image,exception) == MagickFalse)
@@ -1395,8 +1395,8 @@ MagickExport QuantizeInfo *DestroyQuantizeInfo(QuantizeInfo *quantize_info)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(quantize_info != (QuantizeInfo *) NULL);
- assert(quantize_info->signature == MagickSignature);
- quantize_info->signature=(~MagickSignature);
+ assert(quantize_info->signature == MagickCoreSignature);
+ quantize_info->signature=(~MagickCoreSignature);
quantize_info=(QuantizeInfo *) RelinquishMagickMemory(quantize_info);
return(quantize_info);
}
@@ -2207,7 +2207,7 @@ MagickExport MagickBooleanType GetImageQuantizeError(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
image->total_colors=GetNumberColors(image,(FILE *) NULL,exception);
@@ -2300,7 +2300,7 @@ MagickExport void GetQuantizeInfo(QuantizeInfo *quantize_info)
quantize_info->dither_method=RiemersmaDitherMethod;
quantize_info->colorspace=UndefinedColorspace;
quantize_info->measure_error=MagickFalse;
- quantize_info->signature=MagickSignature;
+ quantize_info->signature=MagickCoreSignature;
}
/*
@@ -2372,11 +2372,11 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (image->storage_class == PseudoClass)
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
@@ -2784,13 +2784,13 @@ MagickExport MagickBooleanType QuantizeImage(const QuantizeInfo *quantize_info,
maximum_colors;
assert(quantize_info != (const QuantizeInfo *) NULL);
- assert(quantize_info->signature == MagickSignature);
+ assert(quantize_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
maximum_colors=quantize_info->number_colors;
if (maximum_colors == 0)
maximum_colors=MaxColormapSize;
@@ -2910,13 +2910,13 @@ MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info,
number_images;
assert(quantize_info != (const QuantizeInfo *) NULL);
- assert(quantize_info->signature == MagickSignature);
+ assert(quantize_info->signature == MagickCoreSignature);
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (GetNextImageInList(images) == (Image *) NULL)
{
/*
@@ -3276,13 +3276,13 @@ MagickExport MagickBooleanType RemapImage(const QuantizeInfo *quantize_info,
Initialize color cube.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(remap_image != (Image *) NULL);
- assert(remap_image->signature == MagickSignature);
+ assert(remap_image->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
cube_info=GetCubeInfo(quantize_info,MaxTreeDepth,
quantize_info->number_colors);
if (cube_info == (CubeInfo *) NULL)
@@ -3344,11 +3344,11 @@ MagickExport MagickBooleanType RemapImages(const QuantizeInfo *quantize_info,
status;
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=images;
if (remap_image == (Image *) NULL)
{
@@ -3456,7 +3456,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->type != GrayscaleType)
(void) TransformImageColorspace(image,GRAYColorspace,exception);
colormap_index=(ssize_t *) AcquireQuantumMemory(MaxMap+1,
diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c
index ce5a28246..0f91d0855 100644
--- a/MagickCore/quantum-export.c
+++ b/MagickCore/quantum-export.c
@@ -249,7 +249,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
x;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -357,7 +357,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
bit;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -653,7 +653,7 @@ static void ExportBGRAQuantum(const Image *image,QuantumInfo *quantum_info,
x;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -897,7 +897,7 @@ static void ExportBGROQuantum(const Image *image,QuantumInfo *quantum_info,
x;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -1250,7 +1250,7 @@ static void ExportBlueQuantum(const Image *image,QuantumInfo *quantum_info,
x;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -1365,7 +1365,7 @@ static void ExportCbYCrYQuantum(const Image *image,QuantumInfo *quantum_info,
n;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
n=0;
quantum=0;
switch (quantum_info->depth)
@@ -1945,7 +1945,7 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info,
x;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 1:
@@ -2203,7 +2203,7 @@ static void ExportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
x;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 1:
@@ -2409,7 +2409,7 @@ static void ExportGreenQuantum(const Image *image,QuantumInfo *quantum_info,
x;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -2876,7 +2876,7 @@ static void ExportOpacityQuantum(const Image *image,QuantumInfo *quantum_info,
x;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -2981,7 +2981,7 @@ static void ExportRedQuantum(const Image *image,QuantumInfo *quantum_info,
x;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -3089,7 +3089,7 @@ static void ExportRGBQuantum(const Image *image,QuantumInfo *quantum_info,
bit;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -3385,7 +3385,7 @@ static void ExportRGBAQuantum(const Image *image,QuantumInfo *quantum_info,
x;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -3629,7 +3629,7 @@ static void ExportRGBOQuantum(const Image *image,QuantumInfo *quantum_info,
x;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -3883,11 +3883,11 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
extent;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
if (pixels == (unsigned char *) NULL)
pixels=(unsigned char *) GetQuantumPixels(quantum_info);
if (image_view == (CacheView *) NULL)
diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c
index fb9610f14..bfc4c6a85 100644
--- a/MagickCore/quantum-import.c
+++ b/MagickCore/quantum-import.c
@@ -265,7 +265,7 @@ static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -385,7 +385,7 @@ static void ImportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -693,7 +693,7 @@ static void ImportBGRAQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -927,7 +927,7 @@ static void ImportBGROQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -1282,7 +1282,7 @@ static void ImportBlueQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -1399,7 +1399,7 @@ static void ImportCbYCrYQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 10:
@@ -2023,7 +2023,7 @@ static void ImportGrayQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 1:
@@ -2337,7 +2337,7 @@ static void ImportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 1:
@@ -2545,7 +2545,7 @@ static void ImportGreenQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -3088,7 +3088,7 @@ static void ImportOpacityQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -3205,7 +3205,7 @@ static void ImportRedQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -3325,7 +3325,7 @@ static void ImportRGBQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -3633,7 +3633,7 @@ static void ImportRGBAQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -3867,7 +3867,7 @@ static void ImportRGBOQuantum(const Image *image,QuantumInfo *quantum_info,
pixel;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
switch (quantum_info->depth)
{
case 8:
@@ -4108,11 +4108,11 @@ MagickExport size_t ImportQuantumPixels(const Image *image,
extent;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
if (pixels == (const unsigned char *) NULL)
pixels=(const unsigned char *) GetQuantumPixels(quantum_info);
x=0;
diff --git a/MagickCore/quantum.c b/MagickCore/quantum.c
index f0422f829..be7c69aa9 100644
--- a/MagickCore/quantum.c
+++ b/MagickCore/quantum.c
@@ -118,7 +118,7 @@ MagickExport QuantumInfo *AcquireQuantumInfo(const ImageInfo *image_info,
quantum_info=(QuantumInfo *) AcquireMagickMemory(sizeof(*quantum_info));
if (quantum_info == (QuantumInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
- quantum_info->signature=MagickSignature;
+ quantum_info->signature=MagickCoreSignature;
GetQuantumInfo(image_info,quantum_info);
if (image == (const Image *) NULL)
return(quantum_info);
@@ -161,7 +161,7 @@ static MagickBooleanType AcquireQuantumPixels(QuantumInfo *quantum_info,
i;
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
quantum_info->number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
quantum_info->pixels=(unsigned char **) AcquireQuantumMemory(
quantum_info->number_threads,sizeof(*quantum_info->pixels));
@@ -214,12 +214,12 @@ static MagickBooleanType AcquireQuantumPixels(QuantumInfo *quantum_info,
MagickExport QuantumInfo *DestroyQuantumInfo(QuantumInfo *quantum_info)
{
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
if (quantum_info->pixels != (unsigned char **) NULL)
DestroyQuantumPixels(quantum_info);
if (quantum_info->semaphore != (SemaphoreInfo *) NULL)
RelinquishSemaphoreInfo(&quantum_info->semaphore);
- quantum_info->signature=(~MagickSignature);
+ quantum_info->signature=(~MagickCoreSignature);
quantum_info=(QuantumInfo *) RelinquishMagickMemory(quantum_info);
return(quantum_info);
}
@@ -255,7 +255,7 @@ static void DestroyQuantumPixels(QuantumInfo *quantum_info)
extent;
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
assert(quantum_info->pixels != (unsigned char **) NULL);
extent=(ssize_t) quantum_info->extent;
for (i=0; i < (ssize_t) quantum_info->number_threads; i++)
@@ -307,7 +307,7 @@ MagickExport size_t GetQuantumExtent(const Image *image,
packet_size;
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
packet_size=1;
switch (quantum_type)
{
@@ -352,7 +352,7 @@ MagickExport size_t GetQuantumExtent(const Image *image,
MagickExport EndianType GetQuantumEndian(const QuantumInfo *quantum_info)
{
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
return(quantum_info->endian);
}
@@ -381,7 +381,7 @@ MagickExport EndianType GetQuantumEndian(const QuantumInfo *quantum_info)
MagickExport QuantumFormatType GetQuantumFormat(const QuantumInfo *quantum_info)
{
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
return(quantum_info->format);
}
@@ -422,7 +422,7 @@ MagickExport void GetQuantumInfo(const ImageInfo *image_info,
quantum_info->scale=QuantumRange;
quantum_info->pack=MagickTrue;
quantum_info->semaphore=AcquireSemaphoreInfo();
- quantum_info->signature=MagickSignature;
+ quantum_info->signature=MagickCoreSignature;
if (image_info == (const ImageInfo *) NULL)
return;
option=GetImageOption(image_info,"quantum:format");
@@ -486,7 +486,7 @@ MagickExport unsigned char *GetQuantumPixels(const QuantumInfo *quantum_info)
id = GetOpenMPThreadId();
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
return(quantum_info->pixels[id]);
}
@@ -520,7 +520,7 @@ MagickExport QuantumType GetQuantumType(Image *image,ExceptionInfo *exception)
quantum_type;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
(void) exception;
@@ -584,7 +584,7 @@ MagickPrivate void ResetQuantumState(QuantumInfo *quantum_info)
};
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
quantum_info->state.inverse_scale=1.0;
if (fabs(quantum_info->scale) >= MagickEpsilon)
quantum_info->state.inverse_scale/=quantum_info->scale;
@@ -622,7 +622,7 @@ MagickExport void SetQuantumAlphaType(QuantumInfo *quantum_info,
const QuantumAlphaType type)
{
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
quantum_info->alpha_type=type;
}
@@ -664,11 +664,11 @@ MagickExport MagickBooleanType SetQuantumDepth(const Image *image,
Allocate the quantum pixel buffer.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
quantum_info->depth=depth;
if (quantum_info->format == FloatingPointQuantumFormat)
{
@@ -720,11 +720,11 @@ MagickExport MagickBooleanType SetQuantumEndian(const Image *image,
QuantumInfo *quantum_info,const EndianType endian)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
quantum_info->endian=endian;
return(SetQuantumDepth(image,quantum_info,quantum_info->depth));
}
@@ -760,11 +760,11 @@ MagickExport MagickBooleanType SetQuantumFormat(const Image *image,
QuantumInfo *quantum_info,const QuantumFormatType format)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
quantum_info->format=format;
return(SetQuantumDepth(image,quantum_info,quantum_info->depth));
}
@@ -799,7 +799,7 @@ MagickExport void SetQuantumImageType(Image *image,
const QuantumType quantum_type)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
switch (quantum_type)
@@ -865,7 +865,7 @@ MagickExport void SetQuantumPack(QuantumInfo *quantum_info,
const MagickBooleanType pack)
{
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
quantum_info->pack=pack;
}
@@ -901,11 +901,11 @@ MagickExport MagickBooleanType SetQuantumPad(const Image *image,
QuantumInfo *quantum_info,const size_t pad)
{
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
quantum_info->pad=pad;
return(SetQuantumDepth(image,quantum_info,quantum_info->depth));
}
@@ -939,7 +939,7 @@ MagickExport void SetQuantumMinIsWhite(QuantumInfo *quantum_info,
const MagickBooleanType min_is_white)
{
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
quantum_info->min_is_white=min_is_white;
}
@@ -972,7 +972,7 @@ MagickExport void SetQuantumQuantum(QuantumInfo *quantum_info,
const size_t quantum)
{
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
quantum_info->quantum=quantum;
}
@@ -1003,6 +1003,6 @@ MagickExport void SetQuantumQuantum(QuantumInfo *quantum_info,
MagickExport void SetQuantumScale(QuantumInfo *quantum_info,const double scale)
{
assert(quantum_info != (QuantumInfo *) NULL);
- assert(quantum_info->signature == MagickSignature);
+ assert(quantum_info->signature == MagickCoreSignature);
quantum_info->scale=scale;
}
diff --git a/MagickCore/random.c b/MagickCore/random.c
index 315260799..a6ebcd3c8 100644
--- a/MagickCore/random.c
+++ b/MagickCore/random.c
@@ -190,7 +190,7 @@ MagickExport RandomInfo *AcquireRandomInfo(void)
random_info->protocol_minor=RandomProtocolMinorVersion;
random_info->semaphore=AcquireSemaphoreInfo();
random_info->timestamp=(ssize_t) time(0);
- random_info->signature=MagickSignature;
+ random_info->signature=MagickCoreSignature;
/*
Seed random nonce.
*/
@@ -276,7 +276,7 @@ MagickExport RandomInfo *DestroyRandomInfo(RandomInfo *random_info)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(random_info != (RandomInfo *) NULL);
- assert(random_info->signature == MagickSignature);
+ assert(random_info->signature == MagickCoreSignature);
LockSemaphoreInfo(random_info->semaphore);
if (random_info->reservoir != (StringInfo *) NULL)
random_info->reservoir=DestroyStringInfo(random_info->reservoir);
@@ -286,7 +286,7 @@ MagickExport RandomInfo *DestroyRandomInfo(RandomInfo *random_info)
random_info->signature_info=DestroySignatureInfo(
random_info->signature_info);
(void) ResetMagickMemory(random_info->seed,0,sizeof(*random_info->seed));
- random_info->signature=(~MagickSignature);
+ random_info->signature=(~MagickCoreSignature);
UnlockSemaphoreInfo(random_info->semaphore);
RelinquishSemaphoreInfo(&random_info->semaphore);
random_info=(RandomInfo *) RelinquishMagickMemory(random_info);
diff --git a/MagickCore/registry.c b/MagickCore/registry.c
index 00ae40a70..bd231cc94 100644
--- a/MagickCore/registry.c
+++ b/MagickCore/registry.c
@@ -487,7 +487,7 @@ MagickExport MagickBooleanType SetImageRegistry(const RegistryType type,
*image;
image=(const Image *) value;
- if (image->signature != MagickSignature)
+ if (image->signature != MagickCoreSignature)
{
(void) ThrowMagickException(exception,GetMagickModule(),RegistryError,
"UnableToSetRegistry","%s",key);
@@ -502,7 +502,7 @@ MagickExport MagickBooleanType SetImageRegistry(const RegistryType type,
*image_info;
image_info=(const ImageInfo *) value;
- if (image_info->signature != MagickSignature)
+ if (image_info->signature != MagickCoreSignature)
{
(void) ThrowMagickException(exception,GetMagickModule(),RegistryError,
"UnableToSetRegistry","%s",key);
@@ -520,7 +520,7 @@ MagickExport MagickBooleanType SetImageRegistry(const RegistryType type,
(void) ResetMagickMemory(registry_info,0,sizeof(*registry_info));
registry_info->type=type;
registry_info->value=clone_value;
- registry_info->signature=MagickSignature;
+ registry_info->signature=MagickCoreSignature;
if (registry == (SplayTreeInfo *) NULL)
{
if (registry_semaphore == (SemaphoreInfo *) NULL)
diff --git a/MagickCore/resample.c b/MagickCore/resample.c
index c938d277d..b9fb95630 100644
--- a/MagickCore/resample.c
+++ b/MagickCore/resample.c
@@ -211,11 +211,11 @@ MagickExport ResampleFilter *AcquireResampleFilter(const Image *image,
*resample_filter;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
resample_filter=(ResampleFilter *) AcquireMagickMemory(sizeof(
*resample_filter));
if (resample_filter == (ResampleFilter *) NULL)
@@ -228,7 +228,7 @@ MagickExport ResampleFilter *AcquireResampleFilter(const Image *image,
resample_filter->debug=IsEventLogging();
resample_filter->image_area=(ssize_t) (image->columns*image->rows);
resample_filter->average_defined=MagickFalse;
- resample_filter->signature=MagickSignature;
+ resample_filter->signature=MagickCoreSignature;
SetResampleFilter(resample_filter,image->filter);
(void) SetResampleFilterInterpolateMethod(resample_filter,image->interpolate);
(void) SetResampleFilterVirtualPixelMethod(resample_filter,
@@ -264,7 +264,7 @@ MagickExport ResampleFilter *DestroyResampleFilter(
ResampleFilter *resample_filter)
{
assert(resample_filter != (ResampleFilter *) NULL);
- assert(resample_filter->signature == MagickSignature);
+ assert(resample_filter->signature == MagickCoreSignature);
assert(resample_filter->image != (Image *) NULL);
if (resample_filter->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
@@ -274,7 +274,7 @@ MagickExport ResampleFilter *DestroyResampleFilter(
#if ! FILTER_LUT
resample_filter->filter_def=DestroyResizeFilter(resample_filter->filter_def);
#endif
- resample_filter->signature=(~MagickSignature);
+ resample_filter->signature=(~MagickCoreSignature);
resample_filter=(ResampleFilter *) RelinquishMagickMemory(resample_filter);
return(resample_filter);
}
@@ -327,7 +327,7 @@ MagickExport MagickBooleanType ResamplePixelColor(
register double weight;
register const Quantum *pixels;
assert(resample_filter != (ResampleFilter *) NULL);
- assert(resample_filter->signature == MagickSignature);
+ assert(resample_filter->signature == MagickCoreSignature);
status=MagickTrue;
/* GetPixelInfo(resample_filter->image,pixel); */
@@ -1042,7 +1042,7 @@ MagickExport void ScaleResampleFilter(ResampleFilter *resample_filter,
double A,B,C,F;
assert(resample_filter != (ResampleFilter *) NULL);
- assert(resample_filter->signature == MagickSignature);
+ assert(resample_filter->signature == MagickCoreSignature);
resample_filter->limit_reached = MagickFalse;
@@ -1246,7 +1246,7 @@ MagickExport void SetResampleFilter(ResampleFilter *resample_filter,
*resize_filter;
assert(resample_filter != (ResampleFilter *) NULL);
- assert(resample_filter->signature == MagickSignature);
+ assert(resample_filter->signature == MagickCoreSignature);
resample_filter->do_interpolate = MagickFalse;
resample_filter->filter = filter;
@@ -1406,7 +1406,7 @@ MagickExport MagickBooleanType SetResampleFilterInterpolateMethod(
ResampleFilter *resample_filter,const PixelInterpolateMethod method)
{
assert(resample_filter != (ResampleFilter *) NULL);
- assert(resample_filter->signature == MagickSignature);
+ assert(resample_filter->signature == MagickCoreSignature);
assert(resample_filter->image != (Image *) NULL);
if (resample_filter->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
@@ -1445,7 +1445,7 @@ MagickExport MagickBooleanType SetResampleFilterVirtualPixelMethod(
ResampleFilter *resample_filter,const VirtualPixelMethod method)
{
assert(resample_filter != (ResampleFilter *) NULL);
- assert(resample_filter->signature == MagickSignature);
+ assert(resample_filter->signature == MagickCoreSignature);
assert(resample_filter->image != (Image *) NULL);
if (resample_filter->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index a8ccb19fd..b8741ff4c 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -862,12 +862,12 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image,
Allocate resize filter.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(UndefinedFilter < filter && filter < SentinelFilter);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
resize_filter=(ResizeFilter *) AcquireMagickMemory(sizeof(*resize_filter));
if (resize_filter == (ResizeFilter *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
@@ -929,7 +929,7 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image,
resize_filter->support=filters[filter_type].support;
resize_filter->window=filters[window_type].function;
resize_filter->scale=filters[window_type].scale;
- resize_filter->signature=MagickSignature;
+ resize_filter->signature=MagickCoreSignature;
/* Filter Modifications for orthogonal/cylindrical usage */
if (cylindrical != MagickFalse)
@@ -1469,8 +1469,8 @@ static double BesselOrderOne(double x)
MagickPrivate ResizeFilter *DestroyResizeFilter(ResizeFilter *resize_filter)
{
assert(resize_filter != (ResizeFilter *) NULL);
- assert(resize_filter->signature == MagickSignature);
- resize_filter->signature=(~MagickSignature);
+ assert(resize_filter->signature == MagickCoreSignature);
+ resize_filter->signature=(~MagickCoreSignature);
resize_filter=(ResizeFilter *) RelinquishMagickMemory(resize_filter);
return(resize_filter);
}
@@ -1503,21 +1503,21 @@ MagickPrivate double *GetResizeFilterCoefficient(
const ResizeFilter *resize_filter)
{
assert(resize_filter != (ResizeFilter *) NULL);
- assert(resize_filter->signature == MagickSignature);
+ assert(resize_filter->signature == MagickCoreSignature);
return((double *) resize_filter->coefficient);
}
MagickPrivate double GetResizeFilterBlur(const ResizeFilter *resize_filter)
{
assert(resize_filter != (ResizeFilter *) NULL);
- assert(resize_filter->signature == MagickSignature);
+ assert(resize_filter->signature == MagickCoreSignature);
return(resize_filter->blur);
}
MagickPrivate double GetResizeFilterScale(const ResizeFilter *resize_filter)
{
assert(resize_filter != (ResizeFilter *) NULL);
- assert(resize_filter->signature == MagickSignature);
+ assert(resize_filter->signature == MagickCoreSignature);
return(resize_filter->scale);
}
@@ -1525,7 +1525,7 @@ MagickPrivate double GetResizeFilterWindowSupport(
const ResizeFilter *resize_filter)
{
assert(resize_filter != (ResizeFilter *) NULL);
- assert(resize_filter->signature == MagickSignature);
+ assert(resize_filter->signature == MagickCoreSignature);
return(resize_filter->window_support);
}
@@ -1533,7 +1533,7 @@ MagickPrivate ResizeWeightingFunctionType GetResizeFilterWeightingType(
const ResizeFilter *resize_filter)
{
assert(resize_filter != (ResizeFilter *) NULL);
- assert(resize_filter->signature == MagickSignature);
+ assert(resize_filter->signature == MagickCoreSignature);
return(resize_filter->filterWeightingType);
}
@@ -1541,14 +1541,14 @@ MagickPrivate ResizeWeightingFunctionType GetResizeFilterWindowWeightingType(
const ResizeFilter *resize_filter)
{
assert(resize_filter != (ResizeFilter *) NULL);
- assert(resize_filter->signature == MagickSignature);
+ assert(resize_filter->signature == MagickCoreSignature);
return(resize_filter->windowWeightingType);
}
MagickPrivate double GetResizeFilterSupport(const ResizeFilter *resize_filter)
{
assert(resize_filter != (ResizeFilter *) NULL);
- assert(resize_filter->signature == MagickSignature);
+ assert(resize_filter->signature == MagickCoreSignature);
return(resize_filter->support*resize_filter->blur);
}
@@ -1591,7 +1591,7 @@ MagickPrivate double GetResizeFilterWeight(const ResizeFilter *resize_filter,
Windowing function - scale the weighting filter by this amount.
*/
assert(resize_filter != (ResizeFilter *) NULL);
- assert(resize_filter->signature == MagickSignature);
+ assert(resize_filter->signature == MagickCoreSignature);
x_blur=fabs((double) x)/resize_filter->blur; /* X offset with blur scaling */
if ((resize_filter->window_support < MagickEpsilon) ||
(resize_filter->window == Box))
@@ -1667,11 +1667,11 @@ MagickExport Image *InterpolativeResizeImage(const Image *image,
Interpolatively resize image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if ((columns == 0) || (rows == 0))
return((Image *) NULL);
if ((columns == image->columns) && (rows == image->rows))
@@ -1844,11 +1844,11 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns,
Liquid rescale image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if ((columns == 0) || (rows == 0))
return((Image *) NULL);
if ((columns == image->columns) && (rows == image->rows))
@@ -1961,11 +1961,11 @@ MagickExport Image *LiquidRescaleImage(const Image *image,
ExceptionInfo *exception)
{
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
(void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError,
"DelegateLibrarySupportNotBuiltIn","'%s' (LQR)",image->filename);
return((Image *) NULL);
@@ -2021,11 +2021,11 @@ MagickExport Image *MagnifyImage(const Image *image,ExceptionInfo *exception)
Initialize magnified image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
magnify_image=CloneImage(image,2*image->columns,2*image->rows,MagickTrue,
exception);
if (magnify_image == (Image *) NULL)
@@ -2194,11 +2194,11 @@ MagickExport Image *MinifyImage(const Image *image,ExceptionInfo *exception)
*minify_image;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
minify_image=ResizeImage(image,image->columns/2,image->rows/2,SplineFilter,
exception);
return(minify_image);
@@ -2254,11 +2254,11 @@ MagickExport Image *ResampleImage(const Image *image,const double x_resolution,
Initialize sampled image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
width=(size_t) (x_resolution*image->columns/(image->resolution.x == 0.0 ?
72.0 : image->resolution.x)+0.5);
height=(size_t) (y_resolution*image->rows/(image->resolution.y == 0.0 ?
@@ -2822,11 +2822,11 @@ MagickExport Image *ResizeImage(const Image *image,const size_t columns,
Acquire resize image.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if ((columns == 0) || (rows == 0))
ThrowImageException(ImageError,"NegativeOrZeroImageSize");
if ((columns == image->columns) && (rows == image->rows) &&
@@ -2967,11 +2967,11 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns,
Initialize sampled image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if ((columns == 0) || (rows == 0))
ThrowImageException(ImageError,"NegativeOrZeroImageSize");
if ((columns == image->columns) && (rows == image->rows))
@@ -3189,11 +3189,11 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
Initialize scaled image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if ((columns == 0) || (rows == 0))
return((Image *) NULL);
if ((columns == image->columns) && (rows == image->rows))
@@ -3622,11 +3622,11 @@ MagickExport Image *ThumbnailImage(const Image *image,const size_t columns,
attributes;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
x_factor=(double) columns/(double) image->columns;
y_factor=(double) rows/(double) image->rows;
if ((x_factor*y_factor) > 0.1)
diff --git a/MagickCore/segment.c b/MagickCore/segment.c
index 4f267dce5..1cef25cc0 100644
--- a/MagickCore/segment.c
+++ b/MagickCore/segment.c
@@ -968,7 +968,7 @@ MagickExport MagickBooleanType GetImageDynamicThreshold(const Image *image,
Allocate histogram and extrema.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
GetPixelInfo(image,pixel);
@@ -1798,7 +1798,7 @@ MagickExport MagickBooleanType SegmentImage(Image *image,
Allocate histogram and extrema.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
for (i=0; i < MaxDimension; i++)
diff --git a/MagickCore/semaphore.c b/MagickCore/semaphore.c
index ce52043d2..e42acf8b4 100644
--- a/MagickCore/semaphore.c
+++ b/MagickCore/semaphore.c
@@ -263,7 +263,7 @@ MagickExport SemaphoreInfo *AcquireSemaphoreInfo(void)
#endif
semaphore_info->id=GetMagickThreadId();
semaphore_info->reference_count=0;
- semaphore_info->signature=MagickSignature;
+ semaphore_info->signature=MagickCoreSignature;
return(semaphore_info);
}
@@ -292,7 +292,7 @@ MagickExport SemaphoreInfo *AcquireSemaphoreInfo(void)
MagickExport void LockSemaphoreInfo(SemaphoreInfo *semaphore_info)
{
assert(semaphore_info != (SemaphoreInfo *) NULL);
- assert(semaphore_info->signature == MagickSignature);
+ assert(semaphore_info->signature == MagickCoreSignature);
#if defined(MAGICKCORE_DEBUG)
if ((semaphore_info->reference_count > 0) &&
(IsMagickThreadEqual(semaphore_info->id) != MagickFalse))
@@ -351,7 +351,7 @@ MagickExport void RelinquishSemaphoreInfo(SemaphoreInfo **semaphore_info)
{
assert(semaphore_info != (SemaphoreInfo **) NULL);
assert((*semaphore_info) != (SemaphoreInfo *) NULL);
- assert((*semaphore_info)->signature == MagickSignature);
+ assert((*semaphore_info)->signature == MagickCoreSignature);
InitializeMagickMutex();
LockMagickMutex();
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -372,7 +372,7 @@ MagickExport void RelinquishSemaphoreInfo(SemaphoreInfo **semaphore_info)
#elif defined(MAGICKCORE_HAVE_WINTHREADS)
DeleteCriticalSection(&(*semaphore_info)->mutex);
#endif
- (*semaphore_info)->signature=(~MagickSignature);
+ (*semaphore_info)->signature=(~MagickCoreSignature);
*semaphore_info=(SemaphoreInfo *) RelinquishSemaphoreMemory(*semaphore_info);
UnlockMagickMutex();
}
@@ -449,7 +449,7 @@ MagickPrivate void SemaphoreComponentTerminus(void)
MagickExport void UnlockSemaphoreInfo(SemaphoreInfo *semaphore_info)
{
assert(semaphore_info != (SemaphoreInfo *) NULL);
- assert(semaphore_info->signature == MagickSignature);
+ assert(semaphore_info->signature == MagickCoreSignature);
#if defined(MAGICKCORE_DEBUG)
assert(IsMagickThreadEqual(semaphore_info->id) != MagickFalse);
if (semaphore_info->reference_count == 0)
diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index a0390eac5..49c36b36e 100644
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -1176,7 +1176,7 @@ static MagickBooleanType XShearImage(Image *image,const double degrees,
X shear image.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=MagickTrue;
@@ -1392,7 +1392,7 @@ static MagickBooleanType YShearImage(Image *image,const double degrees,
Y Shear image.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=MagickTrue;
@@ -1600,11 +1600,11 @@ MagickExport Image *ShearImage(const Image *image,const double x_shear,
bounds;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if ((x_shear != 0.0) && (fmod(x_shear,90.0) == 0.0))
ThrowImageException(ImageError,"AngleIsDiscontinuous");
if ((y_shear != 0.0) && (fmod(y_shear,90.0) == 0.0))
@@ -1744,11 +1744,11 @@ MagickExport Image *ShearRotateImage(const Image *image,const double degrees,
Adjust rotation angle.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
angle=degrees;
while (angle < -45.0)
angle+=360.0;
diff --git a/MagickCore/signature.c b/MagickCore/signature.c
index e4c9572a3..72841981a 100644
--- a/MagickCore/signature.c
+++ b/MagickCore/signature.c
@@ -137,7 +137,7 @@ MagickPrivate SignatureInfo *AcquireSignatureInfo(void)
signature_info->lsb_first=(int) (*(char *) &lsb_first) == 1 ? MagickTrue :
MagickFalse;
signature_info->timestamp=(ssize_t) time(0);
- signature_info->signature=MagickSignature;
+ signature_info->signature=MagickCoreSignature;
InitializeSignature(signature_info);
return(signature_info);
}
@@ -169,7 +169,7 @@ MagickPrivate SignatureInfo *DestroySignatureInfo(SignatureInfo *signature_info)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(signature_info != (SignatureInfo *) NULL);
- assert(signature_info->signature == MagickSignature);
+ assert(signature_info->signature == MagickCoreSignature);
if (signature_info->accumulator != (unsigned int *) NULL)
signature_info->accumulator=(unsigned int *) RelinquishMagickMemory(
signature_info->accumulator);
@@ -177,7 +177,7 @@ MagickPrivate SignatureInfo *DestroySignatureInfo(SignatureInfo *signature_info)
signature_info->message=DestroyStringInfo(signature_info->message);
if (signature_info->digest != (StringInfo *) NULL)
signature_info->digest=DestroyStringInfo(signature_info->digest);
- signature_info->signature=(~MagickSignature);
+ signature_info->signature=(~MagickCoreSignature);
signature_info=(SignatureInfo *) RelinquishMagickMemory(signature_info);
return(signature_info);
}
@@ -228,7 +228,7 @@ MagickPrivate void FinalizeSignature(SignatureInfo *signature_info)
*/
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(signature_info != (SignatureInfo *) NULL);
- assert(signature_info->signature == MagickSignature);
+ assert(signature_info->signature == MagickCoreSignature);
low_order=signature_info->low_order;
high_order=signature_info->high_order;
count=((low_order >> 3) & 0x3f);
@@ -293,7 +293,7 @@ MagickPrivate unsigned int GetSignatureBlocksize(
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(signature_info != (SignatureInfo *) NULL);
- assert(signature_info->signature == MagickSignature);
+ assert(signature_info->signature == MagickCoreSignature);
return(signature_info->blocksize);
}
@@ -324,7 +324,7 @@ MagickPrivate const StringInfo *GetSignatureDigest(
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(signature_info != (SignatureInfo *) NULL);
- assert(signature_info->signature == MagickSignature);
+ assert(signature_info->signature == MagickCoreSignature);
return(signature_info->digest);
}
@@ -355,7 +355,7 @@ MagickPrivate unsigned int GetSignatureDigestsize(
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(signature_info != (SignatureInfo *) NULL);
- assert(signature_info->signature == MagickSignature);
+ assert(signature_info->signature == MagickCoreSignature);
return(signature_info->digestsize);
}
@@ -385,7 +385,7 @@ MagickPrivate void InitializeSignature(SignatureInfo *signature_info)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(signature_info != (SignatureInfo *) NULL);
- assert(signature_info->signature == MagickSignature);
+ assert(signature_info->signature == MagickCoreSignature);
signature_info->accumulator[0]=0x6a09e667U;
signature_info->accumulator[1]=0xbb67ae85U;
signature_info->accumulator[2]=0x3c6ef372U;
@@ -431,7 +431,7 @@ MagickPrivate void SetSignatureDigest(SignatureInfo *signature_info,
Set the signature accumulator.
*/
assert(signature_info != (SignatureInfo *) NULL);
- assert(signature_info->signature == MagickSignature);
+ assert(signature_info->signature == MagickCoreSignature);
SetStringInfo(signature_info->digest,digest);
}
@@ -493,7 +493,7 @@ MagickExport MagickBooleanType SignatureImage(Image *image,
Compute image digital signature.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
signature_info=AcquireSignatureInfo();
@@ -790,7 +790,7 @@ MagickPrivate void UpdateSignature(SignatureInfo *signature_info,
Update the Signature accumulator.
*/
assert(signature_info != (SignatureInfo *) NULL);
- assert(signature_info->signature == MagickSignature);
+ assert(signature_info->signature == MagickCoreSignature);
n=GetStringInfoLength(message);
length=Trunc32((unsigned int) (signature_info->low_order+(n << 3)));
if (length < signature_info->low_order)
diff --git a/MagickCore/splay-tree.c b/MagickCore/splay-tree.c
index 783dadde6..fadbc8271 100644
--- a/MagickCore/splay-tree.c
+++ b/MagickCore/splay-tree.c
@@ -352,7 +352,7 @@ MagickExport SplayTreeInfo *CloneSplayTree(SplayTreeInfo *splay_tree,
*clone_tree;
assert(splay_tree != (SplayTreeInfo *) NULL);
- assert(splay_tree->signature == MagickSignature);
+ assert(splay_tree->signature == MagickCoreSignature);
if (splay_tree->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
clone_tree=NewSplayTree(splay_tree->compare,splay_tree->relinquish_key,
@@ -489,7 +489,7 @@ MagickExport MagickBooleanType DeleteNodeByValueFromSplayTree(
*node;
assert(splay_tree != (SplayTreeInfo *) NULL);
- assert(splay_tree->signature == MagickSignature);
+ assert(splay_tree->signature == MagickCoreSignature);
if (splay_tree->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
LockSemaphoreInfo(splay_tree->semaphore);
@@ -609,7 +609,7 @@ MagickExport MagickBooleanType DeleteNodeFromSplayTree(
*right;
assert(splay_tree != (SplayTreeInfo *) NULL);
- assert(splay_tree->signature == MagickSignature);
+ assert(splay_tree->signature == MagickCoreSignature);
if (splay_tree->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if (splay_tree->root == (NodeInfo *) NULL)
@@ -733,7 +733,7 @@ MagickExport SplayTreeInfo *DestroySplayTree(SplayTreeInfo *splay_tree)
}
}
}
- splay_tree->signature=(~MagickSignature);
+ splay_tree->signature=(~MagickCoreSignature);
UnlockSemaphoreInfo(splay_tree->semaphore);
RelinquishSemaphoreInfo(&splay_tree->semaphore);
splay_tree=(SplayTreeInfo *) RelinquishMagickMemory(splay_tree);
@@ -773,7 +773,7 @@ MagickExport const void *GetNextKeyInSplayTree(SplayTreeInfo *splay_tree)
*key;
assert(splay_tree != (SplayTreeInfo *) NULL);
- assert(splay_tree->signature == MagickSignature);
+ assert(splay_tree->signature == MagickCoreSignature);
if (splay_tree->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if ((splay_tree->root == (NodeInfo *) NULL) ||
@@ -827,7 +827,7 @@ MagickExport const void *GetNextValueInSplayTree(SplayTreeInfo *splay_tree)
*value;
assert(splay_tree != (SplayTreeInfo *) NULL);
- assert(splay_tree->signature == MagickSignature);
+ assert(splay_tree->signature == MagickCoreSignature);
if (splay_tree->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if ((splay_tree->root == (NodeInfo *) NULL) ||
@@ -885,7 +885,7 @@ MagickExport const void *GetValueFromSplayTree(SplayTreeInfo *splay_tree,
*value;
assert(splay_tree != (SplayTreeInfo *) NULL);
- assert(splay_tree->signature == MagickSignature);
+ assert(splay_tree->signature == MagickCoreSignature);
if (splay_tree->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if (splay_tree->root == (NodeInfo *) NULL)
@@ -934,7 +934,7 @@ MagickExport size_t GetNumberOfNodesInSplayTree(
const SplayTreeInfo *splay_tree)
{
assert(splay_tree != (SplayTreeInfo *) NULL);
- assert(splay_tree->signature == MagickSignature);
+ assert(splay_tree->signature == MagickCoreSignature);
if (splay_tree->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
return(splay_tree->nodes);
@@ -1116,7 +1116,7 @@ MagickExport SplayTreeInfo *NewSplayTree(
splay_tree->nodes=0;
splay_tree->debug=IsEventLogging();
splay_tree->semaphore=AcquireSemaphoreInfo();
- splay_tree->signature=MagickSignature;
+ splay_tree->signature=MagickCoreSignature;
return(splay_tree);
}
@@ -1157,7 +1157,7 @@ MagickExport void *RemoveNodeByValueFromSplayTree(SplayTreeInfo *splay_tree,
*key;
assert(splay_tree != (SplayTreeInfo *) NULL);
- assert(splay_tree->signature == MagickSignature);
+ assert(splay_tree->signature == MagickCoreSignature);
if (splay_tree->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
key=(void *) NULL;
@@ -1269,7 +1269,7 @@ MagickExport void *RemoveNodeFromSplayTree(SplayTreeInfo *splay_tree,
*value;
assert(splay_tree != (SplayTreeInfo *) NULL);
- assert(splay_tree->signature == MagickSignature);
+ assert(splay_tree->signature == MagickCoreSignature);
if (splay_tree->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
value=(void *) NULL;
@@ -1346,7 +1346,7 @@ MagickExport void ResetSplayTree(SplayTreeInfo *splay_tree)
*pend;
assert(splay_tree != (SplayTreeInfo *) NULL);
- assert(splay_tree->signature == MagickSignature);
+ assert(splay_tree->signature == MagickCoreSignature);
if (splay_tree->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
LockSemaphoreInfo(splay_tree->semaphore);
@@ -1431,7 +1431,7 @@ MagickExport void ResetSplayTree(SplayTreeInfo *splay_tree)
MagickExport void ResetSplayTreeIterator(SplayTreeInfo *splay_tree)
{
assert(splay_tree != (SplayTreeInfo *) NULL);
- assert(splay_tree->signature == MagickSignature);
+ assert(splay_tree->signature == MagickCoreSignature);
if (splay_tree->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
LockSemaphoreInfo(splay_tree->semaphore);
diff --git a/MagickCore/static.c b/MagickCore/static.c
index b0242d521..a91fc84b7 100644
--- a/MagickCore/static.c
+++ b/MagickCore/static.c
@@ -89,7 +89,7 @@ MagickExport MagickBooleanType InvokeStaticImageFilter(const char *tag,
rights;
assert(image != (Image **) NULL);
- assert((*image)->signature == MagickSignature);
+ assert((*image)->signature == MagickCoreSignature);
if ((*image)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*image)->filename);
rights=ReadPolicyRights;
diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 4b7e0787b..728bbbe35 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -453,11 +453,11 @@ MagickExport Image *EvaluateImages(const Image *images,
#endif
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=CloneImage(images,images->columns,images->rows,MagickTrue,
exception);
if (image == (Image *) NULL)
@@ -778,11 +778,11 @@ MagickExport MagickBooleanType EvaluateImage(Image *image,
#endif
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
status=MagickTrue;
@@ -1008,11 +1008,11 @@ MagickExport MagickBooleanType FunctionImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
status=MagickTrue;
@@ -1120,7 +1120,7 @@ MagickExport MagickBooleanType GetImageEntropy(const Image *image,
i;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
channel_statistics=GetImageStatistics(image,exception);
@@ -1193,7 +1193,7 @@ MagickExport MagickBooleanType GetImageExtrema(const Image *image,
status;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=GetImageRange(image,&min,&max,exception);
@@ -1253,7 +1253,7 @@ MagickExport MagickBooleanType GetImageKurtosis(const Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=MagickTrue;
@@ -1383,7 +1383,7 @@ MagickExport MagickBooleanType GetImageMean(const Image *image,double *mean,
i;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
channel_statistics=GetImageStatistics(image,exception);
@@ -1498,7 +1498,7 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
channel_moments=(ChannelMoments *) AcquireQuantumMemory(MaxPixelChannels+1,
@@ -1895,7 +1895,7 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=MagickTrue;
@@ -2026,7 +2026,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
histogram=(double *) AcquireQuantumMemory(MaxMap+1UL,MaxPixelChannels*
@@ -2275,11 +2275,11 @@ MagickExport Image *PolynomialImage(const Image *images,
y;
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=CloneImage(images,images->columns,images->rows,MagickTrue,
exception);
if (image == (Image *) NULL)
@@ -2542,7 +2542,7 @@ static PixelList *AcquirePixelList(const size_t width,const size_t height)
return(DestroyPixelList(pixel_list));
(void) ResetMagickMemory(pixel_list->skip_list.nodes,0,65537UL*
sizeof(*pixel_list->skip_list.nodes));
- pixel_list->signature=MagickSignature;
+ pixel_list->signature=MagickCoreSignature;
return(pixel_list);
}
@@ -2956,11 +2956,11 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type,
Initialize statistics image attributes.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
statistic_image=CloneImage(image,image->columns,image->rows,MagickTrue,
exception);
if (statistic_image == (Image *) NULL)
diff --git a/MagickCore/stream.c b/MagickCore/stream.c
index 9eaeec80c..f51f2176f 100644
--- a/MagickCore/stream.c
+++ b/MagickCore/stream.c
@@ -169,7 +169,7 @@ MagickExport StreamInfo *AcquireStreamInfo(const ImageInfo *image_info,
stream_info->map=ConstantString("RGB");
stream_info->storage_type=CharPixel;
stream_info->stream=AcquireImage(image_info,exception);
- stream_info->signature=MagickSignature;
+ stream_info->signature=MagickCoreSignature;
return(stream_info);
}
@@ -218,11 +218,11 @@ static void DestroyPixelStream(Image *image)
destroy;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
destroy=MagickFalse;
LockSemaphoreInfo(cache_info->semaphore);
cache_info->reference_count--;
@@ -269,7 +269,7 @@ MagickExport StreamInfo *DestroyStreamInfo(StreamInfo *stream_info)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(stream_info != (StreamInfo *) NULL);
- assert(stream_info->signature == MagickSignature);
+ assert(stream_info->signature == MagickCoreSignature);
if (stream_info->map != (char *) NULL)
stream_info->map=DestroyString(stream_info->map);
if (stream_info->pixels != (unsigned char *) NULL)
@@ -282,7 +282,7 @@ MagickExport StreamInfo *DestroyStreamInfo(StreamInfo *stream_info)
}
if (stream_info->quantum_info != (QuantumInfo *) NULL)
stream_info->quantum_info=DestroyQuantumInfo(stream_info->quantum_info);
- stream_info->signature=(~MagickSignature);
+ stream_info->signature=(~MagickCoreSignature);
stream_info=(StreamInfo *) RelinquishMagickMemory(stream_info);
return(stream_info);
}
@@ -317,11 +317,11 @@ static void *GetAuthenticMetacontentFromStream(const Image *image)
*cache_info;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
return(cache_info->metacontent);
}
@@ -365,7 +365,7 @@ static Quantum *GetAuthenticPixelsStream(Image *image,const ssize_t x,
*pixels;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
pixels=QueueAuthenticPixelsStream(image,x,y,columns,rows,exception);
@@ -401,11 +401,11 @@ static Quantum *GetAuthenticPixelsFromStream(const Image *image)
*cache_info;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
return(cache_info->pixels);
}
@@ -450,7 +450,7 @@ static MagickBooleanType GetOneAuthenticPixelFromStream(Image *image,
i;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
(void) memset(pixel,0,MaxPixelChannels*sizeof(*pixel));
p=GetAuthenticPixelsStream(image,x,y,1,1,exception);
if (p == (Quantum *) NULL)
@@ -514,7 +514,7 @@ static MagickBooleanType GetOneVirtualPixelFromStream(const Image *image,
i;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
(void) memset(pixel,0,MaxPixelChannels*sizeof(*pixel));
p=GetVirtualPixelStream(image,virtual_pixel_method,x,y,1,1,exception);
if (p == (const Quantum *) NULL)
@@ -559,7 +559,7 @@ static MagickBooleanType GetOneVirtualPixelFromStream(const Image *image,
MagickPrivate const void *GetStreamInfoClientData(StreamInfo *stream_info)
{
assert(stream_info != (StreamInfo *) NULL);
- assert(stream_info->signature == MagickSignature);
+ assert(stream_info->signature == MagickCoreSignature);
return(stream_info->client_data);
}
@@ -595,11 +595,11 @@ static const Quantum *GetVirtualPixelsStream(const Image *image)
*cache_info;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
return(cache_info->pixels);
}
@@ -633,11 +633,11 @@ static const void *GetVirtualMetacontentFromStream(const Image *image)
*cache_info;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
return(cache_info->metacontent);
}
@@ -722,7 +722,7 @@ static const Quantum *GetVirtualPixelStream(const Image *image,
Validate pixel cache geometry.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((x < 0) || (y < 0) ||
@@ -735,7 +735,7 @@ static const Quantum *GetVirtualPixelStream(const Image *image,
return((Quantum *) NULL);
}
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
/*
Pixels are stored in a temporary buffer until they are synced to the cache.
*/
@@ -885,7 +885,7 @@ static Quantum *QueueAuthenticPixelsStream(Image *image,const ssize_t x,
return((Quantum *) NULL);
}
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
if ((image->storage_class != GetPixelCacheStorageClass(image->cache)) ||
(image->colorspace != GetPixelCacheColorspace(image->cache)))
{
@@ -982,12 +982,12 @@ MagickExport Image *ReadStream(const ImageInfo *image_info,StreamHandler stream,
Stream image pixels.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
read_info=CloneImageInfo(image_info);
read_info->cache=AcquirePixelCache(0);
GetPixelCacheMethods(&cache_methods);
@@ -1041,7 +1041,7 @@ MagickPrivate void SetStreamInfoClientData(StreamInfo *stream_info,
const void *client_data)
{
assert(stream_info != (StreamInfo *) NULL);
- assert(stream_info->signature == MagickSignature);
+ assert(stream_info->signature == MagickCoreSignature);
stream_info->client_data=client_data;
}
@@ -1072,7 +1072,7 @@ MagickPrivate void SetStreamInfoClientData(StreamInfo *stream_info,
MagickExport void SetStreamInfoMap(StreamInfo *stream_info,const char *map)
{
assert(stream_info != (StreamInfo *) NULL);
- assert(stream_info->signature == MagickSignature);
+ assert(stream_info->signature == MagickCoreSignature);
(void) CloneString(&stream_info->map,map);
}
@@ -1105,7 +1105,7 @@ MagickExport void SetStreamInfoStorageType(StreamInfo *stream_info,
const StorageType storage_type)
{
assert(stream_info != (StreamInfo *) NULL);
- assert(stream_info->signature == MagickSignature);
+ assert(stream_info->signature == MagickCoreSignature);
stream_info->storage_type=storage_type;
}
@@ -1175,7 +1175,7 @@ static size_t WriteStreamImage(const Image *image,const void *pixels,
case ShortPixel: packet_size=sizeof(unsigned short); break;
}
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
packet_size*=strlen(stream_info->map);
length=packet_size*cache_info->columns*cache_info->rows;
if (image != stream_info->image)
@@ -1242,12 +1242,12 @@ MagickExport Image *StreamImage(const ImageInfo *image_info,
*read_info;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(stream_info != (StreamInfo *) NULL);
- assert(stream_info->signature == MagickSignature);
+ assert(stream_info->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
read_info=CloneImageInfo(image_info);
stream_info->image_info=image_info;
@@ -1312,9 +1312,9 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info,
length;
assert(stream_info != (StreamInfo *) NULL);
- assert(stream_info->signature == MagickSignature);
+ assert(stream_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
length=strlen(stream_info->map);
@@ -2686,11 +2686,11 @@ static MagickBooleanType SyncAuthenticPixelsStream(Image *image,
stream_handler;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
cache_info=(CacheInfo *) image->cache;
- assert(cache_info->signature == MagickSignature);
+ assert(cache_info->signature == MagickCoreSignature);
stream_handler=GetBlobStreamHandler(image);
if (stream_handler == (StreamHandler) NULL)
{
@@ -2740,12 +2740,12 @@ MagickExport MagickBooleanType WriteStream(const ImageInfo *image_info,
status;
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
write_info=CloneImageInfo(image_info);
*write_info->magick='\0';
write_info->stream=stream;
diff --git a/MagickCore/string.c b/MagickCore/string.c
index e1b24c9e1..0160c0413 100644
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -172,7 +172,7 @@ MagickExport StringInfo *AcquireStringInfo(const size_t length)
if (string_info == (StringInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
(void) ResetMagickMemory(string_info,0,sizeof(*string_info));
- string_info->signature=MagickSignature;
+ string_info->signature=MagickCoreSignature;
string_info->length=length;
string_info->datum=(unsigned char *) NULL;
if (~string_info->length >= (MagickPathExtent-1))
@@ -323,7 +323,7 @@ MagickExport StringInfo *CloneStringInfo(const StringInfo *string_info)
*clone_info;
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
clone_info=AcquireStringInfo(string_info->length);
if (string_info->length != 0)
(void) memcpy(clone_info->datum,string_info->datum,string_info->length+1);
@@ -364,9 +364,9 @@ MagickExport int CompareStringInfo(const StringInfo *target,
status;
assert(target != (StringInfo *) NULL);
- assert(target->signature == MagickSignature);
+ assert(target->signature == MagickCoreSignature);
assert(source != (StringInfo *) NULL);
- assert(source->signature == MagickSignature);
+ assert(source->signature == MagickCoreSignature);
status=memcmp(target->datum,source->datum,MagickMin(target->length,
source->length));
if (status != 0)
@@ -538,7 +538,7 @@ MagickExport void ConcatenateStringInfo(StringInfo *string_info,
length;
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
assert(source != (const StringInfo *) NULL);
length=string_info->length;
if (~length < source->length)
@@ -837,13 +837,13 @@ MagickExport char *DestroyString(char *string)
MagickExport StringInfo *DestroyStringInfo(StringInfo *string_info)
{
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
if (string_info->datum != (unsigned char *) NULL)
string_info->datum=(unsigned char *) RelinquishMagickMemory(
string_info->datum);
if (string_info->path != (char *) NULL)
string_info->path=DestroyString(string_info->path);
- string_info->signature=(~MagickSignature);
+ string_info->signature=(~MagickCoreSignature);
string_info=(StringInfo *) RelinquishMagickMemory(string_info);
return(string_info);
}
@@ -1271,7 +1271,7 @@ MagickExport char *GetEnvironmentValue(const char *name)
MagickExport unsigned char *GetStringInfoDatum(const StringInfo *string_info)
{
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
return(string_info->datum);
}
@@ -1300,7 +1300,7 @@ MagickExport unsigned char *GetStringInfoDatum(const StringInfo *string_info)
MagickExport size_t GetStringInfoLength(const StringInfo *string_info)
{
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
return(string_info->length);
}
@@ -1329,7 +1329,7 @@ MagickExport size_t GetStringInfoLength(const StringInfo *string_info)
MagickExport const char *GetStringInfoPath(const StringInfo *string_info)
{
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
return(string_info->path);
}
@@ -1743,7 +1743,7 @@ MagickExport void PrintStringInfo(FILE *file,const char *id,
assert(id != (const char *) NULL);
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
p=(char *) string_info->datum;
for (i=0; i < string_info->length; i++)
{
@@ -1818,7 +1818,7 @@ MagickExport void PrintStringInfo(FILE *file,const char *id,
MagickExport void ResetStringInfo(StringInfo *string_info)
{
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
(void) ResetMagickMemory(string_info->datum,0,string_info->length);
}
@@ -1850,9 +1850,9 @@ MagickExport void SetStringInfo(StringInfo *string_info,
const StringInfo *source)
{
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
assert(source != (StringInfo *) NULL);
- assert(source->signature == MagickSignature);
+ assert(source->signature == MagickCoreSignature);
if (string_info->length == 0)
return;
(void) ResetMagickMemory(string_info->datum,0,string_info->length);
@@ -1890,7 +1890,7 @@ MagickExport void SetStringInfoDatum(StringInfo *string_info,
const unsigned char *source)
{
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
if (string_info->length != 0)
(void) memcpy(string_info->datum,source,string_info->length);
}
@@ -1923,7 +1923,7 @@ MagickExport void SetStringInfoLength(StringInfo *string_info,
const size_t length)
{
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
if (~length < MagickPathExtent)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
string_info->length=length;
@@ -1964,7 +1964,7 @@ MagickExport void SetStringInfoLength(StringInfo *string_info,
MagickExport void SetStringInfoPath(StringInfo *string_info,const char *path)
{
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
assert(path != (const char *) NULL);
string_info->path=ConstantString(path);
}
@@ -1998,7 +1998,7 @@ MagickExport StringInfo *SplitStringInfo(StringInfo *string_info,
*split_info;
assert(string_info != (StringInfo *) NULL);
- assert(string_info->signature == MagickSignature);
+ assert(string_info->signature == MagickCoreSignature);
if (offset > string_info->length)
return((StringInfo *) NULL);
split_info=AcquireStringInfo(offset);
@@ -2296,7 +2296,7 @@ MagickExport double *StringToArrayOfDoubles(const char *string,ssize_t *count,
Determine count of values, and check syntax.
*/
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
*count=0;
i=0;
p=string;
diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 8aabd9be8..4c48c8da3 100644
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -202,11 +202,11 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image,
Initialize threshold image attributes.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
threshold_image=CloneImage(image,image->columns,image->rows,MagickTrue,
exception);
if (threshold_image == (Image *) NULL)
@@ -414,7 +414,7 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
@@ -549,7 +549,7 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (thresholds == (const char *) NULL)
@@ -703,7 +703,7 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception)
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->storage_class == PseudoClass)
@@ -1312,11 +1312,11 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image,
*map;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (threshold_map == (const char *) NULL)
return(MagickTrue);
p=(char *) threshold_map;
@@ -1495,7 +1495,7 @@ MagickExport MagickBooleanType PerceptibleImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->storage_class == PseudoClass)
@@ -1656,11 +1656,11 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image,
#endif
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (thresholds == (const char *) NULL)
return(MagickTrue);
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
@@ -1817,7 +1817,7 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (thresholds == (const char *) NULL)
diff --git a/MagickCore/timer.c b/MagickCore/timer.c
index 399c36952..04fa5babe 100644
--- a/MagickCore/timer.c
+++ b/MagickCore/timer.c
@@ -92,7 +92,7 @@ MagickExport TimerInfo *AcquireTimerInfo(void)
if (timer_info == (TimerInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString");
(void) ResetMagickMemory(timer_info,0,sizeof(*timer_info));
- timer_info->signature=MagickSignature;
+ timer_info->signature=MagickCoreSignature;
GetTimerInfo(timer_info);
return(timer_info);
}
@@ -123,7 +123,7 @@ MagickExport TimerInfo *AcquireTimerInfo(void)
MagickExport MagickBooleanType ContinueTimer(TimerInfo *time_info)
{
assert(time_info != (TimerInfo *) NULL);
- assert(time_info->signature == MagickSignature);
+ assert(time_info->signature == MagickCoreSignature);
if (time_info->state == UndefinedTimerState)
return(MagickFalse);
if (time_info->state == StoppedTimerState)
@@ -161,8 +161,8 @@ MagickExport MagickBooleanType ContinueTimer(TimerInfo *time_info)
MagickExport TimerInfo *DestroyTimerInfo(TimerInfo *timer_info)
{
assert(timer_info != (TimerInfo *) NULL);
- assert(timer_info->signature == MagickSignature);
- timer_info->signature=(~MagickSignature);
+ assert(timer_info->signature == MagickCoreSignature);
+ timer_info->signature=(~MagickCoreSignature);
timer_info=(TimerInfo *) RelinquishMagickMemory(timer_info);
return(timer_info);
}
@@ -229,7 +229,7 @@ static double ElapsedTime(void)
MagickExport double GetElapsedTime(TimerInfo *time_info)
{
assert(time_info != (TimerInfo *) NULL);
- assert(time_info->signature == MagickSignature);
+ assert(time_info->signature == MagickCoreSignature);
if (time_info->state == UndefinedTimerState)
return(0.0);
if (time_info->state == RunningTimerState)
@@ -267,7 +267,7 @@ MagickExport void GetTimerInfo(TimerInfo *time_info)
assert(time_info != (TimerInfo *) NULL);
(void) ResetMagickMemory(time_info,0,sizeof(*time_info));
time_info->state=UndefinedTimerState;
- time_info->signature=MagickSignature;
+ time_info->signature=MagickCoreSignature;
StartTimer(time_info,MagickTrue);
}
@@ -298,7 +298,7 @@ MagickExport void GetTimerInfo(TimerInfo *time_info)
MagickExport double GetUserTime(TimerInfo *time_info)
{
assert(time_info != (TimerInfo *) NULL);
- assert(time_info->signature == MagickSignature);
+ assert(time_info->signature == MagickCoreSignature);
if (time_info->state == UndefinedTimerState)
return(0.0);
if (time_info->state == RunningTimerState)
@@ -331,7 +331,7 @@ MagickExport double GetUserTime(TimerInfo *time_info)
MagickExport void ResetTimer(TimerInfo *time_info)
{
assert(time_info != (TimerInfo *) NULL);
- assert(time_info->signature == MagickSignature);
+ assert(time_info->signature == MagickCoreSignature);
StopTimer(time_info);
time_info->elapsed.stop=0.0;
time_info->user.stop=0.0;
@@ -366,7 +366,7 @@ MagickExport void ResetTimer(TimerInfo *time_info)
MagickExport void StartTimer(TimerInfo *time_info,const MagickBooleanType reset)
{
assert(time_info != (TimerInfo *) NULL);
- assert(time_info->signature == MagickSignature);
+ assert(time_info->signature == MagickCoreSignature);
if (reset != MagickFalse)
{
/*
@@ -408,7 +408,7 @@ MagickExport void StartTimer(TimerInfo *time_info,const MagickBooleanType reset)
static void StopTimer(TimerInfo *time_info)
{
assert(time_info != (TimerInfo *) NULL);
- assert(time_info->signature == MagickSignature);
+ assert(time_info->signature == MagickCoreSignature);
time_info->elapsed.stop=ElapsedTime();
time_info->user.stop=UserTime();
if (time_info->state == RunningTimerState)
diff --git a/MagickCore/token.c b/MagickCore/token.c
index 4fda183d2..9c8dc1bd8 100644
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -99,7 +99,7 @@ MagickExport TokenInfo *AcquireTokenInfo(void)
token_info=(TokenInfo *) AcquireMagickMemory(sizeof(*token_info));
if (token_info == (TokenInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
- token_info->signature=MagickSignature;
+ token_info->signature=MagickCoreSignature;
return(token_info);
}
@@ -130,8 +130,8 @@ MagickExport TokenInfo *DestroyTokenInfo(TokenInfo *token_info)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(token_info != (TokenInfo *) NULL);
- assert(token_info->signature == MagickSignature);
- token_info->signature=(~MagickSignature);
+ assert(token_info->signature == MagickCoreSignature);
+ token_info->signature=(~MagickCoreSignature);
token_info=(TokenInfo *) RelinquishMagickMemory(token_info);
return(token_info);
}
diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index 586a12aee..2e9040b30 100644
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -102,9 +102,9 @@ MagickExport Image *AutoOrientImage(const Image *image,
*orient_image;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
orient_image=(Image *) NULL;
switch(orientation)
{
@@ -212,11 +212,11 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
Check chop geometry.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
assert(chop_info != (RectangleInfo *) NULL);
if (((chop_info->x+(ssize_t) chop_info->width) < 0) ||
((chop_info->y+(ssize_t) chop_info->height) < 0) ||
@@ -429,11 +429,11 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
Consolidate separate C, M, Y, and K planes into a single image.
*/
assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
+ assert(images->signature == MagickCoreSignature);
if (images->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
cmyk_images=NewImageList();
for (j=0; j < (ssize_t) GetImageListLength(images); j+=4)
{
@@ -561,12 +561,12 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry,
Check crop geometry.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(geometry != (const RectangleInfo *) NULL);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
bounding_box=image->page;
if ((bounding_box.width == 0) || (bounding_box.height == 0))
{
@@ -792,7 +792,7 @@ MagickExport Image *CropImageToTiles(const Image *image,
geometry;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
crop_image=NewImageList();
@@ -1002,12 +1002,12 @@ MagickExport Image *ExcerptImage(const Image *image,
Allocate excerpt image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(geometry != (const RectangleInfo *) NULL);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
excerpt_image=CloneImage(image,geometry->width,geometry->height,MagickTrue,
exception);
if (excerpt_image == (Image *) NULL)
@@ -1133,12 +1133,12 @@ MagickExport Image *ExtentImage(const Image *image,
Allocate extent image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(geometry != (const RectangleInfo *) NULL);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if ((image->columns == geometry->width) &&
(image->rows == geometry->height) &&
(geometry->x == 0) && (geometry->y == 0))
@@ -1202,11 +1202,11 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception)
y;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
flip_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (flip_image == (Image *) NULL)
return((Image *) NULL);
@@ -1343,11 +1343,11 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception)
y;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
flop_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (flop_image == (Image *) NULL)
return((Image *) NULL);
@@ -1565,11 +1565,11 @@ MagickExport Image *RollImage(const Image *image,const ssize_t x_offset,
Initialize roll image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
roll_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (roll_image == (Image *) NULL)
return((Image *) NULL);
@@ -1650,7 +1650,7 @@ MagickExport Image *ShaveImage(const Image *image,
geometry;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (((2*shave_info->width) >= image->columns) ||
@@ -1728,12 +1728,12 @@ MagickExport Image *SpliceImage(const Image *image,
Allocate splice image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(geometry != (const RectangleInfo *) NULL);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
splice_geometry=(*geometry);
splice_image=CloneImage(image,image->columns+splice_geometry.width,
image->rows+splice_geometry.height,MagickTrue,exception);
@@ -2086,7 +2086,7 @@ MagickExport MagickBooleanType TransformImage(Image **image,
geometry;
assert(image != (Image **) NULL);
- assert((*image)->signature == MagickSignature);
+ assert((*image)->signature == MagickCoreSignature);
if ((*image)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*image)->filename);
transform_image=(*image);
@@ -2176,7 +2176,7 @@ MagickExport MagickBooleanType TransformImages(Image **images,
i;
assert(images != (Image **) NULL);
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
if ((*images)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
(*images)->filename);
@@ -2245,11 +2245,11 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception)
y;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
transpose_image=CloneImage(image,image->rows,image->columns,MagickTrue,
exception);
if (transpose_image == (Image *) NULL)
@@ -2390,11 +2390,11 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception)
y;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
transverse_image=CloneImage(image,image->rows,image->columns,MagickTrue,
exception);
if (transverse_image == (Image *) NULL)
@@ -2524,7 +2524,7 @@ MagickExport Image *TrimImage(const Image *image,ExceptionInfo *exception)
geometry;
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
geometry=GetImageBoundingBox(image,exception);
diff --git a/MagickCore/type.c b/MagickCore/type.c
index 3bda3c106..f934e69b6 100644
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -813,7 +813,7 @@ MagickExport MagickBooleanType LoadFontConfigFonts(SplayTreeInfo *type_cache,
continue;
(void) ResetMagickMemory(type_info,0,sizeof(*type_info));
type_info->path=ConstantString("System Fonts");
- type_info->signature=MagickSignature;
+ type_info->signature=MagickCoreSignature;
(void) CopyMagickString(name,"Unknown",MagickPathExtent);
status=FcPatternGetString(font_set->fonts[i],FC_FULLNAME,0,&fullname);
if ((status == FcResultMatch) && (fullname != (FcChar8 *) NULL))
@@ -1190,7 +1190,7 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache,
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
(void) ResetMagickMemory(type_info,0,sizeof(*type_info));
type_info->path=ConstantString(filename);
- type_info->signature=MagickSignature;
+ type_info->signature=MagickCoreSignature;
continue;
}
if (type_info == (TypeInfo *) NULL)
diff --git a/MagickCore/vision.c b/MagickCore/vision.c
index 9c315fb47..912f1a48b 100644
--- a/MagickCore/vision.c
+++ b/MagickCore/vision.c
@@ -466,11 +466,11 @@ MagickExport Image *ConnectedComponentsImage(const Image *image,
Initialize connected components image attributes.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
component_image=CloneImage(image,image->columns,image->rows,MagickTrue,
exception);
if (component_image == (Image *) NULL)
diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index 59ad60f31..c956b0015 100644
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -179,7 +179,7 @@ MagickExport XMLTreeInfo *AddChildToXMLTree(XMLTreeInfo *xml_info,
child->attributes=sentinel;
child->content=ConstantString("");
child->debug=IsEventLogging();
- child->signature=MagickSignature;
+ child->signature=MagickCoreSignature;
return(InsertTagIntoXMLTree(xml_info,child,offset));
}
@@ -233,8 +233,8 @@ MagickPrivate XMLTreeInfo *AddPathToXMLTree(XMLTreeInfo *xml_info,
*node;
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
node=xml_info;
@@ -506,8 +506,8 @@ static void DestroyXMLTreeRoot(XMLTreeInfo *xml_info)
*root;
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if (xml_info->parent != (XMLTreeInfo *) NULL)
@@ -557,8 +557,8 @@ static void DestroyXMLTreeRoot(XMLTreeInfo *xml_info)
MagickExport XMLTreeInfo *DestroyXMLTree(XMLTreeInfo *xml_info)
{
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
DestroyXMLTreeChild(xml_info);
@@ -746,8 +746,8 @@ MagickPrivate char *FileToXML(const char *filename,const size_t extent)
MagickExport XMLTreeInfo *GetNextXMLTreeTag(XMLTreeInfo *xml_info)
{
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
return(xml_info->next);
@@ -791,8 +791,8 @@ MagickExport const char *GetXMLTreeAttribute(XMLTreeInfo *xml_info,
*root;
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if (xml_info->attributes == (char **) NULL)
@@ -854,8 +854,8 @@ MagickPrivate MagickBooleanType GetXMLTreeAttributes(const XMLTreeInfo *xml_info
i;
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((const XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((const XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(attributes != (SplayTreeInfo *) NULL);
@@ -901,8 +901,8 @@ MagickExport XMLTreeInfo *GetXMLTreeChild(XMLTreeInfo *xml_info,const char *tag)
*child;
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
child=xml_info->child;
@@ -938,8 +938,8 @@ MagickExport XMLTreeInfo *GetXMLTreeChild(XMLTreeInfo *xml_info,const char *tag)
MagickExport const char *GetXMLTreeContent(XMLTreeInfo *xml_info)
{
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
return(xml_info->content);
@@ -970,8 +970,8 @@ MagickExport const char *GetXMLTreeContent(XMLTreeInfo *xml_info)
MagickPrivate XMLTreeInfo *GetXMLTreeOrdered(XMLTreeInfo *xml_info)
{
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
return(xml_info->ordered);
@@ -1022,8 +1022,8 @@ MagickPrivate XMLTreeInfo *GetXMLTreePath(XMLTreeInfo *xml_info,const char *path
*node;
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
node=xml_info;
@@ -1087,8 +1087,8 @@ MagickPrivate const char **GetXMLTreeProcessingInstructions(
*root;
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
root=(XMLTreeRoot *) xml_info;
@@ -1128,8 +1128,8 @@ MagickPrivate const char **GetXMLTreeProcessingInstructions(
MagickExport XMLTreeInfo *GetXMLTreeSibling(XMLTreeInfo *xml_info)
{
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
return(xml_info->sibling);
@@ -1160,8 +1160,8 @@ MagickExport XMLTreeInfo *GetXMLTreeSibling(XMLTreeInfo *xml_info)
MagickExport const char *GetXMLTreeTag(XMLTreeInfo *xml_info)
{
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
return(xml_info->tag);
@@ -2365,7 +2365,7 @@ MagickExport XMLTreeInfo *NewXMLTreeTag(const char *tag)
root->attributes=(char ***) root->root.attributes;
root->processing_instructions=(char ***) root->root.attributes;
root->debug=IsEventLogging();
- root->signature=MagickSignature;
+ root->signature=MagickCoreSignature;
return(&root->root);
}
@@ -2398,8 +2398,8 @@ MagickPrivate XMLTreeInfo *PruneTagFromXMLTree(XMLTreeInfo *xml_info)
*node;
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if (xml_info->next != (XMLTreeInfo *) NULL)
@@ -2476,8 +2476,8 @@ MagickPrivate XMLTreeInfo *SetXMLTreeAttribute(XMLTreeInfo *xml_info,
j;
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
i=0;
@@ -2563,8 +2563,8 @@ MagickExport XMLTreeInfo *SetXMLTreeContent(XMLTreeInfo *xml_info,
const char *content)
{
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if (xml_info->content != (char *) NULL)
@@ -2764,8 +2764,8 @@ MagickExport char *XMLTreeInfoToXML(XMLTreeInfo *xml_info)
*root;
assert(xml_info != (XMLTreeInfo *) NULL);
- assert((xml_info->signature == MagickSignature) ||
- (((XMLTreeRoot *) xml_info)->signature == MagickSignature));
+ assert((xml_info->signature == MagickCoreSignature) ||
+ (((XMLTreeRoot *) xml_info)->signature == MagickCoreSignature));
if (xml_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if (xml_info->tag == (char *) NULL)
diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 22b2c3653..6cafe416c 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -4894,7 +4894,7 @@ MagickExport Image *XImportImage(const ImageInfo *image_info,
Open X server connection.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -9931,13 +9931,13 @@ MagickExport Image *XImportImage(const ImageInfo *image_info,
XImportInfo *ximage_info,ExceptionInfo *exception)
{
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(ximage_info != (XImportInfo *) NULL);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
return((Image *) NULL);
}
diff --git a/MagickWand/animate.c b/MagickWand/animate.c
index 3e173d7d4..b538a7f62 100644
--- a/MagickWand/animate.c
+++ b/MagickWand/animate.c
@@ -303,7 +303,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
Set defaults.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(exception != (ExceptionInfo *) NULL);
diff --git a/MagickWand/compare.c b/MagickWand/compare.c
index 58fef3df3..19af90b03 100644
--- a/MagickWand/compare.c
+++ b/MagickWand/compare.c
@@ -253,7 +253,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
Set defaults.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(exception != (ExceptionInfo *) NULL);
diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index 25bb4aed2..9553c60d2 100644
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -115,9 +115,9 @@ static MagickBooleanType CompositeImageList(ImageInfo *image_info,Image **image,
status;
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image **) NULL);
- assert((*image)->signature == MagickSignature);
+ assert((*image)->signature == MagickCoreSignature);
if ((*image)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*image)->filename);
assert(exception != (ExceptionInfo *) NULL);
@@ -129,7 +129,7 @@ static MagickBooleanType CompositeImageList(ImageInfo *image_info,Image **image,
channel_mask=SetImageChannelMask(composite_image,
composite_options->channel);
- assert(composite_image->signature == MagickSignature);
+ assert(composite_image->signature == MagickCoreSignature);
switch (composite_options->compose)
{
case BlendCompositeOp:
@@ -451,7 +451,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
Set default.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(exception != (ExceptionInfo *) NULL);
diff --git a/MagickWand/conjure.c b/MagickWand/conjure.c
index 23b8fd5b8..76ec29a3f 100644
--- a/MagickWand/conjure.c
+++ b/MagickWand/conjure.c
@@ -172,7 +172,7 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info,
Set defaults.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(exception != (ExceptionInfo *) NULL);
diff --git a/MagickWand/convert.c b/MagickWand/convert.c
index 92595a91c..9ed4d9999 100644
--- a/MagickWand/convert.c
+++ b/MagickWand/convert.c
@@ -556,7 +556,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
Set defaults.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(exception != (ExceptionInfo *) NULL);
diff --git a/MagickWand/display.c b/MagickWand/display.c
index 6bc88484c..7cd99ac6d 100644
--- a/MagickWand/display.c
+++ b/MagickWand/display.c
@@ -350,7 +350,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
Set defaults.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(exception != (ExceptionInfo *) NULL);
diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c
index 27d3ba64f..d28282241 100644
--- a/MagickWand/drawing-wand.c
+++ b/MagickWand/drawing-wand.c
@@ -175,7 +175,7 @@ static int MvgPrintf(DrawingWand *wand,const char *format,...)
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",format);
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
extent=20UL*MagickPathExtent;
if (wand->mvg == (char *) NULL)
{
@@ -323,7 +323,7 @@ static void MvgAppendPointsCommand(DrawingWand *wand,const char *command,
static void AdjustAffine(DrawingWand *wand,const AffineMatrix *affine)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((affine->sx != 1.0) || (affine->rx != 0.0) || (affine->ry != 0.0) ||
@@ -369,7 +369,7 @@ static void AdjustAffine(DrawingWand *wand,const AffineMatrix *affine)
WandExport void ClearDrawingWand(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
for ( ; wand->index > 0; wand->index--)
@@ -445,7 +445,7 @@ WandExport DrawingWand *CloneDrawingWand(const DrawingWand *wand)
i;
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
clone_wand=(DrawingWand *) AcquireMagickMemory(sizeof(*clone_wand));
@@ -486,7 +486,7 @@ WandExport DrawingWand *CloneDrawingWand(const DrawingWand *wand)
clone_wand->debug=IsEventLogging();
if (clone_wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",clone_wand->name);
- clone_wand->signature=WandSignature;
+ clone_wand->signature=MagickWandSignature;
return(clone_wand);
}
@@ -517,7 +517,7 @@ WandExport DrawingWand *CloneDrawingWand(const DrawingWand *wand)
WandExport DrawingWand *DestroyDrawingWand(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
for ( ; wand->index > 0; wand->index--)
@@ -532,7 +532,7 @@ WandExport DrawingWand *DestroyDrawingWand(DrawingWand *wand)
wand->image=DestroyImage(wand->image);
wand->image=(Image *) NULL;
wand->exception=DestroyExceptionInfo(wand->exception);
- wand->signature=(~WandSignature);
+ wand->signature=(~MagickWandSignature);
RelinquishWandId(wand->id);
wand=(DrawingWand *) RelinquishMagickMemory(wand);
return(wand);
@@ -567,7 +567,7 @@ WandExport DrawingWand *DestroyDrawingWand(DrawingWand *wand)
WandExport void DrawAffine(DrawingWand *wand,const AffineMatrix *affine)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(affine != (const AffineMatrix *) NULL);
@@ -664,7 +664,7 @@ WandExport void DrawAlpha(DrawingWand *wand,const double x,const double y,
const PaintMethod paint_method)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"alpha %.20g %.20g '%s'\n",x,y,CommandOptionToMnemonic(
@@ -707,7 +707,7 @@ WandExport void DrawAnnotation(DrawingWand *wand,const double x,const double y,
*escaped_text;
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(text != (const unsigned char *) NULL);
@@ -759,7 +759,7 @@ WandExport void DrawArc(DrawingWand *wand,const double sx,const double sy,
const double ex,const double ey,const double sd,const double ed)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"arc %.20g %.20g %.20g %.20g %.20g %.20g\n",sx,sy,ex,
@@ -797,7 +797,7 @@ WandExport void DrawBezier(DrawingWand *wand,
const size_t number_coordinates,const PointInfo *coordinates)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(coordinates != (const PointInfo *) NULL);
@@ -839,7 +839,7 @@ WandExport void DrawCircle(DrawingWand *wand,const double ox,const double oy,
const double px,const double py)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"circle %.20g %.20g %.20g %.20g\n",ox,oy,px,py);
@@ -870,7 +870,7 @@ WandExport void DrawCircle(DrawingWand *wand,const double ox,const double oy,
WandExport MagickBooleanType DrawClearException(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
ClearMagickException(wand->exception);
@@ -902,7 +902,7 @@ WandExport MagickBooleanType DrawClearException(DrawingWand *wand)
WandExport ExceptionInfo *DrawCloneExceptionInfo(const DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->exception == (ExceptionInfo*) NULL)
return (ExceptionInfo*) NULL;
return CloneExceptionInfo(wand->exception);
@@ -982,7 +982,7 @@ WandExport MagickBooleanType DrawComposite(DrawingWand *wand,
*blob;
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(magick_wand != (MagickWand *) NULL);
@@ -1073,7 +1073,7 @@ WandExport void DrawColor(DrawingWand *wand,const double x,const double y,
const PaintMethod paint_method)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"color %.20g %.20g '%s'\n",x,y,CommandOptionToMnemonic(
@@ -1148,7 +1148,7 @@ WandExport void DrawEllipse(DrawingWand *wand,const double ox,const double oy,
const double rx,const double ry,const double start,const double end)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"ellipse %.20g %.20g %.20g %.20g %.20g %.20g\n",ox,oy,
@@ -1185,7 +1185,7 @@ WandExport void DrawGetBorderColor(const DrawingWand *wand,
PixelWand *border_color)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
assert(border_color != (PixelWand *) NULL);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1218,7 +1218,7 @@ WandExport void DrawGetBorderColor(const DrawingWand *wand,
WandExport char *DrawGetClipPath(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (CurrentContext->clip_mask != (char *) NULL)
@@ -1252,7 +1252,7 @@ WandExport char *DrawGetClipPath(const DrawingWand *wand)
WandExport FillRule DrawGetClipRule(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->fill_rule);
@@ -1283,7 +1283,7 @@ WandExport FillRule DrawGetClipRule(const DrawingWand *wand)
WandExport ClipPathUnits DrawGetClipUnits(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->clip_units);
@@ -1322,7 +1322,7 @@ WandExport char *DrawGetException(const DrawingWand *wand,
*description;
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(severity != (ExceptionType *) NULL);
@@ -1374,7 +1374,7 @@ WandExport char *DrawGetException(const DrawingWand *wand,
WandExport ExceptionType DrawGetExceptionType(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(wand->exception->severity);
@@ -1408,7 +1408,7 @@ WandExport ExceptionType DrawGetExceptionType(const DrawingWand *wand)
WandExport void DrawGetFillColor(const DrawingWand *wand,PixelWand *fill_color)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
assert(fill_color != (PixelWand *) NULL);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1444,7 +1444,7 @@ WandExport double DrawGetFillOpacity(const DrawingWand *wand)
alpha;
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
alpha=(double) QuantumScale*CurrentContext->fill.alpha;
@@ -1476,7 +1476,7 @@ WandExport double DrawGetFillOpacity(const DrawingWand *wand)
WandExport FillRule DrawGetFillRule(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->fill_rule);
@@ -1509,7 +1509,7 @@ WandExport FillRule DrawGetFillRule(const DrawingWand *wand)
WandExport char *DrawGetFont(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (CurrentContext->font != (char *) NULL)
@@ -1543,7 +1543,7 @@ WandExport char *DrawGetFont(const DrawingWand *wand)
WandExport char *DrawGetFontFamily(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (CurrentContext->family != NULL)
@@ -1582,7 +1582,7 @@ WandExport MagickBooleanType DrawGetFontResolution(const DrawingWand *wand,
double *x,double *y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
*x=72.0;
@@ -1629,7 +1629,7 @@ WandExport MagickBooleanType DrawGetFontResolution(const DrawingWand *wand,
WandExport double DrawGetFontSize(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->pointsize);
@@ -1660,7 +1660,7 @@ WandExport double DrawGetFontSize(const DrawingWand *wand)
WandExport StretchType DrawGetFontStretch(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->stretch);
@@ -1691,7 +1691,7 @@ WandExport StretchType DrawGetFontStretch(const DrawingWand *wand)
WandExport StyleType DrawGetFontStyle(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->style);
@@ -1722,7 +1722,7 @@ WandExport StyleType DrawGetFontStyle(const DrawingWand *wand)
WandExport size_t DrawGetFontWeight(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->weight);
@@ -1754,7 +1754,7 @@ WandExport size_t DrawGetFontWeight(const DrawingWand *wand)
WandExport GravityType DrawGetGravity(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->gravity);
@@ -1789,7 +1789,7 @@ WandExport double DrawGetOpacity(const DrawingWand *wand)
alpha;
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
alpha=(double) QuantumScale*CurrentContext->alpha;
@@ -1824,7 +1824,7 @@ WandExport double DrawGetOpacity(const DrawingWand *wand)
WandExport MagickBooleanType DrawGetStrokeAntialias(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->stroke_antialias);
@@ -1859,7 +1859,7 @@ WandExport void DrawGetStrokeColor(const DrawingWand *wand,
PixelWand *stroke_color)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
assert(stroke_color != (PixelWand *) NULL);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1912,7 +1912,7 @@ WandExport double *DrawGetStrokeDashArray(const DrawingWand *wand,
n;
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(number_elements != (size_t *) NULL);
@@ -1962,7 +1962,7 @@ WandExport double *DrawGetStrokeDashArray(const DrawingWand *wand,
WandExport double DrawGetStrokeDashOffset(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->dash_offset);
@@ -1995,7 +1995,7 @@ WandExport double DrawGetStrokeDashOffset(const DrawingWand *wand)
WandExport LineCap DrawGetStrokeLineCap(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->linecap);
@@ -2029,7 +2029,7 @@ WandExport LineCap DrawGetStrokeLineCap(const DrawingWand *wand)
WandExport LineJoin DrawGetStrokeLineJoin(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->linejoin);
@@ -2064,7 +2064,7 @@ WandExport LineJoin DrawGetStrokeLineJoin(const DrawingWand *wand)
WandExport size_t DrawGetStrokeMiterLimit(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return CurrentContext->miterlimit;
@@ -2098,7 +2098,7 @@ WandExport double DrawGetStrokeOpacity(const DrawingWand *wand)
alpha;
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
alpha=(double) QuantumScale*CurrentContext->stroke.alpha;
@@ -2131,7 +2131,7 @@ WandExport double DrawGetStrokeOpacity(const DrawingWand *wand)
WandExport double DrawGetStrokeWidth(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->stroke_width);
@@ -2163,7 +2163,7 @@ WandExport double DrawGetStrokeWidth(const DrawingWand *wand)
WandExport AlignType DrawGetTextAlignment(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->align);
@@ -2195,7 +2195,7 @@ WandExport AlignType DrawGetTextAlignment(const DrawingWand *wand)
WandExport MagickBooleanType DrawGetTextAntialias(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->text_antialias);
@@ -2227,7 +2227,7 @@ WandExport MagickBooleanType DrawGetTextAntialias(const DrawingWand *wand)
WandExport DecorationType DrawGetTextDecoration(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->decorate);
@@ -2259,7 +2259,7 @@ WandExport DecorationType DrawGetTextDecoration(const DrawingWand *wand)
WandExport DirectionType DrawGetTextDirection(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->direction);
@@ -2292,7 +2292,7 @@ WandExport DirectionType DrawGetTextDirection(const DrawingWand *wand)
WandExport char *DrawGetTextEncoding(const DrawingWand *wand)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (CurrentContext->encoding != (char *) NULL)
@@ -2325,7 +2325,7 @@ WandExport char *DrawGetTextEncoding(const DrawingWand *wand)
WandExport double DrawGetTextKerning(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2357,7 +2357,7 @@ WandExport double DrawGetTextKerning(DrawingWand *wand)
WandExport double DrawGetTextInterlineSpacing(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->interline_spacing);
@@ -2388,7 +2388,7 @@ WandExport double DrawGetTextInterlineSpacing(DrawingWand *wand)
WandExport double DrawGetTextInterwordSpacing(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(CurrentContext->interword_spacing);
@@ -2436,7 +2436,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand)
*xml_info;
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
xml_info=NewXMLTreeTag("drawing-wand");
@@ -2676,7 +2676,7 @@ WandExport void DrawGetTextUnderColor(const DrawingWand *wand,
PixelWand *under_color)
{
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
assert(under_color != (PixelWand *) NULL);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2719,7 +2719,7 @@ WandExport void DrawLine(DrawingWand *wand,const double sx,const double sy,
const double ex,const double ey)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"line %.20g %.20g %.20g %.20g\n",sx,sy,ex,ey);
@@ -2753,7 +2753,7 @@ WandExport void DrawLine(DrawingWand *wand,const double sx,const double sy,
WandExport void DrawPathClose(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgAutoWrapPrintf(wand,"%s",wand->path_mode == AbsolutePathMode ?
@@ -2806,7 +2806,7 @@ static void DrawPathCurveTo(DrawingWand *wand,const PathMode mode,
const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->path_operation != PathCurveToOperation) ||
@@ -2826,7 +2826,7 @@ WandExport void DrawPathCurveToAbsolute(DrawingWand *wand,const double x1,
const double y1,const double x2,const double y2,const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathCurveTo(wand,AbsolutePathMode,x1,y1,x2,y2,x,y);
@@ -2876,7 +2876,7 @@ WandExport void DrawPathCurveToRelative(DrawingWand *wand,const double x1,
const double y1,const double x2,const double y2,const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathCurveTo(wand,RelativePathMode,x1,y1,x2,y2,x,y);
@@ -2921,7 +2921,7 @@ static void DrawPathCurveToQuadraticBezier(DrawingWand *wand,
const PathMode mode,const double x1,double y1,const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->path_operation != PathCurveToQuadraticBezierOperation) ||
@@ -2940,7 +2940,7 @@ WandExport void DrawPathCurveToQuadraticBezierAbsolute(DrawingWand *wand,
const double x1,const double y1,const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathCurveToQuadraticBezier(wand,AbsolutePathMode,x1,y1,x,y);
@@ -2984,7 +2984,7 @@ WandExport void DrawPathCurveToQuadraticBezierRelative(DrawingWand *wand,
const double x1,const double y1,const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathCurveToQuadraticBezier(wand,RelativePathMode,x1,y1,x,y);
@@ -3033,7 +3033,7 @@ static void DrawPathCurveToQuadraticBezierSmooth(DrawingWand *wand,
const PathMode mode,const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->path_operation != PathCurveToQuadraticBezierSmoothOperation) ||
@@ -3052,7 +3052,7 @@ WandExport void DrawPathCurveToQuadraticBezierSmoothAbsolute(DrawingWand *wand,
const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathCurveToQuadraticBezierSmooth(wand,AbsolutePathMode,x,y);
@@ -3147,7 +3147,7 @@ static void DrawPathCurveToSmooth(DrawingWand *wand,const PathMode mode,
const double x2,const double y2,const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->path_operation != PathCurveToSmoothOperation) ||
@@ -3166,7 +3166,7 @@ WandExport void DrawPathCurveToSmoothAbsolute(DrawingWand *wand,const double x2,
const double y2,const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathCurveToSmooth(wand,AbsolutePathMode,x2,y2,x,y);
@@ -3216,7 +3216,7 @@ WandExport void DrawPathCurveToSmoothRelative(DrawingWand *wand,const double x2,
const double y2,const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathCurveToSmooth(wand,RelativePathMode,x2,y2,x,y);
@@ -3277,7 +3277,7 @@ static void DrawPathEllipticArc(DrawingWand *wand, const PathMode mode,
const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->path_operation != PathEllipticArcOperation) ||
@@ -3300,7 +3300,7 @@ WandExport void DrawPathEllipticArcAbsolute(DrawingWand *wand,const double rx,
const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathEllipticArc(wand,AbsolutePathMode,rx,ry,x_axis_rotation,
@@ -3388,7 +3388,7 @@ WandExport void DrawPathEllipticArcRelative(DrawingWand *wand,const double rx,
WandExport void DrawPathFinish(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"'\n");
@@ -3429,7 +3429,7 @@ static void DrawPathLineTo(DrawingWand *wand,const PathMode mode,
const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->path_operation != PathLineToOperation) ||
@@ -3448,7 +3448,7 @@ WandExport void DrawPathLineToAbsolute(DrawingWand *wand,const double x,
const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathLineTo(wand,AbsolutePathMode,x,y);
@@ -3487,7 +3487,7 @@ WandExport void DrawPathLineToRelative(DrawingWand *wand,const double x,
const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathLineTo(wand,RelativePathMode,x,y);
@@ -3524,7 +3524,7 @@ static void DrawPathLineToHorizontal(DrawingWand *wand,const PathMode mode,
const double x)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->path_operation != PathLineToHorizontalOperation) ||
@@ -3543,7 +3543,7 @@ WandExport void DrawPathLineToHorizontalAbsolute(DrawingWand *wand,
const double x)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathLineToHorizontal(wand,AbsolutePathMode,x);
@@ -3614,7 +3614,7 @@ static void DrawPathLineToVertical(DrawingWand *wand,const PathMode mode,
const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->path_operation != PathLineToVerticalOperation) ||
@@ -3632,7 +3632,7 @@ static void DrawPathLineToVertical(DrawingWand *wand,const PathMode mode,
WandExport void DrawPathLineToVerticalAbsolute(DrawingWand *wand,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathLineToVertical(wand,AbsolutePathMode,y);
@@ -3668,7 +3668,7 @@ WandExport void DrawPathLineToVerticalAbsolute(DrawingWand *wand,const double y)
WandExport void DrawPathLineToVerticalRelative(DrawingWand *wand,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathLineToVertical(wand,RelativePathMode,y);
@@ -3707,7 +3707,7 @@ static void DrawPathMoveTo(DrawingWand *wand,const PathMode mode,const double x,
const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->path_operation != PathMoveToOperation) ||
@@ -3726,7 +3726,7 @@ WandExport void DrawPathMoveToAbsolute(DrawingWand *wand,const double x,
const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathMoveTo(wand,AbsolutePathMode,x,y);
@@ -3765,7 +3765,7 @@ WandExport void DrawPathMoveToRelative(DrawingWand *wand,const double x,
const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
DrawPathMoveTo(wand,RelativePathMode,x,y);
@@ -3800,7 +3800,7 @@ WandExport void DrawPathMoveToRelative(DrawingWand *wand,const double x,
WandExport void DrawPathStart(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"path '");
@@ -3837,7 +3837,7 @@ WandExport void DrawPathStart(DrawingWand *wand)
WandExport void DrawPoint(DrawingWand *wand,const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"point %.20g %.20g\n",x,y);
@@ -3875,7 +3875,7 @@ WandExport void DrawPolygon(DrawingWand *wand,
const size_t number_coordinates,const PointInfo *coordinates)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
MvgAppendPointsCommand(wand,"polygon",number_coordinates,coordinates);
@@ -3913,7 +3913,7 @@ WandExport void DrawPolyline(DrawingWand *wand,
const size_t number_coordinates,const PointInfo *coordinates)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
MvgAppendPointsCommand(wand,"polyline",number_coordinates,coordinates);
@@ -3944,7 +3944,7 @@ WandExport void DrawPolyline(DrawingWand *wand,
WandExport void DrawPopClipPath(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->indent_depth > 0)
@@ -3977,7 +3977,7 @@ WandExport void DrawPopClipPath(DrawingWand *wand)
WandExport void DrawPopDefs(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->indent_depth > 0)
@@ -4014,7 +4014,7 @@ WandExport MagickBooleanType DrawPopPattern(DrawingWand *wand)
key[MagickPathExtent];
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->image == (Image *) NULL)
@@ -4073,7 +4073,7 @@ WandExport MagickBooleanType DrawPopPattern(DrawingWand *wand)
WandExport void DrawPushClipPath(DrawingWand *wand,const char *clip_mask_id)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(clip_mask_id != (const char *) NULL);
@@ -4108,7 +4108,7 @@ WandExport void DrawPushClipPath(DrawingWand *wand,const char *clip_mask_id)
WandExport void DrawPushDefs(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"push defs\n");
@@ -4159,7 +4159,7 @@ WandExport MagickBooleanType DrawPushPattern(DrawingWand *wand,
const double height)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(pattern_id != (const char *) NULL);
@@ -4216,7 +4216,7 @@ WandExport void DrawRectangle(DrawingWand *wand,const double x1,const double y1,
const double x2,const double y2)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"rectangle %.20g %.20g %.20g %.20g\n",x1,y1,x2,y2);
@@ -4250,7 +4250,7 @@ WandExport MagickBooleanType DrawRender(DrawingWand *wand)
status;
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
CurrentContext->primitive=wand->mvg;
@@ -4289,7 +4289,7 @@ WandExport MagickBooleanType DrawRender(DrawingWand *wand)
WandExport void DrawResetVectorGraphics(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->mvg != (char *) NULL)
@@ -4326,7 +4326,7 @@ WandExport void DrawResetVectorGraphics(DrawingWand *wand)
WandExport void DrawRotate(DrawingWand *wand,const double degrees)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"rotate %.20g\n",degrees);
@@ -4373,7 +4373,7 @@ WandExport void DrawRoundRectangle(DrawingWand *wand,double x1,double y1,
double x2,double y2,double rx,double ry)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"roundrectangle %.20g %.20g %.20g %.20g %.20g %.20g\n",
@@ -4410,7 +4410,7 @@ WandExport void DrawRoundRectangle(DrawingWand *wand,double x1,double y1,
WandExport void DrawScale(DrawingWand *wand,const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"scale %.20g %.20g\n",x,y);
@@ -4450,7 +4450,7 @@ WandExport void DrawSetBorderColor(DrawingWand *wand,
new_border;
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(border_wand != (const PixelWand *) NULL);
@@ -4500,7 +4500,7 @@ WandExport MagickBooleanType DrawSetClipPath(DrawingWand *wand,
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",clip_mask);
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
assert(clip_mask != (const char *) NULL);
if ((CurrentContext->clip_mask == (const char *) NULL) ||
(wand->filter_off != MagickFalse) ||
@@ -4544,7 +4544,7 @@ WandExport MagickBooleanType DrawSetClipPath(DrawingWand *wand,
WandExport void DrawSetClipRule(DrawingWand *wand,const FillRule fill_rule)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -4586,7 +4586,7 @@ WandExport void DrawSetClipUnits(DrawingWand *wand,
const ClipPathUnits clip_units)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -4642,7 +4642,7 @@ WandExport void DrawSetFillColor(DrawingWand *wand,const PixelWand *fill_wand)
new_fill;
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(fill_wand != (const PixelWand *) NULL);
@@ -4690,7 +4690,7 @@ WandExport void DrawSetFillOpacity(DrawingWand *wand,const double fill_opacity)
alpha;
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
alpha=(double) ClampToQuantum(QuantumRange*fill_opacity);
@@ -4736,7 +4736,7 @@ WandExport MagickBooleanType DrawSetFontResolution(DrawingWand *wand,
density[MagickPathExtent];
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) FormatLocaleString(density,MagickPathExtent,"%.20gx%.20g",x_resolution,
@@ -4776,7 +4776,7 @@ WandExport void DrawSetOpacity(DrawingWand *wand,const double opacity)
quantum_alpha;
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
quantum_alpha=ClampToQuantum(QuantumRange*opacity);
@@ -4824,7 +4824,7 @@ WandExport MagickBooleanType DrawSetFillPatternURL(DrawingWand *wand,
pattern_spec[MagickPathExtent];
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",fill_url);
if (wand->image == (Image *) NULL)
@@ -4879,7 +4879,7 @@ WandExport MagickBooleanType DrawSetFillPatternURL(DrawingWand *wand,
WandExport void DrawSetFillRule(DrawingWand *wand,const FillRule fill_rule)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -4920,7 +4920,7 @@ WandExport MagickBooleanType DrawSetFont(DrawingWand *wand,
const char *font_name)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(font_name != (const char *) NULL);
@@ -4963,7 +4963,7 @@ WandExport MagickBooleanType DrawSetFontFamily(DrawingWand *wand,
const char *font_family)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(font_family != (const char *) NULL);
@@ -5004,7 +5004,7 @@ WandExport MagickBooleanType DrawSetFontFamily(DrawingWand *wand,
WandExport void DrawSetFontSize(DrawingWand *wand,const double pointsize)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5048,7 +5048,7 @@ WandExport void DrawSetFontStretch(DrawingWand *wand,
const StretchType font_stretch)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5088,7 +5088,7 @@ WandExport void DrawSetFontStretch(DrawingWand *wand,
WandExport void DrawSetFontStyle(DrawingWand *wand,const StyleType style)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5129,7 +5129,7 @@ WandExport void DrawSetFontWeight(DrawingWand *wand,
const size_t font_weight)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5171,7 +5171,7 @@ WandExport void DrawSetFontWeight(DrawingWand *wand,
WandExport void DrawSetGravity(DrawingWand *wand,const GravityType gravity)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5217,7 +5217,7 @@ WandExport void DrawSetStrokeColor(DrawingWand *wand,
stroke_color;
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(stroke_wand != (const PixelWand *) NULL);
@@ -5267,7 +5267,7 @@ WandExport MagickBooleanType DrawSetStrokePatternURL(DrawingWand *wand,
pattern_spec[MagickPathExtent];
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->image == (Image *) NULL)
@@ -5324,7 +5324,7 @@ WandExport void DrawSetStrokeAntialias(DrawingWand *wand,
const MagickBooleanType stroke_antialias)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5389,7 +5389,7 @@ WandExport MagickBooleanType DrawSetStrokeDashArray(DrawingWand *wand,
n_old;
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
n_new=number_elements;
@@ -5494,7 +5494,7 @@ WandExport void DrawSetStrokeDashOffset(DrawingWand *wand,
const double dash_offset)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5535,7 +5535,7 @@ WandExport void DrawSetStrokeDashOffset(DrawingWand *wand,
WandExport void DrawSetStrokeLineCap(DrawingWand *wand,const LineCap linecap)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5577,7 +5577,7 @@ WandExport void DrawSetStrokeLineCap(DrawingWand *wand,const LineCap linecap)
WandExport void DrawSetStrokeLineJoin(DrawingWand *wand,const LineJoin linejoin)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5622,7 +5622,7 @@ WandExport void DrawSetStrokeMiterLimit(DrawingWand *wand,
const size_t miterlimit)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (CurrentContext->miterlimit != miterlimit)
@@ -5664,7 +5664,7 @@ WandExport void DrawSetStrokeOpacity(DrawingWand *wand,
alpha;
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
alpha=(double) ClampToQuantum(QuantumRange*opacity);
@@ -5705,7 +5705,7 @@ WandExport void DrawSetStrokeOpacity(DrawingWand *wand,
WandExport void DrawSetStrokeWidth(DrawingWand *wand,const double stroke_width)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5746,7 +5746,7 @@ WandExport void DrawSetTextAlignment(DrawingWand *wand,
const AlignType alignment)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5789,7 +5789,7 @@ WandExport void DrawSetTextAntialias(DrawingWand *wand,
const MagickBooleanType text_antialias)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5831,7 +5831,7 @@ WandExport void DrawSetTextDecoration(DrawingWand *wand,
const DecorationType decoration)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->filter_off != MagickFalse) ||
@@ -5874,7 +5874,7 @@ WandExport void DrawSetTextDirection(DrawingWand *wand,
const DirectionType direction)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -5919,7 +5919,7 @@ WandExport void DrawSetTextDirection(DrawingWand *wand,
WandExport void DrawSetTextEncoding(DrawingWand *wand,const char *encoding)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(encoding != (char *) NULL);
@@ -5959,7 +5959,7 @@ WandExport void DrawSetTextEncoding(DrawingWand *wand,const char *encoding)
WandExport void DrawSetTextKerning(DrawingWand *wand,const double kerning)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -6000,7 +6000,7 @@ WandExport void DrawSetTextInterlineSpacing(DrawingWand *wand,
const double interline_spacing)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -6041,7 +6041,7 @@ WandExport void DrawSetTextInterwordSpacing(DrawingWand *wand,
const double interword_spacing)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -6086,7 +6086,7 @@ WandExport void DrawSetTextUnderColor(DrawingWand *wand,
under_color;
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(under_wand != (const PixelWand *) NULL);
@@ -6153,7 +6153,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand,
*xml_info;
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
CurrentContext=DestroyDrawInfo(CurrentContext);
@@ -6435,7 +6435,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand,
WandExport void DrawSkewX(DrawingWand *wand,const double degrees)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"skewX %.20g\n",degrees);
@@ -6469,7 +6469,7 @@ WandExport void DrawSkewX(DrawingWand *wand,const double degrees)
WandExport void DrawSkewY(DrawingWand *wand,const double degrees)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"skewY %.20g\n",degrees);
@@ -6507,7 +6507,7 @@ WandExport void DrawSkewY(DrawingWand *wand,const double degrees)
WandExport void DrawTranslate(DrawingWand *wand,const double x,const double y)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"translate %.20g %.20g\n",x,y);
@@ -6552,7 +6552,7 @@ WandExport void DrawSetViewbox(DrawingWand *wand,const double x1,
const double y1,const double x2,const double y2)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) MvgPrintf(wand,"viewbox %.20g %.20g %.20g %.20g\n",x1,y1,x2,y2);
@@ -6584,7 +6584,7 @@ WandExport MagickBooleanType IsDrawingWand(const DrawingWand *wand)
{
if (wand == (const DrawingWand *) NULL)
return(MagickFalse);
- if (wand->signature != WandSignature)
+ if (wand->signature != MagickWandSignature)
return(MagickFalse);
if (LocaleNCompare(wand->name,DrawingWandId,strlen(DrawingWandId)) != 0)
return(MagickFalse);
@@ -6658,7 +6658,7 @@ WandExport DrawingWand *NewDrawingWand(void)
wand->image=AcquireImage((const ImageInfo *) NULL,wand->exception);
wand->destroy=MagickTrue;
wand->debug=IsEventLogging();
- wand->signature=WandSignature;
+ wand->signature=MagickWandSignature;
CurrentContext=CloneDrawInfo((ImageInfo *) NULL,(DrawInfo *) NULL);
return(wand);
}
@@ -6691,7 +6691,7 @@ WandExport DrawInfo *PeekDrawingWand(const DrawingWand *wand)
*draw_info;
assert(wand != (const DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
draw_info=CloneDrawInfo((ImageInfo *) NULL,CurrentContext);
@@ -6728,7 +6728,7 @@ WandExport DrawInfo *PeekDrawingWand(const DrawingWand *wand)
WandExport MagickBooleanType PopDrawingWand(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->index == 0)
@@ -6783,7 +6783,7 @@ WandExport MagickBooleanType PopDrawingWand(DrawingWand *wand)
WandExport MagickBooleanType PushDrawingWand(DrawingWand *wand)
{
assert(wand != (DrawingWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->index++;
diff --git a/MagickWand/identify.c b/MagickWand/identify.c
index 7c9c320bf..68b8bc362 100644
--- a/MagickWand/identify.c
+++ b/MagickWand/identify.c
@@ -241,7 +241,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
Set defaults.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(exception != (ExceptionInfo *) NULL);
diff --git a/MagickWand/import.c b/MagickWand/import.c
index b36e89dc2..9d51f25e3 100644
--- a/MagickWand/import.c
+++ b/MagickWand/import.c
@@ -292,7 +292,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
Set defaults.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(exception != (ExceptionInfo *) NULL);
diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c
index 1459d31a4..6dfbf4ab1 100644
--- a/MagickWand/magick-cli.c
+++ b/MagickWand/magick-cli.c
@@ -127,7 +127,7 @@ WandExport void ProcessScriptOptions(MagickCLI *cli_wand,const char *filename,
assert(filename != (char *) NULL ); /* at least one argument - script name */
assert(cli_wand != (MagickCLI *) NULL);
- assert(cli_wand->signature == WandSignature);
+ assert(cli_wand->signature == MagickWandSignature);
if (IfMagickTrue(cli_wand->wand.debug))
(void) LogMagickEvent(CommandEvent,GetMagickModule(),
"Processing script \"%s\"", filename);
@@ -373,7 +373,7 @@ WandExport int ProcessCommandOptions(MagickCLI *cli_wand,int argc,char **argv,
assert(argv[index] != (char *) NULL);
assert(argv[argc-1] != (char *) NULL);
assert(cli_wand != (MagickCLI *) NULL);
- assert(cli_wand->signature == WandSignature);
+ assert(cli_wand->signature == MagickWandSignature);
/* define the error location string for use in exceptions
order of localtion format escapes: filename, line, column */
diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 6c00caab7..36a07d463 100644
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -91,7 +91,7 @@ static MagickWand *CloneMagickWandFromImages(const MagickWand *wand,
*clone_wand;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
clone_wand=(MagickWand *) AcquireMagickMemory(sizeof(*clone_wand));
@@ -107,7 +107,7 @@ static MagickWand *CloneMagickWandFromImages(const MagickWand *wand,
clone_wand->image_info=CloneImageInfo(wand->image_info);
clone_wand->images=images;
clone_wand->debug=IsEventLogging();
- clone_wand->signature=WandSignature;
+ clone_wand->signature=MagickWandSignature;
if (IfMagickTrue(clone_wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",clone_wand->name);
return(clone_wand);
@@ -138,7 +138,7 @@ static MagickWand *CloneMagickWandFromImages(const MagickWand *wand,
WandExport Image *GetImageFromMagickWand(const MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -190,7 +190,7 @@ WandExport MagickBooleanType MagickAdaptiveBlurImage(MagickWand *wand,
*sharp_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -235,7 +235,7 @@ WandExport MagickBooleanType MagickAdaptiveResizeImage(MagickWand *wand,
*resize_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -287,7 +287,7 @@ WandExport MagickBooleanType MagickAdaptiveSharpenImage(MagickWand *wand,
*sharp_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -338,7 +338,7 @@ WandExport MagickBooleanType MagickAdaptiveThresholdImage(MagickWand *wand,
*threshold_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -440,11 +440,11 @@ WandExport MagickBooleanType MagickAddImage(MagickWand *wand,
*images;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(add_wand != (MagickWand *) NULL);
- assert(add_wand->signature == WandSignature);
+ assert(add_wand->signature == MagickWandSignature);
if (add_wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",add_wand->name);
/*
@@ -491,7 +491,7 @@ WandExport MagickBooleanType MagickAddNoiseImage(MagickWand *wand,
*noise_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -539,7 +539,7 @@ WandExport MagickBooleanType MagickAffineTransformImage(MagickWand *wand,
*affine_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -604,7 +604,7 @@ WandExport MagickBooleanType MagickAnnotateImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -656,7 +656,7 @@ WandExport MagickBooleanType MagickAnimateImages(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) CloneString(&wand->image_info->server_name,server_name);
@@ -703,7 +703,7 @@ WandExport MagickWand *MagickAppendImages(MagickWand *wand,
*append_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -743,7 +743,7 @@ WandExport MagickBooleanType MagickAutoGammaImage(MagickWand *wand)
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -781,7 +781,7 @@ WandExport MagickBooleanType MagickAutoLevelImage(MagickWand *wand)
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -820,7 +820,7 @@ WandExport MagickBooleanType MagickAutoOrientImage(MagickWand *wand)
*orient_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -870,7 +870,7 @@ WandExport MagickBooleanType MagickBlackThresholdImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -916,7 +916,7 @@ WandExport MagickBooleanType MagickBlueShiftImage(MagickWand *wand,
*shift_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -966,7 +966,7 @@ WandExport MagickBooleanType MagickBlurImage(MagickWand *wand,
*blur_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1022,7 +1022,7 @@ WandExport MagickBooleanType MagickBorderImage(MagickWand *wand,
border_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1076,7 +1076,7 @@ WandExport MagickBooleanType MagickBrightnessContrastImage(
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1130,7 +1130,7 @@ WandExport MagickWand *MagickChannelFxImage(MagickWand *wand,
*fx_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1176,7 +1176,7 @@ WandExport MagickBooleanType MagickCharcoalImage(MagickWand *wand,
*charcoal_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1233,7 +1233,7 @@ WandExport MagickBooleanType MagickChopImage(MagickWand *wand,
chop;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1276,7 +1276,7 @@ WandExport MagickBooleanType MagickChopImage(MagickWand *wand,
WandExport MagickBooleanType MagickClampImage(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1313,7 +1313,7 @@ WandExport MagickBooleanType MagickClipImage(MagickWand *wand)
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1361,7 +1361,7 @@ WandExport MagickBooleanType MagickClipImagePath(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1404,7 +1404,7 @@ WandExport MagickBooleanType MagickClutImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->images == (Image *) NULL) || (clut_wand->images == (Image *) NULL))
@@ -1446,7 +1446,7 @@ WandExport MagickWand *MagickCoalesceImages(MagickWand *wand)
*coalesce_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1507,7 +1507,7 @@ WandExport MagickBooleanType MagickColorDecisionListImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1557,7 +1557,7 @@ WandExport MagickBooleanType MagickColorizeImage(MagickWand *wand,
target;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1625,7 +1625,7 @@ WandExport MagickBooleanType MagickColorMatrixImage(MagickWand *wand,
*color_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (color_matrix == (const KernelInfo *) NULL)
@@ -1674,7 +1674,7 @@ WandExport MagickWand *MagickCombineImages(MagickWand *wand,
*combine_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1717,7 +1717,7 @@ WandExport MagickBooleanType MagickCommentImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1760,7 +1760,7 @@ WandExport MagickWand *MagickCompareImagesLayers(MagickWand *wand,
*layers_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -1810,7 +1810,7 @@ WandExport MagickWand *MagickCompareImages(MagickWand *wand,
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->images == (Image *) NULL) || (reference->images == (Image *) NULL))
@@ -1877,7 +1877,7 @@ WandExport MagickBooleanType MagickCompositeImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->images == (Image *) NULL) ||
@@ -1949,7 +1949,7 @@ WandExport MagickBooleanType MagickCompositeLayers(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->images == (Image *) NULL) ||
@@ -1995,7 +1995,7 @@ WandExport MagickBooleanType MagickContrastImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2041,7 +2041,7 @@ WandExport MagickBooleanType MagickContrastStretchImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2083,7 +2083,7 @@ WandExport MagickBooleanType MagickConvolveImage(MagickWand *wand,
*filter_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (kernel == (const KernelInfo *) NULL)
@@ -2138,7 +2138,7 @@ WandExport MagickBooleanType MagickCropImage(MagickWand *wand,
crop;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2188,7 +2188,7 @@ WandExport MagickBooleanType MagickCycleColormapImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2257,7 +2257,7 @@ WandExport MagickBooleanType MagickConstituteImage(MagickWand *wand,
*images;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
images=ConstituteImage(columns,rows,map,storage,pixels,wand->exception);
@@ -2295,7 +2295,7 @@ WandExport MagickBooleanType MagickDecipherImage(MagickWand *wand,
const char *passphrase)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2333,7 +2333,7 @@ WandExport MagickWand *MagickDeconstructImages(MagickWand *wand)
*deconstruct_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2380,7 +2380,7 @@ WandExport MagickBooleanType MagickDeskewImage(MagickWand *wand,
*sepia_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2421,7 +2421,7 @@ WandExport MagickBooleanType MagickDespeckleImage(MagickWand *wand)
*despeckle_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2496,7 +2496,7 @@ WandExport MagickBooleanType MagickDisplayImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2542,7 +2542,7 @@ WandExport MagickBooleanType MagickDisplayImages(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) CloneString(&wand->image_info->server_name,server_name);
@@ -2618,7 +2618,7 @@ WandExport MagickBooleanType MagickDistortImage(MagickWand *wand,
*distort_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2669,7 +2669,7 @@ WandExport MagickBooleanType MagickDrawImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2720,7 +2720,7 @@ WandExport MagickBooleanType MagickEdgeImage(MagickWand *wand,
*edge_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2771,7 +2771,7 @@ WandExport MagickBooleanType MagickEmbossImage(MagickWand *wand,
*emboss_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2812,7 +2812,7 @@ WandExport MagickBooleanType MagickEncipherImage(MagickWand *wand,
const char *passphrase)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2849,7 +2849,7 @@ WandExport MagickBooleanType MagickEnhanceImage(MagickWand *wand)
*enhance_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2891,7 +2891,7 @@ WandExport MagickBooleanType MagickEqualizeImage(MagickWand *wand)
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2940,7 +2940,7 @@ WandExport MagickWand *MagickEvaluateImages(MagickWand *wand,
*evaluate_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -2958,7 +2958,7 @@ WandExport MagickBooleanType MagickEvaluateImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3027,7 +3027,7 @@ WandExport MagickBooleanType MagickExportImagePixels(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3080,7 +3080,7 @@ WandExport MagickBooleanType MagickExtentImage(MagickWand *wand,
extent;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3125,7 +3125,7 @@ WandExport MagickBooleanType MagickFlipImage(MagickWand *wand)
*flip_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3193,7 +3193,7 @@ WandExport MagickBooleanType MagickFloodfillPaintImage(MagickWand *wand,
target;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3240,7 +3240,7 @@ WandExport MagickBooleanType MagickFlopImage(MagickWand *wand)
*flop_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3287,7 +3287,7 @@ WandExport MagickBooleanType MagickForwardFourierTransformImage(
*forward_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3352,7 +3352,7 @@ WandExport MagickBooleanType MagickFrameImage(MagickWand *wand,
frame_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3413,7 +3413,7 @@ WandExport MagickBooleanType MagickFunctionImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3453,7 +3453,7 @@ WandExport MagickWand *MagickFxImage(MagickWand *wand,const char *expression)
*fx_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3502,7 +3502,7 @@ WandExport MagickBooleanType MagickGammaImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3549,7 +3549,7 @@ WandExport MagickBooleanType MagickGaussianBlurImage(MagickWand *wand,
*blur_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3589,7 +3589,7 @@ WandExport MagickWand *MagickGetImage(MagickWand *wand)
*image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3631,7 +3631,7 @@ WandExport MagickWand *MagickGetImage(MagickWand *wand)
WandExport MagickBooleanType MagickGetImageAlphaChannel(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3667,7 +3667,7 @@ WandExport MagickWand *MagickGetImageMask(MagickWand *wand)
*image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3711,7 +3711,7 @@ WandExport MagickBooleanType MagickGetImageBackgroundColor(MagickWand *wand,
PixelWand *background_color)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3758,7 +3758,7 @@ WandExport unsigned char *MagickGetImageBlob(MagickWand *wand,size_t *length)
*blob;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3809,7 +3809,7 @@ WandExport unsigned char *MagickGetImagesBlob(MagickWand *wand,size_t *length)
*blob;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3855,7 +3855,7 @@ WandExport MagickBooleanType MagickGetImageBluePrimary(MagickWand *wand,
double *x,double *y)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3894,7 +3894,7 @@ WandExport MagickBooleanType MagickGetImageBorderColor(MagickWand *wand,
PixelWand *border_color)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3945,7 +3945,7 @@ WandExport ChannelFeatures *MagickGetImageFeatures(MagickWand *wand,
const size_t distance)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -3992,7 +3992,7 @@ WandExport MagickBooleanType MagickGetImageKurtosis(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4038,7 +4038,7 @@ WandExport MagickBooleanType MagickGetImageMean(MagickWand *wand,double *mean,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4081,7 +4081,7 @@ WandExport MagickBooleanType MagickGetImageRange(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4123,7 +4123,7 @@ WandExport MagickBooleanType MagickGetImageRange(MagickWand *wand,
WandExport ChannelStatistics *MagickGetImageStatistics(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4167,7 +4167,7 @@ WandExport MagickBooleanType MagickGetImageColormapColor(MagickWand *wand,
const size_t index,PixelWand *color)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4208,7 +4208,7 @@ WandExport MagickBooleanType MagickGetImageColormapColor(MagickWand *wand,
WandExport size_t MagickGetImageColors(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4245,7 +4245,7 @@ WandExport size_t MagickGetImageColors(MagickWand *wand)
WandExport ColorspaceType MagickGetImageColorspace(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4283,7 +4283,7 @@ WandExport ColorspaceType MagickGetImageColorspace(MagickWand *wand)
WandExport CompositeOperator MagickGetImageCompose(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4320,7 +4320,7 @@ WandExport CompositeOperator MagickGetImageCompose(MagickWand *wand)
WandExport CompressionType MagickGetImageCompression(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4357,7 +4357,7 @@ WandExport CompressionType MagickGetImageCompression(MagickWand *wand)
WandExport size_t MagickGetImageCompressionQuality(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4394,7 +4394,7 @@ WandExport size_t MagickGetImageCompressionQuality(MagickWand *wand)
WandExport size_t MagickGetImageDelay(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4427,7 +4427,7 @@ WandExport size_t MagickGetImageDelay(MagickWand *wand)
WandExport size_t MagickGetImageDepth(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4460,7 +4460,7 @@ WandExport size_t MagickGetImageDepth(MagickWand *wand)
WandExport DisposeType MagickGetImageDispose(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4510,7 +4510,7 @@ WandExport MagickBooleanType MagickGetImageDistortion(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->images == (Image *) NULL) || (reference->images == (Image *) NULL))
@@ -4557,11 +4557,11 @@ WandExport double *MagickGetImageDistortions(MagickWand *wand,
*channel_distortion;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(reference != (MagickWand *) NULL);
- assert(reference->signature == WandSignature);
+ assert(reference->signature == MagickWandSignature);
if ((wand->images == (Image *) NULL) || (reference->images == (Image *) NULL))
{
(void) ThrowMagickException(wand->exception,GetMagickModule(),WandError,
@@ -4598,7 +4598,7 @@ WandExport double *MagickGetImageDistortions(MagickWand *wand,
WandExport EndianType MagickGetImageEndian(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4636,7 +4636,7 @@ WandExport EndianType MagickGetImageEndian(MagickWand *wand)
WandExport char *MagickGetImageFilename(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4674,7 +4674,7 @@ WandExport char *MagickGetImageFilename(MagickWand *wand)
WandExport char *MagickGetImageFormat(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4711,7 +4711,7 @@ WandExport char *MagickGetImageFormat(MagickWand *wand)
WandExport double MagickGetImageFuzz(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4748,7 +4748,7 @@ WandExport double MagickGetImageFuzz(MagickWand *wand)
WandExport double MagickGetImageGamma(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4785,7 +4785,7 @@ WandExport double MagickGetImageGamma(MagickWand *wand)
WandExport GravityType MagickGetImageGravity(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4828,7 +4828,7 @@ WandExport MagickBooleanType MagickGetImageGreenPrimary(MagickWand *wand,
double *x,double *y)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4863,7 +4863,7 @@ WandExport MagickBooleanType MagickGetImageGreenPrimary(MagickWand *wand,
WandExport size_t MagickGetImageHeight(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4911,7 +4911,7 @@ WandExport PixelWand **MagickGetImageHistogram(MagickWand *wand,
i;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4958,7 +4958,7 @@ WandExport PixelWand **MagickGetImageHistogram(MagickWand *wand,
WandExport InterlaceType MagickGetImageInterlaceScheme(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -4998,7 +4998,7 @@ WandExport PixelInterpolateMethod MagickGetImageInterpolateMethod(
MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5035,7 +5035,7 @@ WandExport PixelInterpolateMethod MagickGetImageInterpolateMethod(
WandExport size_t MagickGetImageIterations(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5072,7 +5072,7 @@ WandExport MagickBooleanType MagickGetImageLength(MagickWand *wand,
MagickSizeType *length)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5110,7 +5110,7 @@ WandExport MagickBooleanType MagickGetImageMatteColor(MagickWand *wand,
PixelWand *matte_color)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5144,7 +5144,7 @@ WandExport MagickBooleanType MagickGetImageMatteColor(MagickWand *wand,
WandExport OrientationType MagickGetImageOrientation(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5191,7 +5191,7 @@ WandExport MagickBooleanType MagickGetImagePage(MagickWand *wand,
size_t *width,size_t *height,ssize_t *x,ssize_t *y)
{
assert(wand != (const MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5240,7 +5240,7 @@ WandExport MagickBooleanType MagickGetImagePixelColor(MagickWand *wand,
*image_view;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5288,7 +5288,7 @@ WandExport MagickBooleanType MagickGetImageRedPrimary(MagickWand *wand,
double *x,double *y)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5342,7 +5342,7 @@ WandExport MagickWand *MagickGetImageRegion(MagickWand *wand,
region;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5382,7 +5382,7 @@ WandExport MagickWand *MagickGetImageRegion(MagickWand *wand,
WandExport RenderingIntent MagickGetImageRenderingIntent(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5425,7 +5425,7 @@ WandExport MagickBooleanType MagickGetImageResolution(MagickWand *wand,
double *x,double *y)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5460,7 +5460,7 @@ WandExport MagickBooleanType MagickGetImageResolution(MagickWand *wand,
WandExport size_t MagickGetImageScene(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5500,7 +5500,7 @@ WandExport char *MagickGetImageSignature(MagickWand *wand)
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5543,7 +5543,7 @@ WandExport char *MagickGetImageSignature(MagickWand *wand)
WandExport size_t MagickGetImageTicksPerSecond(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5584,7 +5584,7 @@ WandExport size_t MagickGetImageTicksPerSecond(MagickWand *wand)
WandExport ImageType MagickGetImageType(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5621,7 +5621,7 @@ WandExport ImageType MagickGetImageType(MagickWand *wand)
WandExport ResolutionType MagickGetImageUnits(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5659,7 +5659,7 @@ WandExport ResolutionType MagickGetImageUnits(MagickWand *wand)
WandExport VirtualPixelMethod MagickGetImageVirtualPixelMethod(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5702,7 +5702,7 @@ WandExport MagickBooleanType MagickGetImageWhitePoint(MagickWand *wand,
double *x,double *y)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5737,7 +5737,7 @@ WandExport MagickBooleanType MagickGetImageWhitePoint(MagickWand *wand,
WandExport size_t MagickGetImageWidth(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5771,7 +5771,7 @@ WandExport size_t MagickGetImageWidth(MagickWand *wand)
WandExport size_t MagickGetNumberImages(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(GetImageListLength(wand->images));
@@ -5802,7 +5802,7 @@ WandExport size_t MagickGetNumberImages(MagickWand *wand)
WandExport double MagickGetImageTotalInkDensity(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5850,7 +5850,7 @@ WandExport MagickBooleanType MagickHaldClutImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->images == (Image *) NULL) || (hald_wand->images == (Image *) NULL))
@@ -5885,7 +5885,7 @@ WandExport MagickBooleanType MagickHaldClutImage(MagickWand *wand,
WandExport MagickBooleanType MagickHasNextImage(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5921,7 +5921,7 @@ WandExport MagickBooleanType MagickHasNextImage(MagickWand *wand)
WandExport MagickBooleanType MagickHasPreviousImage(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -5967,7 +5967,7 @@ WandExport char *MagickIdentifyImage(MagickWand *wand)
unique_file;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6031,7 +6031,7 @@ WandExport MagickBooleanType MagickImplodeImage(MagickWand *wand,
*implode_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6102,7 +6102,7 @@ WandExport MagickBooleanType MagickImportImagePixels(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6148,7 +6148,7 @@ WandExport MagickBooleanType MagickInterpolativeResizeImage(MagickWand *wand,
*resize_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6203,7 +6203,7 @@ WandExport MagickBooleanType MagickInverseFourierTransformImage(
*wand;
assert(magnitude_wand != (MagickWand *) NULL);
- assert(magnitude_wand->signature == WandSignature);
+ assert(magnitude_wand->signature == MagickWandSignature);
if (IfMagickTrue(magnitude_wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",
magnitude_wand->name);
@@ -6212,7 +6212,7 @@ WandExport MagickBooleanType MagickInverseFourierTransformImage(
ThrowWandException(WandError,"ContainsNoImages",
magnitude_wand->name);
assert(phase_wand != (MagickWand *) NULL);
- assert(phase_wand->signature == WandSignature);
+ assert(phase_wand->signature == MagickWandSignature);
inverse_image=InverseFourierTransformImage(magnitude_wand->images,
phase_wand->images,magnitude,wand->exception);
if (inverse_image == (Image *) NULL)
@@ -6252,7 +6252,7 @@ WandExport MagickBooleanType MagickLabelImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6310,7 +6310,7 @@ WandExport MagickBooleanType MagickLevelImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6357,7 +6357,7 @@ WandExport MagickBooleanType MagickLinearStretchImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6405,7 +6405,7 @@ WandExport MagickBooleanType MagickLiquidRescaleImage(MagickWand *wand,
*rescale_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6447,7 +6447,7 @@ WandExport MagickBooleanType MagickMagnifyImage(MagickWand *wand)
*magnify_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6509,7 +6509,7 @@ WandExport MagickWand *MagickMergeImageLayers(MagickWand *wand,
*mosaic_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6549,7 +6549,7 @@ WandExport MagickBooleanType MagickMinifyImage(MagickWand *wand)
*minify_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6607,7 +6607,7 @@ WandExport MagickBooleanType MagickModulateImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6675,7 +6675,7 @@ WandExport MagickWand *MagickMontageImage(MagickWand *wand,
*pixel_wand;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6765,7 +6765,7 @@ WandExport MagickWand *MagickMorphImages(MagickWand *wand,
*morph_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6815,7 +6815,7 @@ WandExport MagickBooleanType MagickMorphologyImage(MagickWand *wand,
*morphology_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (kernel == (const KernelInfo *) NULL)
@@ -6871,7 +6871,7 @@ WandExport MagickBooleanType MagickMotionBlurImage(MagickWand *wand,
*blur_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6920,7 +6920,7 @@ WandExport MagickBooleanType MagickNegateImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -6970,7 +6970,7 @@ WandExport MagickBooleanType MagickNewImage(MagickWand *wand,const size_t width,
pixel;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
PixelGetMagickColor(background,&pixel);
@@ -7018,7 +7018,7 @@ WandExport MagickBooleanType MagickNewImage(MagickWand *wand,const size_t width,
WandExport MagickBooleanType MagickNextImage(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7070,7 +7070,7 @@ WandExport MagickBooleanType MagickNormalizeImage(MagickWand *wand)
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7115,7 +7115,7 @@ WandExport MagickBooleanType MagickOilPaintImage(MagickWand *wand,
*paint_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7177,7 +7177,7 @@ WandExport MagickBooleanType MagickOpaquePaintImage(MagickWand *wand,
target_pixel;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7221,7 +7221,7 @@ WandExport MagickWand *MagickOptimizeImageLayers(MagickWand *wand)
*optimize_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7263,7 +7263,7 @@ WandExport MagickWand *MagickOptimizeImageLayers(MagickWand *wand)
WandExport MagickBooleanType MagickOptimizeImageTransparency(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7324,7 +7324,7 @@ WandExport MagickBooleanType MagickOrderedPosterizeImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7370,7 +7370,7 @@ WandExport MagickBooleanType MagickPingImage(MagickWand *wand,
*ping_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
ping_info=CloneImageInfo(wand->image_info);
@@ -7420,7 +7420,7 @@ WandExport MagickBooleanType MagickPingImageBlob(MagickWand *wand,
*read_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
read_info=CloneImageInfo(wand->image_info);
@@ -7466,7 +7466,7 @@ WandExport MagickBooleanType MagickPingImageFile(MagickWand *wand,FILE *file)
*read_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
assert(file != (FILE *) NULL);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -7522,7 +7522,7 @@ WandExport MagickBooleanType MagickPolaroidImage(MagickWand *wand,
*polaroid_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7574,7 +7574,7 @@ WandExport MagickBooleanType MagickPosterizeImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7618,7 +7618,7 @@ WandExport MagickWand *MagickPreviewImages(MagickWand *wand,
*preview_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7668,7 +7668,7 @@ WandExport MagickWand *MagickPreviewImages(MagickWand *wand,
WandExport MagickBooleanType MagickPreviousImage(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7750,7 +7750,7 @@ WandExport MagickBooleanType MagickQuantizeImage(MagickWand *wand,
*quantize_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7828,7 +7828,7 @@ WandExport MagickBooleanType MagickQuantizeImages(MagickWand *wand,
*quantize_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7876,7 +7876,7 @@ WandExport MagickBooleanType MagickRotationalBlurImage(MagickWand *wand,
*blur_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7931,7 +7931,7 @@ WandExport MagickBooleanType MagickRaiseImage(MagickWand *wand,
raise_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -7979,7 +7979,7 @@ WandExport MagickBooleanType MagickRandomThresholdImage(MagickWand *wand,
threshold[MagickPathExtent];
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8027,7 +8027,7 @@ WandExport MagickBooleanType MagickReadImage(MagickWand *wand,
*read_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
read_info=CloneImageInfo(wand->image_info);
@@ -8075,7 +8075,7 @@ WandExport MagickBooleanType MagickReadImageBlob(MagickWand *wand,
*images;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
images=BlobToImage(wand->image_info,blob,length,wand->exception);
@@ -8118,7 +8118,7 @@ WandExport MagickBooleanType MagickReadImageFile(MagickWand *wand,FILE *file)
*read_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
assert(file != (FILE *) NULL);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -8170,7 +8170,7 @@ WandExport MagickBooleanType MagickRemapImage(MagickWand *wand,
*quantize_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->images == (Image *) NULL) ||
@@ -8211,7 +8211,7 @@ WandExport MagickBooleanType MagickRemapImage(MagickWand *wand,
WandExport MagickBooleanType MagickRemoveImage(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8267,7 +8267,7 @@ WandExport MagickBooleanType MagickResampleImage(MagickWand *wand,
*resample_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8309,7 +8309,7 @@ WandExport MagickBooleanType MagickResetImagePage(MagickWand *wand,
const char *page)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8369,7 +8369,7 @@ WandExport MagickBooleanType MagickResizeImage(MagickWand *wand,
*resize_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8416,7 +8416,7 @@ WandExport MagickBooleanType MagickRollImage(MagickWand *wand,
*roll_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8465,7 +8465,7 @@ WandExport MagickBooleanType MagickRotateImage(MagickWand *wand,
*rotate_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8515,7 +8515,7 @@ WandExport MagickBooleanType MagickSampleImage(MagickWand *wand,
*sample_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8562,7 +8562,7 @@ WandExport MagickBooleanType MagickScaleImage(MagickWand *wand,
*scale_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8621,7 +8621,7 @@ MagickExport MagickBooleanType MagickSegmentImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8671,7 +8671,7 @@ WandExport MagickBooleanType MagickSelectiveBlurImage(MagickWand *wand,
*blur_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8718,7 +8718,7 @@ WandExport MagickBooleanType MagickSeparateImage(MagickWand *wand,
*separate_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8765,7 +8765,7 @@ WandExport MagickBooleanType MagickSepiaToneImage(MagickWand *wand,
*sepia_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8811,11 +8811,11 @@ WandExport MagickBooleanType MagickSetImage(MagickWand *wand,
*images;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(set_wand != (MagickWand *) NULL);
- assert(set_wand->signature == WandSignature);
+ assert(set_wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",set_wand->name);
if (set_wand->images == (Image *) NULL)
@@ -8858,7 +8858,7 @@ WandExport MagickBooleanType MagickSetImageAlphaChannel(MagickWand *wand,
const AlphaChannelOption alpha_type)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8895,7 +8895,7 @@ WandExport MagickBooleanType MagickSetImageBackgroundColor(MagickWand *wand,
const PixelWand *background)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8935,7 +8935,7 @@ WandExport MagickBooleanType MagickSetImageBluePrimary(MagickWand *wand,
const double x,const double y)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -8974,7 +8974,7 @@ WandExport MagickBooleanType MagickSetImageBorderColor(MagickWand *wand,
const PixelWand *border)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9012,7 +9012,7 @@ WandExport ChannelType MagickSetImageChannelMask(MagickWand *wand,
const ChannelType channel_mask)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(SetImageChannelMask(wand->images,channel_mask));
@@ -9047,11 +9047,11 @@ WandExport MagickBooleanType MagickSetImageMask(MagickWand *wand,
const MagickWand *clip_mask)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(clip_mask != (MagickWand *) NULL);
- assert(clip_mask->signature == WandSignature);
+ assert(clip_mask->signature == MagickWandSignature);
if (IfMagickTrue(clip_mask->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",clip_mask->name);
if (clip_mask->images == (Image *) NULL)
@@ -9091,7 +9091,7 @@ WandExport MagickBooleanType MagickSetImageColor(MagickWand *wand,
pixel;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
PixelGetMagickColor(color,&pixel);
@@ -9130,7 +9130,7 @@ WandExport MagickBooleanType MagickSetImageColormapColor(MagickWand *wand,
const size_t index,const PixelWand *color)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9176,7 +9176,7 @@ WandExport MagickBooleanType MagickSetImageColorspace(MagickWand *wand,
const ColorspaceType colorspace)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9215,7 +9215,7 @@ WandExport MagickBooleanType MagickSetImageCompose(MagickWand *wand,
const CompositeOperator compose)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9253,7 +9253,7 @@ WandExport MagickBooleanType MagickSetImageCompression(MagickWand *wand,
const CompressionType compression)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9291,7 +9291,7 @@ WandExport MagickBooleanType MagickSetImageCompressionQuality(MagickWand *wand,
const size_t quality)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9329,7 +9329,7 @@ WandExport MagickBooleanType MagickSetImageDelay(MagickWand *wand,
const size_t delay)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9367,7 +9367,7 @@ WandExport MagickBooleanType MagickSetImageDepth(MagickWand *wand,
const size_t depth)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9404,7 +9404,7 @@ WandExport MagickBooleanType MagickSetImageDispose(MagickWand *wand,
const DisposeType dispose)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9442,7 +9442,7 @@ WandExport MagickBooleanType MagickSetImageEndian(MagickWand *wand,
const EndianType endian)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9482,7 +9482,7 @@ WandExport MagickBooleanType MagickSetImageExtent(MagickWand *wand,
const size_t columns,const size_t rows)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9520,7 +9520,7 @@ WandExport MagickBooleanType MagickSetImageFilename(MagickWand *wand,
const char *filename)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9563,7 +9563,7 @@ WandExport MagickBooleanType MagickSetImageFormat(MagickWand *wand,
*magick_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9610,7 +9610,7 @@ WandExport MagickBooleanType MagickSetImageFuzz(MagickWand *wand,
const double fuzz)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9648,7 +9648,7 @@ WandExport MagickBooleanType MagickSetImageGamma(MagickWand *wand,
const double gamma)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9687,7 +9687,7 @@ WandExport MagickBooleanType MagickSetImageGravity(MagickWand *wand,
const GravityType gravity)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9729,7 +9729,7 @@ WandExport MagickBooleanType MagickSetImageGreenPrimary(MagickWand *wand,
const double x,const double y)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9769,7 +9769,7 @@ WandExport MagickBooleanType MagickSetImageInterlaceScheme(MagickWand *wand,
const InterlaceType interlace)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9809,7 +9809,7 @@ WandExport MagickBooleanType MagickSetImagePixelInterpolateMethod(
MagickWand *wand,const PixelInterpolateMethod method)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9847,7 +9847,7 @@ WandExport MagickBooleanType MagickSetImageIterations(MagickWand *wand,
const size_t iterations)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9886,7 +9886,7 @@ WandExport MagickBooleanType MagickSetImageMatte(MagickWand *wand,
const MagickBooleanType matte)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9927,7 +9927,7 @@ WandExport MagickBooleanType MagickSetImageMatteColor(MagickWand *wand,
const PixelWand *matte)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -9969,7 +9969,7 @@ WandExport MagickBooleanType MagickSetImageAlpha(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10008,7 +10008,7 @@ WandExport MagickBooleanType MagickSetImageOrientation(MagickWand *wand,
const OrientationType orientation)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10052,7 +10052,7 @@ WandExport MagickBooleanType MagickSetImagePage(MagickWand *wand,
const ssize_t y)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10108,7 +10108,7 @@ WandExport MagickProgressMonitor MagickSetImageProgressMonitor(MagickWand *wand,
previous_monitor;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10153,7 +10153,7 @@ WandExport MagickBooleanType MagickSetImageRedPrimary(MagickWand *wand,
const double x,const double y)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10193,7 +10193,7 @@ WandExport MagickBooleanType MagickSetImageRenderingIntent(MagickWand *wand,
const RenderingIntent rendering_intent)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10233,7 +10233,7 @@ WandExport MagickBooleanType MagickSetImageResolution(MagickWand *wand,
const double x_resolution,const double y_resolution)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10272,7 +10272,7 @@ WandExport MagickBooleanType MagickSetImageScene(MagickWand *wand,
const size_t scene)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10310,7 +10310,7 @@ WandExport MagickBooleanType MagickSetImageTicksPerSecond(MagickWand *wand,
const ssize_t ticks_per_second)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10351,7 +10351,7 @@ WandExport MagickBooleanType MagickSetImageType(MagickWand *wand,
const ImageType image_type)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10389,7 +10389,7 @@ WandExport MagickBooleanType MagickSetImageUnits(MagickWand *wand,
const ResolutionType units)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10429,7 +10429,7 @@ WandExport VirtualPixelMethod MagickSetImageVirtualPixelMethod(MagickWand *wand,
const VirtualPixelMethod method)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10468,7 +10468,7 @@ WandExport MagickBooleanType MagickSetImageWhitePoint(MagickWand *wand,
const double x,const double y)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10516,7 +10516,7 @@ WandExport MagickBooleanType MagickShadeImage(MagickWand *wand,
*shade_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10566,7 +10566,7 @@ WandExport MagickBooleanType MagickShadowImage(MagickWand *wand,
*shadow_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10616,7 +10616,7 @@ WandExport MagickBooleanType MagickSharpenImage(MagickWand *wand,
*sharp_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10668,7 +10668,7 @@ WandExport MagickBooleanType MagickShaveImage(MagickWand *wand,
shave_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10726,7 +10726,7 @@ WandExport MagickBooleanType MagickShearImage(MagickWand *wand,
*shear_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10784,7 +10784,7 @@ WandExport MagickBooleanType MagickSigmoidalContrastImage(
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10840,7 +10840,7 @@ WandExport MagickWand *MagickSimilarityImage(MagickWand *wand,
*similarity_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->images == (Image *) NULL) || (reference->images == (Image *) NULL))
@@ -10897,7 +10897,7 @@ WandExport MagickBooleanType MagickSketchImage(MagickWand *wand,
*sketch_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10946,7 +10946,7 @@ WandExport MagickWand *MagickSmushImages(MagickWand *wand,
*smush_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -10992,7 +10992,7 @@ WandExport MagickBooleanType MagickSolarizeImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11060,7 +11060,7 @@ WandExport MagickBooleanType MagickSparseColorImage(MagickWand *wand,
*sparse_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11116,7 +11116,7 @@ WandExport MagickBooleanType MagickSpliceImage(MagickWand *wand,
splice;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11167,7 +11167,7 @@ WandExport MagickBooleanType MagickSpreadImage(MagickWand *wand,
*spread_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11216,7 +11216,7 @@ WandExport MagickBooleanType MagickStatisticImage(MagickWand *wand,
*statistic_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11266,7 +11266,7 @@ WandExport MagickWand *MagickSteganoImage(MagickWand *wand,
*stegano_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->images == (Image *) NULL) ||
@@ -11317,7 +11317,7 @@ WandExport MagickWand *MagickStereoImage(MagickWand *wand,
*stereo_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->images == (Image *) NULL) ||
@@ -11358,7 +11358,7 @@ WandExport MagickWand *MagickStereoImage(MagickWand *wand,
WandExport MagickBooleanType MagickStripImage(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11402,7 +11402,7 @@ WandExport MagickBooleanType MagickSwirlImage(MagickWand *wand,
*swirl_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11450,7 +11450,7 @@ WandExport MagickWand *MagickTextureImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if ((wand->images == (Image *) NULL) ||
@@ -11520,7 +11520,7 @@ WandExport MagickBooleanType MagickThresholdImageChannel(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11565,7 +11565,7 @@ WandExport MagickBooleanType MagickThumbnailImage(MagickWand *wand,
*thumbnail_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11620,7 +11620,7 @@ WandExport MagickBooleanType MagickTintImage(MagickWand *wand,
target;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11690,7 +11690,7 @@ WandExport MagickWand *MagickTransformImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11743,7 +11743,7 @@ WandExport MagickBooleanType MagickTransformImageColorspace(MagickWand *wand,
const ColorspaceType colorspace)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11802,7 +11802,7 @@ WandExport MagickBooleanType MagickTransparentPaintImage(MagickWand *wand,
target_pixel;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11843,7 +11843,7 @@ WandExport MagickBooleanType MagickTransposeImage(MagickWand *wand)
*transpose_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11884,7 +11884,7 @@ WandExport MagickBooleanType MagickTransverseImage(MagickWand *wand)
*transverse_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11931,7 +11931,7 @@ WandExport MagickBooleanType MagickTrimImage(MagickWand *wand,const double fuzz)
*trim_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -11972,7 +11972,7 @@ WandExport MagickBooleanType MagickUniqueImageColors(MagickWand *wand)
*unique_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -12029,7 +12029,7 @@ WandExport MagickBooleanType MagickUnsharpMaskImage(MagickWand *wand,
*unsharp_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -12079,7 +12079,7 @@ WandExport MagickBooleanType MagickVignetteImage(MagickWand *wand,
*vignette_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -12130,7 +12130,7 @@ WandExport MagickBooleanType MagickWaveImage(MagickWand *wand,
*wave_image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -12177,7 +12177,7 @@ WandExport MagickBooleanType MagickWhiteThresholdImage(MagickWand *wand,
thresholds[MagickPathExtent];
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -12230,7 +12230,7 @@ WandExport MagickBooleanType MagickWriteImage(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -12284,7 +12284,7 @@ WandExport MagickBooleanType MagickWriteImageFile(MagickWand *wand,FILE *file)
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
assert(file != (FILE *) NULL);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -12339,7 +12339,7 @@ WandExport MagickBooleanType MagickWriteImages(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -12384,7 +12384,7 @@ WandExport MagickBooleanType MagickWriteImagesFile(MagickWand *wand,FILE *file)
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (IfMagickTrue(wand->debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
diff --git a/MagickWand/magick-property.c b/MagickWand/magick-property.c
index 291d67b64..f3686d847 100644
--- a/MagickWand/magick-property.c
+++ b/MagickWand/magick-property.c
@@ -81,7 +81,7 @@ WandExport MagickBooleanType MagickDeleteImageArtifact(MagickWand *wand,
const char *artifact)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -123,7 +123,7 @@ WandExport MagickBooleanType MagickDeleteImageProperty(MagickWand *wand,
const char *property)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -165,7 +165,7 @@ WandExport MagickBooleanType MagickDeleteOption(MagickWand *wand,
const char *option)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -198,7 +198,7 @@ WandExport MagickBooleanType MagickDeleteOption(MagickWand *wand,
WandExport MagickBooleanType MagickGetAntialias(const MagickWand *wand)
{
assert(wand != (const MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -233,7 +233,7 @@ WandExport PixelWand *MagickGetBackgroundColor(MagickWand *wand)
*background_color;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -267,7 +267,7 @@ WandExport PixelWand *MagickGetBackgroundColor(MagickWand *wand)
WandExport ColorspaceType MagickGetColorspace(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -299,7 +299,7 @@ WandExport ColorspaceType MagickGetColorspace(MagickWand *wand)
WandExport CompressionType MagickGetCompression(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -331,7 +331,7 @@ WandExport CompressionType MagickGetCompression(MagickWand *wand)
WandExport size_t MagickGetCompressionQuality(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -387,7 +387,7 @@ WandExport const char *MagickGetCopyright(void)
WandExport char *MagickGetFilename(const MagickWand *wand)
{
assert(wand != (const MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -419,7 +419,7 @@ WandExport char *MagickGetFilename(const MagickWand *wand)
WandExport char *MagickGetFont(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -453,7 +453,7 @@ WandExport char *MagickGetFont(MagickWand *wand)
WandExport char *MagickGetFormat(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -491,7 +491,7 @@ WandExport GravityType MagickGetGravity(MagickWand *wand)
type;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -557,7 +557,7 @@ WandExport char *MagickGetImageArtifact(MagickWand *wand,const char *artifact)
*value;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -619,7 +619,7 @@ WandExport char **MagickGetImageArtifacts(MagickWand *wand,
length;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -701,7 +701,7 @@ WandExport unsigned char *MagickGetImageProfile(MagickWand *wand,
*datum;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -773,7 +773,7 @@ WandExport char **MagickGetImageProfiles(MagickWand *wand,const char *pattern,
length;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -850,7 +850,7 @@ WandExport char *MagickGetImageProperty(MagickWand *wand,const char *property)
*value;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -912,7 +912,7 @@ WandExport char **MagickGetImageProperties(MagickWand *wand,
length;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -982,7 +982,7 @@ WandExport char **MagickGetImageProperties(MagickWand *wand,
WandExport InterlaceType MagickGetInterlaceScheme(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1020,7 +1020,7 @@ WandExport PixelInterpolateMethod MagickGetInterpolateMethod(MagickWand *wand)
method;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1064,7 +1064,7 @@ WandExport char *MagickGetOption(MagickWand *wand,const char *key)
*option;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1118,7 +1118,7 @@ WandExport char **MagickGetOptions(MagickWand *wand,const char *pattern,
length;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1187,7 +1187,7 @@ WandExport char **MagickGetOptions(MagickWand *wand,const char *pattern,
WandExport OrientationType MagickGetOrientation(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1257,7 +1257,7 @@ WandExport MagickBooleanType MagickGetPage(const MagickWand *wand,
geometry;
assert(wand != (const MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1296,7 +1296,7 @@ WandExport MagickBooleanType MagickGetPage(const MagickWand *wand,
WandExport double MagickGetPointsize(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1414,7 +1414,7 @@ WandExport MagickBooleanType MagickGetResolution(const MagickWand *wand,
double *x,double *y)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1529,7 +1529,7 @@ WandExport double *MagickGetSamplingFactors(MagickWand *wand,
i;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1597,7 +1597,7 @@ WandExport MagickBooleanType MagickGetSize(const MagickWand *wand,
geometry;
assert(wand != (const MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1641,7 +1641,7 @@ WandExport MagickBooleanType MagickGetSizeOffset(const MagickWand *wand,
geometry;
assert(wand != (const MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1676,7 +1676,7 @@ WandExport MagickBooleanType MagickGetSizeOffset(const MagickWand *wand,
WandExport ImageType MagickGetType(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1747,7 +1747,7 @@ WandExport MagickBooleanType MagickProfileImage(MagickWand *wand,
const char *name,const void *profile,const size_t length)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1793,7 +1793,7 @@ WandExport unsigned char *MagickRemoveImageProfile(MagickWand *wand,
*datum;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1847,7 +1847,7 @@ WandExport MagickBooleanType MagickSetAntialias(MagickWand *wand,
const MagickBooleanType antialias)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1884,7 +1884,7 @@ WandExport MagickBooleanType MagickSetBackgroundColor(MagickWand *wand,
const PixelWand *background)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1921,7 +1921,7 @@ WandExport MagickBooleanType MagickSetColorspace(MagickWand *wand,
const ColorspaceType colorspace)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1958,7 +1958,7 @@ WandExport MagickBooleanType MagickSetCompression(MagickWand *wand,
const CompressionType compression)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -1995,7 +1995,7 @@ WandExport MagickBooleanType MagickSetCompressionQuality(MagickWand *wand,
const size_t quality)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2032,7 +2032,7 @@ WandExport MagickBooleanType MagickSetDepth(MagickWand *wand,
const size_t depth)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2071,7 +2071,7 @@ WandExport MagickBooleanType MagickSetExtract(MagickWand *wand,
const char *geometry)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->image_info->extract != (char *) NULL)
@@ -2110,7 +2110,7 @@ WandExport MagickBooleanType MagickSetFilename(MagickWand *wand,
const char *filename)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2148,7 +2148,7 @@ WandExport MagickBooleanType MagickSetFont(MagickWand *wand,const char *font)
if ((font == (const char *) NULL) || (*font == '\0'))
return(MagickFalse);
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2187,7 +2187,7 @@ WandExport MagickBooleanType MagickSetFormat(MagickWand *wand,
*magick_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2236,7 +2236,7 @@ WandExport MagickBooleanType MagickSetGravity(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2276,7 +2276,7 @@ WandExport MagickBooleanType MagickSetImageArtifact(MagickWand *wand,
const char *artifact,const char *value)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2327,7 +2327,7 @@ WandExport MagickBooleanType MagickSetImageProfile(MagickWand *wand,
*profile_info;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2374,7 +2374,7 @@ WandExport MagickBooleanType MagickSetImageProperty(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2414,7 +2414,7 @@ WandExport MagickBooleanType MagickSetInterlaceScheme(MagickWand *wand,
const InterlaceType interlace_scheme)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2454,7 +2454,7 @@ WandExport MagickBooleanType MagickSetInterpolateMethod(MagickWand *wand,
status;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2495,7 +2495,7 @@ WandExport MagickBooleanType MagickSetOption(MagickWand *wand,const char *key,
const char *value)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2531,7 +2531,7 @@ WandExport MagickBooleanType MagickSetOrientation(MagickWand *wand,
const OrientationType orientation)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2579,7 +2579,7 @@ WandExport MagickBooleanType MagickSetPage(MagickWand *wand,
geometry[MagickPathExtent];
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2618,7 +2618,7 @@ WandExport MagickBooleanType MagickSetPassphrase(MagickWand *wand,
const char *passphrase)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2655,7 +2655,7 @@ WandExport MagickBooleanType MagickSetPointsize(MagickWand *wand,
const double pointsize)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2707,7 +2707,7 @@ WandExport MagickProgressMonitor MagickSetProgressMonitor(MagickWand *wand,
previous_monitor;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2783,7 +2783,7 @@ WandExport MagickBooleanType MagickSetResolution(MagickWand *wand,
density[MagickPathExtent];
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2831,7 +2831,7 @@ WandExport MagickBooleanType MagickSetSamplingFactors(MagickWand *wand,
i;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2888,7 +2888,7 @@ WandExport MagickBooleanType MagickSetSize(MagickWand *wand,
geometry[MagickPathExtent];
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2936,7 +2936,7 @@ WandExport MagickBooleanType MagickSetSizeOffset(MagickWand *wand,
geometry[MagickPathExtent];
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -2978,7 +2978,7 @@ WandExport MagickBooleanType MagickSetType(MagickWand *wand,
const ImageType image_type)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if( IfMagickTrue(wand->debug) )
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
diff --git a/MagickWand/magick-wand.c b/MagickWand/magick-wand.c
index f555212d3..e5da6c359 100644
--- a/MagickWand/magick-wand.c
+++ b/MagickWand/magick-wand.c
@@ -77,7 +77,7 @@
WandExport void ClearMagickWand(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->image_info=DestroyImageInfo(wand->image_info);
@@ -117,7 +117,7 @@ WandExport MagickWand *CloneMagickWand(const MagickWand *wand)
*clone_wand;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
clone_wand=(MagickWand *) AcquireMagickMemory(sizeof(*clone_wand));
@@ -137,7 +137,7 @@ WandExport MagickWand *CloneMagickWand(const MagickWand *wand)
clone_wand->debug=IsEventLogging();
if (clone_wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",clone_wand->name);
- clone_wand->signature=WandSignature;
+ clone_wand->signature=MagickWandSignature;
return(clone_wand);
}
@@ -166,7 +166,7 @@ WandExport MagickWand *CloneMagickWand(const MagickWand *wand)
WandExport MagickWand *DestroyMagickWand(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->images=DestroyImageList(wand->images);
@@ -175,7 +175,7 @@ WandExport MagickWand *DestroyMagickWand(MagickWand *wand)
if (wand->exception != (ExceptionInfo *) NULL )
wand->exception=DestroyExceptionInfo(wand->exception);
RelinquishWandId(wand->id);
- wand->signature=(~WandSignature);
+ wand->signature=(~MagickWandSignature);
wand=(MagickWand *) RelinquishMagickMemory(wand);
return(wand);
}
@@ -206,7 +206,7 @@ WandExport MagickBooleanType IsMagickWand(const MagickWand *wand)
{
if (wand == (const MagickWand *) NULL)
return(MagickFalse);
- if (wand->signature != WandSignature)
+ if (wand->signature != MagickWandSignature)
return(MagickFalse);
if (LocaleNCompare(wand->name,MagickWandId,strlen(MagickWandId)) != 0)
return(MagickFalse);
@@ -238,7 +238,7 @@ WandExport MagickBooleanType IsMagickWand(const MagickWand *wand)
WandExport MagickBooleanType MagickClearException(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
ClearMagickException(wand->exception);
@@ -277,7 +277,7 @@ WandExport char *MagickGetException(const MagickWand *wand,
*description;
assert(wand != (const MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(severity != (ExceptionType *) NULL);
@@ -330,7 +330,7 @@ WandExport char *MagickGetException(const MagickWand *wand,
WandExport ExceptionType MagickGetExceptionType(const MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(wand->exception->severity);
@@ -362,7 +362,7 @@ WandExport ExceptionType MagickGetExceptionType(const MagickWand *wand)
WandExport ssize_t MagickGetIteratorIndex(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -525,7 +525,7 @@ WandExport double *MagickQueryFontMetrics(MagickWand *wand,
metrics;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(drawing_wand != (const DrawingWand *) NULL);
@@ -632,7 +632,7 @@ WandExport double *MagickQueryMultilineFontMetrics(MagickWand *wand,
metrics;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(drawing_wand != (const DrawingWand *) NULL);
@@ -823,7 +823,7 @@ WandExport void *MagickRelinquishMemory(void *memory)
WandExport void MagickResetIterator(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->images=GetFirstImageInList(wand->images);
@@ -867,7 +867,7 @@ WandExport void MagickResetIterator(MagickWand *wand)
WandExport void MagickSetFirstIterator(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->images=GetFirstImageInList(wand->images);
@@ -923,7 +923,7 @@ WandExport MagickBooleanType MagickSetIteratorIndex(MagickWand *wand,
*image;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
@@ -970,7 +970,7 @@ WandExport MagickBooleanType MagickSetIteratorIndex(MagickWand *wand,
WandExport void MagickSetLastIterator(MagickWand *wand)
{
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->images=GetLastImageInList(wand->images);
@@ -1076,7 +1076,7 @@ WandExport MagickWand *NewMagickWand(void)
wand->debug=IsEventLogging();
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- wand->signature=WandSignature;
+ wand->signature=MagickWandSignature;
return(wand);
}
diff --git a/MagickWand/method-attribute.h b/MagickWand/method-attribute.h
index 9c0475285..fe3ab9365 100644
--- a/MagickWand/method-attribute.h
+++ b/MagickWand/method-attribute.h
@@ -94,7 +94,7 @@ extern "C" {
# endif
#endif
-#define WandSignature 0xabacadabUL
+#define MagickWandSignature 0xabacadabUL
#if !defined(MagickPathExtent)
# define MagickPathExtent 4096
#endif
diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 708199ac7..5a70a2cba 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -456,11 +456,11 @@ static Image *SparseColorOption(const Image *image,
represent a color varies depending on the current channel setting.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
/*
Limit channels according to image - and add up number of color channel.
*/
@@ -696,9 +696,9 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
Initialize method variables.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image **) NULL);
- assert((*image)->signature == MagickSignature);
+ assert((*image)->signature == MagickCoreSignature);
if ((*image)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*image)->filename);
if (argc < 0)
@@ -3765,7 +3765,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
Set defaults.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(exception != (ExceptionInfo *) NULL);
@@ -6426,7 +6426,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
Initialize method variables.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -7551,10 +7551,10 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
Apply options to the image list.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(images != (Image **) NULL);
assert((*images)->previous == (Image *) NULL);
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
if ((*images)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
(*images)->filename);
@@ -8699,11 +8699,11 @@ WandExport MagickBooleanType MogrifyImages(ImageInfo *image_info,
i;
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (images == (Image **) NULL)
return(MogrifyImage(image_info,argc,argv,images,exception));
assert((*images)->previous == (Image *) NULL);
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
if ((*images)->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
(*images)->filename);
diff --git a/MagickWand/montage.c b/MagickWand/montage.c
index 2f4da710a..c62f134b8 100644
--- a/MagickWand/montage.c
+++ b/MagickWand/montage.c
@@ -328,7 +328,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
Set defaults.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(exception != (ExceptionInfo *) NULL);
diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 64bf4edeb..c721b85c3 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -199,11 +199,11 @@ static Image *SparseColorOption(const Image *image,
number_colors;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (IfMagickTrue(image->debug))
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
/*
Limit channels according to image
add up number of values needed per color.
@@ -423,8 +423,8 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand,
#define ArgOption(def) (IfSetOption?arg1:(const char *)(def))
assert(cli_wand != (MagickCLI *) NULL);
- assert(cli_wand->signature == WandSignature);
- assert(cli_wand->wand.signature == WandSignature);
+ assert(cli_wand->signature == MagickWandSignature);
+ assert(cli_wand->wand.signature == MagickWandSignature);
if (IfMagickTrue(cli_wand->wand.debug))
(void) CLILogEvent(cli_wand,CommandEvent,GetMagickModule(),
@@ -1698,8 +1698,8 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
#define IsPlusOp IsMagickFalse(IfNormalOp)
assert(cli_wand != (MagickCLI *) NULL);
- assert(cli_wand->signature == WandSignature);
- assert(cli_wand->wand.signature == WandSignature);
+ assert(cli_wand->signature == MagickWandSignature);
+ assert(cli_wand->wand.signature == MagickWandSignature);
assert(_image != (Image *) NULL); /* an image must be present */
if (IfMagickTrue(cli_wand->wand.debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",cli_wand->wand.name);
@@ -3556,8 +3556,8 @@ WandPrivate MagickBooleanType CLISimpleOperatorImages(MagickCLI *cli_wand,
#endif
assert(cli_wand != (MagickCLI *) NULL);
- assert(cli_wand->signature == WandSignature);
- assert(cli_wand->wand.signature == WandSignature);
+ assert(cli_wand->signature == MagickWandSignature);
+ assert(cli_wand->wand.signature == MagickWandSignature);
assert(cli_wand->wand.images != (Image *) NULL); /* images must be present */
if (IfMagickTrue(cli_wand->wand.debug))
@@ -3646,8 +3646,8 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand,
#define IsNormalOp IsMagickTrue(IfNormalOp)
assert(cli_wand != (MagickCLI *) NULL);
- assert(cli_wand->signature == WandSignature);
- assert(cli_wand->wand.signature == WandSignature);
+ assert(cli_wand->signature == MagickWandSignature);
+ assert(cli_wand->wand.signature == MagickWandSignature);
assert(_images != (Image *) NULL); /* _images must be present */
if (IfMagickTrue(cli_wand->wand.debug))
@@ -4532,8 +4532,8 @@ WandPrivate void CLINoImageOperator(MagickCLI *cli_wand,
#define IfPlusOp (*option!='-')
assert(cli_wand != (MagickCLI *) NULL);
- assert(cli_wand->signature == WandSignature);
- assert(cli_wand->wand.signature == WandSignature);
+ assert(cli_wand->signature == MagickWandSignature);
+ assert(cli_wand->wand.signature == MagickWandSignature);
if (IfMagickTrue(cli_wand->wand.debug))
(void) CLILogEvent(cli_wand,CommandEvent,GetMagickModule(),
@@ -5049,8 +5049,8 @@ WandExport void CLIOption(MagickCLI *cli_wand,const char *option,...)
option_type;
assert(cli_wand != (MagickCLI *) NULL);
- assert(cli_wand->signature == WandSignature);
- assert(cli_wand->wand.signature == WandSignature);
+ assert(cli_wand->signature == MagickWandSignature);
+ assert(cli_wand->wand.signature == MagickWandSignature);
do { /* Break Code Block for error handling */
diff --git a/MagickWand/pixel-iterator.c b/MagickWand/pixel-iterator.c
index d47127672..12b60d465 100644
--- a/MagickWand/pixel-iterator.c
+++ b/MagickWand/pixel-iterator.c
@@ -119,7 +119,7 @@ struct _PixelIterator
WandExport void ClearPixelIterator(PixelIterator *iterator)
{
assert(iterator != (const PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
iterator->pixel_wands=DestroyPixelWands(iterator->pixel_wands,
@@ -159,7 +159,7 @@ WandExport PixelIterator *ClonePixelIterator(const PixelIterator *iterator)
*clone_iterator;
assert(iterator != (PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
clone_iterator=(PixelIterator *) AcquireMagickMemory(sizeof(*clone_iterator));
@@ -182,7 +182,7 @@ WandExport PixelIterator *ClonePixelIterator(const PixelIterator *iterator)
if (clone_iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",
clone_iterator->name);
- clone_iterator->signature=WandSignature;
+ clone_iterator->signature=MagickWandSignature;
return(clone_iterator);
}
@@ -211,14 +211,14 @@ WandExport PixelIterator *ClonePixelIterator(const PixelIterator *iterator)
WandExport PixelIterator *DestroyPixelIterator(PixelIterator *iterator)
{
assert(iterator != (const PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
iterator->view=DestroyCacheView(iterator->view);
iterator->pixel_wands=DestroyPixelWands(iterator->pixel_wands,
iterator->region.width);
iterator->exception=DestroyExceptionInfo(iterator->exception);
- iterator->signature=(~WandSignature);
+ iterator->signature=(~MagickWandSignature);
RelinquishWandId(iterator->id);
iterator=(PixelIterator *) RelinquishMagickMemory(iterator);
return(iterator);
@@ -254,7 +254,7 @@ WandExport MagickBooleanType IsPixelIterator(const PixelIterator *iterator)
if (iterator == (const PixelIterator *) NULL)
return(MagickFalse);
- if (iterator->signature != WandSignature)
+ if (iterator->signature != MagickWandSignature)
return(MagickFalse);
length=strlen(PixelIteratorId);
if (LocaleNCompare(iterator->name,PixelIteratorId,length) != 0)
@@ -336,7 +336,7 @@ WandExport PixelIterator *NewPixelIterator(MagickWand *wand)
iterator->debug=IsEventLogging();
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
- iterator->signature=WandSignature;
+ iterator->signature=MagickWandSignature;
return(iterator);
}
@@ -367,7 +367,7 @@ WandExport MagickBooleanType PixelClearIteratorException(
PixelIterator *iterator)
{
assert(iterator != (PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
ClearMagickException(iterator->exception);
@@ -455,7 +455,7 @@ WandExport PixelIterator *NewPixelRegionIterator(MagickWand *wand,
iterator->debug=IsEventLogging();
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
- iterator->signature=WandSignature;
+ iterator->signature=MagickWandSignature;
return(iterator);
}
@@ -495,7 +495,7 @@ WandExport PixelWand **PixelGetCurrentIteratorRow(PixelIterator *iterator,
x;
assert(iterator != (PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
*number_wands=0;
@@ -548,7 +548,7 @@ WandExport char *PixelGetIteratorException(const PixelIterator *iterator,
*description;
assert(iterator != (const PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
assert(severity != (ExceptionType *) NULL);
@@ -601,7 +601,7 @@ WandExport ExceptionType PixelGetIteratorExceptionType(
const PixelIterator *iterator)
{
assert(iterator != (const PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
return(iterator->exception->severity);
@@ -632,7 +632,7 @@ WandExport ExceptionType PixelGetIteratorExceptionType(
WandExport ssize_t PixelGetIteratorRow(PixelIterator *iterator)
{
assert(iterator != (const PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
return(iterator->y);
@@ -674,7 +674,7 @@ WandExport PixelWand **PixelGetNextIteratorRow(PixelIterator *iterator,
x;
assert(iterator != (PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
*number_wands=0;
@@ -733,7 +733,7 @@ WandExport PixelWand **PixelGetPreviousIteratorRow(PixelIterator *iterator,
x;
assert(iterator != (PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
*number_wands=0;
@@ -783,7 +783,7 @@ WandExport PixelWand **PixelGetPreviousIteratorRow(PixelIterator *iterator,
WandExport void PixelResetIterator(PixelIterator *iterator)
{
assert(iterator != (PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
iterator->active=MagickFalse;
@@ -815,7 +815,7 @@ WandExport void PixelResetIterator(PixelIterator *iterator)
WandExport void PixelSetFirstIteratorRow(PixelIterator *iterator)
{
assert(iterator != (PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
iterator->active=MagickFalse;
@@ -849,7 +849,7 @@ WandExport MagickBooleanType PixelSetIteratorRow(PixelIterator *iterator,
const ssize_t row)
{
assert(iterator != (const PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
if ((row < 0) || (row >= (ssize_t) iterator->region.height))
@@ -884,7 +884,7 @@ WandExport MagickBooleanType PixelSetIteratorRow(PixelIterator *iterator,
WandExport void PixelSetLastIteratorRow(PixelIterator *iterator)
{
assert(iterator != (PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
iterator->active=MagickFalse;
@@ -925,7 +925,7 @@ WandExport MagickBooleanType PixelSyncIterator(PixelIterator *iterator)
*restrict pixels;
assert(iterator != (const PixelIterator *) NULL);
- assert(iterator->signature == WandSignature);
+ assert(iterator->signature == MagickWandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
status=SetCacheViewStorageClass(iterator->view,DirectClass,
diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c
index a6036901f..8f93bc143 100644
--- a/MagickWand/pixel-wand.c
+++ b/MagickWand/pixel-wand.c
@@ -109,7 +109,7 @@ struct _PixelWand
WandExport void ClearPixelWand(PixelWand *wand)
{
assert(wand != (PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
ClearMagickException(wand->exception);
@@ -145,7 +145,7 @@ WandExport PixelWand *ClonePixelWand(const PixelWand *wand)
*clone_wand;
assert(wand != (PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
clone_wand=(PixelWand *) AcquireMagickMemory(sizeof(*clone_wand));
@@ -163,7 +163,7 @@ WandExport PixelWand *ClonePixelWand(const PixelWand *wand)
clone_wand->debug=IsEventLogging();
if (clone_wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",clone_wand->name);
- clone_wand->signature=WandSignature;
+ clone_wand->signature=MagickWandSignature;
return(clone_wand);
}
@@ -236,11 +236,11 @@ WandExport PixelWand **ClonePixelWands(const PixelWand **wands,
WandExport PixelWand *DestroyPixelWand(PixelWand *wand)
{
assert(wand != (PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->exception=DestroyExceptionInfo(wand->exception);
- wand->signature=(~WandSignature);
+ wand->signature=(~MagickWandSignature);
RelinquishWandId(wand->id);
wand=(PixelWand *) RelinquishMagickMemory(wand);
return(wand);
@@ -280,7 +280,7 @@ WandExport PixelWand **DestroyPixelWands(PixelWand **wand,
assert(wand != (PixelWand **) NULL);
assert(*wand != (PixelWand *) NULL);
- assert((*wand)->signature == WandSignature);
+ assert((*wand)->signature == MagickWandSignature);
if ((*wand)->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",(*wand)->name);
for (i=(ssize_t) number_wands-1; i >= 0; i--)
@@ -322,11 +322,11 @@ WandExport MagickBooleanType IsPixelWandSimilar(PixelWand *p,PixelWand *q,
const double fuzz)
{
assert(p != (PixelWand *) NULL);
- assert(p->signature == WandSignature);
+ assert(p->signature == MagickWandSignature);
if (p->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",p->name);
assert(q != (PixelWand *) NULL);
- assert(q->signature == WandSignature);
+ assert(q->signature == MagickWandSignature);
if (q->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",q->name);
p->pixel.fuzz=fuzz;
@@ -360,7 +360,7 @@ WandExport MagickBooleanType IsPixelWand(const PixelWand *wand)
{
if (wand == (const PixelWand *) NULL)
return(MagickFalse);
- if (wand->signature != WandSignature)
+ if (wand->signature != MagickWandSignature)
return(MagickFalse);
if (LocaleNCompare(wand->name,PixelWandId,strlen(PixelWandId)) != 0)
return(MagickFalse);
@@ -413,7 +413,7 @@ WandExport PixelWand *NewPixelWand(void)
wand->debug=IsEventLogging();
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- wand->signature=WandSignature;
+ wand->signature=MagickWandSignature;
return(wand);
}
@@ -482,7 +482,7 @@ WandExport PixelWand **NewPixelWands(const size_t number_wands)
WandExport MagickBooleanType PixelClearException(PixelWand *wand)
{
assert(wand != (PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
ClearMagickException(wand->exception);
@@ -514,7 +514,7 @@ WandExport MagickBooleanType PixelClearException(PixelWand *wand)
WandExport double PixelGetAlpha(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return((double) QuantumScale*wand->pixel.alpha);
@@ -545,7 +545,7 @@ WandExport double PixelGetAlpha(const PixelWand *wand)
WandExport Quantum PixelGetAlphaQuantum(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(ClampToQuantum(wand->pixel.alpha));
@@ -576,7 +576,7 @@ WandExport Quantum PixelGetAlphaQuantum(const PixelWand *wand)
WandExport double PixelGetBlack(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return((double) QuantumScale*wand->pixel.black);
@@ -607,7 +607,7 @@ WandExport double PixelGetBlack(const PixelWand *wand)
WandExport Quantum PixelGetBlackQuantum(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(ClampToQuantum(wand->pixel.black));
@@ -638,7 +638,7 @@ WandExport Quantum PixelGetBlackQuantum(const PixelWand *wand)
WandExport double PixelGetBlue(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return((double) QuantumScale*wand->pixel.blue);
@@ -669,7 +669,7 @@ WandExport double PixelGetBlue(const PixelWand *wand)
WandExport Quantum PixelGetBlueQuantum(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(ClampToQuantum(wand->pixel.blue));
@@ -706,7 +706,7 @@ WandExport char *PixelGetColorAsString(const PixelWand *wand)
pixel;
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
pixel=wand->pixel;
@@ -744,7 +744,7 @@ WandExport char *PixelGetColorAsNormalizedString(const PixelWand *wand)
color[2*MagickPathExtent];
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
(void) FormatLocaleString(color,MagickPathExtent,"%g,%g,%g",
@@ -785,7 +785,7 @@ WandExport char *PixelGetColorAsNormalizedString(const PixelWand *wand)
WandExport size_t PixelGetColorCount(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(wand->count);
@@ -816,7 +816,7 @@ WandExport size_t PixelGetColorCount(const PixelWand *wand)
WandExport double PixelGetCyan(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return((double) QuantumScale*wand->pixel.red);
@@ -847,7 +847,7 @@ WandExport double PixelGetCyan(const PixelWand *wand)
WandExport Quantum PixelGetCyanQuantum(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(ClampToQuantum(wand->pixel.red));
@@ -885,7 +885,7 @@ WandExport char *PixelGetException(const PixelWand *wand,
*description;
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(severity != (ExceptionType *) NULL);
@@ -935,7 +935,7 @@ WandExport char *PixelGetException(const PixelWand *wand,
WandExport ExceptionType PixelGetExceptionType(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(wand->exception->severity);
@@ -966,7 +966,7 @@ WandExport ExceptionType PixelGetExceptionType(const PixelWand *wand)
WandExport double PixelGetFuzz(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return((double) wand->pixel.fuzz);
@@ -997,7 +997,7 @@ WandExport double PixelGetFuzz(const PixelWand *wand)
WandExport double PixelGetGreen(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return((double) QuantumScale*wand->pixel.green);
@@ -1028,7 +1028,7 @@ WandExport double PixelGetGreen(const PixelWand *wand)
WandExport Quantum PixelGetGreenQuantum(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(ClampToQuantum(wand->pixel.green));
@@ -1064,7 +1064,7 @@ WandExport void PixelGetHSL(const PixelWand *wand,double *hue,
double *saturation,double *lightness)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
ConvertRGBToHSL((double) ClampToQuantum(wand->pixel.red),(double)
@@ -1097,7 +1097,7 @@ WandExport void PixelGetHSL(const PixelWand *wand,double *hue,
WandExport Quantum PixelGetIndex(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return((Quantum) wand->pixel.black);
@@ -1128,7 +1128,7 @@ WandExport Quantum PixelGetIndex(const PixelWand *wand)
WandExport double PixelGetMagenta(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return((double) QuantumScale*wand->pixel.green);
@@ -1159,7 +1159,7 @@ WandExport double PixelGetMagenta(const PixelWand *wand)
WandExport Quantum PixelGetMagentaQuantum(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(ClampToQuantum(wand->pixel.green));
@@ -1193,7 +1193,7 @@ WandExport void PixelGetMagickColor(const PixelWand *wand,
PixelInfo *color)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(color != (PixelInfo *) NULL);
@@ -1225,7 +1225,7 @@ WandExport void PixelGetMagickColor(const PixelWand *wand,
WandExport PixelInfo PixelGetPixel(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(wand->pixel);
@@ -1258,7 +1258,7 @@ WandExport PixelInfo PixelGetPixel(const PixelWand *wand)
WandExport void PixelGetQuantumPacket(const PixelWand *wand,PixelInfo *packet)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(packet != (PixelInfo *) NULL);
@@ -1318,7 +1318,7 @@ WandExport void PixelGetQuantumPixel(const Image *image,const PixelWand *wand,
Quantum *pixel)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(pixel != (Quantum *) NULL);
@@ -1367,7 +1367,7 @@ WandExport void PixelGetQuantumPixel(const Image *image,const PixelWand *wand,
WandExport double PixelGetRed(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return((double) QuantumScale*wand->pixel.red);
@@ -1398,7 +1398,7 @@ WandExport double PixelGetRed(const PixelWand *wand)
WandExport Quantum PixelGetRedQuantum(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(ClampToQuantum(wand->pixel.red));
@@ -1429,7 +1429,7 @@ WandExport Quantum PixelGetRedQuantum(const PixelWand *wand)
WandExport double PixelGetYellow(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return((double) QuantumScale*wand->pixel.blue);
@@ -1460,7 +1460,7 @@ WandExport double PixelGetYellow(const PixelWand *wand)
WandExport Quantum PixelGetYellowQuantum(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
return(ClampToQuantum(wand->pixel.blue));
@@ -1494,7 +1494,7 @@ WandExport Quantum PixelGetYellowQuantum(const PixelWand *wand)
WandExport void PixelSetAlpha(PixelWand *wand,const double alpha)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.alpha=(double) ClampToQuantum(QuantumRange*alpha);
@@ -1527,7 +1527,7 @@ WandExport void PixelSetAlpha(PixelWand *wand,const double alpha)
WandExport void PixelSetAlphaQuantum(PixelWand *wand,const Quantum alpha)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.alpha=(double) alpha;
@@ -1560,7 +1560,7 @@ WandExport void PixelSetAlphaQuantum(PixelWand *wand,const Quantum alpha)
WandExport void PixelSetBlack(PixelWand *wand,const double black)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.black=(double) ClampToQuantum(QuantumRange*black);
@@ -1593,7 +1593,7 @@ WandExport void PixelSetBlack(PixelWand *wand,const double black)
WandExport void PixelSetBlackQuantum(PixelWand *wand,const Quantum black)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.black=(double) black;
@@ -1626,7 +1626,7 @@ WandExport void PixelSetBlackQuantum(PixelWand *wand,const Quantum black)
WandExport void PixelSetBlue(PixelWand *wand,const double blue)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.blue=(double) ClampToQuantum(QuantumRange*blue);
@@ -1659,7 +1659,7 @@ WandExport void PixelSetBlue(PixelWand *wand,const double blue)
WandExport void PixelSetBlueQuantum(PixelWand *wand,const Quantum blue)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.blue=(double) blue;
@@ -1699,7 +1699,7 @@ WandExport MagickBooleanType PixelSetColor(PixelWand *wand,const char *color)
pixel;
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
status=QueryColorCompliance(color,AllCompliance,&pixel,wand->exception);
@@ -1735,7 +1735,7 @@ WandExport MagickBooleanType PixelSetColor(PixelWand *wand,const char *color)
WandExport void PixelSetColorCount(PixelWand *wand,const size_t count)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->count=count;
@@ -1768,7 +1768,7 @@ WandExport void PixelSetColorCount(PixelWand *wand,const size_t count)
WandExport void PixelSetColorFromWand(PixelWand *wand,const PixelWand *color)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(color != (const PixelWand *) NULL);
@@ -1802,7 +1802,7 @@ WandExport void PixelSetColorFromWand(PixelWand *wand,const PixelWand *color)
WandExport void PixelSetCyan(PixelWand *wand,const double cyan)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.red=(double) ClampToQuantum(QuantumRange*cyan);
@@ -1835,7 +1835,7 @@ WandExport void PixelSetCyan(PixelWand *wand,const double cyan)
WandExport void PixelSetCyanQuantum(PixelWand *wand,const Quantum cyan)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.red=(double) cyan;
@@ -1868,7 +1868,7 @@ WandExport void PixelSetCyanQuantum(PixelWand *wand,const Quantum cyan)
WandExport void PixelSetFuzz(PixelWand *wand,const double fuzz)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.fuzz=(double) fuzz;
@@ -1901,7 +1901,7 @@ WandExport void PixelSetFuzz(PixelWand *wand,const double fuzz)
WandExport void PixelSetGreen(PixelWand *wand,const double green)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.green=(double) ClampToQuantum(QuantumRange*green);
@@ -1934,7 +1934,7 @@ WandExport void PixelSetGreen(PixelWand *wand,const double green)
WandExport void PixelSetGreenQuantum(PixelWand *wand,const Quantum green)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.green=(double) green;
@@ -1975,7 +1975,7 @@ WandExport void PixelSetHSL(PixelWand *wand,const double hue,
red;
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
ConvertHSLToRGB(hue,saturation,lightness,&red,&green,&blue);
@@ -2011,7 +2011,7 @@ WandExport void PixelSetHSL(PixelWand *wand,const double hue,
WandExport void PixelSetIndex(PixelWand *wand,const Quantum index)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.index=(double) index;
@@ -2044,7 +2044,7 @@ WandExport void PixelSetIndex(PixelWand *wand,const Quantum index)
WandExport void PixelSetMagenta(PixelWand *wand,const double magenta)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.green=(double) ClampToQuantum(QuantumRange*magenta);
@@ -2078,7 +2078,7 @@ WandExport void PixelSetMagenta(PixelWand *wand,const double magenta)
WandExport void PixelSetMagentaQuantum(PixelWand *wand,const Quantum magenta)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.green=(double) magenta;
@@ -2111,7 +2111,7 @@ WandExport void PixelSetMagentaQuantum(PixelWand *wand,const Quantum magenta)
WandExport void PixelSetPixelColor(PixelWand *wand,const PixelInfo *color)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(color != (const PixelInfo *) NULL);
@@ -2147,7 +2147,7 @@ WandExport void PixelSetQuantumPixel(const Image *image,const Quantum *pixel,
PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(pixel != (Quantum *) NULL);
@@ -2187,7 +2187,7 @@ WandExport void PixelSetQuantumPixel(const Image *image,const Quantum *pixel,
WandExport void PixelSetRed(PixelWand *wand,const double red)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.red=(double) ClampToQuantum(QuantumRange*red);
@@ -2220,7 +2220,7 @@ WandExport void PixelSetRed(PixelWand *wand,const double red)
WandExport void PixelSetRedQuantum(PixelWand *wand,const Quantum red)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.red=(double) red;
@@ -2253,7 +2253,7 @@ WandExport void PixelSetRedQuantum(PixelWand *wand,const Quantum red)
WandExport void PixelSetYellow(PixelWand *wand,const double yellow)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.blue=(double) ClampToQuantum(QuantumRange*yellow);
@@ -2286,7 +2286,7 @@ WandExport void PixelSetYellow(PixelWand *wand,const double yellow)
WandExport void PixelSetYellowQuantum(PixelWand *wand,const Quantum yellow)
{
assert(wand != (const PixelWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.blue=(double) yellow;
diff --git a/MagickWand/script-token.c b/MagickWand/script-token.c
index 9da504904..6fafb7293 100644
--- a/MagickWand/script-token.c
+++ b/MagickWand/script-token.c
@@ -235,7 +235,7 @@ WandExport ScriptTokenInfo *AcquireScriptTokenInfo(const char *filename)
token_info->status=(token_info->token != (char *) NULL)
? TokenStatusOK : TokenStatusMemoryFailed;
- token_info->signature=WandSignature;
+ token_info->signature=MagickWandSignature;
return token_info;
}
@@ -266,7 +266,7 @@ WandExport ScriptTokenInfo *AcquireScriptTokenInfo(const char *filename)
WandExport ScriptTokenInfo * DestroyScriptTokenInfo(ScriptTokenInfo *token_info)
{
assert(token_info != (ScriptTokenInfo *) NULL);
- assert(token_info->signature == WandSignature);
+ assert(token_info->signature == MagickWandSignature);
if ( token_info->opened != MagickFalse )
fclose(token_info->stream);
diff --git a/MagickWand/stream.c b/MagickWand/stream.c
index 579d5d65a..12f43e680 100644
--- a/MagickWand/stream.c
+++ b/MagickWand/stream.c
@@ -219,7 +219,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
Set defaults.
*/
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(exception != (ExceptionInfo *) NULL);
diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c
index 4b4530984..014719067 100644
--- a/MagickWand/wand-view.c
+++ b/MagickWand/wand-view.c
@@ -124,7 +124,7 @@ WandExport WandView *CloneWandView(const WandView *wand_view)
i;
assert(wand_view != (WandView *) NULL);
- assert(wand_view->signature == WandSignature);
+ assert(wand_view->signature == MagickWandSignature);
if (wand_view->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand_view->name);
clone_view=(WandView *) AcquireMagickMemory(sizeof(*clone_view));
@@ -148,7 +148,7 @@ WandExport WandView *CloneWandView(const WandView *wand_view)
clone_view->debug=wand_view->debug;
if (clone_view->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",clone_view->name);
- clone_view->signature=WandSignature;
+ clone_view->signature=MagickWandSignature;
return(clone_view);
}
@@ -192,13 +192,13 @@ static PixelWand ***DestroyPixelsThreadSet(PixelWand ***pixel_wands,
WandExport WandView *DestroyWandView(WandView *wand_view)
{
assert(wand_view != (WandView *) NULL);
- assert(wand_view->signature == WandSignature);
+ assert(wand_view->signature == MagickWandSignature);
wand_view->pixel_wands=DestroyPixelsThreadSet(wand_view->pixel_wands,
wand_view->extent.width);
wand_view->image=DestroyImage(wand_view->image);
wand_view->view=DestroyCacheView(wand_view->view);
wand_view->exception=DestroyExceptionInfo(wand_view->exception);
- wand_view->signature=(~WandSignature);
+ wand_view->signature=(~MagickWandSignature);
RelinquishWandId(wand_view->id);
wand_view=(WandView *) RelinquishMagickMemory(wand_view);
return(wand_view);
@@ -278,7 +278,7 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source,
y;
assert(source != (WandView *) NULL);
- assert(source->signature == WandSignature);
+ assert(source->signature == MagickWandSignature);
if (transfer == (DuplexTransferWandViewMethod) NULL)
return(MagickFalse);
source_image=source->wand->images;
@@ -417,7 +417,7 @@ WandExport char *GetWandViewException(const WandView *wand_view,
*description;
assert(wand_view != (const WandView *) NULL);
- assert(wand_view->signature == WandSignature);
+ assert(wand_view->signature == MagickWandSignature);
if (wand_view->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand_view->name);
assert(severity != (ExceptionType *) NULL);
@@ -468,7 +468,7 @@ WandExport char *GetWandViewException(const WandView *wand_view,
WandExport RectangleInfo GetWandViewExtent(const WandView *wand_view)
{
assert(wand_view != (WandView *) NULL);
- assert(wand_view->signature == WandSignature);
+ assert(wand_view->signature == MagickWandSignature);
return(wand_view->extent);
}
@@ -536,7 +536,7 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source,
y;
assert(source != (WandView *) NULL);
- assert(source->signature == WandSignature);
+ assert(source->signature == MagickWandSignature);
if (get == (GetWandViewMethod) NULL)
return(MagickFalse);
source_image=source->wand->images;
@@ -619,7 +619,7 @@ WandExport PixelWand **GetWandViewPixels(const WandView *wand_view)
id = GetOpenMPThreadId();
assert(wand_view != (WandView *) NULL);
- assert(wand_view->signature == WandSignature);
+ assert(wand_view->signature == MagickWandSignature);
return(wand_view->pixel_wands[id]);
}
@@ -648,7 +648,7 @@ WandExport PixelWand **GetWandViewPixels(const WandView *wand_view)
WandExport MagickWand *GetWandViewWand(const WandView *wand_view)
{
assert(wand_view != (WandView *) NULL);
- assert(wand_view->signature == WandSignature);
+ assert(wand_view->signature == MagickWandSignature);
return(wand_view->wand);
}
@@ -682,7 +682,7 @@ WandExport MagickBooleanType IsWandView(const WandView *wand_view)
if (wand_view == (const WandView *) NULL)
return(MagickFalse);
- if (wand_view->signature != WandSignature)
+ if (wand_view->signature != MagickWandSignature)
return(MagickFalse);
length=strlen(WandViewId);
if (LocaleNCompare(wand_view->name,WandViewId,length) != 0)
@@ -749,7 +749,7 @@ WandExport WandView *NewWandView(MagickWand *wand)
*wand_view;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
wand_view=(WandView *) AcquireMagickMemory(sizeof(*wand_view));
if (wand_view == (WandView *) NULL)
ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
@@ -770,7 +770,7 @@ WandExport WandView *NewWandView(MagickWand *wand)
ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
GetExceptionMessage(errno));
wand_view->debug=IsEventLogging();
- wand_view->signature=WandSignature;
+ wand_view->signature=MagickWandSignature;
return(wand_view);
}
@@ -811,7 +811,7 @@ WandExport WandView *NewWandViewExtent(MagickWand *wand,const ssize_t x,
*wand_view;
assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
+ assert(wand->signature == MagickWandSignature);
wand_view=(WandView *) AcquireMagickMemory(sizeof(*wand_view));
if (wand_view == (WandView *) NULL)
ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
@@ -834,7 +834,7 @@ WandExport WandView *NewWandViewExtent(MagickWand *wand,const ssize_t x,
ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
GetExceptionMessage(errno));
wand_view->debug=IsEventLogging();
- wand_view->signature=WandSignature;
+ wand_view->signature=MagickWandSignature;
return(wand_view);
}
@@ -866,7 +866,7 @@ MagickExport void SetWandViewDescription(WandView *wand_view,
const char *description)
{
assert(wand_view != (WandView *) NULL);
- assert(wand_view->signature == WandSignature);
+ assert(wand_view->signature == MagickWandSignature);
wand_view->description=ConstantString(description);
}
@@ -935,7 +935,7 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination,
y;
assert(destination != (WandView *) NULL);
- assert(destination->signature == WandSignature);
+ assert(destination->signature == MagickWandSignature);
if (set == (SetWandViewMethod) NULL)
return(MagickFalse);
destination_image=destination->wand->images;
@@ -1071,7 +1071,7 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source,
y;
assert(source != (WandView *) NULL);
- assert(source->signature == WandSignature);
+ assert(source->signature == MagickWandSignature);
if (transfer == (TransferWandViewMethod) NULL)
return(MagickFalse);
source_image=source->wand->images;
@@ -1227,7 +1227,7 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source,
y;
assert(source != (WandView *) NULL);
- assert(source->signature == WandSignature);
+ assert(source->signature == MagickWandSignature);
if (update == (UpdateWandViewMethod) NULL)
return(MagickFalse);
source_image=source->wand->images;
diff --git a/MagickWand/wandcli.c b/MagickWand/wandcli.c
index 94b60a5d3..3d8d1b47c 100644
--- a/MagickWand/wandcli.c
+++ b/MagickWand/wandcli.c
@@ -109,7 +109,7 @@ WandExport MagickCLI *AcquireMagickCLI(ImageInfo *image_info,
else
cli_wand->wand.exception=exception;
cli_wand->wand.debug=IsEventLogging();
- cli_wand->wand.signature=WandSignature;
+ cli_wand->wand.signature=MagickWandSignature;
/* Initialize CLI Part of MagickCLI */
cli_wand->draw_info=CloneDrawInfo(cli_wand->wand.image_info,(DrawInfo *) NULL);
@@ -128,7 +128,7 @@ WandExport MagickCLI *AcquireMagickCLI(ImageInfo *image_info,
cli_wand->line=0; /* line from script OR CLI argument */
cli_wand->column=0; /* column from script */
- cli_wand->signature=WandSignature;
+ cli_wand->signature=MagickWandSignature;
if (IfMagickTrue(cli_wand->wand.debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",cli_wand->wand.name);
return(cli_wand);
@@ -160,8 +160,8 @@ WandExport MagickCLI *DestroyMagickCLI(MagickCLI *cli_wand)
*node;
assert(cli_wand != (MagickCLI *) NULL);
- assert(cli_wand->signature == WandSignature);
- assert(cli_wand->wand.signature == WandSignature);
+ assert(cli_wand->signature == MagickWandSignature);
+ assert(cli_wand->wand.signature == MagickWandSignature);
if (IfMagickTrue(cli_wand->wand.debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",cli_wand->wand.name);
@@ -184,7 +184,7 @@ WandExport MagickCLI *DestroyMagickCLI(MagickCLI *cli_wand)
(void) DestroyImageInfo((ImageInfo *)node->data);
(void) RelinquishMagickMemory(node);
}
- cli_wand->signature=(~WandSignature);
+ cli_wand->signature=(~MagickWandSignature);
/* Destroy Wand part MagickCLI */
cli_wand->wand.images=DestroyImageList(cli_wand->wand.images);
@@ -193,7 +193,7 @@ WandExport MagickCLI *DestroyMagickCLI(MagickCLI *cli_wand)
if (cli_wand->wand.exception != (ExceptionInfo *) NULL )
cli_wand->wand.exception=DestroyExceptionInfo(cli_wand->wand.exception);
RelinquishWandId(cli_wand->wand.id);
- cli_wand->wand.signature=(~WandSignature);
+ cli_wand->wand.signature=(~MagickWandSignature);
return((MagickCLI *) NULL);
}
@@ -237,8 +237,8 @@ WandExport MagickBooleanType CLICatchException(MagickCLI *cli_wand,
MagickBooleanType
status;
assert(cli_wand != (MagickCLI *) NULL);
- assert(cli_wand->signature == WandSignature);
- assert(cli_wand->wand.signature == WandSignature);
+ assert(cli_wand->signature == MagickWandSignature);
+ assert(cli_wand->wand.signature == MagickWandSignature);
if (IfMagickTrue(cli_wand->wand.debug))
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",cli_wand->wand.name);
diff --git a/coders/aai.c b/coders/aai.c
index 2e00fb20b..8f0d143a0 100644
--- a/coders/aai.c
+++ b/coders/aai.c
@@ -126,12 +126,12 @@ static Image *ReadAAIImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -349,13 +349,13 @@ static MagickBooleanType WriteAAIImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/art.c b/coders/art.c
index 095ebd400..b3df32578 100644
--- a/coders/art.c
+++ b/coders/art.c
@@ -120,12 +120,12 @@ static Image *ReadARTImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -301,13 +301,13 @@ static MagickBooleanType WriteARTImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/avs.c b/coders/avs.c
index 0deb5aa88..8911c6439 100644
--- a/coders/avs.c
+++ b/coders/avs.c
@@ -128,12 +128,12 @@ static Image *ReadAVSImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -352,13 +352,13 @@ static MagickBooleanType WriteAVSImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/bgr.c b/coders/bgr.c
index c858a0210..30af2b1ce 100644
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -133,12 +133,12 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
@@ -1126,9 +1126,9 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image,
Allocate memory for pixels.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image_info->interlace != PartitionInterlace)
@@ -1137,7 +1137,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/bmp.c b/coders/bmp.c
index ab695da7b..c21d5e8aa 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -206,7 +206,7 @@ static MagickBooleanType DecodeImage(Image *image,const size_t compression,
byte;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(pixels != (unsigned char *) NULL);
@@ -376,7 +376,7 @@ static size_t EncodeImage(Image *image,const size_t bytes_per_line,
Runlength encode pixels.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(pixels != (const unsigned char *) NULL);
@@ -534,12 +534,12 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1559,13 +1559,13 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/braille.c b/coders/braille.c
index 7212811cf..a80b4f67b 100644
--- a/coders/braille.c
+++ b/coders/braille.c
@@ -199,9 +199,9 @@ static MagickBooleanType WriteBRAILLEImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (LocaleCompare(image_info->magick, "UBRL") == 0)
unicode=1;
else
@@ -212,7 +212,7 @@ static MagickBooleanType WriteBRAILLEImage(const ImageInfo *image_info,
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/cals.c b/coders/cals.c
index f5392ad72..993e04247 100644
--- a/coders/cals.c
+++ b/coders/cals.c
@@ -180,12 +180,12 @@ static Image *ReadCALSImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -456,13 +456,13 @@ static MagickBooleanType WriteCALSImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/caption.c b/coders/caption.c
index 9abb49257..47fc9b9ce 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -127,12 +127,12 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
Initialize Image structure.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
(void) ResetImagePage(image,"0x0+0+0");
/*
diff --git a/coders/cin.c b/coders/cin.c
index df281f69e..cf74a33a1 100644
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -425,12 +425,12 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -936,13 +936,13 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/cip.c b/coders/cip.c
index c4fdd6780..2b97e7066 100644
--- a/coders/cip.c
+++ b/coders/cip.c
@@ -186,13 +186,13 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/clip.c b/coders/clip.c
index 3931bcba8..275d5b953 100644
--- a/coders/clip.c
+++ b/coders/clip.c
@@ -100,12 +100,12 @@ static Image *ReadCLIPImage(const ImageInfo *image_info,
Initialize Image structure.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
(void) CopyMagickString(read_info->magick,"MIFF",MagickPathExtent);
diff --git a/coders/clipboard.c b/coders/clipboard.c
index 1937001e7..b6c801b48 100644
--- a/coders/clipboard.c
+++ b/coders/clipboard.c
@@ -121,12 +121,12 @@ static Image *ReadCLIPBOARDImage(const ImageInfo *image_info,
y;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
{
HBITMAP
@@ -338,9 +338,9 @@ static MagickBooleanType WriteCLIPBOARDImage(const ImageInfo *image_info,
Allocate memory for pixels.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
{
diff --git a/coders/cmyk.c b/coders/cmyk.c
index 335d14b79..cafef6d90 100644
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -132,12 +132,12 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
@@ -1239,9 +1239,9 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
Allocate memory for pixels.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image_info->interlace != PartitionInterlace)
diff --git a/coders/cut.c b/coders/cut.c
index f73d09ed0..179f6858b 100644
--- a/coders/cut.c
+++ b/coders/cut.c
@@ -310,12 +310,12 @@ static Image *ReadCUTImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/dcm.c b/coders/dcm.c
index f1b393240..13d878eb6 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -2841,12 +2841,12 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/dds.c b/coders/dds.c
index 663f52838..b9f463854 100644
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -1660,12 +1660,12 @@ static Image *ReadDDSImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -2599,9 +2599,9 @@ static MagickBooleanType WriteDDSImage(const ImageInfo *image_info,
weightByAlpha;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
diff --git a/coders/debug.c b/coders/debug.c
index 48b12c659..110c42b4c 100644
--- a/coders/debug.c
+++ b/coders/debug.c
@@ -191,9 +191,9 @@ static MagickBooleanType WriteDEBUGImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=OpenBlob(image_info,image,WriteBlobMode,exception);
diff --git a/coders/dib.c b/coders/dib.c
index 34ae5fd62..13735f7ee 100644
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -175,7 +175,7 @@ static MagickBooleanType DecodeImage(Image *image,
byte;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(pixels != (unsigned char *) NULL);
@@ -335,7 +335,7 @@ static size_t EncodeImage(Image *image,const size_t bytes_per_line,
Runlength encode pixels.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(pixels != (const unsigned char *) NULL);
@@ -479,12 +479,12 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1027,13 +1027,13 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/djvu.c b/coders/djvu.c
index ddef74eaf..eb2a5043f 100644
--- a/coders/djvu.c
+++ b/coders/djvu.c
@@ -766,14 +766,14 @@ static Image *ReadDJVUImage(const ImageInfo *image_info,
* Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
logging = LogMagickEvent(CoderEvent,GetMagickModule(),"enter ReadDJVUImage()");
diff --git a/coders/dng.c b/coders/dng.c
index 746806f58..16a65e999 100644
--- a/coders/dng.c
+++ b/coders/dng.c
@@ -108,12 +108,12 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/dot.c b/coders/dot.c
index d3aa8ea17..3f242aa87 100644
--- a/coders/dot.c
+++ b/coders/dot.c
@@ -119,12 +119,12 @@ static Image *ReadDOTImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/dps.c b/coders/dps.c
index 9ddfa2198..3206d6823 100644
--- a/coders/dps.c
+++ b/coders/dps.c
@@ -155,12 +155,12 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open X server connection.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
display=XOpenDisplay(image_info->server_name);
if (display == (Display *) NULL)
return((Image *) NULL);
diff --git a/coders/dpx.c b/coders/dpx.c
index 32fb55e7d..26c32d026 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -694,12 +694,12 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1481,9 +1481,9 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
horizontal_factor=4;
@@ -1511,7 +1511,7 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image,
if ((image->columns % 2) != 0)
image->columns++;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/emf.c b/coders/emf.c
index 183bbce43..672794e2a 100644
--- a/coders/emf.c
+++ b/coders/emf.c
@@ -688,7 +688,7 @@ static Image *ReadEMFImage(const ImageInfo *image_info,
fileName[MagickPathExtent];
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
diff --git a/coders/ept.c b/coders/ept.c
index 46e6abab1..0fae7eafd 100644
--- a/coders/ept.c
+++ b/coders/ept.c
@@ -178,12 +178,12 @@ static Image *ReadEPTImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -382,13 +382,13 @@ static MagickBooleanType WriteEPTImage(const ImageInfo *image_info,Image *image,
Write EPT image.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/exr.c b/coders/exr.c
index d64f9ff41..4e9ac3fdc 100644
--- a/coders/exr.c
+++ b/coders/exr.c
@@ -169,12 +169,12 @@ static Image *ReadEXRImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -396,13 +396,13 @@ static MagickBooleanType WriteEXRImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/fax.c b/coders/fax.c
index 9edd24bbd..66ad70c3c 100644
--- a/coders/fax.c
+++ b/coders/fax.c
@@ -140,12 +140,12 @@ static Image *ReadFAXImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -312,13 +312,13 @@ static MagickBooleanType WriteFAXImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/fd.c b/coders/fd.c
index 7e2d4cd4b..add6f7a95 100644
--- a/coders/fd.c
+++ b/coders/fd.c
@@ -97,12 +97,12 @@ static Image *ReadFDImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
read_info=CloneImageInfo(image_info);
read_info->file=fdopen(StringToLong(image_info->filename),"rb");
if ((read_info->file == (FILE *) NULL) ||
diff --git a/coders/fits.c b/coders/fits.c
index d68d56ed3..5448518b4 100644
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -286,12 +286,12 @@ static Image *ReadFITSImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -637,13 +637,13 @@ static MagickBooleanType WriteFITSImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/fpx.c b/coders/fpx.c
index 3d5f19351..8547d5864 100644
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -178,12 +178,12 @@ static Image *ReadFPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -809,13 +809,13 @@ static MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image,
Open input file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/gif.c b/coders/gif.c
index d0cab312c..d57b4f35d 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -411,7 +411,7 @@ static MagickBooleanType DecodeImage(Image *image,const ssize_t opacity,
Allocate decoder tables.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
data_size=(unsigned char) ReadBlobByte(image);
@@ -875,7 +875,7 @@ static ssize_t ReadBlobBlock(Image *image,unsigned char *data)
block_count;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(data != (unsigned char *) NULL);
count=ReadBlob(image,1,&block_count);
if (count != 1)
@@ -920,7 +920,7 @@ static MagickBooleanType PingGIFImage(Image *image,ExceptionInfo *exception)
data_size;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (ReadBlob(image,1,&data_size) != 1)
@@ -988,12 +988,12 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1516,13 +1516,13 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/gradient.c b/coders/gradient.c
index 59d455fc1..77415d08d 100644
--- a/coders/gradient.c
+++ b/coders/gradient.c
@@ -116,12 +116,12 @@ static Image *ReadGRADIENTImage(const ImageInfo *image_info,
Initialize Image structure.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
(void) CopyMagickString(colorname,image_info->filename,MagickPathExtent);
diff --git a/coders/gray.c b/coders/gray.c
index 7a29a0700..6744a8c39 100644
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -130,12 +130,12 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
@@ -401,13 +401,13 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/hald.c b/coders/hald.c
index 3ff438e98..84787eb0f 100644
--- a/coders/hald.c
+++ b/coders/hald.c
@@ -109,12 +109,12 @@ static Image *ReadHALDImage(const ImageInfo *image_info,
Create HALD color lookup table image.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
level=0;
if (*image_info->filename != '\0')
diff --git a/coders/hdr.c b/coders/hdr.c
index 23a2af8d4..0b61dbaaf 100644
--- a/coders/hdr.c
+++ b/coders/hdr.c
@@ -176,12 +176,12 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -689,13 +689,13 @@ static MagickBooleanType WriteHDRImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/histogram.c b/coders/histogram.c
index cb7ad5c4d..0fb2780e9 100644
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -219,9 +219,9 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
Allocate histogram image.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
diff --git a/coders/hrz.c b/coders/hrz.c
index 26fc655d6..9c067bd86 100644
--- a/coders/hrz.c
+++ b/coders/hrz.c
@@ -123,12 +123,12 @@ static Image *ReadHRZImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -295,13 +295,13 @@ static MagickBooleanType WriteHRZImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/html.c b/coders/html.c
index 69e1000ad..d5edea9fd 100644
--- a/coders/html.c
+++ b/coders/html.c
@@ -232,14 +232,14 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info,
Open image.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/icon.c b/coders/icon.c
index 222dec254..fa3f6e663 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -278,10 +278,10 @@ static Image *ReadICONImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"%s",image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -897,12 +897,12 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/info.c b/coders/info.c
index 2ff094da8..4f19e0b8e 100644
--- a/coders/info.c
+++ b/coders/info.c
@@ -171,9 +171,9 @@ static MagickBooleanType WriteINFOImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=OpenBlob(image_info,image,WriteBlobMode,exception);
diff --git a/coders/inline.c b/coders/inline.c
index c915686b8..1b0babfa4 100644
--- a/coders/inline.c
+++ b/coders/inline.c
@@ -117,12 +117,12 @@ static Image *ReadINLINEImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if (LocaleNCompare(image_info->filename,"data:",5) == 0)
return(ReadInlineImage(image_info,image_info->filename,exception));
image=AcquireImage(image_info,exception);
@@ -285,9 +285,9 @@ static MagickBooleanType WriteINLINEImage(const ImageInfo *image_info,
Convert image to base64-encoding.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
write_info=CloneImageInfo(image_info);
diff --git a/coders/ipl.c b/coders/ipl.c
index 19db1ddcc..8c80a4f5e 100644
--- a/coders/ipl.c
+++ b/coders/ipl.c
@@ -201,12 +201,12 @@ static Image *ReadIPLImage(const ImageInfo *image_info,ExceptionInfo *exception)
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if ( image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent, GetMagickModule(), "%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -527,13 +527,13 @@ static MagickBooleanType WriteIPLImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/jbig.c b/coders/jbig.c
index 938e7b9ed..3cee88533 100644
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -149,12 +149,12 @@ static Image *ReadJBIGImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -446,13 +446,13 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/jnx.c b/coders/jnx.c
index 0ca1d1889..795731bf9 100644
--- a/coders/jnx.c
+++ b/coders/jnx.c
@@ -152,12 +152,12 @@ static Image *ReadJNXImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/jp2.c b/coders/jp2.c
index d7a704b29..a9035078a 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -292,12 +292,12 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -788,13 +788,13 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/jpeg.c b/coders/jpeg.c
index ca9603ad5..7f4e0fb37 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1047,12 +1047,12 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
debug=IsEventLogging();
(void) debug;
image=AcquireImage(image_info,exception);
@@ -2144,13 +2144,13 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
if ((LocaleCompare(image_info->magick,"JPS") == 0) &&
(image->next != (Image *) NULL))
image=AppendImages(image,MagickFalse,exception);
diff --git a/coders/json.c b/coders/json.c
index f3ff11d15..015dbddc9 100644
--- a/coders/json.c
+++ b/coders/json.c
@@ -109,8 +109,7 @@ ModuleExport size_t RegisterJSONImage(void)
MagickInfo
*entry;
- entry=AcquireMagickInfo("JSON","JSON",
- "The image format and characteristics");
+ entry=AcquireMagickInfo("JSON","JSON","The image format and characteristics");
entry->encoder=(EncodeImageHandler *) WriteJSONImage;
entry->flags^=CoderBlobSupportFlag;
(void) RegisterMagickInfo(entry);
@@ -279,7 +278,7 @@ static ChannelStatistics *GetLocationStatistics(const Image *image,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
channel_statistics=(ChannelStatistics *) AcquireQuantumMemory(
@@ -649,16 +648,12 @@ static ssize_t PrintChannelStatistics(FILE *file,const PixelChannel channel,
n;
n=FormatLocaleFile(file,StatisticsFormat,name,ClampToQuantum(scale*
- channel_statistics[channel].minima),channel_statistics[channel].minima/
- (double) QuantumRange,ClampToQuantum(scale*
- channel_statistics[channel].maxima),channel_statistics[channel].maxima/
- (double) QuantumRange,scale*channel_statistics[channel].mean,
- channel_statistics[channel].mean/(double) QuantumRange,scale*
- channel_statistics[channel].standard_deviation,
- channel_statistics[channel].standard_deviation/(double) QuantumRange,
+ channel_statistics[channel].minima),ClampToQuantum(scale*
+ channel_statistics[channel].maxima),scale*channel_statistics[channel].mean,
+ scale*channel_statistics[channel].standard_deviation,
channel_statistics[channel].kurtosis,channel_statistics[channel].skewness);
if (separator != MagickFalse)
- (void) FormatLocaleFile(file,",");
+ (void) FormatLocaleFile(file,",");
(void) FormatLocaleFile(file,"\n");
return(n);
}
@@ -723,7 +718,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
*format='\0';
@@ -732,6 +727,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file,
GetTimerInfo(&image->timer);
p=GetVirtualPixels(image,0,0,1,1,exception);
ping=p == (const Quantum *) NULL ? MagickTrue : MagickFalse;
+ (void) ping;
type=GetImageType(image,exception);
(void) SignatureImage(image,exception);
JsonFormatLocaleFile(file,"{\n \"image\": {\n \"name\": %s,\n",
@@ -1089,7 +1085,8 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file,
}
if (image->colorspace == CMYKColorspace)
(void) FormatLocaleFile(file," \"totalInkDensity\": \"%.*g%%\",\n",
- GetImageTotalInkDensity(image,exception)/(double) QuantumRange);
+ GetMagickPrecision(),100.0*GetImageTotalInkDensity(image,exception)/
+ (double) QuantumRange);
x=0;
if (image->alpha_trait != UndefinedPixelTrait)
{
@@ -1576,9 +1573,9 @@ static MagickBooleanType WriteJSONImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=OpenBlob(image_info,image,WriteBlobMode,exception);
diff --git a/coders/label.c b/coders/label.c
index 800052930..eb4044b6d 100644
--- a/coders/label.c
+++ b/coders/label.c
@@ -116,12 +116,12 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
Initialize Image structure.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
(void) ResetImagePage(image,"0x0+0+0");
property=InterpretImageProperties((ImageInfo *) image_info,image,
diff --git a/coders/mac.c b/coders/mac.c
index 043a47f4e..a18575878 100644
--- a/coders/mac.c
+++ b/coders/mac.c
@@ -121,12 +121,12 @@ static Image *ReadMACImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/magick.c b/coders/magick.c
index a046e246b..db538c84d 100644
--- a/coders/magick.c
+++ b/coders/magick.c
@@ -13234,12 +13234,12 @@ static MagickBooleanType WriteMAGICKImage(const ImageInfo *image_info,
Write logo image.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
magick_image=CloneImage(image,0,0,MagickTrue,exception);
if (magick_image == (Image *) NULL)
ThrowWriterException(ResourceLimitError,exception->reason);
diff --git a/coders/map.c b/coders/map.c
index d1809e809..15c1cdc23 100644
--- a/coders/map.c
+++ b/coders/map.c
@@ -137,12 +137,12 @@ static Image *ReadMAPImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
@@ -366,13 +366,13 @@ static MagickBooleanType WriteMAPImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/mask.c b/coders/mask.c
index 41cd0dd40..1b317f5bb 100644
--- a/coders/mask.c
+++ b/coders/mask.c
@@ -102,12 +102,12 @@ static Image *ReadMASKImage(const ImageInfo *image_info,
Initialize Image structure.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
(void) CopyMagickString(read_info->magick,"MIFF",MagickPathExtent);
diff --git a/coders/mat.c b/coders/mat.c
index d224aae8e..b5a3f1f97 100644
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -626,9 +626,9 @@ static Image *ReadMATImage(const ImageInfo *image_info,ExceptionInfo *exception)
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
logging = LogMagickEvent(CoderEvent,GetMagickModule(),"enter");
/*
@@ -1197,13 +1197,13 @@ static MagickBooleanType WriteMATImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"enter MAT");
(void) logging;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(MagickFalse);
diff --git a/coders/meta.c b/coders/meta.c
index 7b3e936c3..8a3357b7a 100644
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -1159,12 +1159,12 @@ static Image *ReadMETAImage(const ImageInfo *image_info,
Open file containing binary metadata
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -2215,9 +2215,9 @@ static MagickBooleanType WriteMETAImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
length=0;
@@ -2230,7 +2230,7 @@ static MagickBooleanType WriteMETAImage(const ImageInfo *image_info,
if (profile == (StringInfo *) NULL)
ThrowWriterException(CoderError,"No8BIMDataIsAvailable");
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
@@ -2253,7 +2253,7 @@ static MagickBooleanType WriteMETAImage(const ImageInfo *image_info,
if (profile == (StringInfo *) NULL)
ThrowWriterException(CoderError,"No8BIMDataIsAvailable");
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
info=GetStringInfoDatum(profile);
length=GetStringInfoLength(profile);
@@ -2273,7 +2273,7 @@ static MagickBooleanType WriteMETAImage(const ImageInfo *image_info,
if (profile == (StringInfo *) NULL)
ThrowWriterException(CoderError,"No8BIMDataIsAvailable");
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
@@ -2307,7 +2307,7 @@ static MagickBooleanType WriteMETAImage(const ImageInfo *image_info,
if (length == 0)
ThrowWriterException(CoderError,"NoIPTCProfileAvailable");
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
@@ -2334,7 +2334,7 @@ static MagickBooleanType WriteMETAImage(const ImageInfo *image_info,
if (profile == (StringInfo *) NULL)
ThrowWriterException(CoderError,"NoAPP1DataIsAvailable");
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
@@ -2353,7 +2353,7 @@ static MagickBooleanType WriteMETAImage(const ImageInfo *image_info,
if (profile == (StringInfo *) NULL)
ThrowWriterException(CoderError,"NoColorProfileIsAvailable");
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/miff.c b/coders/miff.c
index c9eeddc3f..8b9c5d154 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -478,12 +478,12 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1960,13 +1960,13 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/mono.c b/coders/mono.c
index 74ee20b9b..1c88f65b3 100644
--- a/coders/mono.c
+++ b/coders/mono.c
@@ -122,12 +122,12 @@ static Image *ReadMONOImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
@@ -305,13 +305,13 @@ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/mpc.c b/coders/mpc.c
index 334ea6d52..7e99669cc 100644
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -193,12 +193,12 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1082,13 +1082,13 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image,
Open persistent cache.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/mpeg.c b/coders/mpeg.c
index 12bc8dfc1..9f189e7c8 100644
--- a/coders/mpeg.c
+++ b/coders/mpeg.c
@@ -182,12 +182,12 @@ static Image *ReadMPEGImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -473,13 +473,13 @@ static MagickBooleanType WriteMPEGImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/mpr.c b/coders/mpr.c
index f6ec3e118..6ff9c0e4e 100644
--- a/coders/mpr.c
+++ b/coders/mpr.c
@@ -91,12 +91,12 @@ static Image *ReadMPRImage(const ImageInfo *image_info,ExceptionInfo *exception)
*image;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=(Image *) GetImageRegistry(ImageRegistryType,image_info->filename,
exception);
if (image != (Image *) NULL)
@@ -210,9 +210,9 @@ static MagickBooleanType WriteMPRImage(const ImageInfo *image_info,Image *image,
status;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
magick_unreferenced(image_info);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
diff --git a/coders/msl.c b/coders/msl.c
index 94bfa2bd6..a2fa2292b 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -7716,7 +7716,7 @@ static MagickBooleanType ProcessMSLScript(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
@@ -7827,12 +7827,12 @@ static Image *ReadMSLImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=(Image *) NULL;
(void) ProcessMSLScript(image_info,&image,exception);
return(GetFirstImageInList(image));
@@ -8226,9 +8226,9 @@ static MagickBooleanType WriteMSLImage(const ImageInfo *image_info,Image *image,
ExceptionInfo *exception)
{
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
(void) ReferenceImage(image);
diff --git a/coders/mtv.c b/coders/mtv.c
index 335f870b4..583aab592 100644
--- a/coders/mtv.c
+++ b/coders/mtv.c
@@ -127,12 +127,12 @@ static Image *ReadMTVImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -351,13 +351,13 @@ static MagickBooleanType WriteMTVImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/mvg.c b/coders/mvg.c
index 5e90e478f..c8d3e94ef 100644
--- a/coders/mvg.c
+++ b/coders/mvg.c
@@ -141,12 +141,12 @@ static Image *ReadMVGImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -320,9 +320,9 @@ static MagickBooleanType WriteMVGImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
value=GetImageArtifact(image,"MVG");
diff --git a/coders/null.c b/coders/null.c
index 0f271c986..7404ec3df 100644
--- a/coders/null.c
+++ b/coders/null.c
@@ -118,12 +118,12 @@ static Image *ReadNULLImage(const ImageInfo *image_info,
Initialize Image structure.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
if (image->columns == 0)
image->columns=1;
@@ -244,9 +244,9 @@ static MagickBooleanType WriteNULLImage(const ImageInfo *image_info,
Image *image,ExceptionInfo *exception)
{
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
diff --git a/coders/otb.c b/coders/otb.c
index ede66cba6..c9c189440 100644
--- a/coders/otb.c
+++ b/coders/otb.c
@@ -126,12 +126,12 @@ static Image *ReadOTBImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -325,13 +325,13 @@ static MagickBooleanType WriteOTBImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/palm.c b/coders/palm.c
index 039c82c53..a245f9ac2 100644
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -289,12 +289,12 @@ static Image *ReadPALMImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -722,13 +722,13 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/pango.c b/coders/pango.c
index b61a6d614..27f37eaf5 100644
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -172,12 +172,12 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
Initialize Image structure.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
(void) ResetImagePage(image,"0x0+0+0");
/*
diff --git a/coders/pcd.c b/coders/pcd.c
index c603d3c52..5591630d6 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -177,7 +177,7 @@ static MagickBooleanType DecodeImage(Image *image,unsigned char *luma,
Initialize Huffman tables.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(luma != (unsigned char *) NULL);
@@ -518,12 +518,12 @@ static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1071,9 +1071,9 @@ static MagickBooleanType WritePCDImage(const ImageInfo *image_info,Image *image,
i;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
pcd_image=image;
diff --git a/coders/pcl.c b/coders/pcl.c
index ef757f3bc..f5b9a51c6 100644
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -199,12 +199,12 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception)
count;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
/*
Open image file.
*/
@@ -702,13 +702,13 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/pcx.c b/coders/pcx.c
index 76a8137be..bdc1273f5 100644
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -260,12 +260,12 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -875,13 +875,13 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/pdb.c b/coders/pdb.c
index 6ab2f97b9..0e4d1ef17 100644
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -314,12 +314,12 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -748,13 +748,13 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/pdf.c b/coders/pdf.c
index b755b62f7..93b0282fa 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -449,12 +449,12 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
count;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
/*
Open image file.
*/
@@ -1160,13 +1160,13 @@ RestoreMSCWarning
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/pes.c b/coders/pes.c
index 3c04932ec..bac24b46d 100644
--- a/coders/pes.c
+++ b/coders/pes.c
@@ -472,12 +472,12 @@ static Image *ReadPESImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/pict.c b/coders/pict.c
index 3899fce84..11d747556 100644
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -621,7 +621,7 @@ static size_t EncodeImage(Image *image,const unsigned char *scanline,
Pack scanline.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(scanline != (unsigned char *) NULL);
@@ -854,12 +854,12 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1652,15 +1652,15 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((image->columns > 65535L) || (image->rows > 65535L))
ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/pix.c b/coders/pix.c
index 0673c6c99..71bf4d425 100644
--- a/coders/pix.c
+++ b/coders/pix.c
@@ -119,12 +119,12 @@ static Image *ReadPIXImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/png.c b/coders/png.c
index 8c89cb206..338377437 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -1188,7 +1188,7 @@ static size_t WriteBlobMSBULong(Image *image,const size_t value)
buffer[4];
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
buffer[0]=(unsigned char) (value >> 24);
buffer[1]=(unsigned char) (value >> 16);
buffer[2]=(unsigned char) (value >> 8);
@@ -3948,14 +3948,14 @@ static Image *ReadPNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter ReadPNGImage()");
image=AcquireImage(image_info,exception);
mng_info=(MngInfo *) NULL;
@@ -4801,10 +4801,10 @@ static Image *ReadJNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter ReadJNGImage()");
image=AcquireImage(image_info,exception);
mng_info=(MngInfo *) NULL;
@@ -4969,10 +4969,10 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
/* Open image file. */
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter ReadMNGImage()");
image=AcquireImage(image_info,exception);
mng_info=(MngInfo *) NULL;
@@ -11474,9 +11474,9 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter WritePNGImage()");
/*
@@ -12730,9 +12730,9 @@ static MagickBooleanType WriteJNGImage(const ImageInfo *image_info,Image *image,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter WriteJNGImage()");
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
@@ -12826,9 +12826,9 @@ static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter WriteMNGImage()");
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
diff --git a/coders/pnm.c b/coders/pnm.c
index 349d94e9d..76fce2f53 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -258,12 +258,12 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1544,13 +1544,13 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/preview.c b/coders/preview.c
index df5cb4bf7..baaab5530 100644
--- a/coders/preview.c
+++ b/coders/preview.c
@@ -176,9 +176,9 @@ static MagickBooleanType WritePreviewImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
preview_image=PreviewImage(image,image_info->preview_type,exception);
diff --git a/coders/ps.c b/coders/ps.c
index b972aaa7b..3657d7383 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -495,12 +495,12 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1542,13 +1542,13 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/ps2.c b/coders/ps2.c
index e4ae54775..4f68a19a8 100644
--- a/coders/ps2.c
+++ b/coders/ps2.c
@@ -455,13 +455,13 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/ps3.c b/coders/ps3.c
index ed26efac4..ae8c24dbd 100644
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -254,7 +254,7 @@ static MagickBooleanType SerializeImage(const ImageInfo *image_info,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=MagickTrue;
@@ -326,7 +326,7 @@ static MagickBooleanType SerializeImageChannel(const ImageInfo *image_info,
bit;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=MagickTrue;
@@ -395,7 +395,7 @@ static MagickBooleanType SerializeImageIndexes(const ImageInfo *image_info,
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=MagickTrue;
@@ -457,9 +457,9 @@ static MagickBooleanType WritePS3MaskImage(const ImageInfo *image_info,
*pixels;
assert(image_info != (ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(image->alpha_trait != UndefinedPixelTrait);
@@ -877,13 +877,13 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(MagickFalse);
diff --git a/coders/psd.c b/coders/psd.c
index fe2690525..f1cb9ab84 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1659,12 +1659,12 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
@@ -2032,7 +2032,7 @@ static size_t PSDPackbitsEncodeImage(Image *image,const size_t length,
Compress pixels with Packbits encoding.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(pixels != (unsigned char *) NULL);
@@ -2533,13 +2533,13 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/pwp.c b/coders/pwp.c
index e6e5555e2..be867caa2 100644
--- a/coders/pwp.c
+++ b/coders/pwp.c
@@ -159,12 +159,12 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
pwp_image=AcquireImage(image_info,exception);
image=pwp_image;
status=OpenBlob(image_info,pwp_image,ReadBinaryBlobMode,exception);
diff --git a/coders/raw.c b/coders/raw.c
index 3a7cb8f98..9140236ea 100644
--- a/coders/raw.c
+++ b/coders/raw.c
@@ -126,12 +126,12 @@ static Image *ReadRAWImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
@@ -462,13 +462,13 @@ static MagickBooleanType WriteRAWImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/rgb.c b/coders/rgb.c
index 27cece453..7941ab778 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -132,12 +132,12 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
@@ -1119,9 +1119,9 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,
Allocate memory for pixels.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image_info->interlace != PartitionInterlace)
diff --git a/coders/rgf.c b/coders/rgf.c
index 5a6131c71..16d925b8d 100644
--- a/coders/rgf.c
+++ b/coders/rgf.c
@@ -128,12 +128,12 @@ static Image *ReadRGFImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -330,13 +330,13 @@ static MagickBooleanType WriteRGFImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/rla.c b/coders/rla.c
index c80ff7aa0..4be92fc24 100644
--- a/coders/rla.c
+++ b/coders/rla.c
@@ -191,12 +191,12 @@ static Image *ReadRLAImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/rle.c b/coders/rle.c
index 0bd024a3f..05da9aa97 100644
--- a/coders/rle.c
+++ b/coders/rle.c
@@ -192,12 +192,12 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/scr.c b/coders/scr.c
index 9b73ecf90..3dca095d6 100644
--- a/coders/scr.c
+++ b/coders/scr.c
@@ -141,12 +141,12 @@ static Image *ReadSCRImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/screenshot.c b/coders/screenshot.c
index e821f1ae4..a1f311101 100644
--- a/coders/screenshot.c
+++ b/coders/screenshot.c
@@ -104,12 +104,12 @@ static Image *ReadSCREENSHOTImage(const ImageInfo *image_info,
Image
*image;
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=(Image *) NULL;
#if defined(MAGICKCORE_WINGDI32_DELEGATE)
{
diff --git a/coders/sct.c b/coders/sct.c
index 69370772e..c1e273689 100644
--- a/coders/sct.c
+++ b/coders/sct.c
@@ -160,12 +160,12 @@ static Image *ReadSCTImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/sfw.c b/coders/sfw.c
index 5f7fa0c09..b65e068b8 100644
--- a/coders/sfw.c
+++ b/coders/sfw.c
@@ -235,12 +235,12 @@ static Image *ReadSFWImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/sgi.c b/coders/sgi.c
index 627f7524f..100ce7c95 100644
--- a/coders/sgi.c
+++ b/coders/sgi.c
@@ -296,12 +296,12 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -903,15 +903,15 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((image->columns > 65535UL) || (image->rows > 65535UL))
ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/sixel.c b/coders/sixel.c
index 2888cdd50..3525cdd1e 100644
--- a/coders/sixel.c
+++ b/coders/sixel.c
@@ -978,12 +978,12 @@ static Image *ReadSIXELImage(const ImageInfo *image_info,ExceptionInfo *exceptio
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1203,9 +1203,9 @@ static MagickBooleanType WriteSIXELImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
diff --git a/coders/stegano.c b/coders/stegano.c
index 6e9a5b365..8c31b8880 100644
--- a/coders/stegano.c
+++ b/coders/stegano.c
@@ -131,12 +131,12 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info,
Initialize Image structure.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
one=1;
image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
diff --git a/coders/sun.c b/coders/sun.c
index 91b59bc0e..6907a54e7 100644
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -273,12 +273,12 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -746,13 +746,13 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/svg.c b/coders/svg.c
index 1ffb60060..eadbf14c1 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2781,12 +2781,12 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -3616,13 +3616,13 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/tga.c b/coders/tga.c
index f4a7d13ee..c2d760425 100644
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -189,12 +189,12 @@ static Image *ReadTGAImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -736,13 +736,13 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/tiff.c b/coders/tiff.c
index 936c82b6d..f1e440e4a 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -333,12 +333,12 @@ static Image *ReadGROUP4Image(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -1089,12 +1089,12 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
Open image.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -2394,13 +2394,13 @@ static MagickBooleanType WriteGROUP4Image(const ImageInfo *image_info,
Write image as CCITT Group4 TIFF image to a temporary file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
@@ -3046,13 +3046,13 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
Open TIFF file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/tile.c b/coders/tile.c
index cafe8dc17..a8d29990f 100644
--- a/coders/tile.c
+++ b/coders/tile.c
@@ -101,12 +101,12 @@ static Image *ReadTILEImage(const ImageInfo *image_info,
Initialize Image structure.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
*read_info->magick='\0';
diff --git a/coders/tim.c b/coders/tim.c
index 1b51871d2..0555d6bd6 100644
--- a/coders/tim.c
+++ b/coders/tim.c
@@ -143,12 +143,12 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/ttf.c b/coders/ttf.c
index 11cd34d6e..057549fdf 100644
--- a/coders/ttf.c
+++ b/coders/ttf.c
@@ -205,12 +205,12 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
image->columns=800;
image->rows=480;
diff --git a/coders/txt.c b/coders/txt.c
index b92a0fada..8ee342ffa 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -189,12 +189,12 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
/*
Set the page geometry.
*/
@@ -405,12 +405,12 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -698,9 +698,9 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=OpenBlob(image_info,image,WriteBlobMode,exception);
diff --git a/coders/uil.c b/coders/uil.c
index 82e6d4bae..85a780313 100644
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -202,13 +202,13 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/uyvy.c b/coders/uyvy.c
index ff9ec4f39..75bf728c1 100644
--- a/coders/uyvy.c
+++ b/coders/uyvy.c
@@ -121,12 +121,12 @@ static Image *ReadUYVYImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
@@ -311,15 +311,15 @@ static MagickBooleanType WriteUYVYImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((image->columns % 2) != 0)
image->columns++;
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/vicar.c b/coders/vicar.c
index f7c8c9e3a..c70209d49 100644
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -182,12 +182,12 @@ static Image *ReadVICARImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -452,13 +452,13 @@ static MagickBooleanType WriteVICARImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/vid.c b/coders/vid.c
index b57d26b0a..087210769 100644
--- a/coders/vid.c
+++ b/coders/vid.c
@@ -132,12 +132,12 @@ static Image *ReadVIDImage(const ImageInfo *image_info,ExceptionInfo *exception)
Expand the filename.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
filelist=(char **) AcquireMagickMemory(sizeof(*filelist));
if (filelist == (char **) NULL)
diff --git a/coders/viff.c b/coders/viff.c
index 3a4a8a85e..b8dda7eeb 100644
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -255,12 +255,12 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -942,13 +942,13 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/vips.c b/coders/vips.c
index 11519ec9a..32d759918 100644
--- a/coders/vips.c
+++ b/coders/vips.c
@@ -389,12 +389,12 @@ static Image *ReadVIPSImage(const ImageInfo *image_info,
type;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
@@ -633,9 +633,9 @@ static MagickBooleanType WriteVIPSImage(const ImageInfo *image_info,
channels;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
diff --git a/coders/wbmp.c b/coders/wbmp.c
index c76132fd1..7f33606de 100644
--- a/coders/wbmp.c
+++ b/coders/wbmp.c
@@ -146,12 +146,12 @@ static Image *ReadWBMPImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -369,13 +369,13 @@ static MagickBooleanType WriteWBMPImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/webp.c b/coders/webp.c
index d65e6e2e3..bd26b7ab1 100644
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -239,12 +239,12 @@ static Image *ReadWEBPImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -531,9 +531,9 @@ static MagickBooleanType WriteWEBPImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((image->columns > 16383UL) || (image->rows > 16383UL))
diff --git a/coders/wmf.c b/coders/wmf.c
index 61de11bec..daddbd59a 100644
--- a/coders/wmf.c
+++ b/coders/wmf.c
@@ -457,7 +457,7 @@ int magick_progress_callback(void *context,float quantum)
(void) quantum;
image=(Image *) context;
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
status=SetImageProgress(image,LoadImagesTag,TellBlob(image),
GetBlobSize(image));
return(status != MagickFalse ? 0 : 1);
diff --git a/coders/wpg.c b/coders/wpg.c
index c6fa00ac0..a6467ec03 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -977,9 +977,9 @@ static Image *ReadWPGImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
one=1;
image=AcquireImage(image_info,exception);
image->depth=8;
diff --git a/coders/xbm.c b/coders/xbm.c
index 8350c72ae..32dd8c589 100644
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -214,12 +214,12 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -507,13 +507,13 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/xc.c b/coders/xc.c
index 506a88dce..ee7614a30 100644
--- a/coders/xc.c
+++ b/coders/xc.c
@@ -113,12 +113,12 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception)
Initialize Image structure.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
if (image->columns == 0)
image->columns=1;
diff --git a/coders/xcf.c b/coders/xcf.c
index 3e3a33154..872f9e494 100644
--- a/coders/xcf.c
+++ b/coders/xcf.c
@@ -303,7 +303,7 @@ static char *ReadBlobStringWithLongSize(Image *image,char *string,size_t max,
length;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
assert(max != 0);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
@@ -1008,12 +1008,12 @@ static Image *ReadXCFImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
diff --git a/coders/xpm.c b/coders/xpm.c
index 66cedba7c..6736d823f 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -280,12 +280,12 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -661,13 +661,13 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
@@ -907,13 +907,13 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/xps.c b/coders/xps.c
index a7f85159e..81659710f 100644
--- a/coders/xps.c
+++ b/coders/xps.c
@@ -153,12 +153,12 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
count;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
/*
Open image file.
*/
diff --git a/coders/xwd.c b/coders/xwd.c
index 7ce7627f7..45bc008e0 100644
--- a/coders/xwd.c
+++ b/coders/xwd.c
@@ -203,12 +203,12 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
@@ -700,13 +700,13 @@ static MagickBooleanType WriteXWDImage(const ImageInfo *image_info,Image *image,
Open output image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/ycbcr.c b/coders/ycbcr.c
index 36d8adf5b..29b652cff 100644
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -139,12 +139,12 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
Open image file.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
@@ -1023,9 +1023,9 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info,
Allocate memory for pixels.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image_info->interlace != PartitionInterlace)
@@ -1034,7 +1034,7 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info,
Open output image file.
*/
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
diff --git a/coders/yuv.c b/coders/yuv.c
index f24b2a36e..5bacfa32f 100644
--- a/coders/yuv.c
+++ b/coders/yuv.c
@@ -135,12 +135,12 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
Allocate image structure.
*/
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
image=AcquireImage(image_info,exception);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
@@ -588,9 +588,9 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image,
y;
assert(image_info != (const ImageInfo *) NULL);
- assert(image_info->signature == MagickSignature);
+ assert(image_info->signature == MagickCoreSignature);
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
quantum=(size_t) (image->depth <= 8 ? 1 : 2);
diff --git a/filters/analyze.c b/filters/analyze.c
index 7dd95f3df..162ba8034 100644
--- a/filters/analyze.c
+++ b/filters/analyze.c
@@ -110,7 +110,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
assert(images != (Image **) NULL);
assert(*images != (Image *) NULL);
- assert((*images)->signature == MagickSignature);
+ assert((*images)->signature == MagickCoreSignature);
(void) argc;
(void) argv;
image=(*images);
diff --git a/utilities/convert.1 b/utilities/convert.1
index a07de18ca..ae94f0411 100644
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -279,6 +279,8 @@ Image Sequence Operators:
\-compare mathematically and visually annotate the difference between an image and its reconstruction
\-complex operator perform complex mathematics on an image sequence
\-composite composite image
+ \-copy geometry offset,
+ copy pixels from one area of an image to another
\-crop geometry cut out a rectangular region of the image
\-deconstruct break down an image sequence into constituent parts
\-evaluate-sequence operator
diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index a2edf0daa..2fe945d46 100644
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -278,6 +278,8 @@ Image Sequence Operators:
\-compare mathematically and visually annotate the difference between an image and its reconstruction
\-complex operator perform complex mathematics on an image sequence
\-composite composite image
+ \-copy geometry offset,
+ copy pixels from one area of an image to another
\-crop geometry cut out a rectangular region of the image
\-deconstruct break down an image sequence into constituent parts
\-evaluate-sequence operator
--
2.40.0