From aa8634f731b35f3924daf3aa1a8eb52d2cba0c44 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 1 Oct 2011 13:25:12 +0000 Subject: [PATCH] --- MagickCore/magick-type.h | 6 +----- MagickCore/pixel.c | 5 ++--- MagickCore/statistic.c | 8 ++++---- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h index de80e2993..eb9ad8c6a 100644 --- a/MagickCore/magick-type.h +++ b/MagickCore/magick-type.h @@ -38,7 +38,6 @@ extern "C" { #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickEpsilon 1.0e-6 -#define MagickHuge 1.0e6 #define MaxColormapSize 256UL #define MaxMap 255UL @@ -54,7 +53,6 @@ typedef unsigned char Quantum; #endif #elif (MAGICKCORE_QUANTUM_DEPTH == 16) #define MagickEpsilon 1.0e-10 -#define MagickHuge 1.0e12 #define MaxColormapSize 65536UL #define MaxMap 65535UL @@ -70,7 +68,6 @@ typedef unsigned short Quantum; #endif #elif (MAGICKCORE_QUANTUM_DEPTH == 32) #define MagickEpsilon 1.0e-10 -#define MagickHuge 1.0e12 #define MaxColormapSize 65536UL #define MaxMap 65535UL @@ -86,7 +83,6 @@ typedef unsigned int Quantum; #endif #elif (MAGICKCORE_QUANTUM_DEPTH == 64) && defined(MAGICKCORE_HAVE_LONG_DOUBLE_WIDER) #define MagickEpsilon 1.0e-10 -#define MagickHuge 1.0e12 #define MaxColormapSize 65536UL #define MaxMap 65535UL @@ -99,7 +95,7 @@ typedef double Quantum; # error "MAGICKCORE_QUANTUM_DEPTH must be one of 8, 16, 32, or 64" #endif #endif -#define MagickMaxFloat 3.402823466E+38F +#define MagickHuge 3.402823466E+38F #define MagickPI 3.14159265358979323846264338327950288419716939937510L #define QuantumScale ((double) 1.0/(double) QuantumRange) diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index b2707086f..9ed61f54b 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -1729,7 +1729,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image, % % % % % % -% G e t M a g i c k P i x e l P a c k e t % +% G e t P i x e l I n f o % % % % % % % @@ -1748,8 +1748,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image, % o pixel: Specifies a pointer to a PixelPacket structure. % */ -MagickExport void GetPixelInfo(const Image *image, - PixelInfo *pixel) +MagickExport void GetPixelInfo(const Image *image,PixelInfo *pixel) { pixel->storage_class=DirectClass; pixel->colorspace=RGBColorspace; diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index b909ba8f4..f9cb703fc 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -1371,8 +1371,8 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima, if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=MagickTrue; - *maxima=(-MagickMaxFloat); - *minima=MagickMaxFloat; + *maxima=(-MagickHuge); + *minima=MagickHuge; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(dynamic) shared(status) omp_throttle(1) @@ -1518,8 +1518,8 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image, for (i=0; i <= (ssize_t) MaxPixelChannels; i++) { channel_statistics[i].depth=1; - channel_statistics[i].maxima=(-MagickMaxFloat); - channel_statistics[i].minima=MagickMaxFloat; + channel_statistics[i].maxima=(-MagickHuge); + channel_statistics[i].minima=MagickHuge; } for (y=0; y < (ssize_t) image->rows; y++) { -- 2.50.1