summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2018-04-21 20:39:43 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2018-04-22 09:30:08 +0200
commit456de479fad14968cb38c15d906a0573f43e619a (patch)
tree9993dbfeb74061d9a1760b38a98ff711a16c0f18 /vcl
parentb3e0ef4cacfa63be7a6d4f152f197d07a3bbe255 (diff)
sal_GlyphId can be 16 bit now
OpenType glyph ids are 16 bit unsigned integers, but we were using 32 bit integer and abusing the higher bits to set glyph flags. All such abuses are now gone and we can make it a simple 16 bit integer. Change-Id: I594068675f239fd525376fd9ea752462ec3edd9d Reviewed-on: https://gerrit.libreoffice.org/53270 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/quartz/salgdi.h2
-rw-r--r--vcl/inc/sallayout.hxx2
2 files changed, 1 insertions, 3 deletions
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 071cc0c079f2..1b9782fa652b 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -53,8 +53,6 @@ class CoreTextStyle;
class XorEmulation;
class CommonSalLayout;
-typedef sal_uInt32 sal_GlyphId;
-
// CoreText-specific physically available font face
class CoreTextFontFace : public PhysicalFontFace
{
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index ffc38d4b8adf..a430223adc02 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -249,7 +249,7 @@ private:
bool mbIncomplete;
};
-typedef sal_uInt32 sal_GlyphId;
+typedef sal_uInt16 sal_GlyphId;
struct GlyphItem
{