From 63a81879d3568083e4ee4f78ebcae2bc831cb764 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 22 Mar 2012 15:52:52 +0000 Subject: [PATCH] --- MagickCore/composite.c | 1 + MagickCore/constitute.c | 1 + MagickCore/identify.c | 1 + MagickCore/image.c | 1 + MagickCore/resample.c | 1 + MagickCore/resize.c | 1 + MagickCore/token.c | 41 +++++++++++++++++++++++++++++++++++++++++ MagickCore/token.h | 3 ++- MagickCore/utility.c | 41 ----------------------------------------- MagickCore/utility.h | 1 - MagickCore/xwindow.c | 1 + 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 8c25deffd..a0dda1b96 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -72,6 +72,7 @@ #include "MagickCore/resource_.h" #include "MagickCore/string_.h" #include "MagickCore/thread-private.h" +#include "MagickCore/token.h" #include "MagickCore/utility.h" #include "MagickCore/utility-private.h" #include "MagickCore/version.h" diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c index 908403881..de91c5827 100644 --- a/MagickCore/constitute.c +++ b/MagickCore/constitute.c @@ -73,6 +73,7 @@ #include "MagickCore/string_.h" #include "MagickCore/string-private.h" #include "MagickCore/timer.h" +#include "MagickCore/token.h" #include "MagickCore/transform.h" #include "MagickCore/utility.h" #include "MagickCore/utility-private.h" diff --git a/MagickCore/identify.c b/MagickCore/identify.c index ff9a40410..b733a9df6 100644 --- a/MagickCore/identify.c +++ b/MagickCore/identify.c @@ -91,6 +91,7 @@ #include "MagickCore/string_.h" #include "MagickCore/string-private.h" #include "MagickCore/timer.h" +#include "MagickCore/token.h" #include "MagickCore/utility.h" #include "MagickCore/utility-private.h" #include "MagickCore/version.h" diff --git a/MagickCore/image.c b/MagickCore/image.c index cdc3c0ebf..d29352476 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -92,6 +92,7 @@ #include "MagickCore/thread-private.h" #include "MagickCore/threshold.h" #include "MagickCore/timer.h" +#include "MagickCore/token.h" #include "MagickCore/utility.h" #include "MagickCore/utility-private.h" #include "MagickCore/version.h" diff --git a/MagickCore/resample.c b/MagickCore/resample.c index 5a5b43f52..4fb94ef2c 100644 --- a/MagickCore/resample.c +++ b/MagickCore/resample.c @@ -59,6 +59,7 @@ #include "MagickCore/resample.h" #include "MagickCore/resize.h" #include "MagickCore/resize-private.h" +#include "MagickCore/token.h" #include "MagickCore/transform.h" #include "MagickCore/signature-private.h" #include "MagickCore/utility.h" diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 8e3af8f1b..ba3d87ab2 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -69,6 +69,7 @@ #include "MagickCore/string_.h" #include "MagickCore/string-private.h" #include "MagickCore/thread-private.h" +#include "MagickCore/token.h" #include "MagickCore/utility.h" #include "MagickCore/utility-private.h" #include "MagickCore/version.h" diff --git a/MagickCore/token.c b/MagickCore/token.c index c32ec6368..0752ee14f 100644 --- a/MagickCore/token.c +++ b/MagickCore/token.c @@ -612,6 +612,47 @@ MagickPrivate MagickBooleanType IsGlob(const char *path) % % % % % % +% I s M a g i c k T r u e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% IsMagickTrue() returns MagickTrue if the value is "true", "on", "yes" or +% "1". +% +% The format of the IsMagickTrue method is: +% +% MagickBooleanType IsMagickTrue(const char *value) +% +% A description of each parameter follows: +% +% o option: either MagickTrue or MagickFalse depending on the value +% parameter. +% +% o value: Specifies a pointer to a character array. +% +*/ +MagickExport MagickBooleanType IsMagickTrue(const char *value) +{ + if (value == (const char *) NULL) + return(MagickFalse); + if (LocaleCompare(value,"true") == 0) + return(MagickTrue); + if (LocaleCompare(value,"on") == 0) + return(MagickTrue); + if (LocaleCompare(value,"yes") == 0) + return(MagickTrue); + if (LocaleCompare(value,"1") == 0) + return(MagickTrue); + return(MagickFalse); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % % T o k e n i z e r % % % % % diff --git a/MagickCore/token.h b/MagickCore/token.h index 001bbf91f..79768ac98 100644 --- a/MagickCore/token.h +++ b/MagickCore/token.h @@ -33,7 +33,8 @@ extern MagickExport int const char *,const char *,const char *,const char,char *,int *,char *); extern MagickExport MagickBooleanType - GlobExpression(const char *,const char *,const MagickBooleanType); + GlobExpression(const char *,const char *,const MagickBooleanType), + IsMagickTrue(const char *); extern MagickExport TokenInfo *AcquireTokenInfo(void), diff --git a/MagickCore/utility.c b/MagickCore/utility.c index ebc43915a..57f35b383 100644 --- a/MagickCore/utility.c +++ b/MagickCore/utility.c @@ -1454,47 +1454,6 @@ static int IsPathDirectory(const char *path) % % % % % % -% I s M a g i c k T r u e % -% % -% % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% IsMagickTrue() returns MagickTrue if the value is "true", "on", "yes" or -% "1". -% -% The format of the IsMagickTrue method is: -% -% MagickBooleanType IsMagickTrue(const char *value) -% -% A description of each parameter follows: -% -% o option: either MagickTrue or MagickFalse depending on the value -% parameter. -% -% o value: Specifies a pointer to a character array. -% -*/ -MagickExport MagickBooleanType IsMagickTrue(const char *value) -{ - if (value == (const char *) NULL) - return(MagickFalse); - if (LocaleCompare(value,"true") == 0) - return(MagickTrue); - if (LocaleCompare(value,"on") == 0) - return(MagickTrue); - if (LocaleCompare(value,"yes") == 0) - return(MagickTrue); - if (LocaleCompare(value,"1") == 0) - return(MagickTrue); - return(MagickFalse); -} - -/* -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% % -% % % L i s t F i l e s % % % % % diff --git a/MagickCore/utility.h b/MagickCore/utility.h index f196ddcba..a8c6c4a56 100644 --- a/MagickCore/utility.h +++ b/MagickCore/utility.h @@ -47,7 +47,6 @@ extern MagickExport MagickBooleanType AcquireUniqueSymbolicLink(const char *,char *), ExpandFilenames(int *,char ***), GetPathAttributes(const char *,void *), - IsMagickTrue(const char *), IsPathAccessible(const char *); extern MagickExport size_t diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c index 47831ddaf..eacd87727 100644 --- a/MagickCore/xwindow.c +++ b/MagickCore/xwindow.c @@ -77,6 +77,7 @@ #include "MagickCore/string_.h" #include "MagickCore/string-private.h" #include "MagickCore/transform.h" +#include "MagickCore/token.h" #include "MagickCore/utility.h" #include "MagickCore/utility-private.h" #include "MagickCore/widget.h" -- 2.40.0