7e403195e5
...with a boost::optional fallback for Xcode < 10 (as std::optional is only
available starting with Xcode 10 according to
<https://en.cppreference.com/w/cpp/compiler_support>, and our baseline for iOS
and macOS is still Xcode 9.3 according to README.md). And mechanically rewrite
all code to use o3tl::optional instead of boost::optional.
One immediate benefit is that disabling -Wmaybe-uninitialized for GCC as per
fed7c3deb3 "Slience bogus
-Werror=maybe-uninitialized" should no longer be necessary (and whose check
happened to no longer trigger for GCC 10 trunk, even though that compiler would
still emit bogus -Wmaybe-uninitialized for uses of boost::optional under
--enable-optimized, which made me ponder whether this switch from
boost::optional to std::optional would be a useful thing to do; I keep that
configure.ac check for now, though, and will only remove it in a follow up
commit).
Another longer-term benefit is that the code is now already in good shape for an
eventual switch to std::optional (a switch we would have done anyway once we no
longer need to support Xcode < 10).
Only desktop/qa/desktop_lib/test_desktop_lib.cxx heavily uses
boost::property_tree::ptree::get_child_optional returning boost::optional, so
let it keep using boost::optional for now.
After a number of preceding commits have paved the way for this change, this
commit is completely mechanical, done with
> git ls-files -z | grep -vz -e '^bin/find-unneeded-includes$' -e '^configure.ac$' -e '^desktop/qa/desktop_lib/test_desktop_lib.cxx$' -e '^dictionaries$' -e '^external/' -e '^helpcontent2$' -e '^include/IwyuFilter_include.yaml$' -e '^sc/IwyuFilter_sc.yaml$' -e '^solenv/gdb/boost/optional.py$' -e '^solenv/vs/LibreOffice.natvis$' -e '^translations$' -e '\.svg$' | xargs -0 sed -i -E -e 's|\<boost(/optional)?/optional\.hpp\>|o3tl/optional.hxx|g' -e 's/\<boost(\s*)::(\s*)(make_)?optional\>/o3tl\1::\2\3optional/g' -e 's/\<boost(\s*)::(\s*)none\>/o3tl\1::\2nullopt/g'
(before committing include/o3tl/optional.hxx, and relying on some GNU features).
It excludes some files where mention of boost::optional et al should apparently
not be changed (and the sub-repo directory stubs). It turned out that all uses
of boost::none across the code base were in combination with boost::optional, so
had all to be rewritten as o3tl::nullopt.
Change-Id: Ibfd9f4b3d5a8aee6e6eed310b988c4e5ffd8b11b
Reviewed-on: https://gerrit.libreoffice.org/84128
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
136 lines
5.1 KiB
C++
136 lines
5.1 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_VCL_INC_FONTINSTANCE_HXX
|
|
#define INCLUDED_VCL_INC_FONTINSTANCE_HXX
|
|
|
|
#include "fontselect.hxx"
|
|
#include "impfontmetricdata.hxx"
|
|
|
|
#include <basegfx/polygon/b2dpolypolygon.hxx>
|
|
#include <rtl/ref.hxx>
|
|
#include <salhelper/simplereferenceobject.hxx>
|
|
#include <tools/gen.hxx>
|
|
#include <tools/fontenum.hxx>
|
|
#include <vcl/glyphitem.hxx>
|
|
|
|
#include <o3tl/optional.hxx>
|
|
#include <unordered_map>
|
|
#include <memory>
|
|
|
|
#include <hb.h>
|
|
|
|
class ConvertChar;
|
|
class ImplFontCache;
|
|
class PhysicalFontFace;
|
|
|
|
// TODO: allow sharing of metrics for related fonts
|
|
|
|
class VCL_PLUGIN_PUBLIC LogicalFontInstance : public salhelper::SimpleReferenceObject
|
|
{
|
|
// just declaring the factory function doesn't work AKA
|
|
// friend LogicalFontInstance* PhysicalFontFace::CreateFontInstance(const FontSelectPattern&) const;
|
|
friend class PhysicalFontFace;
|
|
friend class ImplFontCache;
|
|
|
|
public: // TODO: make data members private
|
|
virtual ~LogicalFontInstance() override;
|
|
|
|
ImplFontMetricDataRef mxFontMetric; // Font attributes
|
|
const ConvertChar* mpConversion; // used e.g. for StarBats->StarSymbol
|
|
|
|
long mnLineHeight;
|
|
short mnOwnOrientation; // text angle if lower layers don't rotate text themselves
|
|
short mnOrientation; // text angle in 3600 system
|
|
bool mbInit; // true if maFontMetric member is valid
|
|
|
|
void AddFallbackForUnicode( sal_UCS4, FontWeight eWeight, const OUString& rFontName );
|
|
bool GetFallbackForUnicode( sal_UCS4, FontWeight eWeight, OUString* pFontName ) const;
|
|
void IgnoreFallbackForUnicode( sal_UCS4, FontWeight eWeight, const OUString& rFontName );
|
|
|
|
inline hb_font_t* GetHbFont();
|
|
bool IsGraphiteFont();
|
|
void SetAverageWidthFactor(double nFactor) { m_nAveWidthFactor = std::abs(nFactor); }
|
|
double GetAverageWidthFactor() const { return m_nAveWidthFactor; }
|
|
const FontSelectPattern& GetFontSelectPattern() const { return m_aFontSelData; }
|
|
|
|
const PhysicalFontFace* GetFontFace() const { return m_pFontFace.get(); }
|
|
PhysicalFontFace* GetFontFace() { return m_pFontFace.get(); }
|
|
const ImplFontCache* GetFontCache() const { return mpFontCache; }
|
|
|
|
bool GetGlyphBoundRect(sal_GlyphId, tools::Rectangle&, bool) const;
|
|
virtual bool GetGlyphOutline(sal_GlyphId, basegfx::B2DPolyPolygon&, bool) const = 0;
|
|
|
|
int GetKashidaWidth();
|
|
|
|
void GetScale(double* nXScale, double* nYScale);
|
|
static inline void DecodeOpenTypeTag(const uint32_t nTableTag, char* pTagName);
|
|
|
|
protected:
|
|
explicit LogicalFontInstance(const PhysicalFontFace&, const FontSelectPattern&);
|
|
|
|
virtual bool ImplGetGlyphBoundRect(sal_GlyphId, tools::Rectangle&, bool) const = 0;
|
|
|
|
// Takes ownership of pHbFace.
|
|
static hb_font_t* InitHbFont(hb_face_t* pHbFace);
|
|
virtual hb_font_t* ImplInitHbFont() { assert(false); return hb_font_get_empty(); }
|
|
inline void ReleaseHbFont();
|
|
|
|
private:
|
|
// cache of Unicode characters and replacement font names
|
|
// TODO: a fallback map can be shared with many other ImplFontEntries
|
|
// TODO: at least the ones which just differ in orientation, stretching or height
|
|
typedef ::std::unordered_map< ::std::pair<sal_UCS4,FontWeight>, OUString > UnicodeFallbackList;
|
|
std::unique_ptr<UnicodeFallbackList> mpUnicodeFallbackList;
|
|
mutable ImplFontCache * mpFontCache;
|
|
const FontSelectPattern m_aFontSelData;
|
|
hb_font_t* m_pHbFont;
|
|
double m_nAveWidthFactor;
|
|
rtl::Reference<PhysicalFontFace> m_pFontFace;
|
|
o3tl::optional<bool> m_xbIsGraphiteFont;
|
|
};
|
|
|
|
inline hb_font_t* LogicalFontInstance::GetHbFont()
|
|
{
|
|
if (!m_pHbFont)
|
|
m_pHbFont = ImplInitHbFont();
|
|
return m_pHbFont;
|
|
}
|
|
|
|
inline void LogicalFontInstance::ReleaseHbFont()
|
|
{
|
|
if (!m_pHbFont)
|
|
return;
|
|
hb_font_destroy(m_pHbFont);
|
|
m_pHbFont = nullptr;
|
|
}
|
|
|
|
inline void LogicalFontInstance::DecodeOpenTypeTag(const uint32_t nTableTag, char* pTagName)
|
|
{
|
|
pTagName[0] = static_cast<char>(nTableTag >> 24);
|
|
pTagName[1] = static_cast<char>(nTableTag >> 16);
|
|
pTagName[2] = static_cast<char>(nTableTag >> 8);
|
|
pTagName[3] = static_cast<char>(nTableTag);
|
|
pTagName[4] = 0;
|
|
}
|
|
|
|
#endif // INCLUDED_VCL_INC_FONTINSTANCE_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|