WIP: fix line through z-index issue (#1630)

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index eaf6b82246a5531b919b67ece6e6701d1e264068..c921100c683ee27bd21d0ec3b204f20bac1972fc 100644 (file)
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -526,19 +526,17 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
         (void) DrawImage(image,annotate_info,exception);
         break;
       }
-      case LineThroughDecoration:
-      {
+    }
+    status=RenderType(image,annotate,&offset,&metrics,exception);
+    if (status == MagickFalse)
+      break;
+
+    if (annotate->decorate == LineThroughDecoration) {
         annotate_info->affine.ty-=(draw_info->affine.sy*(height+
           metrics.underline_position+metrics.descent*2)/2.0);
         (void) CloneString(&annotate_info->primitive,primitive);
         (void) DrawImage(image,annotate_info,exception);
-      }
-      default:
-        break;
     }
-    status=RenderType(image,annotate,&offset,&metrics,exception);
-    if (status == MagickFalse)
-      break;
   }
   /*
     Relinquish resources.