Eliminate C++ compiler warnings

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 5131918477393c61ff3e14a2c5c7da608062ebaa..fdaedf3611d40293d9b0989f6936dec068c556a7 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -3443,7 +3443,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
                   (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
                     message);
                 }
-              return(status);
+              return(status == 0 ? MagickFalse : MagickTrue);
             }
         }
       RelinquishMagickResource(MemoryResource,cache_info->length);
@@ -3505,7 +3505,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
                   (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
                     message);
                 }
-              return(status);
+              return(status == 0 ? MagickFalse : MagickTrue);
             }
         }
       RelinquishMagickResource(DiskResource,cache_info->length);
@@ -3590,7 +3590,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
                   (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
                     message);
                 }
-              return(status);
+              return(status == 0 ? MagickFalse : MagickTrue);
             }
         }
       RelinquishMagickResource(MapResource,cache_info->length);
@@ -3614,7 +3614,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
         cache_info->number_channels,format);
       (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);
     }
-  return(status);
+  return(status == 0 ? MagickFalse : MagickTrue);
 }
 \f
 /*

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index ff0812ec5c7d481fb14db1353707792b6ddbcbd4..38a95287181b9591b2bace02a37b5bf189e3c38d 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -5893,10 +5893,13 @@ MagickExport Image *WaveletDenoiseImage(const Image *image,
     PixelChannel
       pixel_channel;
 
+    PixelTrait
+      traits;
 
     if (status == MagickFalse)
       continue;
-    if (GetPixelChannelTraits(image,channel) == UndefinedPixelTrait)
+    traits=GetPixelChannelTraits(image,(PixelChannel) channel);
+    if (traits == UndefinedPixelTrait)
       continue;
     pixel_channel=GetPixelChannelChannel(image,channel);
     if ((pixel_channel != RedPixelChannel) &&

diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c
index ee8fee92d37b8c9a23b8ade8a7afc1c5ae6e119d..91911a71745d55c608ce08b8866e4d111e15afb1 100644 (file)
--- a/MagickCore/geometry.c
+++ b/MagickCore/geometry.c
@@ -358,7 +358,7 @@ MagickExport char *GetPageGeometry(const char *page_geometry)
     size_t
       extent;
 
-    char
+    const char
       *geometry;
   } PageInfo;
 
@@ -451,7 +451,7 @@ MagickExport char *GetPageGeometry(const char *page_geometry)
   assert(page_geometry != (char *) NULL);
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",page_geometry);
   CopyMagickMemory(page,page_geometry,MaxTextExtent);
-  for (i=0; i < (sizeof(PageSizes)/sizeof(PageSizes[0])); i++)
+  for (i=0; i < (ssize_t) (sizeof(PageSizes)/sizeof(PageSizes[0])); i++)
   {
     int
       status;

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 55ae36d7d98a8550520ed66083e32bbc2fb3234a..8bcd1898f6612a8a77deb5234466859f319a9c60 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -1538,7 +1538,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
                   {
                     if (EXIFTag[i].tag == 0)
                       break;
-                    if ((ssize_t) EXIFTag[i].tag == tag_value)
+                    if (EXIFTag[i].tag == tag_value)
                       {
                         description=EXIFTag[i].description;
                         break;

diff --git a/MagickCore/static.c b/MagickCore/static.c
index 0dfc567a5df2660ffe6129e784a44b0e6ae852a3..1d76bebe73060f026749e0655471d9933a73d3b6 100644 (file)
--- a/MagickCore/static.c
+++ b/MagickCore/static.c
@@ -322,7 +322,9 @@ MagickExport void RegisterStaticModules(void)
   (void) RegisterXCFImage();
   (void) RegisterXPMImage();
   (void) RegisterXPSImage();
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
   (void) RegisterXTRNImage();
+#endif
 #if defined(MAGICKCORE_X11_DELEGATE)
   (void) RegisterXWDImage();
 #endif
@@ -507,7 +509,9 @@ MagickExport void UnregisterStaticModules(void)
   UnregisterXCFImage();
   UnregisterXPMImage();
   UnregisterXPSImage();
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
   UnregisterXTRNImage();
+#endif
 #if defined(MAGICKCORE_X11_DELEGATE)
   UnregisterXWDImage();
 #endif

diff --git a/MagickCore/token.c b/MagickCore/token.c
index 80004e2101bc2f0442672ec4757be6471ee44a56..cb554498533dcf70010e93cde89d66ebd0ad98fb 100644 (file)
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -217,17 +217,17 @@ MagickExport void GetNextToken(const char *start,const char **end,
               p++;
               break;
             }
-        if (i < (extent-1))
+        if (i < (ssize_t) (extent-1))
           token[i++]=(*p);
       }
       break;
     }
     case '/':
     {
-      if (i < (extent-1))
+      if (i < (ssize_t) (extent-1))
         token[i++]=(*p++);
       if ((*p == '>') || (*p == '/'))
-        if (i < (extent-1))
+        if (i < (ssize_t) (extent-1))
           token[i++]=(*p++);
       break;
     }
@@ -241,17 +241,17 @@ MagickExport void GetNextToken(const char *start,const char **end,
       if ((p != q) && (*p != ','))
         {
           for ( ; (p < q) && (*p != ','); p++)
-            if (i < (extent-1))
+            if (i < (ssize_t) (extent-1))
               token[i++]=(*p);
           if (*p == '%')
-            if (i < (extent-1))
+            if (i < (ssize_t) (extent-1))
               token[i++]=(*p++);
           break;
         }
       if ((*p != '\0') && (isalpha((int) ((unsigned char) *p)) == 0) &&
           (*p != *DirectorySeparator) && (*p != '#') && (*p != '<'))
         {
-          if (i < (extent-1))
+          if (i < (ssize_t) (extent-1))
             token[i++]=(*p++);
           break;
         }
@@ -262,14 +262,14 @@ MagickExport void GetNextToken(const char *start,const char **end,
           break;
         if ((i > 0) && (*p == '<'))
           break;
-        if (i < (extent-1))
+        if (i < (ssize_t) (extent-1))
           token[i++]=(*p);
         if (*p == '>')
           break;
         if (*p == '(')
           for (p++; *p != '\0'; p++)
           {
-            if (i < (extent-1))
+            if (i < (ssize_t) (extent-1))
               token[i++]=(*p);
             if ((*p == ')') && (*(p-1) != '\\'))
               break;

diff --git a/MagickCore/transform-private.h b/MagickCore/transform-private.h
index 6af1726348f1ff712335c01f5957e7a6acccaab3..5986d7673f4be6a2328de2f0aa1551db644d453d 100644 (file)
--- a/MagickCore/transform-private.h
+++ b/MagickCore/transform-private.h
@@ -22,8 +22,8 @@
 extern "C" {
 #endif
 
-  extern MagickPrivate MagickBooleanType
-    TransformImage(Image **, const char *, const char *, ExceptionInfo *);
+extern MagickPrivate MagickBooleanType
+  TransformImage(Image **,const char *,const char *,ExceptionInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/coders/mat.c b/coders/mat.c
index 7987dd0e844a3d1ace8ac2deb7495743a919c5b4..515fc58290f5aacda12a7f5e25534fcc29e0a343 100644 (file)
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -617,6 +617,7 @@ static Image *ReadMATImageV4(const ImageInfo *image_info,Image *image,
     i;
 
   ssize_t
+    count,
     y;
 
   unsigned char
@@ -721,8 +722,8 @@ static Image *ReadMATImageV4(const ImageInfo *image_info,Image *image,
     register Quantum
       *magick_restrict q;
 
-    status=ReadBlob(image,depth/8*image->columns,(char *) pixels);
-    if (status == -1)
+    count=ReadBlob(image,depth/8*image->columns,(char *) pixels);
+    if (count == -1)
       break;
     q=QueueAuthenticPixels(image,0,image->rows-y-1,image->columns,1,exception);
     if (q == (Quantum *) NULL)
@@ -744,9 +745,6 @@ static Image *ReadMATImageV4(const ImageInfo *image_info,Image *image,
   if (HDR.imagf == 1)
     for (y=0; y < (ssize_t) image->rows; y++)
     {
-      ssize_t
-        count;
-
       /*
         Read complex pixels.
       */

diff --git a/coders/meta.c b/coders/meta.c
index 060d235319506ef4e1945a2d6f0a8b3f170d37f2..baba221d60cc9fabcd7a3719219a355441d2dfcf 100644 (file)
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -143,7 +143,7 @@ static MagickBooleanType IsMETA(const unsigned char *magick,const size_t length)
 
 typedef struct _html_code
 {
-  const short
+  const short int
     len;
 
   const char
@@ -225,7 +225,7 @@ static size_t convertHTMLcodes(char *s, const size_t len)
       codes=sizeof(html_codes)/sizeof(html_code);
       for (i=0; i < codes; i++)
       {
-        if (html_codes[i].len <= len)
+        if (html_codes[i].len <= (ssize_t) len)
           if (stringnicmp(s, html_codes[i].code,(size_t) (html_codes[i].len)) == 0)
             {
               (void) memmove(s+1,s+html_codes[i].len,

diff --git a/coders/viff.c b/coders/viff.c
index ce00f4ec2b53f92fadeb49c5e48029226e60ad7e..6ce2fa93f01617c8386525cefbb7b2d1a0c93bc0 100644 (file)
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -57,6 +57,7 @@
 #include "MagickCore/list.h"
 #include "MagickCore/magick.h"
 #include "MagickCore/memory_.h"
+#include "MagickCore/memory-private.h"
 #include "MagickCore/monitor.h"
 #include "MagickCore/monitor-private.h"
 #include "MagickCore/pixel-accessor.h"

diff --git a/coders/xtrn.c b/coders/xtrn.c
index f37387252e6224af0004d4e826438aaa8211abf3..d07f93cc72cb24d5c59f6e866c2a70bb11a22bf5 100644 (file)
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -69,7 +69,7 @@
 #include "MagickCore/MagickCore.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/string_.h"
-#if defined(_VISUALC_)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
 #define WIN32_LEAN_AND_MEAN
 #define VC_EXTRALEAN
 #include <windows.h>
@@ -109,7 +109,7 @@ static MagickBooleanType
 %    o exception: return any errors or warnings in this structure.
 %
 */
-#if defined(_VISUALC_)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
 #  pragma warning(disable : 4477)
 static Image *ReadXTRNImage(const ImageInfo *image_info,
   ExceptionInfo *exception)
@@ -260,7 +260,7 @@ ModuleExport size_t RegisterXTRNImage(void)
     *entry;
 
   entry=AcquireMagickInfo("XTRN","XTRNFILE","External transfer of a file");
-#if defined(_VISUALC_)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
   entry->decoder=ReadXTRNImage;
   entry->encoder=WriteXTRNImage;
 #endif
@@ -269,7 +269,7 @@ ModuleExport size_t RegisterXTRNImage(void)
   RegisterMagickInfo(entry);
   entry=AcquireMagickInfo("XTRN","XTRNIMAGE",
     "External transfer of a image in memory");
-#if defined(_VISUALC_)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
   entry->decoder=ReadXTRNImage;
   entry->encoder=WriteXTRNImage;
 #endif
@@ -278,7 +278,7 @@ ModuleExport size_t RegisterXTRNImage(void)
   RegisterMagickInfo(entry);
   entry=AcquireMagickInfo("XTRN","XTRNBLOB",
     "IExternal transfer of a blob in memory");
-#if defined(_VISUALC_)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
   entry->decoder=ReadXTRNImage;
   entry->encoder=WriteXTRNImage;
 #endif
@@ -287,7 +287,7 @@ ModuleExport size_t RegisterXTRNImage(void)
   RegisterMagickInfo(entry);
   entry=AcquireMagickInfo("XTRN","XTRNARRAY",
     "External transfer via a smart array interface");
-#if defined(_VISUALC_)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
   entry->decoder=ReadXTRNImage;
   entry->encoder=WriteXTRNImage;
 #endif
@@ -354,7 +354,7 @@ ModuleExport void UnregisterXTRNImage(void)
 %
 */
 
-#if defined(_VISUALC_)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
 static size_t SafeArrayFifo(const Image *image,const void *data,
   const size_t length)
 {
@@ -399,7 +399,7 @@ static size_t SafeArrayFifo(const Image *image,const void *data,
 }
 #endif
 
-#if defined(_VISUALC_)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
 #  pragma warning(disable : 4477)
 static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,
   Image *image,ExceptionInfo *exception)

diff --git a/utilities/magick.c b/utilities/magick.c
index 52b0f11e5ea863cbe55f39dd746c4033f6a2b454..bb3f95b8ed77535b2c389c3d75682a264db918b8 100644 (file)
--- a/utilities/magick.c
+++ b/utilities/magick.c
@@ -119,7 +119,7 @@ static int MagickMain(int argc,char **argv)
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   GetPathComponent(argv[0],TailPath,client_name);
-  for (i=0; i < (sizeof(MagickCommands)/sizeof(MagickCommands[0])); i++)
+  for (i=0; i < (ssize_t) (sizeof(MagickCommands)/sizeof(MagickCommands[0])); i++)
   {
     offset=LocaleNCompare(MagickCommands[i].client_name,client_name,
       MagickCommands[i].extent);
@@ -129,7 +129,7 @@ static int MagickMain(int argc,char **argv)
   i%=(sizeof(MagickCommands)/sizeof(MagickCommands[0]));
   if ((i == 0) && (argc > 1))
     {
-      for (i=1; i < (sizeof(MagickCommands)/sizeof(MagickCommands[0])); i++)
+      for (i=1; i < (ssize_t) (sizeof(MagickCommands)/sizeof(MagickCommands[0])); i++)
       {
         offset=LocaleCompare(MagickCommands[i].client_name,argv[1]);
         if (offset == 0)