diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index ad35bae..cebf158 100644
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -193,6 +193,7 @@
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/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 7ca17ac..22ceeda 100644
--- 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 54e2119..d0fa748 100644
--- a/MagickCore/animate.h
+++ b/MagickCore/animate.h
@@ -25,6 +25,17 @@
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 fe31b5f..ba3bba6 100644
--- a/MagickCore/blob-private.h
+++ b/MagickCore/blob-private.h
@@ -22,9 +22,6 @@
extern "C" {
#endif
-#include "MagickCore/image.h"
-#include "MagickCore/stream.h"
-
#define MagickMinBlobExtent 32767L
#if defined(MAGICKCORE_HAVE_FSEEKO)
# define fseek fseeko
@@ -33,17 +30,6 @@
typedef enum
{
- UndefinedBlobMode,
- ReadBlobMode,
- ReadBinaryBlobMode,
- WriteBlobMode,
- WriteBinaryBlobMode,
- AppendBlobMode,
- AppendBinaryBlobMode
-} BlobMode;
-
-typedef enum
-{
UndefinedStream,
FileStream,
StandardStream,
@@ -54,77 +40,22 @@
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 MagickPrivate StreamHandler
+ GetBlobStreamHandler(const 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 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 33b0ddb..d6923d1 100644
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -1176,7 +1176,7 @@
% 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 @@
% 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 @@
% 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 @@
% 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 @@
% 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 @@
% o image: the image.
%
*/
-MagickExport MagickBooleanType IsBlobSeekable(const Image *image)
+MagickPrivate MagickBooleanType IsBlobSeekable(const Image *image)
{
MagickBooleanType
seekable;
@@ -2053,7 +2053,7 @@
% 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 @@
% 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 @@
% 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 6590ab0..0c55083 100644
--- a/MagickCore/blob.h
+++ b/MagickCore/blob.h
@@ -29,45 +29,107 @@
typedef enum
{
+ UndefinedBlobMode,
+ ReadBlobMode,
+ ReadBinaryBlobMode,
+ WriteBlobMode,
+ WriteBinaryBlobMode,
+ AppendBlobMode,
+ AppendBinaryBlobMode
+} BlobMode;
+
+typedef enum
+{
ReadMode,
WriteMode,
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 9d04e34..213c6dc 100644
--- 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 960cb12..900b807 100644
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -2257,7 +2257,7 @@
% %
% %
% %
-% 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 @@
% 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 d7542f3..7735689 100644
--- a/MagickCore/color.h
+++ b/MagickCore/color.h
@@ -81,8 +81,6 @@
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 6049bb0..4fa904e 100644
--- 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 b0749ce..cccf853 100644
--- 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 a5b74d2..28bb63a 100644
--- 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 b4710b3..93492ef 100644
--- a/MagickCore/display.h
+++ b/MagickCore/display.h
@@ -27,6 +27,17 @@
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 25a52ba..bfb2066 100644
--- a/MagickCore/fx-private.h
+++ b/MagickCore/fx-private.h
@@ -25,11 +25,11 @@
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 da805a2..640bbf4 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -151,7 +151,7 @@
% 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 @@
% 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 @@
return(alpha);
}
-MagickExport MagickBooleanType FxEvaluateExpression(FxInfo *fx_info,
+MagickPrivate MagickBooleanType FxEvaluateExpression(FxInfo *fx_info,
MagickRealType *alpha,ExceptionInfo *exception)
{
MagickBooleanType
@@ -2840,7 +2840,7 @@
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 @@
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 6f3adfb..d2bdf15 100644
--- 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 2e5ee7e..9282779 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -525,7 +525,6 @@
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 833739f..573d067 100644
--- a/MagickCore/locale-private.h
+++ b/MagickCore/locale-private.h
@@ -28,6 +28,12 @@
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 00d45ce..174f5c5 100644
--- 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 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 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 0b71fc5..6276713 100644
--- a/MagickCore/locale_.h
+++ b/MagickCore/locale_.h
@@ -61,12 +61,8 @@
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 e57dbb0..7372fe0 100644
--- a/MagickCore/magick-private.h
+++ b/MagickCore/magick-private.h
@@ -23,6 +23,7 @@
#endif
extern MagickPrivate MagickBooleanType
+ IsMagickConflict(const char *),
MagickComponentGenesis(void);
extern MagickPrivate void
diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 7c69645..daca3b8 100644
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -902,7 +902,7 @@
% 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 05f4b3d..55c7151 100644
--- a/MagickCore/module-private.h
+++ b/MagickCore/module-private.h
@@ -23,7 +23,9 @@
#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 27103c7..8424176 100644
--- 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 MagickBooleanType
GetMagickModulePath(const char *,MagickModuleType,char *,ExceptionInfo *),
+ InitializeModuleList(ExceptionInfo *),
UnregisterModule(const ModuleInfo *,ExceptionInfo *);
static void
@@ -861,7 +863,7 @@
return(RelinquishMagickMemory(p));
}
-MagickExport MagickBooleanType InitializeModuleList(
+static MagickBooleanType InitializeModuleList(
ExceptionInfo *magick_unused(exception))
{
if ((module_list == (SplayTreeInfo *) NULL) &&
@@ -1221,7 +1223,7 @@
% 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 @@
% 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 bd101c2..6b5410d 100644
--- a/MagickCore/module.h
+++ b/MagickCore/module.h
@@ -69,12 +69,9 @@
**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 8b06993..a5aad5e 100644
--- 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 @@
(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 7896e7a..d7a8051 100644
--- a/MagickCore/profile.h
+++ b/MagickCore/profile.h
@@ -59,8 +59,7 @@
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 6340419..a0b9af7 100644
--- 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 5c63ca6..4ba7a2b 100644
--- a/MagickCore/resize-private.h
+++ b/MagickCore/resize-private.h
@@ -25,18 +25,15 @@
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 9f34a81..e3b7a68 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -651,7 +651,7 @@
% 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 @@
% 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 @@
% 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 @@
% 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 d7001dd..9c7fbc4 100644
--- a/MagickCore/signature-private.h
+++ b/MagickCore/signature-private.h
@@ -29,21 +29,18 @@
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 8a0b2b8..97bdd6d 100644
--- a/MagickCore/signature.c
+++ b/MagickCore/signature.c
@@ -112,7 +112,7 @@
% SignatureInfo *AcquireSignatureInfo(void)
%
*/
-MagickExport SignatureInfo *AcquireSignatureInfo(void)
+MagickPrivate SignatureInfo *AcquireSignatureInfo(void)
{
SignatureInfo
*signature_info;
@@ -164,7 +164,7 @@
% 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 @@
% 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 @@
% 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 @@
% 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 @@
% 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 @@
% 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 @@
% o digest: the digest.
%
*/
-MagickExport void SetSignatureDigest(SignatureInfo *signature_info,
+MagickPrivate void SetSignatureDigest(SignatureInfo *signature_info,
const StringInfo *digest)
{
/*
@@ -760,7 +760,7 @@
% 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 9912d6d..5ef00bf 100644
--- 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 99a13e2..2e75164 100644
--- a/MagickCore/stream.c
+++ b/MagickCore/stream.c
@@ -516,7 +516,7 @@
%
% 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 @@
% 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 @@
% 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 1cc5497..1422f42 100644
--- 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 b3dd2e1..8d6d47b 100644
--- 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 7e7db54..3d16cbe 100644
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -1051,7 +1051,7 @@
% 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 @@
% 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 fd91415..0a8ca34 100644
--- a/MagickCore/string_.h
+++ b/MagickCore/string_.h
@@ -47,7 +47,6 @@
**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 @@
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 9eb663a..683a628 100644
--- a/MagickCore/token-private.h
+++ b/MagickCore/token-private.h
@@ -28,6 +28,9 @@
#define MaxMultibyteCodes 6
+extern MagickPrivate MagickBooleanType
+ IsGlob(const char *);
+
typedef struct
{
int
diff --git a/MagickCore/token.c b/MagickCore/token.c
index b313d96..fbc732d 100644
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -590,7 +590,7 @@
% 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 2e5ef35..306cd97 100644
--- a/MagickCore/token.h
+++ b/MagickCore/token.h
@@ -33,8 +33,7 @@
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 2cd8787..db38e34 100644
--- 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 708d551..1cb9804 100644
--- 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"
