From a0f7fbff738066c71076bcde29fb8b900a671277 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Sat, 25 Feb 2023 23:00:31 +0100 Subject: [PATCH] No longer check for Noto Sans and Nimbus Sans to make sure the correct default is used on Windows. --- MagickCore/annotate.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index 18ca2c2df6..67bb38e677 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -1073,15 +1073,8 @@ static MagickBooleanType RenderType(Image *image,const DrawInfo *draw_info, font=DestroyString(font); } sans_exception=AcquireExceptionInfo(); - if (type_info == (const TypeInfo *) NULL) - type_info=GetTypeInfoByFamily("Noto Sans",draw_info->style, - draw_info->stretch,draw_info->weight,sans_exception); - if (type_info == (const TypeInfo *) NULL) - type_info=GetTypeInfoByFamily("Nimbus Sans",draw_info->style, - draw_info->stretch,draw_info->weight,sans_exception); - if (type_info == (const TypeInfo *) NULL) - type_info=GetTypeInfoByFamily((const char *) NULL,draw_info->style, - draw_info->stretch,draw_info->weight,sans_exception); + type_info=GetTypeInfoByFamily((const char *) NULL,draw_info->style, + draw_info->stretch,draw_info->weight,sans_exception); if (type_info == (const TypeInfo *) NULL) type_info=GetTypeInfo("*",sans_exception); sans_exception=DestroyExceptionInfo(sans_exception);