]> granicus.if.org Git - imagemagick/commitdiff
Fedora 30 has a broken shape extention
authorCristy <mikayla-grace@urban-warrior.org>
Sat, 11 May 2019 16:38:52 +0000 (12:38 -0400)
committerCristy <mikayla-grace@urban-warrior.org>
Sat, 11 May 2019 16:38:52 +0000 (12:38 -0400)
MagickCore/xwindow.c

index 52d8839a574544e75ef646206e62331dc33b3ecd..3cf4b3b6f33441cd61486bc5dd513eb8a1309d37 100644 (file)
@@ -5896,7 +5896,8 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   canvas=image;
   if ((window->immutable == MagickFalse) &&
-      (image->storage_class == DirectClass) && (image->alpha_trait != UndefinedPixelTrait))
+      (image->storage_class == DirectClass) &&
+      (image->alpha_trait != UndefinedPixelTrait))
     {
       char
         size[MagickPathExtent];
@@ -8528,7 +8529,8 @@ MagickPrivate void XMakeWindow(Display *display,Window parent,char **argv,
       window_info->shape=MagickFalse;
 #endif
     }
-  if (window_info->shared_memory)
+  window_info->shape=MagickFalse;  /* Fedora 30 has a broken shape extention */
+  if (window_info->shared_memory != MagickFalse)
     {
 #if defined(MAGICKCORE_HAVE_SHARED_MEMORY)
       /*