...

diff --git a/coders/dcm.c b/coders/dcm.c
index 168e8dd67add4d67454427fba9c85ee73bd8ea69..39a0b7d3caa72b3b7a1ecd8af879b72dcc1790d4 100644 (file)
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -2932,7 +2932,7 @@ static MagickBooleanType ReadDCMPixels(Image *image,DCMInfo *info,
             }
           index&=info->mask;
           index=(int) ConstrainColormapIndex(image,(ssize_t) index,exception);
-          if (first_segment)
+          if (first_segment != MagickFalse)
             SetPixelIndex(image,(Quantum) index,q);
           else
             SetPixelIndex(image,(Quantum) (((size_t) index) |
@@ -3179,9 +3179,9 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         Check for "explicitness", but meta-file headers always explicit.
       */
       if ((explicit_file == MagickFalse) && (group != 0x0002))
-        explicit_file=(isupper((unsigned char) *explicit_vr) != MagickFalse) &&
-          (isupper((unsigned char) *(explicit_vr+1)) != MagickFalse) ?
-          MagickTrue : MagickFalse;
+        explicit_file=(isupper((unsigned char) *explicit_vr) != 0) &&
+          (isupper((unsigned char) *(explicit_vr+1)) != 0) ? MagickTrue :
+          MagickFalse;
       use_explicit=((group == 0x0002) && (explicit_retry == MagickFalse)) ||
         (explicit_file != MagickFalse) ? MagickTrue : MagickFalse;
       if ((use_explicit != MagickFalse) && (strncmp(implicit_vr,"xs",2) == 0))
@@ -3724,7 +3724,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
               attribute=AcquireString("dcm:");
               (void) ConcatenateString(&attribute,dicom_info[i].description);
               for (i=0; i < (ssize_t) MagickMax(length,4); i++)
-                if (isprint((int) data[i]) == MagickFalse)
+                if (isprint((int) data[i]) == 0)
                   break;
               if ((i == (ssize_t) length) || (length > 4))
                 {
@@ -3745,7 +3745,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 Display group data.
               */
               for (i=0; i < (ssize_t) MagickMax(length,4); i++)
-                if (isprint((int) data[i]) == MagickFalse)
+                if (isprint((int) data[i]) == 0)
                   break;
               if ((i != (ssize_t) length) && (length <= 4))
                 {
@@ -3759,7 +3759,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 }
               else
                 for (i=0; i < (ssize_t) length; i++)
-                  if (isprint((int) data[i]) != MagickFalse)
+                  if (isprint((int) data[i]) != 0)
                     (void) FormatLocaleFile(stdout,"%c",data[i]);
                   else
                     (void) FormatLocaleFile(stdout,"%c",'.');