(no commit message)

diff --git a/coders/dcm.c b/coders/dcm.c
index 0a251f3f34e80bc95eb662e304a9325f8288fd75..3b75af396d1de524ac0fc16ee0f51b994dbe4763 100644 (file)
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -2845,17 +2845,12 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
   ssize_t
     count;
 
-  size_t
-    length;
-
-  unsigned char
-    *data;
-
   size_t
     bits_allocated,
     bytes_per_pixel,
     colors,
     height,
+    length,
     mask,
     max_value,
     number_scenes,
@@ -2867,6 +2862,9 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
     width,
     window_width;
 
+  unsigned char
+    *data;
+
   /*
     Open image file.
   */
@@ -3847,10 +3845,10 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                       window_max,
                       window_min;
 
-                    window_min=(ssize_t) ceil(window_center-(window_width-1)/2.0-
-                      0.5);
-                    window_max=(ssize_t) floor(window_center+(window_width-1)/2.0+
-                      0.5);
+                    window_min=(ssize_t) ceil(window_center-(window_width-1)/
+                      2.0-0.5);
+                    window_max=(ssize_t) floor(window_center+(window_width-1)/
+                      2.0+0.5);
                     if ((ssize_t) pixel_value <= window_min)
                       index=0;
                     else

diff --git a/magick/fx.c b/magick/fx.c
index 6d345615f90e6f7dbd77180735e9dd05d3f97bc1..070f5bcf27d6811dbaf0ab1c149eca1aa6624e37 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -1807,7 +1807,7 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const ChannelType channel,
     case 't':
     {
       if (LocaleCompare(symbol,"t") == 0)
-        return((MagickRealType) GetImageIndexInList(fx_info->images) );
+        return((MagickRealType) GetImageIndexInList(fx_info->images));
       break;
     }
     case 'W':