(no commit message)

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 900bd3717c421fb2209e15458e5be36a9a63da04..e11512fa79b0718f17ab86d78f90d0513404d460 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -2108,7 +2108,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info,
     *p;
 
   *beta=0.0;
-  if (exception->severity != UndefinedException)
+  if (exception->severity >= ErrorException)
     return(0.0);
   while (isspace((int) ((unsigned char) *expression)) != 0)
     expression++;
@@ -2152,9 +2152,8 @@ static double FxEvaluateSubexpression(FxInfo *fx_info,
           *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
           if (*beta == 0.0)
             {
-              if (exception->severity == UndefinedException)
-                (void) ThrowMagickException(exception,GetMagickModule(),
-                  OptionError,"DivideByZero","`%s'",expression);
+              (void) ThrowMagickException(exception,GetMagickModule(),
+                OptionError,"DivideByZero","`%s'",expression);
               return(0.0);
             }
           return(alpha/(*beta));

diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index cb363d444a8de31f03480b8b3bfbddf063f0029a..400f4fd3b8e0109680e5124e4500ae06c3714bd6 100644 (file)
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -1771,32 +1771,30 @@ static inline unsigned short ReadProfileShort(const EndianType endian,
   return((unsigned short) (value & 0xffff));
 }
 
-static inline size_t ReadProfileLong(const EndianType endian,
+static inline unsigned int ReadProfileLong(const EndianType endian,
   unsigned char *buffer)
 {
-  size_t
+  unsigned int
     value;
 
   if (endian == LSBEndian)
     {
-      value=(size_t) ((buffer[3] << 24) | (buffer[2] << 16) |
+      value=(unsigned int) ((buffer[3] << 24) | (buffer[2] << 16) |
         (buffer[1] << 8 ) | (buffer[0]));
-      return((size_t) (value & 0xffffffff));
+      return((unsigned int) (value & 0xffffffff));
     }
-  value=(size_t) ((buffer[0] << 24) | (buffer[1] << 16) |
+  value=(unsigned int) ((buffer[0] << 24) | (buffer[1] << 16) |
     (buffer[2] << 8) | buffer[3]);
-  return((size_t) (value & 0xffffffff));
+  return((unsigned int) (value & 0xffffffff));
 }
 
-static inline size_t ReadProfileMSBLong(unsigned char **p,
-  size_t *length)
+static inline unsigned int ReadProfileMSBLong(unsigned char **p,size_t *length)
 {
-  size_t
+  unsigned int
     value;
 
   if (*length < 4)
     return(0);
-
   value=ReadProfileLong(MSBEndian,*p);
   (*length)-=4;
   *p+=4;
@@ -1811,7 +1809,6 @@ static inline unsigned short ReadProfileMSBShort(unsigned char **p,
 
   if (*length < 2)
     return(0);
-
   value=ReadProfileShort(MSBEndian,*p);
   (*length)-=2;
   *p+=2;
@@ -1861,9 +1858,11 @@ static void WriteProfileShort(const EndianType endian,
 static MagickBooleanType Sync8BimProfile(Image *image,StringInfo *profile)
 {
   size_t
-    count,
     length;
 
+  ssize_t
+    count;
+
   unsigned char
     *p;
 
@@ -1872,7 +1871,7 @@ static MagickBooleanType Sync8BimProfile(Image *image,StringInfo *profile)
 
   length=GetStringInfoLength(profile);
   p=GetStringInfoDatum(profile);
-  while(length != 0)
+  while (length != 0)
   {
     if (ReadProfileByte(&p,&length) != 0x38)
       continue;
@@ -1885,16 +1884,16 @@ static MagickBooleanType Sync8BimProfile(Image *image,StringInfo *profile)
     if (length < 7)
       return(MagickFalse);
     id=ReadProfileMSBShort(&p,&length);
-    count=ReadProfileByte(&p,&length);
+    count=(ssize_t) ReadProfileByte(&p,&length);
     if (count > length)
       return(MagickFalse);
     p+=count;
     if ((*p & 0x01) == 0)
-      p++;
-    count=ReadProfileMSBLong(&p,&length);
+      (void) ReadProfileByte(&p,&length);
+    count=(ssize_t) ReadProfileMSBLong(&p,&length);
     if (count > length)
       return(MagickFalse);
-    if (id == 0x3ED && count == 16)
+    if ((id == 0x3ED) && (count == 16))
       {
         if (image->units == PixelsPerCentimeterResolution)
           WriteProfileLong(MSBEndian, (unsigned int) (image->resolution.x*2.54*

diff --git a/MagickCore/static.c b/MagickCore/static.c
index eb6170626acb648dcd83752e1431a91d9f15fc28..6f189d0550bf336390b8af091a3be87c33217a16 100644 (file)
--- a/MagickCore/static.c
+++ b/MagickCore/static.c
@@ -284,6 +284,7 @@ MagickExport void RegisterStaticModules(void)
   (void) RegisterSCTImage();
   (void) RegisterSFWImage();
   (void) RegisterSGIImage();
+  (void) RegisterSIXELImage();
   (void) RegisterSTEGANOImage();
   (void) RegisterSUNImage();
   (void) RegisterSVGImage();
@@ -465,6 +466,7 @@ MagickExport void UnregisterStaticModules(void)
   UnregisterSCTImage();
   UnregisterSFWImage();
   UnregisterSGIImage();
+  UnregisterSIXELImage();
   UnregisterSTEGANOImage();
   UnregisterSUNImage();
   UnregisterSVGImage();

diff --git a/MagickCore/static.h b/MagickCore/static.h
index 48443fd6b97bd005e2d0d0de3b37667f505cde88..8d982698aa1b66fa4b27f8b1f19ad10fabe75a36 100644 (file)
--- a/MagickCore/static.h
+++ b/MagickCore/static.h
@@ -151,6 +151,7 @@ extern ModuleExport size_t
   RegisterSFWImage(void),
   RegisterSGIImage(void),
   RegisterSHTMLImage(void),
+  RegisterSIXELImage(void),
   RegisterSTEGANOImage(void),
   RegisterSUNImage(void),
   RegisterSVGImage(void),
@@ -313,6 +314,7 @@ extern ModuleExport void
   UnregisterSFWImage(void),
   UnregisterSGIImage(void),
   UnregisterSHTMLImage(void),
+  UnregisterSIXELImage(void),
   UnregisterSTEGANOImage(void),
   UnregisterSUNImage(void),
   UnregisterSVGImage(void),