(no commit message)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 8c25deffd6164dc7e0cf93b81fcb6ec75d004bf2..a0dda1b9663c326c1a7492834da86f1cd7730252 100644 (file)
--- 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 908403881b41171f44b1b8cf6d0bf95b0ff630f0..de91c5827cd9fc21c050f3fe128d65d2793062bc 100644 (file)
--- 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 ff9a40410a4ddc72b9e62942e386c75138ac78fe..b733a9df6e78a25d398316aff5285cb571295b10 100644 (file)
--- 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 cdc3c0ebf10ad2709616917b5887e4a336de9443..d293524767828a72bda46e0ba99db3a4b8a914f6 100644 (file)
--- 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 5a5b43f52e05d43f8d6450285f9baaa9561ade25..4fb94ef2ce8f8360e24b032168baa4d6343e348f 100644 (file)
--- 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 8e3af8f1b5bb8b935d18571128726366e0d3504b..ba3d87ab2b926b2cbf467e506b7512fc902caa44 100644 (file)
--- 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 c32ec63685b2c0b22d9b722ab2209bef70a2b1a3..0752ee14f06bb3bc16d4ed145dd8018fb6dbe9c5 100644 (file)
--- 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);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   T o k e n i z e r                                                         %
 %                                                                             %
 %                                                                             %

diff --git a/MagickCore/token.h b/MagickCore/token.h
index 001bbf91f5972fbb45031905f7ffe7b0812fe75e..79768ac987e967b252b72c4c70d4456441e69371 100644 (file)
--- 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 ebc43915a942301c05b1043747b7e98e59362264..57f35b38393e3711027ea09ed55198344aa082a2 100644 (file)
--- 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);
-}
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
 %   L i s t F i l e s                                                         %
 %                                                                             %
 %                                                                             %

diff --git a/MagickCore/utility.h b/MagickCore/utility.h
index f196ddcbaa398e5cfafa44ed0d333e4ebc4f554b..a8c6c4a5656a16a57269badc825b9c733f789397 100644 (file)
--- 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 47831ddaf9e5809fc27a829c76b2e5eec9f9d00d..eacd877276f660f05349462aa58865d14f566753 100644 (file)
--- 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"