Use the maximum of the x-max and x-advance for the last character to properly fix #1879.
diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 41b303c..712e4a9 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1783,13 +1783,7 @@
origin.x+=(FT_Pos) (64.0*draw_info->interword_spacing);
else
if (i == last_character)
- {
- if ((bounds.xMax == 0) ||
- (annotate_info->gravity == CenterGravity))
- origin.x+=(FT_Pos) grapheme[i].x_advance;
- else
- origin.x+=(FT_Pos) bounds.xMax;
- }
+ origin.x+=MagickMax((FT_Pos) grapheme[i].x_advance,bounds.xMax);
else
origin.x+=(FT_Pos) grapheme[i].x_advance;
metrics->origin.x=(double) origin.x;