diff options
| author | Khaled Hosny <khaled@aliftype.com> | 2022-09-11 06:27:23 +0200 |
|---|---|---|
| committer | خالد حسني <khaled@aliftype.com> | 2022-09-11 09:54:16 +0200 |
| commit | 38db900c1f7b471dfdf575bbda522a792db51372 (patch) | |
| tree | 003257fb312afbff2c81667110f3b2d9b3cd0509 /vcl/inc/unx | |
| parent | 4286e745bccc7393ecd8b06346306d13d23316b5 (diff) | |
vcl: Move CreateFontSubset() to PhysicalFontFace
Having it in SalGraphics is not necessary as the code now depends on
PhysicalFontFace for accessing raw font data, and this consolidates all
the near identical copies of this code into one.
Change-Id: I8a411f102fd2188a456bdeb8a0d794078d74e47b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139762
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@aliftype.com>
Diffstat (limited to 'vcl/inc/unx')
| -rw-r--r-- | vcl/inc/unx/fontmanager.hxx | 18 | ||||
| -rw-r--r-- | vcl/inc/unx/freetypetextrender.hxx | 7 | ||||
| -rw-r--r-- | vcl/inc/unx/genpspgraphics.h | 6 | ||||
| -rw-r--r-- | vcl/inc/unx/salgdi.h | 8 |
4 files changed, 0 insertions, 39 deletions
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index f85a80901f74..059ffe1a7e58 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -45,7 +45,6 @@ */ class FontAttributes; -class FontSubsetInfo; class FontConfigFontOptions; namespace vcl::font { @@ -265,23 +264,6 @@ public: // get a fonts glyph bounding box void getFontBoundingBox( fontID nFont, int& xMin, int& yMin, int& xMax, int& yMax ); - // creates a new font subset of an existing SFNT font - // returns true in case of success, else false - // pFace: the font face to be subsetted - // rOutFile: the file to put the new subset into; - // must be a valid osl file URL - // pGlyphIDs: input array of glyph ids for new font - // pNewEncoding: the corresponding encoding in the new font - // nGlyphs: number of glyphs in arrays - // TODO: callers of this method should use its FontSubsetInfo counterpart directly - bool createFontSubset( FontSubsetInfo&, - const vcl::font::PhysicalFontFace* pFace, - const OUString& rOutFile, - const sal_GlyphId* pGlyphIDs, - const sal_uInt8* pNewEncoding, - int nGlyphs - ); - // font administration functions /* system dependent font matching diff --git a/vcl/inc/unx/freetypetextrender.hxx b/vcl/inc/unx/freetypetextrender.hxx index 0c7323885a60..e61faa0c9e49 100644 --- a/vcl/inc/unx/freetypetextrender.hxx +++ b/vcl/inc/unx/freetypetextrender.hxx @@ -47,13 +47,6 @@ public: virtual void GetDevFontList( vcl::font::PhysicalFontCollection* ) override; virtual void ClearDevFontCache() override; virtual bool AddTempDevFont( vcl::font::PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override; - virtual bool CreateFontSubset( - const OUString& rToFile, - const vcl::font::PhysicalFontFace*, - const sal_GlyphId* pGlyphIDs, - const sal_uInt8* pEncoding, - int nGlyphs, - FontSubsetInfo& rInfo) override; virtual const void* GetEmbedFontData(const vcl::font::PhysicalFontFace*, tools::Long* pDataLen) override; virtual void FreeEmbedFontData( const void* pData, tools::Long nDataLen ) override; diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h index da1df08b8895..438e03fa39be 100644 --- a/vcl/inc/unx/genpspgraphics.h +++ b/vcl/inc/unx/genpspgraphics.h @@ -90,12 +90,6 @@ public: const OUString& rFileURL, const OUString& rFontName ) override; - virtual bool CreateFontSubset( const OUString& rToFile, - const vcl::font::PhysicalFontFace*, - const sal_GlyphId* pGlyphIDs, - const sal_uInt8* pEncoding, - int nGlyphs, - FontSubsetInfo& rInfo ) override; virtual const void* GetEmbedFontData(const vcl::font::PhysicalFontFace*, tools::Long* pDataLen) override; virtual void FreeEmbedFontData( const void* pData, tools::Long nDataLen ) override; virtual std::unique_ptr<GenericSalLayout> diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 0b217a784131..dbb7b98fbfec 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -122,14 +122,6 @@ public: virtual void ClearDevFontCache() override; virtual bool AddTempDevFont( vcl::font::PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override; - virtual bool CreateFontSubset( - const OUString& rToFile, - const vcl::font::PhysicalFontFace*, - const sal_GlyphId* pGlyphIDs, - const sal_uInt8* pEncoding, - int nGlyphs, - FontSubsetInfo& rInfo ) override; - virtual const void* GetEmbedFontData(const vcl::font::PhysicalFontFace*, tools::Long* pDataLen) override; virtual void FreeEmbedFontData( const void* pData, tools::Long nDataLen ) override; |