diff options
| author | Tor Lillqvist <tml@collabora.com> | 2022-03-09 11:33:16 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2022-04-13 12:54:33 +0200 |
| commit | cef57d2bfa19d249e1c1721f32640f955a137955 (patch) | |
| tree | 711037ceb57708b02f924d4476b3a9d4b0343869 /vcl/unx/generic/glyphs/freetype_glyphcache.cxx | |
| parent | [cp] This label is too long for Online context menus (diff) | |
| download | core-cef57d2bfa19d249e1c1721f32640f955a137955.tar.gz core-cef57d2bfa19d249e1c1721f32640f955a137955.zip | |
Handle "addfont" from Collabora Online
We use the AddTempDevFont() API to add a new font. Sadly there is no
corresponding way to remove such a temporarily added font.
Change-Id: I6fe61919daa5af29e964cec1caf7293aefa8ea4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131250
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'vcl/unx/generic/glyphs/freetype_glyphcache.cxx')
| -rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 0abddcdd9c09..8e03eddc1929 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -106,12 +106,16 @@ bool FreetypeFontFile::Map() const char* pFileName = maNativeFileName.getStr(); int nFile = open( pFileName, O_RDONLY ); if( nFile < 0 ) + { + SAL_WARN("vcl.unx.freetype", "open('" << maNativeFileName << "') failed: " << strerror(errno)); return false; + } struct stat aStat; int nRet = fstat( nFile, &aStat ); if (nRet < 0) { + SAL_WARN("vcl.unx.freetype", "fstat on '" << maNativeFileName << "' failed: " << strerror(errno)); close (nFile); return false; } @@ -119,7 +123,10 @@ bool FreetypeFontFile::Map() mpFileMap = static_cast<unsigned char*>( mmap( nullptr, mnFileSize, PROT_READ, MAP_SHARED, nFile, 0 )); if( mpFileMap == MAP_FAILED ) + { + SAL_WARN("vcl.unx.freetype", "mmap of '" << maNativeFileName << "' failed: " << strerror(errno)); mpFileMap = nullptr; + } close( nFile ); } |