From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 24 Apr 2010 21:34:22 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9587
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7e40559f0408c5f987aec5c1a51c30b0456509f;p=imagemagick

---

diff --git a/coders/art.c b/coders/art.c
index 8d7c5a7c7..cff9dec7e 100644
--- a/coders/art.c
+++ b/coders/art.c
@@ -44,6 +44,7 @@
 #include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/bmp.c b/coders/bmp.c
index a17241117..0da5ca997 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -46,6 +46,7 @@
 #include "magick/cache.h"
 #include "magick/colormap-private.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/cut.c b/coders/cut.c
index c14e7d5db..29be38c6f 100644
--- a/coders/cut.c
+++ b/coders/cut.c
@@ -52,8 +52,9 @@
 #include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/color.h"
-#include "magick/colormap-private.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
+#include "magick/colormap-private.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
 #include "magick/image.h"
diff --git a/coders/dib.c b/coders/dib.c
index 96f2b9825..a08279b3e 100644
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -44,8 +44,9 @@
 #include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/color.h"
-#include "magick/colormap-private.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
+#include "magick/colormap-private.h"
 #include "magick/colorspace.h"
 #include "magick/draw.h"
 #include "magick/exception.h"
diff --git a/coders/emf.c b/coders/emf.c
index 248925886..00040036a 100644
--- a/coders/emf.c
+++ b/coders/emf.c
@@ -263,7 +263,7 @@ static wchar_t *ConvertUTF8ToUTF16(const unsigned char *source)
       /*
         Not UTF-8, just copy.
       */
-      length=strlen(source);
+      length=strlen((char *) source);
       utf16=(wchar_t *) AcquireQuantumMemory(length+1,sizeof(*utf16));
       if (utf16 == (wchar_t *) NULL)
         return((wchar_t *) NULL);
@@ -333,7 +333,7 @@ static HENHMETAFILE ReadEnhMetaFile(const char *path,long *width,
       wchar_t
         *unicode_path;
 
-      unicode_path=ConvertUTF8ToUTF16(path);
+      unicode_path=ConvertUTF8ToUTF16((const unsigned char *) path);
       if (unicode_path != (wchar_t *) NULL)
         {
           hTemp=GetEnhMetaFileW(unicode_path);
diff --git a/coders/fax.c b/coders/fax.c
index 4c89e938e..1f179ed84 100644
--- a/coders/fax.c
+++ b/coders/fax.c
@@ -42,6 +42,7 @@
 #include "magick/studio.h"
 #include "magick/blob.h"
 #include "magick/blob-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/gif.c b/coders/gif.c
index bc65fab07..b6c9a28cd 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -44,8 +44,9 @@
 #include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/color.h"
-#include "magick/colormap-private.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
+#include "magick/colormap-private.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/icon.c b/coders/icon.c
index 27b05a11a..cf61027d1 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -43,6 +43,7 @@
 #include "magick/blob.h"
 #include "magick/blob-private.h"
 #include "magick/cache.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 7495f999f..0225e2ec0 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -79,7 +79,7 @@
 #define JPEG_INTERNAL_OPTIONS
 #if defined(__MINGW32__)
 # define XMD_H 1  /* Avoid conflicting typedef for INT32 */
-typedef unsigned char  boolean
+typedef unsigned char boolean;
 #endif
 #undef HAVE_STDLIB_H
 #include "jpeglib.h"
diff --git a/coders/map.c b/coders/map.c
index b44d621ec..a5b43d731 100644
--- a/coders/map.c
+++ b/coders/map.c
@@ -45,8 +45,9 @@
 #include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/color.h"
-#include "magick/colormap-private.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
+#include "magick/colormap-private.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/miff.c b/coders/miff.c
index d58dad2d5..fb65ca46d 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -45,8 +45,9 @@
 #include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/color.h"
-#include "magick/colormap-private.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
+#include "magick/colormap-private.h"
 #include "magick/colorspace.h"
 #include "magick/constitute.h"
 #include "magick/exception.h"
diff --git a/coders/mono.c b/coders/mono.c
index 541c97086..d013c7a4d 100644
--- a/coders/mono.c
+++ b/coders/mono.c
@@ -44,6 +44,7 @@
 #include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/mpc.c b/coders/mpc.c
index 4dab01d9d..df6a99fe0 100644
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -48,6 +48,7 @@
 #include "magick/cache.h"
 #include "magick/color.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/constitute.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/otb.c b/coders/otb.c
index c2c021b57..650c8f8df 100644
--- a/coders/otb.c
+++ b/coders/otb.c
@@ -43,6 +43,7 @@
 #include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/pcx.c b/coders/pcx.c
index 88a26bbdd..992966352 100644
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -45,6 +45,7 @@
 #include "magick/cache.h"
 #include "magick/color.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/pdb.c b/coders/pdb.c
index b02a28acd..97de9f94d 100644
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -53,6 +53,7 @@
 #include "magick/cache.h"
 #include "magick/colormap-private.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/constitute.h"
 #include "magick/exception.h"
diff --git a/coders/pict.c b/coders/pict.c
index 60dda99d3..08f871580 100644
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -44,6 +44,7 @@
 #include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colormap-private.h"
 #include "magick/colorspace.h"
 #include "magick/composite.h"
diff --git a/coders/pix.c b/coders/pix.c
index 9cf1528cc..91b4ac643 100644
--- a/coders/pix.c
+++ b/coders/pix.c
@@ -43,6 +43,7 @@
 #include "magick/blob.h"
 #include "magick/blob-private.h"
 #include "magick/cache.h"
+#include "magick/colormap.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
 #include "magick/image.h"
diff --git a/coders/psd.c b/coders/psd.c
index aba0e3c9b..6f4b0cef2 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -45,6 +45,7 @@
 #include "magick/blob.h"
 #include "magick/blob-private.h"
 #include "magick/cache.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/constitute.h"
 #include "magick/enhance.h"
diff --git a/coders/sgi.c b/coders/sgi.c
index f816360a0..669d3fdde 100644
--- a/coders/sgi.c
+++ b/coders/sgi.c
@@ -45,6 +45,7 @@
 #include "magick/cache.h"
 #include "magick/color.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/sun.c b/coders/sun.c
index 086141d18..0b51e4a39 100644
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -45,6 +45,7 @@
 #include "magick/cache.h"
 #include "magick/color.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/tga.c b/coders/tga.c
index f03217154..9eefab969 100644
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -44,6 +44,7 @@
 #include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colormap-private.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
diff --git a/coders/tim.c b/coders/tim.c
index 8a6fc3674..5175d2dda 100644
--- a/coders/tim.c
+++ b/coders/tim.c
@@ -43,6 +43,7 @@
 #include "magick/blob.h"
 #include "magick/blob-private.h"
 #include "magick/cache.h"
+#include "magick/colormap.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
 #include "magick/image.h"
diff --git a/coders/vicar.c b/coders/vicar.c
index 96c511219..6ef63edda 100644
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -43,6 +43,7 @@
 #include "magick/blob.h"
 #include "magick/blob-private.h"
 #include "magick/cache.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/constitute.h"
 #include "magick/exception.h"
diff --git a/coders/viff.c b/coders/viff.c
index a0db6d9b0..ab51c1156 100644
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -45,6 +45,7 @@
 #include "magick/cache.h"
 #include "magick/color.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/wbmp.c b/coders/wbmp.c
index 9c7f00f36..bd2cd3d57 100644
--- a/coders/wbmp.c
+++ b/coders/wbmp.c
@@ -43,6 +43,7 @@
 #include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/wpg.c b/coders/wpg.c
index f98ddb0bd..4131cc718 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -42,6 +42,7 @@
 #include "magick/blob.h"
 #include "magick/blob-private.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colormap-private.h"
 #include "magick/constitute.h"
 #include "magick/exception.h"
diff --git a/coders/xbm.c b/coders/xbm.c
index 999fa9aa1..bc0c231ef 100644
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -44,6 +44,7 @@
 #include "magick/blob-private.h"
 #include "magick/cache.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/coders/xpm.c b/coders/xpm.c
index 97ee9c8c2..102cca60f 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -45,6 +45,7 @@
 #include "magick/cache.h"
 #include "magick/color.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/magick/quantize.c b/magick/quantize.c
index 72e4d0fcc..ee418b9d9 100644
--- a/magick/quantize.c
+++ b/magick/quantize.c
@@ -178,6 +178,7 @@
 #include "magick/cache-view.h"
 #include "magick/color.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/enhance.h"
 #include "magick/exception.h"
diff --git a/magick/segment.c b/magick/segment.c
index 3edc2da33..85953c3bd 100644
--- a/magick/segment.c
+++ b/magick/segment.c
@@ -85,6 +85,7 @@
 #include "magick/studio.h"
 #include "magick/cache.h"
 #include "magick/color.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"
diff --git a/magick/threshold.c b/magick/threshold.c
index c16616c86..211e6a857 100644
--- a/magick/threshold.c
+++ b/magick/threshold.c
@@ -46,6 +46,7 @@
 #include "magick/cache-view.h"
 #include "magick/color.h"
 #include "magick/color-private.h"
+#include "magick/colormap.h"
 #include "magick/colorspace.h"
 #include "magick/configure.h"
 #include "magick/constitute.h"
diff --git a/magick/utility.c b/magick/utility.c
index b61adc657..787a9f703 100644
--- a/magick/utility.c
+++ b/magick/utility.c
@@ -1202,7 +1202,7 @@ MagickExport MagickBooleanType GetPathAttributes(const char *path,
     wchar_t
       *unicode_path;
 
-    unicode_path=ConvertUTF8ToUTF16(path);
+    unicode_path=ConvertUTF8ToUTF16((const unsigned char *) path);
     if (unicode_path == (wchar_t *) NULL)
       return(MagickFalse);
     status=wstat(unicode_path,(struct stat *) attributes) == 0 ? MagickTrue :
@@ -1816,7 +1816,7 @@ MagickExport FILE *OpenMagickStream(const char *path,const char *mode)
       *unicode_mode,
       *unicode_path;
 
-    unicode_path=ConvertUTF8ToUTF16(path);
+    unicode_path=ConvertUTF8ToUTF16((const unsigned char *) path);
     if (unicode_path == (wchar_t *) NULL)
       return((FILE *) NULL);
     unicode_mode=ConvertUTF8ToUTF16(mode);
@@ -1969,7 +1969,7 @@ MagickExport int SystemCommand(const MagickBooleanType asynchronous,
     mode=_P_WAIT;
     if (asynchronous != MagickFalse)
       mode=_P_NOWAIT;
-    status=spawnvp(mode,arguments[1],arguments+1);
+    status=spawnvp(mode,arguments[1],(const char **) (arguments+1));
   }
 #elif defined(macintosh)
   status=MACSystemCommand(shell_command);