From 019459e2674f3167b5d836aad8793dc48f437468 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 2 Jan 2014 23:47:13 +0000 Subject: [PATCH] --- MagickCore/magick-baseconfig.h | 5 ----- MagickCore/magick.c | 10 +++++----- MagickCore/magick.h | 2 +- MagickCore/version.h | 6 +++--- MagickWand/MagickWand.h | 1 + MagickWand/magick-wand.c | 27 ++++++++++++++++++++++++++- 6 files changed, 36 insertions(+), 15 deletions(-) diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index 9e4225447..c5e38de90 100644 --- a/MagickCore/magick-baseconfig.h +++ b/MagickCore/magick-baseconfig.h @@ -1102,11 +1102,6 @@ /* Define if you have JBIG library */ /* #undef JBIG_DELEGATE */ -/* Define if you have JPEG version 2 "Jasper" library */ -#ifndef MAGICKCORE_JP2_DELEGATE -#define MAGICKCORE_JP2_DELEGATE 1 -#endif - /* Define if you have JPEG library */ #ifndef MAGICKCORE_JPEG_DELEGATE #define MAGICKCORE_JPEG_DELEGATE 1 diff --git a/MagickCore/magick.c b/MagickCore/magick.c index 66f06e240..ec8a75858 100644 --- a/MagickCore/magick.c +++ b/MagickCore/magick.c @@ -1035,22 +1035,22 @@ MagickExport MagickBooleanType ListMagickInfo(FILE *file, % % % % % % -% I s M a g i c k I n s t a n t i a t e d % +% I s M a g i c k C o r e I n s t a n t i a t e d % % % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% IsMagickInstantiated() returns MagickTrue if the ImageMagick environment +% IsMagickCoreInstantiated() returns MagickTrue if the ImageMagick environment % is currently instantiated: MagickCoreGenesis() has been called but % MagickDestroy() has not. % -% The format of the IsMagickInstantiated method is: +% The format of the IsMagickCoreInstantiated method is: % -% MagickBooleanType IsMagickInstantiated(void) +% MagickBooleanType IsMagickCoreInstantiated(void) % */ -MagickExport MagickBooleanType IsMagickInstantiated(void) +MagickExport MagickBooleanType IsMagickCoreInstantiated(void) { return(instantiate_magick); } diff --git a/MagickCore/magick.h b/MagickCore/magick.h index ed0ca8710..747ecdd8a 100644 --- a/MagickCore/magick.h +++ b/MagickCore/magick.h @@ -114,7 +114,7 @@ extern MagickExport MagickBooleanType GetMagickEndianSupport(const MagickInfo *), GetMagickRawSupport(const MagickInfo *), GetMagickSeekableStream(const MagickInfo *), - IsMagickInstantiated(void), + IsMagickCoreInstantiated(void), UnregisterMagickInfo(const char *); extern const MagickExport MagickInfo diff --git a/MagickCore/version.h b/MagickCore/version.h index 74c2977eb..7bb519ac1 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2014 ImageMagick Studio LLC" -#define MagickSVNRevision "14085:14096M" +#define MagickSVNRevision "14085:14100M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 @@ -48,11 +48,11 @@ extern "C" { #define MagickppLibAddendum "-0" #define MagickppLibInterface 1 #define MagickppLibMinInterface 1 -#define MagickReleaseDate "2014-01-01" +#define MagickReleaseDate "2014-01-02" #define MagickChangeDate "20120427" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" -#define MagickDelegates "bzlib djvu mpeg fftw fpx fontconfig freetype jng jp2 jpeg lcms lzma openexr pango png ps tiff webp x xml zlib" +#define MagickDelegates "bzlib djvu mpeg fftw fpx fontconfig freetype jng jpeg lcms lzma openexr pango png ps tiff webp x xml zlib" #define MagickHomeURL "file:///usr/share/doc/ImageMagick-7/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" diff --git a/MagickWand/MagickWand.h b/MagickWand/MagickWand.h index 9081977fd..2ecd613f2 100644 --- a/MagickWand/MagickWand.h +++ b/MagickWand/MagickWand.h @@ -100,6 +100,7 @@ extern WandExport ExceptionType extern WandExport MagickBooleanType IsMagickWand(const MagickWand *), + IsMagickWandInstantiated(void), MagickClearException(MagickWand *), MagickSetIteratorIndex(MagickWand *,const ssize_t); diff --git a/MagickWand/magick-wand.c b/MagickWand/magick-wand.c index 72b941ea6..022bb1d2c 100644 --- a/MagickWand/magick-wand.c +++ b/MagickWand/magick-wand.c @@ -1009,7 +1009,7 @@ WandExport void MagickSetLastIterator(MagickWand *wand) */ WandExport void MagickWandGenesis(void) { - if (IsMagickInstantiated() == MagickFalse) + if (IsMagickCoreInstantiated() == MagickFalse) MagickCoreGenesis((char *) NULL,MagickFalse); } @@ -1122,3 +1122,28 @@ WandExport MagickWand *NewMagickWandFromImage(const Image *image) wand->images=CloneImage(image,0,0,MagickTrue,wand->exception); return(wand); } + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% I s M a g i c k W a n d I n s t a n t i a t e d % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% IsMagickWandInstantiated() returns MagickTrue if the ImageMagick environment +% is currently instantiated-- that is, MagickWandGenesis() has been called but +% MagickWandTerminus() has not. +% +% The format of the IsMagickWandInstantiated method is: +% +% MagickBooleanType IsMagickWandInstantiated(void) +% +*/ +MagickExport MagickBooleanType IsMagickWandInstantiated(void) +{ + return(IsMagickCoreInstantiated()); +} -- 2.40.0