Kaydet (Commit) 1d7f96a3 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

tdf#67744: Fix the weight reported by the system for the problematic font

A hack, but oh well.

Change-Id: I13580d27acfb0cc200bdb0cc1911518675d3e32e
Reviewed-on: https://gerrit.libreoffice.org/50172Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTor Lillqvist <tml@collabora.com>
üst 8bd289c4
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
......@@ -382,6 +382,18 @@ FontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFont
CFNumberRef pWeightNum = static_cast<CFNumberRef>(CFDictionaryGetValue( pAttrDict, kCTFontWeightTrait ));
CFNumberGetValue( pWeightNum, kCFNumberDoubleType, &fWeight );
int nInt = WEIGHT_NORMAL;
// Special case fixes
// tdf#67744: Courier Std Medium is always bold. We get a kCTFontWeightTrait of 0.23 which
// surely must be wrong.
if (rDFA.GetFamilyName() == "Courier Std" &&
(rDFA.GetStyleName() == "Medium" || rDFA.GetStyleName() == "Medium Oblique") &&
fWeight > 0.2)
{
fWeight = 0;
}
if( fWeight > 0 )
{
nInt = rint(WEIGHT_NORMAL + fWeight * ((WEIGHT_BLACK - WEIGHT_NORMAL)/0.68));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment