(no commit message)

[imagemagick] / magick / xwindow.c

diff --git a/magick/xwindow.c b/magick/xwindow.c
index 9e5f7a8dced7dc6a08a27d5e04e9e6e631432380..3f22290eebc73fe42732dd05fa2f670ad1d4ba81 100644 (file)
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -1945,18 +1945,18 @@ MagickExport void XDisplayImageInfo(Display *display,
   int
     unique_file;
 
-  ssize_t
-    bytes;
-
   register ssize_t
     i;
 
-  unsigned int
-    levels;
-
   size_t
     number_pixels;
 
+  ssize_t
+    bytes;
+
+  unsigned int
+    levels;
+
   /*
     Write info about the X server to a file.
   */
@@ -2759,7 +2759,10 @@ MagickExport void XFreeResources(Display *display,XVisualInfo *visual_info,
     Free font.
   */
   if (font_info != (XFontStruct *) NULL)
-    (void) XFreeFont(display,font_info);
+    {
+      (void) XFreeFont(display,font_info);
+      font_info=(XFontStruct *) NULL;
+    }
   if (map_info != (XStandardColormap *) NULL)
     {
       /*
@@ -3197,8 +3200,7 @@ MagickExport void XGetPixelPacket(Display *display,
             Initialize pixel array for images of type PseudoClass.
           */
           for (i=0; i < (ssize_t) image->colors; i++)
-            pixel->pixels[i]=
-              XGammaPixel(map_info,image->colormap+i);
+            pixel->pixels[i]=XGammaPixel(map_info,image->colormap+i);
           for (i=0; i < MaxNumberPens; i++)
             pixel->pixels[image->colors+i]=pixel->pen_colors[i].pixel;
           pixel->colors+=MaxNumberPens;
@@ -3525,7 +3527,7 @@ MagickExport void XGetResourceInfo(const ImageInfo *image_info,
     client_name,"geometry",(char *) NULL));
   resource_value=XGetResourceClass(database,client_name,"gravity",
     (char *) "Center");
-  resource_info->gravity=(GravityType) ParseMagickOption(MagickGravityOptions,
+  resource_info->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
     MagickFalse,resource_value);
   directory=getcwd(resource_info->home_directory,MaxTextExtent);
   (void) directory;
@@ -6382,7 +6384,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
         for (x=(int) canvas->columns-1; x >= 0; x--)
         {
           byte>>=1;
-          if (p->opacity > (QuantumRange/2))
+          if (GetOpacityPixelComponent(p) > (QuantumRange/2))
             byte|=0x80;
           bit++;
           if (bit == 8)
@@ -7009,7 +7011,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info,
         for (x=(int) canvas->columns-1; x >= 0; x--)
         {
           byte<<=1;
-          if (p->opacity > (QuantumRange/2))
+          if (GetOpacityPixelComponent(p) > (QuantumRange/2))
             byte|=0x01;
           bit++;
           if (bit == 8)
@@ -7063,9 +7065,6 @@ MagickExport void XMakeMagnifyImage(Display *display,XWindows *windows)
   int
     y;
 
-  ssize_t
-    n;
-
   MagickPixelPacket
     pixel;
 
@@ -7079,6 +7078,9 @@ MagickExport void XMakeMagnifyImage(Display *display,XWindows *windows)
     *p,
     *q;
 
+  ssize_t
+    n;
+
   static unsigned int
     previous_magnify = 0;