(no commit message)

diff --git a/coders/art.c b/coders/art.c
index 8d7c5a7c7faa30c0d6281b22bfe9e034a0157e8a..cff9dec7e6995305c98eb8319c7052c1404aa0bc 100644 (file)
--- 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 a172411176add4b5d800f879a48da59d6b5b34cc..0da5ca997a80400d69e677697c4251563d4ecd9a 100644 (file)
--- 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 c14e7d5db131d5edb9006deda14f3f67f091d4aa..29be38c6f280b1fd9e22082a2d95e80dbe4321d5 100644 (file)
--- 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 96f2b982502cae8ec0bac017d92c1f6e42b86b96..a08279b3ee58f09b3f6bcc8bc16965033d480cfb 100644 (file)
--- 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 2489258864eda3700e4053b31a7e54c40bf8d9cb..00040036a3fb42f8fa2c7512508b82a9d7dcc30c 100644 (file)
--- 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 4c89e938e24b42de829b395de485ccea568c2590..1f179ed84bcfd6b05ac5d3af1075c240e472d325 100644 (file)
--- 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 bc65fab0700bdd54cb867515bc243392d60481a1..b6c9a28cd2ea4bb395342718db756bdf69a9a44b 100644 (file)
--- 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 27b05a11a94fd8b809915ec5726a017a401cd4bd..cf61027d19d43808867c9f03f7b216c87bd7b5aa 100644 (file)
--- 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 7495f999fe53fb5dffe5914a3fe976361b242478..0225e2ec0f38898690baf4f6f523ace4ce606c05 100644 (file)
--- 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 b44d621ec43de88884a5c54d29801c1888bfeb97..a5b43d731a4d03a0b2b6942aae39c9308e19c2e9 100644 (file)
--- 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 d58dad2d56d4f4a4dd63c23d54a65b9a28bcbdf4..fb65ca46d161cbbac2c24a6914e77f4933dd0c7f 100644 (file)
--- 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 541c970867f3e10757f6e6a9fc182637e45b3980..d013c7a4d8118283eae2fb5ebb62f6c8ad8c02c3 100644 (file)
--- 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 4dab01d9d146578e1641ba363c011f1bb11dd113..df6a99fe04ce6a9c2dfa4a4aac7f30551fd79a37 100644 (file)
--- 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 c2c021b570975ab3902f716c6b498e1b41834cf2..650c8f8df17a83ef69f26e9f309c4a3d0858dfba 100644 (file)
--- 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 88a26bbdd844bc10b687318c2cfcabc6f1ee900c..992966352771ed6d5358712d516c0e21fffec37e 100644 (file)
--- 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 b02a28acde33cb495bc57b24d32d5f38bf74b2cc..97de9f94d5c10a076e1d426c94b25a7a90b54f63 100644 (file)
--- 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 60dda99d3646a4a416db5b6e6811fc065d967772..08f8715801e821c78e1767c7448997f0c3d1f53b 100644 (file)
--- 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 9cf1528cc76defb4ff07f696b0413c30c7f46961..91b4ac64398b46cce82d31cc97e9e490d35ff881 100644 (file)
--- 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 aba0e3c9b631648e753be33989d28c18dced7b29..6f4b0cef22f6c439b5c66622009d8023eaebb671 100644 (file)
--- 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 f816360a0361dcc43c84c187b41594ca9af802e8..669d3fdde236bf90fd69f59d1ce8e97a6af8d136 100644 (file)
--- 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 086141d18533b62f623a9ba9919de221d127809e..0b51e4a39aba193c9fcd586899050f556c738bac 100644 (file)
--- 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 f032171549d72f501b598be582450abbd927519f..9eefab9699bf09fcd0f551834dbf994c729f63dd 100644 (file)
--- 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 8a6fc367482e0f1fd3d20e53a3b76c7cd70106de..5175d2dda966e9c195e9ec4cfa0122219f0a64e5 100644 (file)
--- 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 96c5112192c0fb6c5bcf6843aade2f5d0273d9b8..6ef63eddacfb137aba927cac4c45f4ffed86a1b8 100644 (file)
--- 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 a0db6d9b06a30534484dafa873a2b8c236f4f4b5..ab51c115684712f2fd99a73e95428a0e7154c1ad 100644 (file)
--- 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 9c7f00f368fe097ca2bfee28c1a158a16bcef55b..bd2cd3d573a97b4c4621afb5e19ed0da13f0e3dd 100644 (file)
--- 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 f98ddb0bdc206816720fa7cdea4c7642281651b0..4131cc7189707a2961e045d5cebd3a5726fd2808 100644 (file)
--- 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 999fa9aa1646ccf403e616e31cc1b85573080231..bc0c231ef0697d90faacb1912a11842b67cb4765 100644 (file)
--- 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 97ee9c8c270ff3488c45f186c707449a5bb96bd2..102cca60f53326538824b029f09a5cbe60ffb708 100644 (file)
--- 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 72e4d0fcc3ed9ef4bb424e1b2420c0ced012e5a1..ee418b9d9ea3bba2b1aeb353d041773b3e9e7952 100644 (file)
--- 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 3edc2da33d37721ba27684acedad66dff8ebe500..85953c3bd83800e835e8fbcf93516e73202c36b1 100644 (file)
--- 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 c16616c86aafef14cc13a0d3e944d8b1b3fcb3ec..211e6a857de7f9c590f3aff462f6efa478d5af9d 100644 (file)
--- 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 b61adc6571c3ad482132f8e7491bce9cecfbc7b5..787a9f7036e7c56b57581bd526cb427ba723ddff 100644 (file)
--- 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);