From: PIGNOSE <kenneth@pigno.se>
Date: Tue, 9 Jul 2019 23:44:32 +0000 (+0900)
Subject: WIP: fix line through z-index issue (#1630)
X-Git-Tag: 7.0.8-54~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a272444096aa88fcab677492086c03480b029e7c;p=imagemagick

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

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index eaf6b8224..c921100c6 100644
--- 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.