(no commit message)

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index ad35bae8d68312d3f558bd4e7d906fcd96e6b949..cebf158c98c1041453ca4abd8162f80d3870ce0f 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -193,6 +193,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/property.h \
        MagickCore/profile.c \
        MagickCore/profile.h \
+       MagickCore/profile-profile.h \
        MagickCore/quantize.c \
        MagickCore/quantize.h \
        MagickCore/quantum.c \
@@ -411,6 +412,7 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/nt-base.h \
        MagickCore/nt-feature.h \
        MagickCore/policy-private.h \
+       MagickCore/profile-private.h \
        MagickCore/quantum-private.h \
        MagickCore/random_-private.h \
        MagickCore/random-private.h \

diff --git a/MagickCore/animate-private.h b/MagickCore/animate-private.h
index 7ca17ac3abf1e22b221ac8843f2fd89b1a7554c6..22ceedae63718b888a04252972951467ef0f8c92 100644 (file)
--- a/MagickCore/animate-private.h
+++ b/MagickCore/animate-private.h
@@ -22,17 +22,6 @@
 extern "C" {
 #endif
 
-#if defined(MAGICKCORE_X11_DELEGATE)
-#include "MagickCore/xwindow-private.h"
-
-extern MagickExport Image
-  *XAnimateImages(Display *,XResourceInfo *,char **,const int,Image *,
-    ExceptionInfo *);
-
-extern MagickExport void
-  XAnimateBackgroundImage(Display *,XResourceInfo *,Image *,ExceptionInfo *);
-#endif
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/animate.h b/MagickCore/animate.h
index 54e2119a1e4746c1b787c3b31fefa65c167a510b..d0fa748630ac5ab729f228006ab378566ba9c833 100644 (file)
--- a/MagickCore/animate.h
+++ b/MagickCore/animate.h
@@ -25,6 +25,17 @@ extern "C" {
 extern MagickExport MagickBooleanType
   AnimateImages(const ImageInfo *,Image *,ExceptionInfo *);
 
+#if defined(MAGICKCORE_X11_DELEGATE)
+#include "MagickCore/xwindow.h"
+
+extern MagickExport Image
+  *XAnimateImages(Display *,XResourceInfo *,char **,const int,Image *,
+    ExceptionInfo *);
+
+extern MagickExport void
+  XAnimateBackgroundImage(Display *,XResourceInfo *,Image *,ExceptionInfo *);
+#endif
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/blob-private.h b/MagickCore/blob-private.h
index fe31b5fb1558608d9e711fc442c75aa7d70696e3..ba3bba6629a117717995095ede3c6e4f6fdc5538 100644 (file)
--- a/MagickCore/blob-private.h
+++ b/MagickCore/blob-private.h
@@ -22,26 +22,12 @@
 extern "C" {
 #endif
 
-#include "MagickCore/image.h"
-#include "MagickCore/stream.h"
-
 #define MagickMinBlobExtent  32767L
 #if defined(MAGICKCORE_HAVE_FSEEKO)
 # define fseek  fseeko
 # define ftell  ftello
 #endif
 
-typedef enum
-{
-  UndefinedBlobMode,
-  ReadBlobMode,
-  ReadBinaryBlobMode,
-  WriteBlobMode,
-  WriteBinaryBlobMode,
-  AppendBlobMode,
-  AppendBinaryBlobMode
-} BlobMode;
-
 typedef enum
 {
   UndefinedStream,
@@ -54,77 +40,22 @@ typedef enum
   BlobStream
 } StreamType;
 
-typedef int
-  *(*BlobFifo)(const Image *,const void *,const size_t);
+extern MagickPrivate MagickBooleanType
+  GetBlobError(const Image *),
+  IsBlobExempt(const Image *),
+  IsBlobSeekable(const Image *),
+  IsBlobTemporary(const Image *),
+  SetBlobExtent(Image *,const MagickSizeType);
 
-extern MagickExport BlobInfo
-  *CloneBlobInfo(const BlobInfo *),
-  *ReferenceBlob(BlobInfo *);
-
-extern MagickExport char
-  *ReadBlobString(Image *,char *);
-
-extern MagickExport const struct stat
+extern MagickPrivate const struct stat
   *GetBlobProperties(const Image *);
 
-extern MagickExport double
-  ReadBlobDouble(Image *);
-
-extern MagickExport float
-  ReadBlobFloat(Image *);
-
-extern MagickExport int
-  EOFBlob(const Image *),
-  ReadBlobByte(Image *);
-
-extern MagickExport  MagickBooleanType
-  CloseBlob(Image *),
-  DiscardBlobBytes(Image *,const MagickSizeType),
-  OpenBlob(const ImageInfo *,Image *,const BlobMode,ExceptionInfo *),
-  SetBlobExtent(Image *,const MagickSizeType),
-  UnmapBlob(void *,const size_t);
-
-extern MagickExport MagickOffsetType
-  SeekBlob(Image *,const MagickOffsetType,const int),
-  TellBlob(const Image *);
-
-extern MagickExport MagickSizeType
-  ReadBlobLongLong(Image *),
-  ReadBlobMSBLongLong(Image *);
-
-extern MagickExport ssize_t
-  ReadBlob(Image *,const size_t,unsigned char *),
-  WriteBlob(Image *,const size_t,const unsigned char *),
-  WriteBlobByte(Image *,const unsigned char),
-  WriteBlobFloat(Image *,const float),
-  WriteBlobLong(Image *,const unsigned int),
-  WriteBlobShort(Image *,const unsigned short),
-  WriteBlobLSBLong(Image *,const unsigned int),
-  WriteBlobLSBShort(Image *,const unsigned short),
-  WriteBlobMSBLong(Image *,const unsigned int),
-  WriteBlobMSBLongLong(Image *,const MagickSizeType),
-  WriteBlobMSBShort(Image *,const unsigned short),
-  WriteBlobString(Image *,const char *);
-
-extern MagickExport unsigned char
-  *DetachBlob(BlobInfo *),
-  *MapBlob(int,const MapMode,const MagickOffsetType,const size_t);
-
-extern MagickExport unsigned int
-  ReadBlobLong(Image *),
-  ReadBlobLSBLong(Image *),
-  ReadBlobMSBLong(Image *);
-
-extern MagickExport unsigned short
-  ReadBlobShort(Image *),
-  ReadBlobLSBShort(Image *),
-  ReadBlobMSBShort(Image *);
+extern MagickPrivate StreamHandler
+  GetBlobStreamHandler(const Image *);
 
-extern MagickExport void
-  AttachBlob(BlobInfo *,const void *,const size_t),
+extern MagickPrivate void
   GetBlobInfo(BlobInfo *),
-  MSBOrderLong(unsigned char *,const size_t),
-  MSBOrderShort(unsigned char *,const size_t);
+  SetBlobExempt(Image *,const MagickBooleanType);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index 33b0ddb5ac1b57474fbe87efe34ad98885c3f3e6..d6923d11e696fa370a0a2865d9f390de0f26e984 100644 (file)
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -1176,7 +1176,7 @@ MagickExport MagickBooleanType FileToImage(Image *image,const char *filename)
 %    o image: the image.
 %
 */
-MagickExport MagickBooleanType GetBlobError(const Image *image)
+MagickPrivate MagickBooleanType GetBlobError(const Image *image)
 {
   assert(image != (const Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -1236,7 +1236,7 @@ MagickExport FILE *GetBlobFileHandle(const Image *image)
 %    o blob_info: Specifies a pointer to a BlobInfo structure.
 %
 */
-MagickExport void GetBlobInfo(BlobInfo *blob_info)
+MagickPrivate void GetBlobInfo(BlobInfo *blob_info)
 {
   assert(blob_info != (BlobInfo *) NULL);
   (void) ResetMagickMemory(blob_info,0,sizeof(*blob_info));
@@ -1272,7 +1272,7 @@ MagickExport void GetBlobInfo(BlobInfo *blob_info)
 %    o image: the image.
 %
 */
-MagickExport const struct stat *GetBlobProperties(const Image *image)
+MagickPrivate const struct stat *GetBlobProperties(const Image *image)
 {
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -1407,7 +1407,7 @@ MagickExport unsigned char *GetBlobStreamData(const Image *image)
 %    o image: the image.
 %
 */
-MagickExport StreamHandler GetBlobStreamHandler(const Image *image)
+MagickPrivate StreamHandler GetBlobStreamHandler(const Image *image)
 {
   assert(image != (const Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -1986,7 +1986,7 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info,
 %    o image: the image.
 %
 */
-MagickExport MagickBooleanType IsBlobExempt(const Image *image)
+MagickPrivate MagickBooleanType IsBlobExempt(const Image *image)
 {
   assert(image != (const Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -2017,7 +2017,7 @@ MagickExport MagickBooleanType IsBlobExempt(const Image *image)
 %    o image: the image.
 %
 */
-MagickExport MagickBooleanType IsBlobSeekable(const Image *image)
+MagickPrivate MagickBooleanType IsBlobSeekable(const Image *image)
 {
   MagickBooleanType
     seekable;
@@ -2053,7 +2053,7 @@ MagickExport MagickBooleanType IsBlobSeekable(const Image *image)
 %    o image: the image.
 %
 */
-MagickExport MagickBooleanType IsBlobTemporary(const Image *image)
+MagickPrivate MagickBooleanType IsBlobTemporary(const Image *image)
 {
   assert(image != (const Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -3611,7 +3611,7 @@ MagickExport MagickOffsetType SeekBlob(Image *image,
 %    o exempt: Set to true if this blob is exempt from being closed.
 %
 */
-MagickExport void SetBlobExempt(Image *image,const MagickBooleanType exempt)
+MagickPrivate void SetBlobExempt(Image *image,const MagickBooleanType exempt)
 {
   assert(image != (const Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -3646,7 +3646,7 @@ MagickExport void SetBlobExempt(Image *image,const MagickBooleanType exempt)
 %    o extent:  the blob maximum extent.
 %
 */
-MagickExport MagickBooleanType SetBlobExtent(Image *image,
+MagickPrivate MagickBooleanType SetBlobExtent(Image *image,
   const MagickSizeType extent)
 {
   assert(image != (Image *) NULL);

diff --git a/MagickCore/blob.h b/MagickCore/blob.h
index 6590ab067770bcb4a0696a34b928311b53222aaa..0c5508321211dc9b4b22cfaabee75de2de8e5b8f 100644 (file)
--- a/MagickCore/blob.h
+++ b/MagickCore/blob.h
@@ -27,6 +27,17 @@ extern "C" {
 
 #define MagickMaxBufferExtent  (32*8192)
 
+typedef enum
+{
+  UndefinedBlobMode,
+  ReadBlobMode,
+  ReadBinaryBlobMode,
+  WriteBlobMode,
+  WriteBinaryBlobMode,
+  AppendBlobMode,
+  AppendBinaryBlobMode
+} BlobMode;
+
 typedef enum
 {
   ReadMode,
@@ -34,40 +45,91 @@ typedef enum
   IOMode
 } MapMode;
 
+typedef int
+  *(*BlobFifo)(const Image *,const void *,const size_t);
+
+extern MagickExport BlobInfo
+  *CloneBlobInfo(const BlobInfo *),
+  *ReferenceBlob(BlobInfo *);
+
+extern MagickExport char
+  *ReadBlobString(Image *,char *);
+
+extern MagickExport double
+  ReadBlobDouble(Image *);
+
 extern MagickExport FILE
   *GetBlobFileHandle(const Image *);
 
+extern MagickExport float
+  ReadBlobFloat(Image *);
+
 extern MagickExport Image
   *BlobToImage(const ImageInfo *,const void *,const size_t,ExceptionInfo *),
   *PingBlob(const ImageInfo *,const void *,const size_t,ExceptionInfo *);
 
+extern MagickExport int
+  EOFBlob(const Image *),
+  ReadBlobByte(Image *);
+
 extern MagickExport MagickBooleanType
   BlobToFile(char *,const void *,const size_t,ExceptionInfo *),
+  CloseBlob(Image *),
+  DiscardBlobBytes(Image *,const MagickSizeType),
   FileToImage(Image *,const char *),
-  GetBlobError(const Image *),
   ImageToFile(Image *,char *,ExceptionInfo *),
   InjectImageBlob(const ImageInfo *,Image *,Image *,const char *,
     ExceptionInfo *),
-  IsBlobExempt(const Image *),
-  IsBlobSeekable(const Image *),
-  IsBlobTemporary(const Image *);
+  OpenBlob(const ImageInfo *,Image *,const BlobMode,ExceptionInfo *),
+  UnmapBlob(void *,const size_t);
+
+extern MagickExport MagickOffsetType
+  SeekBlob(Image *,const MagickOffsetType,const int),
+  TellBlob(const Image *);
 
 extern MagickExport MagickSizeType
-  GetBlobSize(const Image *);
+  GetBlobSize(const Image *),
+  ReadBlobLongLong(Image *),
+  ReadBlobMSBLongLong(Image *);
 
-extern MagickExport StreamHandler
-  GetBlobStreamHandler(const Image *);
+extern MagickExport ssize_t
+  ReadBlob(Image *,const size_t,unsigned char *),
+  WriteBlob(Image *,const size_t,const unsigned char *),
+  WriteBlobByte(Image *,const unsigned char),
+  WriteBlobFloat(Image *,const float),
+  WriteBlobLong(Image *,const unsigned int),
+  WriteBlobShort(Image *,const unsigned short),
+  WriteBlobLSBLong(Image *,const unsigned int),
+  WriteBlobLSBShort(Image *,const unsigned short),
+  WriteBlobMSBLong(Image *,const unsigned int),
+  WriteBlobMSBLongLong(Image *,const MagickSizeType),
+  WriteBlobMSBShort(Image *,const unsigned short),
+  WriteBlobString(Image *,const char *);
 
 extern MagickExport unsigned char
+  *DetachBlob(BlobInfo *),
   *FileToBlob(const char *,const size_t,size_t *,ExceptionInfo *),
   *GetBlobStreamData(const Image *),
   *ImageToBlob(const ImageInfo *,Image *,size_t *,ExceptionInfo *),
-  *ImagesToBlob(const ImageInfo *,Image *,size_t *,ExceptionInfo *);
+  *ImagesToBlob(const ImageInfo *,Image *,size_t *,ExceptionInfo *),
+  *MapBlob(int,const MapMode,const MagickOffsetType,const size_t);
+
+extern MagickExport unsigned int
+  ReadBlobLong(Image *),
+  ReadBlobLSBLong(Image *),
+  ReadBlobMSBLong(Image *);
+
+extern MagickExport unsigned short
+  ReadBlobShort(Image *),
+  ReadBlobLSBShort(Image *),
+  ReadBlobMSBShort(Image *);
 
 extern MagickExport void
+  AttachBlob(BlobInfo *,const void *,const size_t),
   DestroyBlob(Image *),
   DuplicateBlob(Image *,const Image *),
-  SetBlobExempt(Image *,const MagickBooleanType);
+  MSBOrderLong(unsigned char *,const size_t),
+  MSBOrderShort(unsigned char *,const size_t);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/color-private.h b/MagickCore/color-private.h
index 9d04e341a02cd36e2b7fd93363201e27ffb0b543..213c6dc1837a541914e003e87cac363c6bc7f37e 100644 (file)
--- a/MagickCore/color-private.h
+++ b/MagickCore/color-private.h
@@ -22,8 +22,12 @@
 extern "C" {
 #endif
 
+#include "MagickCore/image.h"
+
 extern MagickPrivate MagickBooleanType
-  ColorComponentGenesis(void);
+  ColorComponentGenesis(void),
+  QueryMagickColorCompliance(const char *,const ComplianceType,PixelInfo *,
+    ExceptionInfo *);
 
 extern MagickPrivate void
   ColorComponentTerminus(void);

diff --git a/MagickCore/color.c b/MagickCore/color.c
index 960cb12d68763b0a4025f1c72d94c700105ac59a..900b80758138f6a8be6ebec7b3ff498d6ee696c4 100644 (file)
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -2257,7 +2257,7 @@ MagickExport MagickBooleanType QueryColorname(const Image *image,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   Q u e r y M a g i c k C o l o r C o m p l i a n c e                       %
++   Q u e r y M a g i c k C o l o r C o m p l i a n c e                       %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -2284,7 +2284,7 @@ MagickExport MagickBooleanType QueryColorname(const Image *image,
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport MagickBooleanType QueryMagickColorCompliance(const char *name,
+MagickPrivate MagickBooleanType QueryMagickColorCompliance(const char *name,
   const ComplianceType compliance,PixelInfo *color,
   ExceptionInfo *exception)
 {

diff --git a/MagickCore/color.h b/MagickCore/color.h
index d7542f3b38480b3b7a30236d453ed9252b95f1ea..7735689a1f7824790a9129d1707f35eb55b116a9 100644 (file)
--- a/MagickCore/color.h
+++ b/MagickCore/color.h
@@ -81,8 +81,6 @@ extern MagickExport MagickBooleanType
   QueryColorname(const Image *,const PixelPacket *,const ComplianceType,char *,
     ExceptionInfo *),
   QueryMagickColor(const char *,PixelInfo *,ExceptionInfo *),
-  QueryMagickColorCompliance(const char *,const ComplianceType,PixelInfo *,
-    ExceptionInfo *),
   QueryMagickColorname(const Image *,const PixelInfo *,const ComplianceType,
     char *,ExceptionInfo *);
 

diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index 6049bb0fab3ec102c64e2ddd5dd59b40973010aa..4fa904e80fb14f3fadc63f5d2e00c6c9104f823b 100644 (file)
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -51,6 +51,7 @@
 #include "MagickCore/memory_.h"
 #include "MagickCore/semaphore.h"
 #include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/utility-private.h"

diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index b0749ced66dc5e11a766d3d36e84285debfa8e41..cccf853e9847dd1906bf1a2f9a1041ba5ee36bee 100644 (file)
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -62,6 +62,7 @@
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/policy.h"
 #include "MagickCore/profile.h"
+#include "MagickCore/profile-private.h"
 #include "MagickCore/property.h"
 #include "MagickCore/quantum.h"
 #include "MagickCore/resize.h"

diff --git a/MagickCore/display-private.h b/MagickCore/display-private.h
index a5b74d20bc717a3502903e0f045cc68ac81358e6..28bb63afedc7305193bdffccd7f3a00dbc981578 100644 (file)
--- a/MagickCore/display-private.h
+++ b/MagickCore/display-private.h
@@ -22,17 +22,6 @@
 extern "C" {
 #endif
 
-#if defined(MAGICKCORE_X11_DELEGATE)
-#include "MagickCore/xwindow-private.h"
-
-extern MagickExport Image
-  *XDisplayImage(Display *,XResourceInfo *,char **,int,Image **,size_t *,
-    ExceptionInfo *);
-
-extern MagickExport MagickBooleanType XDisplayBackgroundImage(Display *,
-  XResourceInfo *,Image *,ExceptionInfo *);
-#endif
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/display.h b/MagickCore/display.h
index b4710b3516d5c2aa3da2ab0f621b08bde325a0f8..93492ef291c63d8bf7d0034e0c7ed6cdd76fe1ec 100644 (file)
--- a/MagickCore/display.h
+++ b/MagickCore/display.h
@@ -27,6 +27,17 @@ extern MagickExport MagickBooleanType
   RemoteDisplayCommand(const ImageInfo *,const char *,const char *,
     ExceptionInfo *);
 
+#if defined(MAGICKCORE_X11_DELEGATE)
+#include "MagickCore/xwindow.h"
+
+extern MagickExport Image
+  *XDisplayImage(Display *,XResourceInfo *,char **,int,Image **,size_t *,
+    ExceptionInfo *);
+
+extern MagickExport MagickBooleanType XDisplayBackgroundImage(Display *,
+  XResourceInfo *,Image *,ExceptionInfo *);
+#endif
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/fx-private.h b/MagickCore/fx-private.h
index 25a52ba2be8bae4f81755d11f121227fefc624bf..bfb20666ce3d85d1733f002db5dd68ba995ce082 100644 (file)
--- a/MagickCore/fx-private.h
+++ b/MagickCore/fx-private.h
@@ -25,11 +25,11 @@ extern "C" {
 typedef struct _FxInfo
   FxInfo;
 
-extern MagickExport FxInfo
+extern MagickPrivate FxInfo
   *AcquireFxInfo(const Image *,const char *),
   *DestroyFxInfo(FxInfo *);
 
-extern MagickExport MagickBooleanType
+extern MagickPrivate MagickBooleanType
   FxEvaluateExpression(FxInfo *,MagickRealType *,ExceptionInfo *),
   FxEvaluateChannelExpression(FxInfo *,const PixelChannel,const ssize_t,
    const ssize_t,MagickRealType *,ExceptionInfo *);

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index da805a212aca4cfd2572e1b8133c0e4f0a73fccc..640bbf403f7d56448aa0a0351117942b9ce2d7f7 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -151,7 +151,7 @@ struct _FxInfo
 %    o expression: the expression.
 %
 */
-MagickExport FxInfo *AcquireFxInfo(const Image *image,const char *expression)
+MagickPrivate FxInfo *AcquireFxInfo(const Image *image,const char *expression)
 {
   char
     fx_op[2];
@@ -1063,7 +1063,7 @@ MagickExport Image *ColorMatrixImage(const Image *image,
 %    o fx_info: the fx info.
 %
 */
-MagickExport FxInfo *DestroyFxInfo(FxInfo *fx_info)
+MagickPrivate FxInfo *DestroyFxInfo(FxInfo *fx_info)
 {
   register ssize_t
     i;
@@ -2812,7 +2812,7 @@ static MagickRealType FxEvaluateSubexpression(FxInfo *fx_info,
   return(alpha);
 }
 
-MagickExport MagickBooleanType FxEvaluateExpression(FxInfo *fx_info,
+MagickPrivate MagickBooleanType FxEvaluateExpression(FxInfo *fx_info,
   MagickRealType *alpha,ExceptionInfo *exception)
 {
   MagickBooleanType
@@ -2840,7 +2840,7 @@ MagickExport MagickBooleanType FxPreprocessExpression(FxInfo *fx_info,
   return(status);
 }
 
-MagickExport MagickBooleanType FxEvaluateChannelExpression(FxInfo *fx_info,
+MagickPrivate MagickBooleanType FxEvaluateChannelExpression(FxInfo *fx_info,
   const PixelChannel channel,const ssize_t x,const ssize_t y,
   MagickRealType *alpha,ExceptionInfo *exception)
 {
@@ -3538,7 +3538,7 @@ static inline Quantum PlasmaPixel(RandomInfo *random_info,
   return(plasma);
 }
 
-MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
+static MagickBooleanType PlasmaImageProxy(Image *image,
   CacheView *image_view,RandomInfo *random_info,const SegmentInfo *segment,
   size_t attenuate,size_t depth,ExceptionInfo *exception)
 {

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 6f3adfbe7709fb811442a6b649a2d218f2855e86..d2bdf1544e3b1a8195687faa4f212c4f630897b7 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -71,6 +71,7 @@
 #include "MagickCore/list.h"
 #include "MagickCore/magic.h"
 #include "MagickCore/magick.h"
+#include "MagickCore/magick-private.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/module.h"
 #include "MagickCore/monitor.h"

diff --git a/MagickCore/image.h b/MagickCore/image.h
index 2e5ee7e4e21550e24b3998b39406860adc58a8c0..9282779b23283e5ec38fc415df65fda1df14758d 100644 (file)
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -525,7 +525,6 @@ extern MagickExport MagickBooleanType
   ClipImagePath(Image *,const char *,const MagickBooleanType,ExceptionInfo *),
   GetImageAlphaChannel(const Image *),
   IsTaintImage(const Image *),
-  IsMagickConflict(const char *),
   IsHighDynamicRangeImage(const Image *,ExceptionInfo *),
   IsImageObject(const Image *),
   ListMagickInfo(FILE *,ExceptionInfo *),

diff --git a/MagickCore/locale-private.h b/MagickCore/locale-private.h
index 833739fa1203e0a0f83ee6f0d86689bd893dbbe3..573d0678161b79566f663a8f1e2590aba7d5d890 100644 (file)
--- a/MagickCore/locale-private.h
+++ b/MagickCore/locale-private.h
@@ -28,6 +28,12 @@ extern MagickPrivate MagickBooleanType
 extern MagickPrivate void
   LocaleComponentTerminus(void);
 
+extern MagickPrivate ssize_t
+  FormatLocaleFileList(FILE *,const char *restrict,va_list)
+    magick_attribute((format (printf,2,0))),
+  FormatLocaleStringList(char *restrict,const size_t,const char *restrict,
+    va_list) magick_attribute((format (printf,3,0)));
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/locale.c b/MagickCore/locale.c
index 00d45ce5b21e62a2acee08d139ff189d01b67e8e..174f5c5004b2383724d836680a66557f5ea8dd7c 100644 (file)
--- a/MagickCore/locale.c
+++ b/MagickCore/locale.c
@@ -53,6 +53,7 @@
 #include "MagickCore/semaphore.h"
 #include "MagickCore/splay-tree.h"
 #include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/utility-private.h"
@@ -236,7 +237,7 @@ MagickExport LinkedListInfo *DestroyLocaleOptions(LinkedListInfo *messages)
 %
 */
 
-MagickExport ssize_t FormatLocaleFileList(FILE *file,
+MagickPrivate ssize_t FormatLocaleFileList(FILE *file,
   const char *restrict format,va_list operands)
 {
   ssize_t
@@ -327,7 +328,7 @@ MagickExport ssize_t FormatLocaleFile(FILE *file,const char *restrict format,
 %
 */
 
-MagickExport ssize_t FormatLocaleStringList(char *restrict string,
+MagickPrivate ssize_t FormatLocaleStringList(char *restrict string,
   const size_t length,const char *restrict format,va_list operands)
 {
   ssize_t

diff --git a/MagickCore/locale_.h b/MagickCore/locale_.h
index 0b71fc52d7a36e2a9869f896537d05c70d7e58e3..6276713a0d0ae4c486ccda894bcad1719a30cefd 100644 (file)
--- a/MagickCore/locale_.h
+++ b/MagickCore/locale_.h
@@ -61,12 +61,8 @@ extern MagickExport MagickBooleanType
 extern MagickExport ssize_t
   FormatLocaleFile(FILE *,const char *restrict,...)
     magick_attribute((format (printf,2,3))),
-  FormatLocaleFileList(FILE *,const char *restrict,va_list)
-    magick_attribute((format (printf,2,0))),
   FormatLocaleString(char *restrict,const size_t,const char *restrict,...)
-    magick_attribute((format (printf,3,4))),
-  FormatLocaleStringList(char *restrict,const size_t,const char *restrict,
-    va_list) magick_attribute((format (printf,3,0)));
+    magick_attribute((format (printf,3,4)));
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/magick-private.h b/MagickCore/magick-private.h
index e57dbb0c93b79db2e0ec010171bd625ba365d233..7372fe0dfb39c98ca1bb0aacf421cf807d57527b 100644 (file)
--- a/MagickCore/magick-private.h
+++ b/MagickCore/magick-private.h
@@ -23,6 +23,7 @@ extern "C" {
 #endif
 
 extern MagickPrivate MagickBooleanType
+  IsMagickConflict(const char *),
   MagickComponentGenesis(void);
 
 extern MagickPrivate void

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 7c69645b75aafbc7e0982cb0909c997a2e531e16..daca3b85d31bb72cf8065c0fe89b3aefe6750ff1 100644 (file)
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -902,7 +902,7 @@ static MagickBooleanType InitializeMagickList(ExceptionInfo *exception)
 %    o magick: Specifies the image format.
 %
 */
-MagickExport MagickBooleanType IsMagickConflict(const char *magick)
+MagickPrivate MagickBooleanType IsMagickConflict(const char *magick)
 {
   assert(magick != (char *) NULL);
 #if defined(macintosh)

diff --git a/MagickCore/module-private.h b/MagickCore/module-private.h
index 05f4b3d70a6fb8af8a1f30ca6fc1e32a7f1ec9e9..55c715150200f11327f230a96258d055f0e98ba3 100644 (file)
--- a/MagickCore/module-private.h
+++ b/MagickCore/module-private.h
@@ -23,7 +23,9 @@ extern "C" {
 #endif
 
 extern MagickPrivate MagickBooleanType
-  ModuleComponentGenesis(void);
+  ModuleComponentGenesis(void),
+  OpenModule(const char *,ExceptionInfo *),
+  OpenModules(ExceptionInfo *);
 
 extern MagickPrivate void
   ModuleComponentTerminus(void);

diff --git a/MagickCore/module.c b/MagickCore/module.c
index 27103c7a2b26d8bdcb1c9767819bd022bff3041d..84241768a85fe861d705f3623f5519b9b85f3c92 100644 (file)
--- a/MagickCore/module.c
+++ b/MagickCore/module.c
@@ -59,6 +59,7 @@
 #include "MagickCore/splay-tree.h"
 #include "MagickCore/static.h"
 #include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/utility-private.h"
@@ -103,6 +104,7 @@ static const ModuleInfo
 
 static MagickBooleanType
   GetMagickModulePath(const char *,MagickModuleType,char *,ExceptionInfo *),
+  InitializeModuleList(ExceptionInfo *),
   UnregisterModule(const ModuleInfo *,ExceptionInfo *);
 
 static void
@@ -861,7 +863,7 @@ static void *DestroyModuleNode(void *module_info)
   return(RelinquishMagickMemory(p));
 }
 
-MagickExport MagickBooleanType InitializeModuleList(
+static MagickBooleanType InitializeModuleList(
   ExceptionInfo *magick_unused(exception))
 {
   if ((module_list == (SplayTreeInfo *) NULL) &&
@@ -1221,7 +1223,7 @@ MagickPrivate void ModuleComponentTerminus(void)
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport MagickBooleanType OpenModule(const char *module,
+MagickPrivate MagickBooleanType OpenModule(const char *module,
   ExceptionInfo *exception)
 {
   char
@@ -1349,7 +1351,7 @@ MagickExport MagickBooleanType OpenModule(const char *module,
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport MagickBooleanType OpenModules(ExceptionInfo *exception)
+MagickPrivate MagickBooleanType OpenModules(ExceptionInfo *exception)
 {
   char
     **modules;

diff --git a/MagickCore/module.h b/MagickCore/module.h
index bd101c219aed50c0c90f22b2d306585d65d66584..6b5410d8156b6c86d78c926cd5a58a64ee259c71 100644 (file)
--- a/MagickCore/module.h
+++ b/MagickCore/module.h
@@ -69,12 +69,9 @@ extern MagickExport const ModuleInfo
   **GetModuleInfoList(const char *,size_t *,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
-  InitializeModuleList(ExceptionInfo *),
   InvokeDynamicImageFilter(const char *,Image **,const int,const char **,
     ExceptionInfo *),
-  ListModuleInfo(FILE *,ExceptionInfo *),
-  OpenModule(const char *,ExceptionInfo *),
-  OpenModules(ExceptionInfo *);
+  ListModuleInfo(FILE *,ExceptionInfo *);
 
 extern MagickExport ModuleInfo
   *GetModuleInfo(const char *,ExceptionInfo *);

diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index 8b0699309d55af33cf7ffd7fd1bf5d44ac90e4e8..a5aad5e2eaf72a2a65ec9b0c3a513ccec21b0540 100644 (file)
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -55,6 +55,7 @@
 #include "MagickCore/option.h"
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/profile.h"
+#include "MagickCore/profile-private.h"
 #include "MagickCore/property.h"
 #include "MagickCore/quantum.h"
 #include "MagickCore/quantum-private.h"
@@ -1739,7 +1740,7 @@ static void WriteProfileShort(const EndianType endian,
   (void) CopyMagickMemory(p,buffer,2);
 }
 
-MagickExport MagickBooleanType SyncImageProfiles(Image *image)
+MagickPrivate MagickBooleanType SyncImageProfiles(Image *image)
 {
 #define MaxDirectoryStack  16
 #define EXIF_DELIMITER  "\n"

diff --git a/MagickCore/profile.h b/MagickCore/profile.h
index 7896e7a7c53dfdb8192c9893440e37fb18cbdb4e..d7a80517460b95222e29ec63b5a3ed08c5146c9f 100644 (file)
--- a/MagickCore/profile.h
+++ b/MagickCore/profile.h
@@ -59,8 +59,7 @@ extern MagickExport MagickBooleanType
   DeleteImageProfile(Image *,const char *),
   ProfileImage(Image *,const char *,const void *,const size_t,
     const MagickBooleanType),
-  SetImageProfile(Image *,const char *,const StringInfo *),
-  SyncImageProfiles(Image *);
+  SetImageProfile(Image *,const char *,const StringInfo *);
 
 extern MagickExport StringInfo
   *RemoveImageProfile(Image *,const char *);

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 634041992768dd4b4462ecdd0e302a4441264395..a0b9af7f60da5a9847db42a491ad5d5cbd473f33 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -58,6 +58,7 @@
 #include "MagickCore/image.h"
 #include "MagickCore/image.h"
 #include "MagickCore/layer.h"
+#include "MagickCore/locale-private.h"
 #include "MagickCore/list.h"
 #include "MagickCore/magick.h"
 #include "MagickCore/memory_.h"
@@ -69,11 +70,12 @@
 #include "MagickCore/quantum.h"
 #include "MagickCore/resource_.h"
 #include "MagickCore/splay-tree.h"
-#include "MagickCore/signature-private.h"
+#include "MagickCore/signature.h"
 #include "MagickCore/statistic.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/string-private.h"
 #include "MagickCore/token.h"
+#include "MagickCore/token-private.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"

diff --git a/MagickCore/resize-private.h b/MagickCore/resize-private.h
index 5c63ca6e2c3ba85fb2c361fb8c49d024994b29db..4ba7a2bcdc9192173fb699fc2ac16e5a75381cee 100644 (file)
--- a/MagickCore/resize-private.h
+++ b/MagickCore/resize-private.h
@@ -25,18 +25,15 @@ extern "C" {
 typedef struct _ResizeFilter
   ResizeFilter;
 
-extern MagickExport MagickRealType
+extern MagickPrivate MagickRealType
   GetResizeFilterSupport(const ResizeFilter *),
   GetResizeFilterWeight(const ResizeFilter *,const MagickRealType);
 
-extern MagickExport ResizeFilter
+extern MagickPrivate ResizeFilter
   *AcquireResizeFilter(const Image *,const FilterTypes,const MagickRealType,
      const MagickBooleanType,ExceptionInfo *),
   *DestroyResizeFilter(ResizeFilter *);
 
-extern MagickExport void
-  SetResizeFilterSupport(ResizeFilter *,const MagickRealType);
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 9f34a819ed06d637db9ca6f326433c5d8c38218f..e3b7a6846ae28a1d1cf1228af92d8d4be76018c6 100644 (file)
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -651,7 +651,7 @@ static MagickRealType Welsh(const MagickRealType x,
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport ResizeFilter *AcquireResizeFilter(const Image *image,
+MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image,
   const FilterTypes filter,const MagickRealType blur,
   const MagickBooleanType cylindrical,ExceptionInfo *exception)
 {
@@ -1518,7 +1518,7 @@ static MagickRealType BesselOrderOne(MagickRealType x)
 %    o resize_filter: the resize filter.
 %
 */
-MagickExport ResizeFilter *DestroyResizeFilter(ResizeFilter *resize_filter)
+MagickPrivate ResizeFilter *DestroyResizeFilter(ResizeFilter *resize_filter)
 {
   assert(resize_filter != (ResizeFilter *) NULL);
   assert(resize_filter->signature == MagickSignature);
@@ -1550,7 +1550,7 @@ MagickExport ResizeFilter *DestroyResizeFilter(ResizeFilter *resize_filter)
 %    o filter: Image filter to use.
 %
 */
-MagickExport MagickRealType GetResizeFilterSupport(
+MagickPrivate MagickRealType GetResizeFilterSupport(
   const ResizeFilter *resize_filter)
 {
   assert(resize_filter != (ResizeFilter *) NULL);
@@ -1585,7 +1585,7 @@ MagickExport MagickRealType GetResizeFilterSupport(
 %    o x: the point.
 %
 */
-MagickExport MagickRealType GetResizeFilterWeight(
+MagickPrivate MagickRealType GetResizeFilterWeight(
   const ResizeFilter *resize_filter,const MagickRealType x)
 {
   MagickRealType

diff --git a/MagickCore/signature-private.h b/MagickCore/signature-private.h
index d7001dd3857e8cf892ef4e5e36014b3f0952d853..9c7fbc439616c6e15aeb4df70b4f557e83d0eb70 100644 (file)
--- a/MagickCore/signature-private.h
+++ b/MagickCore/signature-private.h
@@ -29,21 +29,18 @@ extern "C" {
 typedef struct _SignatureInfo
   SignatureInfo;
 
-extern MagickExport MagickBooleanType
-  SignatureImage(Image *,ExceptionInfo *exception);
-
-extern MagickExport SignatureInfo
+extern MagickPrivate SignatureInfo
   *AcquireSignatureInfo(void),
   *DestroySignatureInfo(SignatureInfo *);
 
-extern MagickExport const StringInfo
+extern MagickPrivate const StringInfo
   *GetSignatureDigest(const SignatureInfo *);
 
-extern MagickExport unsigned int
+extern MagickPrivate unsigned int
   GetSignatureBlocksize(const SignatureInfo *),
   GetSignatureDigestsize(const SignatureInfo *);
 
-extern MagickExport void
+extern MagickPrivate void
   InitializeSignature(SignatureInfo *),
   FinalizeSignature(SignatureInfo *),
   SetSignatureDigest(SignatureInfo *,const StringInfo *),

diff --git a/MagickCore/signature.c b/MagickCore/signature.c
index 8a0b2b8bce2e9c66c9e99b1ab6f7002dff01cabb..97bdd6d67cfa0aee3e6f414efade9d00a6cd9f97 100644 (file)
--- a/MagickCore/signature.c
+++ b/MagickCore/signature.c
@@ -112,7 +112,7 @@ static void
 %      SignatureInfo *AcquireSignatureInfo(void)
 %
 */
-MagickExport SignatureInfo *AcquireSignatureInfo(void)
+MagickPrivate SignatureInfo *AcquireSignatureInfo(void)
 {
   SignatureInfo
     *signature_info;
@@ -164,7 +164,7 @@ MagickExport SignatureInfo *AcquireSignatureInfo(void)
 %    o signature_info: the cipher signature_info.
 %
 */
-MagickExport SignatureInfo *DestroySignatureInfo(SignatureInfo *signature_info)
+MagickPrivate SignatureInfo *DestroySignatureInfo(SignatureInfo *signature_info)
 {
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
   assert(signature_info != (SignatureInfo *) NULL);
@@ -203,7 +203,7 @@ MagickExport SignatureInfo *DestroySignatureInfo(SignatureInfo *signature_info)
 %    o signature_info: the address of a structure of type SignatureInfo.
 %
 */
-MagickExport void FinalizeSignature(SignatureInfo *signature_info)
+MagickPrivate void FinalizeSignature(SignatureInfo *signature_info)
 {
   register ssize_t
     i;
@@ -293,7 +293,7 @@ MagickExport void FinalizeSignature(SignatureInfo *signature_info)
 %    o signature_info: the signature info.
 %
 */
-MagickExport unsigned int GetSignatureBlocksize(
+MagickPrivate unsigned int GetSignatureBlocksize(
   const SignatureInfo *signature_info)
 {
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
@@ -324,7 +324,7 @@ MagickExport unsigned int GetSignatureBlocksize(
 %    o signature_info: the signature info.
 %
 */
-MagickExport const StringInfo *GetSignatureDigest(
+MagickPrivate const StringInfo *GetSignatureDigest(
   const SignatureInfo *signature_info)
 {
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
@@ -355,7 +355,7 @@ MagickExport const StringInfo *GetSignatureDigest(
 %    o signature_info: the signature info.
 %
 */
-MagickExport unsigned int GetSignatureDigestsize(
+MagickPrivate unsigned int GetSignatureDigestsize(
   const SignatureInfo *signature_info)
 {
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
@@ -386,7 +386,7 @@ MagickExport unsigned int GetSignatureDigestsize(
 %    o signature_info: the cipher signature_info.
 %
 */
-MagickExport void InitializeSignature(SignatureInfo *signature_info)
+MagickPrivate void InitializeSignature(SignatureInfo *signature_info)
 {
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
   assert(signature_info != (SignatureInfo *) NULL);
@@ -429,7 +429,7 @@ MagickExport void InitializeSignature(SignatureInfo *signature_info)
 %    o digest: the digest.
 %
 */
-MagickExport void SetSignatureDigest(SignatureInfo *signature_info,
+MagickPrivate void SetSignatureDigest(SignatureInfo *signature_info,
   const StringInfo *digest)
 {
   /*
@@ -760,7 +760,7 @@ static void TransformSignature(SignatureInfo *signature_info)
 %    o message: the message.
 %
 */
-MagickExport void UpdateSignature(SignatureInfo *signature_info,
+MagickPrivate void UpdateSignature(SignatureInfo *signature_info,
   const StringInfo *message)
 {
   register size_t

diff --git a/MagickCore/stream-private.h b/MagickCore/stream-private.h
index 9912d6d264417f79ac6c0ae84d4350f162f7daaa..5ef00bf51782e3b37ca464108de488c7016f21b5 100644 (file)
--- a/MagickCore/stream-private.h
+++ b/MagickCore/stream-private.h
@@ -22,26 +22,11 @@
 extern "C" {
 #endif
 
-typedef struct _StreamInfo
-  StreamInfo;
-
-extern MagickExport const void
+extern MagickPrivate const void
   *GetStreamInfoClientData(StreamInfo *);
 
-extern MagickExport Image
-  *StreamImage(const ImageInfo *,StreamInfo *,ExceptionInfo *);
-
-extern MagickExport MagickBooleanType
-  OpenStream(const ImageInfo *,StreamInfo *,const char *,ExceptionInfo *);
-
-extern MagickExport StreamInfo
-  *AcquireStreamInfo(const ImageInfo *),
-  *DestroyStreamInfo(StreamInfo *);
-
-extern MagickExport void
-  SetStreamInfoClientData(StreamInfo *,const void *),
-  SetStreamInfoMap(StreamInfo *,const char *),
-  SetStreamInfoStorageType(StreamInfo *,const StorageType);
+extern MagickPrivate void
+  SetStreamInfoClientData(StreamInfo *,const void *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/stream.c b/MagickCore/stream.c
index 99a13e21efc3acf810331d574eb59d8a2c3f17b0..2e75164ff7dff68d1b655ae6a8be2e742f16f20c 100644 (file)
--- a/MagickCore/stream.c
+++ b/MagickCore/stream.c
@@ -516,7 +516,7 @@ static MagickBooleanType GetOneVirtualPixelFromStream(const Image *image,
 %
 %  GetStreamInfoClientData() gets the stream info client data.
 %
-%  The format of the SetStreamInfoClientData method is:
+%  The format of the GetStreamInfoClientData method is:
 %
 %      const void *GetStreamInfoClientData(StreamInfo *stream_info)
 %
@@ -525,7 +525,7 @@ static MagickBooleanType GetOneVirtualPixelFromStream(const Image *image,
 %    o stream_info: the stream info.
 %
 */
-MagickExport const void *GetStreamInfoClientData(StreamInfo *stream_info)
+MagickPrivate const void *GetStreamInfoClientData(StreamInfo *stream_info)
 {
   assert(stream_info != (StreamInfo *) NULL);
   assert(stream_info->signature == MagickSignature);
@@ -992,7 +992,7 @@ MagickExport Image *ReadStream(const ImageInfo *image_info,StreamHandler stream,
 %    o client_data: the client data.
 %
 */
-MagickExport void SetStreamInfoClientData(StreamInfo *stream_info,
+MagickPrivate void SetStreamInfoClientData(StreamInfo *stream_info,
   const void *client_data)
 {
   assert(stream_info != (StreamInfo *) NULL);

diff --git a/MagickCore/stream.h b/MagickCore/stream.h
index 1cc5497a3da61051de3f27a191ac11decff32e4e..1422f42268af967b4980c9286fa8997872c247be 100644 (file)
--- a/MagickCore/stream.h
+++ b/MagickCore/stream.h
@@ -22,15 +22,28 @@
 extern "C" {
 #endif
 
+typedef struct _StreamInfo
+  StreamInfo;
+
 typedef size_t
   (*StreamHandler)(const Image *,const void *,const size_t);
 
 extern MagickExport Image
-  *ReadStream(const ImageInfo *,StreamHandler,ExceptionInfo *);
+  *ReadStream(const ImageInfo *,StreamHandler,ExceptionInfo *),
+  *StreamImage(const ImageInfo *,StreamInfo *,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
+  OpenStream(const ImageInfo *,StreamInfo *,const char *,ExceptionInfo *),
   WriteStream(const ImageInfo *,Image *,StreamHandler);
 
+extern MagickExport StreamInfo
+  *AcquireStreamInfo(const ImageInfo *),
+  *DestroyStreamInfo(StreamInfo *);
+
+extern MagickExport void
+  SetStreamInfoMap(StreamInfo *,const char *),
+  SetStreamInfoStorageType(StreamInfo *,const StorageType);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/string-private.h b/MagickCore/string-private.h
index b3dd2e16d41f7bb4e105842560866cf29968f561..8d6d47b396089b4e3341fe8f6879513c9128e071 100644 (file)
--- a/MagickCore/string-private.h
+++ b/MagickCore/string-private.h
@@ -22,6 +22,12 @@
 extern "C" {
 #endif
 
+extern MagickPrivate char
+  *GetEnvironmentValue(const char *);
+
+extern MagickPrivate ssize_t
+  FormatMagickSize(const MagickSizeType,const MagickBooleanType,char *);
+
 static inline double SiPrefixToDouble(const char *string,const double interval)
 {
   char

diff --git a/MagickCore/string.c b/MagickCore/string.c
index 7e7db54fa532b28ca4256ef8f858df6ee9666b79..3d16cbe7e2e4c33d378a0c95315f658db5a07895 100644 (file)
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -1051,7 +1051,7 @@ MagickExport StringInfo *FileToStringInfo(const char *filename,
 %    o format:  human readable format.
 %
 */
-MagickExport ssize_t FormatMagickSize(const MagickSizeType size,
+MagickPrivate ssize_t FormatMagickSize(const MagickSizeType size,
   const MagickBooleanType bi,char *format)
 {
   const char
@@ -1205,7 +1205,7 @@ MagickExport ssize_t FormatMagickTime(const time_t time,const size_t length,
 %    o name: the environment name.
 %
 */
-MagickExport char *GetEnvironmentValue(const char *name)
+MagickPrivate char *GetEnvironmentValue(const char *name)
 {
   const char
     *environment;

diff --git a/MagickCore/string_.h b/MagickCore/string_.h
index fd91415d88d0fc2176a24542bf127218f56f2b54..0a8ca3492ab370b60c5940a5589f1f9daf42f7ed 100644 (file)
--- a/MagickCore/string_.h
+++ b/MagickCore/string_.h
@@ -47,7 +47,6 @@ extern MagickExport char
   **DestroyStringList(char **),
   *EscapeString(const char *,const char),
   *FileToString(const char *,const size_t,ExceptionInfo *),
-  *GetEnvironmentValue(const char *),
   *StringInfoToHexString(const StringInfo *),
   *StringInfoToString(const StringInfo *),
   **StringToArgv(const char *,int *),
@@ -74,7 +73,6 @@ extern MagickExport size_t
   GetStringInfoLength(const StringInfo *);
 
 extern MagickExport ssize_t
-  FormatMagickSize(const MagickSizeType,const MagickBooleanType,char *),
   FormatMagickTime(const time_t,const size_t,char *);
 
 extern MagickExport StringInfo

diff --git a/MagickCore/token-private.h b/MagickCore/token-private.h
index 9eb663a14acf8769ee85a06c48e5ea8ebdc8352e..683a628a8ce695cb7054cd2836c81b90198d5db4 100644 (file)
--- a/MagickCore/token-private.h
+++ b/MagickCore/token-private.h
@@ -28,6 +28,9 @@ extern "C" {
 
 #define MaxMultibyteCodes  6
 
+extern MagickPrivate MagickBooleanType
+  IsGlob(const char *);
+
 typedef struct
 {
   int

diff --git a/MagickCore/token.c b/MagickCore/token.c
index b313d965ac0ef22fa1fc661ad4a54200d2152f56..fbc732d31448c5210d56ec6ea638794c3a41684f 100644 (file)
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -590,7 +590,7 @@ MagickExport MagickBooleanType GlobExpression(const char *expression,
 %    o path: the path.
 %
 */
-MagickExport MagickBooleanType IsGlob(const char *path)
+MagickPrivate MagickBooleanType IsGlob(const char *path)
 {
   MagickBooleanType
     status;

diff --git a/MagickCore/token.h b/MagickCore/token.h
index 2e5ef350ed62f90873b0acfca91094c9d3dd360b..306cd9749cafb2ab50462914486659062a5a725b 100644 (file)
--- a/MagickCore/token.h
+++ b/MagickCore/token.h
@@ -33,8 +33,7 @@ extern MagickExport int
     const char *,const char *,const char *,const char,char *,int *,char *);
 
 extern MagickExport MagickBooleanType
-  GlobExpression(const char *,const char *,const MagickBooleanType),
-  IsGlob(const char *);
+  GlobExpression(const char *,const char *,const MagickBooleanType);
 
 extern MagickExport TokenInfo
   *AcquireTokenInfo(void),

diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index 2cd8787dc543dac91ef9b3472541619d8e20a42a..db38e3498ee39b30aff671854fde5158f796b78b 100644 (file)
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -48,6 +48,7 @@
 #include "MagickCore/geometry.h"
 #include "MagickCore/list.h"
 #include "MagickCore/log.h"
+#include "MagickCore/magick-private.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/option.h"
 #include "MagickCore/policy.h"
@@ -56,7 +57,9 @@
 #include "MagickCore/signature-private.h"
 #include "MagickCore/statistic.h"
 #include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
 #include "MagickCore/token.h"
+#include "MagickCore/token-private.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/utility-private.h"
 #if defined(MAGICKCORE_HAVE_PROCESS_H)

diff --git a/MagickCore/widget.c b/MagickCore/widget.c
index 708d5519279d1527548d4bd2fedad6db75946f5d..1cb98042f471af799ac565f665c42723857f6ab1 100644 (file)
--- a/MagickCore/widget.c
+++ b/MagickCore/widget.c
@@ -51,6 +51,7 @@
 #include "MagickCore/PreRvIcccm.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/token.h"
+#include "MagickCore/token-private.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/utility-private.h"
 #include "MagickCore/xwindow-private.h"

diff --git a/MagickWand/animate.c b/MagickWand/animate.c
index 0038faccf3b8d3d48ac4378cc892b5e4fba4bff3..2c8c0aee8379f2038ba300fe7ee5beb7caca6bb3 100644 (file)
--- a/MagickWand/animate.c
+++ b/MagickWand/animate.c
@@ -45,6 +45,7 @@
 #include "MagickWand/mogrify-private.h"
 #include "MagickCore/animate-private.h"
 #include "MagickCore/string-private.h"
+#include "MagickCore/xwindow-private.h"
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/MagickWand/display.c b/MagickWand/display.c
index 17d7c60ed7a056522d9f20b0373700abe17b7c98..dd54122e16e50bdb27dd35701b3bb6b7ca26d99d 100644 (file)
--- a/MagickWand/display.c
+++ b/MagickWand/display.c
@@ -46,6 +46,7 @@
 #include "MagickWand/mogrify-private.h"
 #include "MagickCore/display-private.h"
 #include "MagickCore/string-private.h"
+#include "MagickCore/xwindow-private.h"
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/MagickWand/import.c b/MagickWand/import.c
index 0207574465616967b26bb375bbc943e801075ee4..c87f3a0b3df93ea395ac8f11ddff7d572fa87ce9 100644 (file)
--- a/MagickWand/import.c
+++ b/MagickWand/import.c
@@ -44,8 +44,8 @@
 #include "MagickWand/studio.h"
 #include "MagickWand/MagickWand.h"
 #include "MagickWand/mogrify-private.h"
-#include "MagickCore/xwindow-private.h"
 #include "MagickCore/string-private.h"
+#include "MagickCore/xwindow-private.h"
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/Makefile.in b/Makefile.in
index 29d5317bcd691148825109f5e8bdf95359e84e2b..fce1366d8ae05e248bd5df5f54a497ff0e7ea730 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -435,21 +435,21 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST =  \
        MagickCore/PreRvIcccm.h MagickCore/prepress.c \
        MagickCore/prepress.h MagickCore/property.c \
        MagickCore/property.h MagickCore/profile.c \
-       MagickCore/profile.h MagickCore/quantize.c \
-       MagickCore/quantize.h MagickCore/quantum.c \
-       MagickCore/quantum.h MagickCore/quantum-export.c \
-       MagickCore/quantum-import.c MagickCore/quantum-private.h \
-       MagickCore/random.c MagickCore/random_.h \
-       MagickCore/random-private.h MagickCore/registry.c \
-       MagickCore/registry.h MagickCore/resample.c \
-       MagickCore/resample.h MagickCore/resample-private.h \
-       MagickCore/resize.c MagickCore/resize.h \
-       MagickCore/resize-private.h MagickCore/resource.c \
-       MagickCore/resource_.h MagickCore/resource-private.h \
-       MagickCore/segment.c MagickCore/segment.h \
-       MagickCore/semaphore.c MagickCore/semaphore.h \
-       MagickCore/semaphore-private.h MagickCore/shear.c \
-       MagickCore/shear.h MagickCore/signature.c \
+       MagickCore/profile.h MagickCore/profile-profile.h \
+       MagickCore/quantize.c MagickCore/quantize.h \
+       MagickCore/quantum.c MagickCore/quantum.h \
+       MagickCore/quantum-export.c MagickCore/quantum-import.c \
+       MagickCore/quantum-private.h MagickCore/random.c \
+       MagickCore/random_.h MagickCore/random-private.h \
+       MagickCore/registry.c MagickCore/registry.h \
+       MagickCore/resample.c MagickCore/resample.h \
+       MagickCore/resample-private.h MagickCore/resize.c \
+       MagickCore/resize.h MagickCore/resize-private.h \
+       MagickCore/resource.c MagickCore/resource_.h \
+       MagickCore/resource-private.h MagickCore/segment.c \
+       MagickCore/segment.h MagickCore/semaphore.c \
+       MagickCore/semaphore.h MagickCore/semaphore-private.h \
+       MagickCore/shear.c MagickCore/shear.h MagickCore/signature.c \
        MagickCore/signature.h MagickCore/signature-private.h \
        MagickCore/splay-tree.c MagickCore/splay-tree.h \
        MagickCore/static.c MagickCore/static.h MagickCore/statistic.c \
@@ -4002,6 +4002,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/property.h \
        MagickCore/profile.c \
        MagickCore/profile.h \
+       MagickCore/profile-profile.h \
        MagickCore/quantize.c \
        MagickCore/quantize.h \
        MagickCore/quantum.c \
@@ -4215,6 +4216,7 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/nt-base.h \
        MagickCore/nt-feature.h \
        MagickCore/policy-private.h \
+       MagickCore/profile-private.h \
        MagickCore/quantum-private.h \
        MagickCore/random_-private.h \
        MagickCore/random-private.h \

diff --git a/coders/dcm.c b/coders/dcm.c
index b2034884d3dcce9de23ce41e7eb05609b81ddc36..6b44877766b178acfd58f94f6846739eefe9c069 100644 (file)
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3822,7 +3822,6 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                         pixel_value=((signed short) pixel_value);
                       if (significant_bits == 12)
                         pixel_value>>=4;
-
                     }
                   else
                     {

diff --git a/config/configure.xml b/config/configure.xml
index 55b21527be23ae9d7d6d55b4d37734aceec6cbd2..6c637a2cbd26d75364b688ca7bbd414ebae3b604 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,7 +10,7 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="5150" />
+  <configure name="SVN_REVISION" value="5157" />
   <configure name="RELEASE_DATE" value="2011-09-04"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 25f3c2a46f3545a94f2d43a4094ec38731b18fd5..1095ba96ac283ff438d989a9f0cc80b198204eeb 100755 (executable)
--- a/configure
+++ b/configure
@@ -3583,7 +3583,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=5150
+MAGICK_SVN_REVISION=5157