vcl/unx/generic/fontmanager/fontconfig.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 0bbd74f93a6f37bf880981862437f892f43452d0
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Apr 14 09:57:33 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Apr 14 12:39:01 2021 +0200
getFontOptions is always called with pitch of PITCH_DONTKNOW
getFontOptions is called from only one location and there
the pitch value is left at its default PITCH_DONTKNOW
which is suspicious but that's the way it currently is
Change-Id: I7e4a487b800a0111133a0edd472731ffa5122177
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114076
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 855868a022e4..17ca8f46ccae 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -1113,7 +1113,8 @@ std::unique_ptr<FontConfigFontOptions>
PrintFontManager::getFontOptions(const Fa
if( !sFamily.isEmpty() )
FcPatternAddString(pPattern, FC_FAMILY, reinterpret_cast<FcChar8 const
*>(sFamily.getStr()));
- addtopattern(pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth,
rInfo.m_ePitch);
+ // TODO: ePitch argument of always PITCH_DONTKNOW is suspicious
+ addtopattern(pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth,
PITCH_DONTKNOW);
FcPatternAddDouble(pPattern, FC_PIXEL_SIZE, nSize);
FcConfigSubstitute(pConfig, pPattern, FcMatchPattern);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
