From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 5 Jan 2015 23:19:48 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1495
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c443544357677730647a537fd9ca8a9ab2e9ab3;p=imagemagick

---

diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index 74319ef09..f3c6d4bd7 100644
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -940,8 +940,8 @@ MagickPrivate MagickBooleanType NTGetModulePath(const char *module,char *path)
 %
 */
 
-static int NTGetRegistryValue(HKEY root,const char *key,DWORD flags,const char *name,
-  char *value,int *length)
+static int NTGetRegistryValue(HKEY root,const char *key,DWORD flags,
+  const char *name,char *value,int *length)
 {
   BYTE
     byte,
@@ -1404,9 +1404,9 @@ MagickPrivate int NTGhostscriptLoadDLL(void)
     lt_dlsym(ghost_handle,"gsapi_revision"));
   UnlockSemaphoreInfo(ghost_semaphore);
   if ((ghost_info.delete_instance == NULL) || (ghost_info.exit == NULL) ||
-      (ghost_info.init_with_args == NULL) || (ghost_info.new_instance == NULL)
-      || (ghost_info.run_string == NULL) || (ghost_info.set_stdio == NULL) ||
-      (ghost_info.revision == NULL))
+      (ghost_info.init_with_args == NULL) ||
+      (ghost_info.new_instance == NULL) || (ghost_info.run_string == NULL) ||
+      (ghost_info.set_stdio == NULL) || (ghost_info.revision == NULL))
     return(FALSE);
   return(TRUE);
 }
diff --git a/coders/pcx.c b/coders/pcx.c
index e580bad88..d75c4d0c4 100644
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -347,7 +347,7 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception)
     image->resolution.y=(double) pcx_info.vertical_resolution;
     image->colors=16;
     count=ReadBlob(image,3*image->colors,pcx_colormap);
-    if (count != (3*image->colors))
+    if (count != (ssize_t) (3*image->colors))
       ThrowReaderException(CorruptImageError,"ImproperImageHeader");
     pcx_info.reserved=(unsigned char) ReadBlobByte(image);
     pcx_info.planes=(unsigned char) ReadBlobByte(image);
diff --git a/coders/pdf.c b/coders/pdf.c
index 65329b3c9..578543c76 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -235,8 +235,8 @@ static MagickBooleanType InvokePDFDelegate(const MagickBooleanType verbose,
     revision.revision=0;
   if (verbose != MagickFalse)
     {
-      (void) fprintf(stdout,"[ghostscript library %.2f]",
-        (double)revision.revision / 100);
+      (void) fprintf(stdout,"[ghostscript library %.2f]",(double)
+        revision.revision/100.0);
       SetArgsStart(command,args_start);
       (void) fputs(args_start,stdout);
     }
diff --git a/coders/ps.c b/coders/ps.c
index 3faccb52b..c7559cf82 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -225,8 +225,8 @@ static MagickBooleanType InvokePostscriptDelegate(
     revision.revision=0;
   if (verbose != MagickFalse)
     {
-      (void) fprintf(stdout,"[ghostscript library %.2f]",
-        (double)revision.revision / 100);
+      (void) fprintf(stdout,"[ghostscript library %.2f]",(double)
+        revision.revision/100.0);
       SetArgsStart(command,args_start);
       (void) fputs(args_start,stdout);
     }