]> granicus.if.org Git - imagemagick/commitdiff
Silenced warnings.
authordirk <dirk@git.imagemagick.org>
Mon, 19 Sep 2016 20:49:38 +0000 (22:49 +0200)
committerdirk <dirk@git.imagemagick.org>
Mon, 19 Sep 2016 20:49:38 +0000 (22:49 +0200)
MagickCore/annotate.c
MagickCore/identify.c
coders/flif.c
coders/mat.c
coders/psd.c
coders/svg.c

index a7933fbf7486adbed9542e0fad5f8b59e92d4ec3..c43f91496d353e0946f90af88a5ec58df222bcee 100644 (file)
@@ -1393,12 +1393,12 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
         geometry_info;
 
       MagickStatusType
-        flags;
+        geometry_flags;
 
-      flags=ParseGeometry(draw_info->density,&geometry_info);
+      geometry_flags=ParseGeometry(draw_info->density,&geometry_info);
       resolution.x=geometry_info.rho;
       resolution.y=geometry_info.sigma;
-      if ((flags & SigmaValue) == 0)
+      if ((geometry_flags & SigmaValue) == 0)
         resolution.y=resolution.x;
     }
   ft_status=FT_Set_Char_Size(face,(FT_F26Dot6) (64.0*draw_info->pointsize),
index 6cd4528b950fd0747d0075f8ddfb53c55459ff63..9f8ed5affdc1f5815d930152157ab6be829b650b 100644 (file)
@@ -401,6 +401,7 @@ static ssize_t PrintChannelPerceptualHash(Image *image,FILE *file,
       (void) FormatLocaleFile(file,", ");
   }
   (void) FormatLocaleFile(file,"\n");
+  n=0;
   for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
   {
     register ssize_t
index 9082f0845b63fee703884bc412d2cad8b5414faf..23314753bd96a653645579727475b64694d59096 100644 (file)
@@ -167,7 +167,7 @@ static Image *ReadFLIFImage(const ImageInfo *image_info,
     ThrowReaderException(CorruptImageError,"InsufficientImageDataInFile");
   flifdec=flif_create_decoder();
   if (image_info->quality != UndefinedCompressionQuality)
-    flif_decoder_set_quality(flifdec,image_info->quality);
+    flif_decoder_set_quality(flifdec,(int32_t) image_info->quality);
   if (!flif_decoder_decode_memory(flifdec,stream,length))
     {
       flif_destroy_decoder(flifdec);
@@ -431,7 +431,7 @@ static MagickBooleanType WriteFLIFImage(const ImageInfo *image_info,
     return(status);
   flifenc=flif_create_encoder();
   if (image_info->quality != UndefinedCompressionQuality)
-    flif_encoder_set_lossy(flifenc,3*(100-image_info->quality));
+    flif_encoder_set_lossy(flifenc,3*(100-(int32_t) image_info->quality));
 
   /* relatively fast encoding */
   flif_encoder_set_learn_repeat(flifenc,1);
@@ -443,12 +443,14 @@ static MagickBooleanType WriteFLIFImage(const ImageInfo *image_info,
   /* Convert image to FLIFIMAGE */
   if (image->depth > 8)
     {
-      flifimage=flif_create_image_HDR(image->columns,image->rows);
+      flifimage=flif_create_image_HDR((uint32_t) image->columns,
+        (uint32_t) image->rows);
       length=sizeof(unsigned short)*4*image->columns;
     }
   else
     {
-      flifimage=flif_create_image(image->columns,image->rows);
+      flifimage=flif_create_image((uint32_t) image->columns,
+        (uint32_t) image->rows);
       length=sizeof(unsigned char)*4*image->columns;
     }
   if (flifimage == (FLIF_IMAGE *) NULL)
@@ -506,7 +508,7 @@ static MagickBooleanType WriteFLIFImage(const ImageInfo *image_info,
           flif_image_write_row_RGBA8(flifimage,y,pixels,length);
         }
     }
-    flif_image_set_frame_delay(flifimage,image->delay*100/
+    flif_image_set_frame_delay(flifimage,(uint32_t) image->delay*100/
       image->ticks_per_second);
     flif_encoder_add_image(flifenc,flifimage);
     if (GetNextImageInList(image) == (Image *) NULL)
index 515fc58290f5aacda12a7f5e25534fcc29e0a343..5d4f07644650bb1b2a2a404f149c4dca8d0ac3f8 100644 (file)
@@ -731,7 +731,7 @@ static Image *ReadMATImageV4(const ImageInfo *image_info,Image *image,
     (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
       GrayQuantum,pixels,exception);
     if ((HDR.Type[1] == 2) || (HDR.Type[1] == 3))
-      FixSignedValues(image,q,image->columns);
+      FixSignedValues(image,q,(int) image->columns);
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
     if (image->previous == (Image *) NULL)
index a1df5102023231fcff50911fe4d813b341fea929..b425a5a356949e3018010c5864b15080bf04bbbe 100644 (file)
@@ -3252,8 +3252,10 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,
         size+=WriteBlobMSBLong(image,20);
         size+=WriteBlobMSBSignedLong(image,mask->page.y);
         size+=WriteBlobMSBSignedLong(image,mask->page.x);
-        size+=WriteBlobMSBLong(image,mask->rows+mask->page.y);
-        size+=WriteBlobMSBLong(image,mask->columns+mask->page.x);
+        size+=WriteBlobMSBLong(image,(const unsigned int) mask->rows+
+          mask->page.y);
+        size+=WriteBlobMSBLong(image,(const unsigned int) mask->columns+
+          mask->page.x);
         size+=WriteBlobByte(image,default_color);
         size+=WriteBlobByte(image,mask->compose == NoCompositeOp ? 2 : 0);
         size+=WriteBlobMSBShort(image,0);
index 30cc15c28180f252f4acd182a03ac6c111b8d45d..727a2556393954e529a2b39b3909d8b9c8aa610f 100644 (file)
@@ -437,7 +437,7 @@ static char **GetTransformTokens(void *context,const char *text,
   {
     if ((*q != '(') && (*q != ')') && (*q != '\0'))
       continue;
-    if (i == extent)
+    if (i == (ssize_t) extent)
       {
         extent<<=1;
         tokens=(char **) ResizeQuantumMemory(tokens,extent+2,sizeof(*tokens));