From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 4 Sep 2011 10:33:32 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~7090
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ea81224e9ff022e56eb2cddb12860a8b2e90411;p=imagemagick

---

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 9c57202a1..c45593a92 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -56,6 +56,7 @@
 #include "MagickCore/effect.h"
 #include "MagickCore/fx.h"
 #include "MagickCore/gem.h"
+#include "MagickCore/gem-private.h"
 #include "MagickCore/geometry.h"
 #include "MagickCore/image-private.h"
 #include "MagickCore/list.h"
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 1d64588ef..045399c43 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -58,6 +58,7 @@
 #include "MagickCore/fx.h"
 #include "MagickCore/fx-private.h"
 #include "MagickCore/gem.h"
+#include "MagickCore/gem-private.h"
 #include "MagickCore/geometry.h"
 #include "MagickCore/layer.h"
 #include "MagickCore/list.h"
diff --git a/MagickCore/gem-private.h b/MagickCore/gem-private.h
index a50a38b43..bee048662 100644
--- a/MagickCore/gem-private.h
+++ b/MagickCore/gem-private.h
@@ -22,6 +22,15 @@
 extern "C" {
 #endif
 
+extern MagickPrivate double
+  GenerateDifferentialNoise(RandomInfo *,const Quantum,const NoiseType,
+    const MagickRealType);
+
+extern MagickPrivate size_t
+  GetOptimalKernelWidth(const double,const double),
+  GetOptimalKernelWidth1D(const double,const double),
+  GetOptimalKernelWidth2D(const double,const double);
+
 extern MagickPrivate void
   ConvertHSBToRGB(const double,const double,const double,Quantum *,Quantum *,
     Quantum *),
diff --git a/MagickCore/gem.c b/MagickCore/gem.c
index 9ac8e133b..3ab4f3f4a 100644
--- a/MagickCore/gem.c
+++ b/MagickCore/gem.c
@@ -605,7 +605,7 @@ MagickExport double ExpandAffine(const AffineMatrix *affine)
 %    o attenuate:  attenuate the noise.
 %
 */
-MagickExport double GenerateDifferentialNoise(RandomInfo *random_info,
+MagickPrivate double GenerateDifferentialNoise(RandomInfo *random_info,
   const Quantum pixel,const NoiseType noise_type,const MagickRealType attenuate)
 {
 #define NoiseEpsilon  (attenuate*1.0e-5)
@@ -747,7 +747,7 @@ MagickExport double GenerateDifferentialNoise(RandomInfo *random_info,
 %    o sigma: the standard deviation of the Gaussian, in pixels.
 %
 */
-MagickExport size_t GetOptimalKernelWidth1D(const double radius,
+MagickPrivate size_t GetOptimalKernelWidth1D(const double radius,
   const double sigma)
 {
   double
@@ -788,7 +788,7 @@ MagickExport size_t GetOptimalKernelWidth1D(const double radius,
   return((size_t) (width-2));
 }
 
-MagickExport size_t GetOptimalKernelWidth2D(const double radius,
+MagickPrivate size_t GetOptimalKernelWidth2D(const double radius,
   const double sigma)
 {
   double
@@ -829,7 +829,7 @@ MagickExport size_t GetOptimalKernelWidth2D(const double radius,
   return((size_t) (width-2));
 }
 
-MagickExport size_t  GetOptimalKernelWidth(const double radius,
+MagickPrivate size_t  GetOptimalKernelWidth(const double radius,
   const double sigma)
 {
   return(GetOptimalKernelWidth1D(radius,sigma));
diff --git a/MagickCore/gem.h b/MagickCore/gem.h
index de71255c3..4519e3e17 100644
--- a/MagickCore/gem.h
+++ b/MagickCore/gem.h
@@ -26,14 +26,7 @@ extern "C" {
 #include <MagickCore/random_.h>
 
 extern MagickExport double
-  ExpandAffine(const AffineMatrix *),
-  GenerateDifferentialNoise(RandomInfo *,const Quantum,const NoiseType,
-    const MagickRealType);
-
-extern MagickExport size_t
-  GetOptimalKernelWidth(const double,const double),
-  GetOptimalKernelWidth1D(const double,const double),
-  GetOptimalKernelWidth2D(const double,const double);
+  ExpandAffine(const AffineMatrix *);
 
 extern MagickExport void
   ConvertHSLToRGB(const double,const double,const double,Quantum *,Quantum *,
diff --git a/MagickCore/image-private.h b/MagickCore/image-private.h
index 49cbfb697..9f9ffd9cb 100644
--- a/MagickCore/image-private.h
+++ b/MagickCore/image-private.h
@@ -30,23 +30,11 @@ extern "C" {
 #define UndefinedTicksPerSecond  100L
 #define UndefinedCompressionQuality  0UL
 
-extern MagickExport const char
+extern MagickPrivate const char
   BackgroundColor[],
   BorderColor[],
-  DefaultTileFrame[],
-  DefaultTileGeometry[],
-  DefaultTileLabel[],
   ForegroundColor[],
-  MatteColor[],
-  LoadImageTag[],
-  LoadImagesTag[],
-  PSDensityGeometry[],
-  PSPageGeometry[],
-  SaveImageTag[],
-  SaveImagesTag[];
-
-extern MagickExport const double
-  DefaultResolution;
+  MatteColor[];
 
 static inline double DegreesToRadians(const double degrees)
 {
diff --git a/MagickCore/image.c b/MagickCore/image.c
index 2bb3af2c9..558f0334e 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -99,23 +99,25 @@
 /*
   Constant declaration.
 */
-const char
+MagickPrivate const char
   BackgroundColor[] = "#ffffff",  /* white */
   BorderColor[] = "#dfdfdf",  /* gray */
+  ForegroundColor[] = "#000",  /* black */
+  MatteColor[] = "#bdbdbd";  /* gray */
+
+MagickExport const char
   DefaultTileFrame[] = "15x15+3+3",
   DefaultTileGeometry[] = "120x120+4+3>",
   DefaultTileLabel[] = "%f\n%G\n%b",
-  ForegroundColor[] = "#000",  /* black */
   LoadImageTag[] = "Load/Image",
   LoadImagesTag[] = "Load/Images",
-  MatteColor[] = "#bdbdbd",  /* gray */
   PSDensityGeometry[] = "72.0x72.0",
   PSPageGeometry[] = "612x792",
   SaveImageTag[] = "Save/Image",
   SaveImagesTag[] = "Save/Images",
   TransparentColor[] = "#00000000";  /* transparent black */
 
-const double
+MagickExport const double
   DefaultResolution = 72.0;
 
 /*
diff --git a/MagickCore/image.h b/MagickCore/image.h
index 705439089..bade5047d 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -479,6 +479,20 @@ struct _ImageInfo
     signature;
 };
 
+extern MagickExport const char
+  DefaultTileFrame[],
+  DefaultTileGeometry[],
+  DefaultTileLabel[],
+  LoadImageTag[],
+  LoadImagesTag[],
+  PSDensityGeometry[],
+  PSPageGeometry[],
+  SaveImageTag[],
+  SaveImagesTag[];
+
+extern MagickExport const double
+  DefaultResolution;
+
 extern MagickExport ExceptionType
   CatchImageException(Image *);
 
diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index dfdce1a59..f3c98311f 100644
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -57,6 +57,7 @@
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/gem.h"
+#include "MagickCore/gem-private.h"
 #include "MagickCore/hashmap.h"
 #include "MagickCore/image.h"
 #include "MagickCore/image-private.h"
diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index 4d9ffeb68..65072d057 100644
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -50,6 +50,7 @@
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/gem.h"
+#include "MagickCore/gem-private.h"
 #include "MagickCore/monitor.h"
 #include "MagickCore/monitor-private.h"
 #include "MagickCore/paint.h"
diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 0335ada5d..db1e25483 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -63,6 +63,7 @@
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/gem.h"
+#include "MagickCore/gem-private.h"
 #include "MagickCore/geometry.h"
 #include "MagickCore/list.h"
 #include "MagickCore/image-private.h"
diff --git a/MagickCore/version.h b/MagickCore/version.h
index c85ce25ce..65c8f0f35 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  5
 #define MagickLibMinInterface  5
-#define MagickReleaseDate  "2011-09-03"
+#define MagickReleaseDate  "2011-09-04"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)