(no commit message)

diff --git a/coders/gray.c b/coders/gray.c
index e148c2b6ba1044221ef8c5d9fc333054749b5a70..553df01eb596bc61b34bd0adb1afcc3ea7caafff 100644 (file)
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -145,7 +145,7 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
       image=DestroyImageList(image);
       return((Image *) NULL);
     }
-  if (DiscardBlobBytes(image,image->offset) == MagickFalse)
+  if (DiscardBlobBytes(image,(size_t) image->offset) == MagickFalse)
     ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
       image->filename);
   /*

diff --git a/magick/draw.c b/magick/draw.c
index 061d38d773868c7081e91ec48a6b206d1db65d5b..4093d05e69b0d4a9d989856df99d21769ed989e8 100644 (file)
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -5153,8 +5153,8 @@ static void TraceEllipse(PrimitiveInfo *primitive_info,const PointInfo start,
     }
   delta=2.0/MagickMax(stop.x,stop.y);
   step=(MagickRealType) (MagickPI/8.0);
-  if ((delta >= 0.0) && (delta < (MagickPI/8.0)))
-    step=MagickPI/(4*(MagickPI/delta/2+0.5));
+  if ((delta >= 0.0) && (delta < (MagickRealType) (MagickPI/8.0)))
+    step=(MagickRealType) (MagickPI/(4*(MagickPI/delta/2+0.5)));
   angle.x=DegreesToRadians(degrees.x);
   y=degrees.y;
   while (y < degrees.x)

diff --git a/magick/gem.c b/magick/gem.c
index b67fb1da4968fb4b47adb5ea3f16ca480618d560..79858a410281cb8899bc24ec2136585fb6adbce1 100644 (file)
--- a/magick/gem.c
+++ b/magick/gem.c
@@ -641,8 +641,8 @@ MagickExport double GenerateDifferentialNoise(RandomInfo *random_info,
         alpha=1.0;
       beta=GetPseudoRandomValue(random_info);
       gamma=sqrt(-2.0*log(alpha));
-      sigma=gamma*cos(2.0*MagickPI*beta);
-      tau=gamma*sin(2.0*MagickPI*beta);
+      sigma=gamma*cos((double) (2.0*MagickPI*beta));
+      tau=gamma*sin((double) (2.0*MagickPI*beta));
       noise=(double) pixel+sqrt((double) pixel)*SigmaGaussian*sigma+
         TauGaussian*tau;
       break;
@@ -655,7 +655,7 @@ MagickExport double GenerateDifferentialNoise(RandomInfo *random_info,
         sigma=sqrt(-2.0*log(alpha));
       beta=GetPseudoRandomValue(random_info);
       noise=(double) pixel+pixel*SigmaMultiplicativeGaussian*sigma/2.0*
-        cos((2.0*MagickPI*beta));
+        cos((double) (2.0*MagickPI*beta));
       break;
     }
     case ImpulseNoise:
@@ -771,7 +771,7 @@ MagickExport size_t GetOptimalKernelWidth1D(const double radius,
   if (gamma <= MagickEpsilon)
     return(3UL);
   alpha=1.0/(2.0*gamma*gamma);
-  beta=1.0/(MagickSQ2PI*gamma);
+  beta=(double) (1.0/(MagickSQ2PI*gamma));
   for (width=5; ; )
   {
     normalize=0.0;
@@ -811,7 +811,7 @@ MagickExport size_t GetOptimalKernelWidth2D(const double radius,
   if (gamma <= MagickEpsilon)
     return(3UL);
   alpha=1.0/(2.0*gamma*gamma);
-  beta=1.0/(Magick2PI*gamma*gamma);
+  beta=(double) (1.0/(Magick2PI*gamma*gamma));
   for (width=5; ; )
   {
     normalize=0.0;

diff --git a/magick/layer.c b/magick/layer.c
index db92fbd6b6d6476607bcfc69c13c329719a4943d..c507f75ecea67d630cefc92c269a81f8728fff68 100644 (file)
--- a/magick/layer.c
+++ b/magick/layer.c
@@ -1988,9 +1988,9 @@ MagickExport Image *MergeImageLayers(Image *image,
              height += page.y-next->page.y;
              page.y = next->page.y;
         }
-        if ( width < (next->page.x + next->columns - page.x) )
+        if ( (ssize_t) width < (next->page.x + next->columns - page.x) )
            width = (size_t) next->page.x + next->columns - page.x;
-        if ( height < (next->page.y + next->rows - page.y) )
+        if ( (ssize_t) height < (next->page.y + next->rows - page.y) )
            height = (size_t) next->page.y + next->rows - page.y;
       }
       break;
@@ -2015,9 +2015,9 @@ MagickExport Image *MergeImageLayers(Image *image,
         if (method == MosaicLayer) {
           page.x=next->page.x;
           page.y=next->page.y;
-          if ( width < (next->page.x + next->columns) )
+          if ( (ssize_t) width < (next->page.x + next->columns) )
              width = (size_t) next->page.x + next->columns;
-          if ( height < (next->page.y + next->rows) )
+          if ( (ssize_t) height < (next->page.y + next->rows) )
              height = (size_t) next->page.y + next->rows;
         }
       }

diff --git a/magick/log.c b/magick/log.c
index ebef9799977a3ecc64789f83120e6007a5c6fdda..1ecce06e55bacc05af59541449130fb987cd8e11 100644 (file)
--- a/magick/log.c
+++ b/magick/log.c
@@ -1175,7 +1175,7 @@ MagickBooleanType LogMagickEventList(const LogEventType type,const char *module,
       file_info.st_size=0;
       if (log_info->file != (FILE *) NULL)
         (void) fstat(fileno(log_info->file),&file_info);
-      if (file_info.st_size > (off_t) (1024*1024*log_info->limit))
+      if (file_info.st_size > (1024*1024*log_info->limit))
         {
           (void) fprintf(log_info->file,"</log>\n");
           (void) fclose(log_info->file);

diff --git a/magick/mime.c b/magick/mime.c
index 8b7063615cf68af5f4cba1d63fc4644e95c203f6..e0ee2c0c61b28841ebd8c9b79a84e082616660b3 100644 (file)
--- a/magick/mime.c
+++ b/magick/mime.c
@@ -226,7 +226,7 @@ MagickExport const MimeInfo *GetMimeInfo(const char *filename,
         if ((size_t) (p->offset+4) > length)
           break;
         q=magic+p->offset;
-        value=(*q++);
+        value=(ssize_t) (*q++);
         if (p->mask == 0)
           {
             if (p->value == value)
@@ -249,12 +249,12 @@ MagickExport const MimeInfo *GetMimeInfo(const char *filename,
           endian=(*(char *) &lsb_first) == 1 ? LSBEndian : MSBEndian;
         if (endian == LSBEndian)
           {
-            value=(*q++);
+            value=(ssize_t) (*q++);
             value|=(*q++) << 8;
           }
         else
           {
-            value=(*q++) << 8;
+            value=(ssize_t) (*q++) << 8;
             value|=(*q++);
           }
         if (p->mask == 0)
@@ -279,14 +279,14 @@ MagickExport const MimeInfo *GetMimeInfo(const char *filename,
           endian=(*(char *) &lsb_first) == 1 ? LSBEndian : MSBEndian;
         if (endian == LSBEndian)
           {
-            value=(*q++);
+            value=(ssize_t) (*q++);
             value|=(*q++) << 8;
             value|=(*q++) << 16;
             value|=(*q++) << 24;
           }
         else
           {
-            value=(*q++) << 24;
+            value=(ssize_t) (*q++) << 24;
             value|=(*q++) << 16;
             value|=(*q++) << 8;
             value|=(*q++);
@@ -886,12 +886,12 @@ static MagickBooleanType LoadMimeList(const char *xml,const char *filename,
         }
         token=DestroyString(token);
         if (mime_info->data_type != StringData)
-          mime_info->value=(size_t) strtoul((char *) mime_info->magic,
+          mime_info->value=(ssize_t) strtoul((char *) mime_info->magic,
             (char **) NULL,0);
       }
     attribute=GetXMLTreeAttribute(mime,"mask");
     if (attribute != (const char *) NULL)
-      mime_info->mask=(size_t) strtoul(attribute,(char **) NULL,0);
+      mime_info->mask=(ssize_t) strtoul(attribute,(char **) NULL,0);
     attribute=GetXMLTreeAttribute(mime,"offset");
     if (attribute != (const char *) NULL)
       {

diff --git a/magick/morphology.c b/magick/morphology.c
index 7b7c3229f61a1bdb19306e8830fab8402ddc8534..7b1528afc0a6a50810e49f8f82dcc1feaceb7967 100644 (file)
--- a/magick/morphology.c
+++ b/magick/morphology.c
@@ -1036,7 +1036,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
           { /* Calculate a Gaussian,  OR positive half of a DoG */
             if ( sigma > MagickEpsilon )
               { A = 1.0/(2.0*sigma*sigma);  /* simplify loop expressions */
-                B = 1.0/(Magick2PI*sigma*sigma);
+                B = (double) (1.0/(Magick2PI*sigma*sigma));
                 for ( i=0, v=-kernel->y; v <= (ssize_t)kernel->y; v++)
                   for ( u=-kernel->x; u <= (ssize_t)kernel->x; u++, i++)
                       kernel->values[i] = exp(-((double)(u*u+v*v))*A)*B;
@@ -1053,7 +1053,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             if ( sigma2 > MagickEpsilon )
               { sigma = sigma2;                /* simplify loop expressions */
                 A = 1.0/(2.0*sigma*sigma);
-                B = 1.0/(Magick2PI*sigma*sigma);
+                B = (double) (1.0/(Magick2PI*sigma*sigma));
                 for ( i=0, v=-kernel->y; v <= (ssize_t)kernel->y; v++)
                   for ( u=-kernel->x; u <= (ssize_t)kernel->x; u++, i++)
                     kernel->values[i] -= exp(-((double)(u*u+v*v))*A)*B;
@@ -1066,7 +1066,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
           { /* Calculate a Laplacian of a Gaussian - Or Mexician Hat */
             if ( sigma > MagickEpsilon )
               { A = 1.0/(2.0*sigma*sigma);  /* simplify loop expressions */
-                B = 1.0/(MagickPI*sigma*sigma*sigma*sigma);
+                B = (double) (1.0/(MagickPI*sigma*sigma*sigma*sigma));
                 for ( i=0, v=-kernel->y; v <= (ssize_t)kernel->y; v++)
                   for ( u=-kernel->x; u <= (ssize_t)kernel->x; u++, i++)
                     { R = ((double)(u*u+v*v))*A;
@@ -1139,7 +1139,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
         if ( sigma > MagickEpsilon )
           { sigma *= KernelRank;               /* simplify loop expressions */
             alpha = 1.0/(2.0*sigma*sigma);
-            beta= 1.0/(MagickSQ2PI*sigma );
+            beta= (double) (1.0/(MagickSQ2PI*sigma ));
             for ( u=-v; u <= v; u++) {
               kernel->values[(u+v)/KernelRank] +=
                               exp(-((double)(u*u))*alpha)*beta;
@@ -1411,7 +1411,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             kernel->values[3] = +MagickSQ2;
             kernel->values[5] = -MagickSQ2;
             CalcKernelMetaData(kernel);     /* recalculate meta-data */
-            ScaleKernelInfo(kernel, 1.0/2.0*MagickSQ2, NoValue);
+            ScaleKernelInfo(kernel, (double) (1.0/2.0*MagickSQ2), NoValue);
             break;
           case 12:
             kernel=ParseKernelArray("3: 1,2,1  0,0,0  1,2,1");
@@ -1421,7 +1421,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             kernel->values[1] = +MagickSQ2;
             kernel->values[7] = +MagickSQ2;
             CalcKernelMetaData(kernel);
-            ScaleKernelInfo(kernel, 1.0/2.0*MagickSQ2, NoValue);
+            ScaleKernelInfo(kernel, (double) (1.0/2.0*MagickSQ2), NoValue);
             break;
           case 13:
             kernel=ParseKernelArray("3: 2,-1,0  -1,0,1  0,1,-2");
@@ -1431,7 +1431,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             kernel->values[0] = +MagickSQ2;
             kernel->values[8] = -MagickSQ2;
             CalcKernelMetaData(kernel);
-            ScaleKernelInfo(kernel, 1.0/2.0*MagickSQ2, NoValue);
+            ScaleKernelInfo(kernel, (double) (1.0/2.0*MagickSQ2), NoValue);
             break;
           case 14:
             kernel=ParseKernelArray("3: 0,1,-2  -1,0,1  2,-1,0");
@@ -1441,7 +1441,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             kernel->values[2] = -MagickSQ2;
             kernel->values[6] = +MagickSQ2;
             CalcKernelMetaData(kernel);
-            ScaleKernelInfo(kernel, 1.0/2.0*MagickSQ2, NoValue);
+            ScaleKernelInfo(kernel, (double) (1.0/2.0*MagickSQ2), NoValue);
             break;
           case 15:
             kernel=ParseKernelArray("3: 0,-1,0  1,0,1  0,-1,0");
@@ -2490,7 +2490,7 @@ static size_t MorphologyPrimitive(const Image *image, Image
       register ssize_t
         y;
 
-      size_t
+      ssize_t
         r;
 
       if (status == MagickFalse)

diff --git a/magick/property.c b/magick/property.c
index f88e7f3d7b2ca50f96fbf680ca1e9d71181ea301..91b89cbd420fcd74cf04ec3cea7e6d410a82e3c7 100644 (file)
--- a/magick/property.c
+++ b/magick/property.c
@@ -616,7 +616,7 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key)
       }
     if ((count & 0x01) == 0)
       (void) ReadPropertyByte(&info,&length);
-    count=(int) ReadPropertyMSBLong(&info,&length);
+    count=(ssize_t) ((int) ReadPropertyMSBLong(&info,&length));
     if ((*name != '\0') && (*name != '#'))
       if ((resource == (char *) NULL) || (LocaleCompare(name,resource) != 0))
         {
@@ -1239,7 +1239,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
   /*
     This the offset to the first IFD.
   */
-  offset=(int) ReadPropertyLong(endian,exif+4);
+  offset=(ssize_t) ((int) ReadPropertyLong(endian,exif+4));
   if ((size_t) offset >= length)
     return(MagickFalse);
   /*
@@ -1285,7 +1285,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
       format=(size_t) ReadPropertyShort(endian,q+2);
       if (format >= (sizeof(tag_bytes)/sizeof(*tag_bytes)))
         break;
-      components=(int) ReadPropertyLong(endian,q+4);
+      components=(ssize_t) ((int) ReadPropertyLong(endian,q+4));
       number_bytes=(size_t) components*tag_bytes[format];
       if (number_bytes <= 4)
         p=q+8;
@@ -1297,7 +1297,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
           /*
             The directory entry contains an offset.
           */
-          offset=(int) ReadPropertyLong(endian,q+8);
+          offset=(ssize_t) ((int) ReadPropertyLong(endian,q+8));
           if ((size_t) (offset+number_bytes) > length)
             continue;
           p=(unsigned char *) (exif+offset);

diff --git a/magick/quantum.c b/magick/quantum.c
index e245d56d99684974105c8373189de8c2acbda46e..7a2e670103643d8a2b54d78cbf15d29e4db938f6 100644 (file)
--- a/magick/quantum.c
+++ b/magick/quantum.c
@@ -256,7 +256,7 @@ static void DestroyQuantumPixels(QuantumInfo *quantum_info)
   assert(quantum_info != (QuantumInfo *) NULL);
   assert(quantum_info->signature == MagickSignature);
   assert(quantum_info->pixels != (unsigned char **) NULL);
-  extent=quantum_info->extent;
+  extent=(ssize_t) quantum_info->extent;
   for (i=0; i < (ssize_t) quantum_info->number_threads; i++)
     if (quantum_info->pixels[i] != (unsigned char *) NULL)
       {

diff --git a/magick/resource.c b/magick/resource.c
index 9abcce171d8f108ea422c8970867d296e7266b2f..c99fd26edc70633002091257eeb891994218e2df 100644 (file)
--- a/magick/resource.c
+++ b/magick/resource.c
@@ -1064,7 +1064,8 @@ MagickExport void ResourceComponentTerminus(void)
 %
 */
 
-static inline size_t MagickMin(const MagickSizeType x,const MagickSizeType y)
+static inline MagickSizeType MagickMin(const MagickSizeType x,
+  const MagickSizeType y)
 {
   if (x < y)
     return(x);

diff --git a/magick/threshold.c b/magick/threshold.c
index ddbda79835fcd43780526ebf11ae8e0567ed9ba3..071c2d9ff9decfd5cd511c087a4b8b85b7f2e122 100644 (file)
--- a/magick/threshold.c
+++ b/magick/threshold.c
@@ -992,7 +992,7 @@ MagickExport ThresholdMap *GetThresholdMapFile(const char *xml,
     map = DestroyThresholdMap(map);
     return(map);
   }
-  map->divisor = StringToLong(attr);
+  map->divisor = (ssize_t) StringToLong(attr);
   if ( map->divisor < 2 ) {
     (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
       "XmlInvalidAttribute", "<levels divisor>, map \"%s\"", map_id);
@@ -1538,32 +1538,32 @@ printf("DEBUG levels  r=%u g=%u b=%u a=%u i=%u\n",
         if (levels.red) {
           t = (ssize_t) (QuantumScale*q->red*(levels.red*d+1.0));
           l = t/d;  t = t-l*d;
-          q->red=RoundToQuantum((l+(t >= threshold))*(double) QuantumRange/
-            levels.red);
+          q->red=RoundToQuantum((MagickRealType) ((l+(t >= threshold))*
+            (MagickRealType) QuantumRange/levels.red));
         }
         if (levels.green) {
           t = (ssize_t) (QuantumScale*q->green*(levels.green*d+1.0));
           l = t/d;  t = t-l*d;
-          q->green=RoundToQuantum((l+(t >= threshold))*(double) QuantumRange/
-            levels.green);
+          q->green=RoundToQuantum((MagickRealType) ((l+(t >= threshold))*
+            (MagickRealType) QuantumRange/levels.green));
         }
         if (levels.blue) {
           t = (ssize_t) (QuantumScale*q->blue*(levels.blue*d+1.0));
           l = t/d;  t = t-l*d;
-          q->blue=RoundToQuantum((l+(t >= threshold))*(double) QuantumRange/
-            levels.blue);
+          q->blue=RoundToQuantum((MagickRealType) ((l+(t >= threshold))*
+            (MagickRealType) QuantumRange/levels.blue));
         }
         if (levels.opacity) {
           t = (ssize_t) ((1.0-QuantumScale*q->opacity)*(levels.opacity*d+.01));
           l = t/d;  t = t-l*d;
-          q->opacity=RoundToQuantum((1.0-l-(t >= threshold))*(double)
-            QuantumRange/levels.opacity);
+          q->opacity=RoundToQuantum((MagickRealType) ((1.0-l-(t >= threshold))*
+            (MagickRealType) QuantumRange/levels.opacity));
         }
         if (levels.index) {
           t = (ssize_t) (QuantumScale*indexes[x]*(levels.index*d+1.0));
           l = t/d;  t = t-l*d;
-          indexes[x]=(IndexPacket) RoundToQuantum((l+(t>=threshold))*(double)
-            QuantumRange/levels.index);
+          indexes[x]=(IndexPacket) RoundToQuantum((MagickRealType) ((l+
+            (t>=threshold))*(MagickRealType) QuantumRange/levels.index));
         }
         q++;
       }

diff --git a/magick/token.c b/magick/token.c
index 23377e3e92fd1109983f0e702617419b98f7900c..341e5f10e3b77cd5823a06d8e62417b68f1ec99c 100644 (file)
--- a/magick/token.c
+++ b/magick/token.c
@@ -388,7 +388,7 @@ MagickExport MagickBooleanType GlobExpression(const char *expression,
       }
       case '[':
       {
-        ssize_t
+        int
           c;
 
         pattern+=GetUTFOctets(pattern);

diff --git a/magick/xml-tree.c b/magick/xml-tree.c
index 3f6aaa28fb25ad34ddeacb06d962f2b93f34ec5c..a334f07cd1b80691d5a0c72017d3e617f2e98f4c 100644 (file)
--- a/magick/xml-tree.c
+++ b/magick/xml-tree.c
@@ -246,7 +246,7 @@ MagickExport XMLTreeInfo *AddPathToXMLTree(XMLTreeInfo *xml_info,
     node=child;
     if (node == (XMLTreeInfo *) NULL)
       break;
-    for (j=StringToLong(subnode)-1; j > 0; j--)
+    for (j=(ssize_t) StringToLong(subnode)-1; j > 0; j--)
     {
       node=GetXMLTreeOrdered(node);
       if (node == (XMLTreeInfo *) NULL)
@@ -835,7 +835,7 @@ MagickExport XMLTreeInfo *GetXMLTreePath(XMLTreeInfo *xml_info,const char *path)
     node=GetXMLTreeChild(node,tag);
     if (node == (XMLTreeInfo *) NULL)
       break;
-    for (j=StringToLong(subnode)-1; j > 0; j--)
+    for (j=(ssize_t) StringToLong(subnode)-1; j > 0; j--)
     {
       node=GetXMLTreeOrdered(node);
       if (node == (XMLTreeInfo *) NULL)