From ebebb531778f57ff0fe8435023326bdc8c4ddc4b Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 3 Sep 2021 12:20:30 +0200
Subject: pack GlyphItem struct

56 bytes -> 48 bytes

Change-Id: I30d9763162b701e3d07a153deae3f5e03c290393
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121583
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 vcl/inc/impglyphitem.hxx | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'vcl')

diff --git a/vcl/inc/impglyphitem.hxx b/vcl/inc/impglyphitem.hxx
index 998c699a5dcb..913a33c1f421 100644
--- a/vcl/inc/impglyphitem.hxx
+++ b/vcl/inc/impglyphitem.hxx
@@ -29,17 +29,17 @@
 
 #include "fontinstance.hxx"
 
-enum class GlyphItemFlags
+enum class GlyphItemFlags : sal_uInt8
 {
     NONE = 0,
-    IS_IN_CLUSTER = 0x001,
-    IS_RTL_GLYPH = 0x002,
-    IS_DIACRITIC = 0x004,
-    IS_VERTICAL = 0x008,
-    IS_SPACING = 0x010,
-    ALLOW_KASHIDA = 0x020,
-    IS_DROPPED = 0x040,
-    IS_CLUSTER_START = 0x080
+    IS_IN_CLUSTER = 0x01,
+    IS_RTL_GLYPH = 0x02,
+    IS_DIACRITIC = 0x04,
+    IS_VERTICAL = 0x08,
+    IS_SPACING = 0x10,
+    ALLOW_KASHIDA = 0x20,
+    IS_DROPPED = 0x40,
+    IS_CLUSTER_START = 0x80
 };
 namespace o3tl
 {
@@ -50,30 +50,30 @@ template <> struct typed_flags<GlyphItemFlags> : is_typed_flags<GlyphItemFlags,
 
 class VCL_DLLPUBLIC GlyphItem
 {
-    sal_GlyphId m_aGlyphId;
-    int m_nCharCount; // number of characters making up this glyph
-    int m_nOrigWidth; // original glyph width
     LogicalFontInstance* m_pFontInstance;
-    int m_nCharPos; // index in string
+    sal_Int32 m_nOrigWidth; // original glyph width
+    sal_Int32 m_nCharPos; // index in string
+    sal_Int32 m_nXOffset;
+    sal_GlyphId m_aGlyphId;
+    sal_Int8 m_nCharCount; // number of characters making up this glyph
     GlyphItemFlags m_nFlags;
-    int m_nXOffset;
 
 public:
-    int m_nNewWidth; // width after adjustments
     Point m_aLinearPos; // absolute position of non rotated string
+    sal_Int32 m_nNewWidth; // width after adjustments
 
     GlyphItem(int nCharPos, int nCharCount, sal_GlyphId aGlyphId, const Point& rLinearPos,
               GlyphItemFlags nFlags, int nOrigWidth, int nXOffset,
               LogicalFontInstance* pFontInstance)
-        : m_aGlyphId(aGlyphId)
-        , m_nCharCount(nCharCount)
+        : m_pFontInstance(pFontInstance)
         , m_nOrigWidth(nOrigWidth)
-        , m_pFontInstance(pFontInstance)
         , m_nCharPos(nCharPos)
-        , m_nFlags(nFlags)
         , m_nXOffset(nXOffset)
-        , m_nNewWidth(nOrigWidth)
+        , m_aGlyphId(aGlyphId)
+        , m_nCharCount(nCharCount)
+        , m_nFlags(nFlags)
         , m_aLinearPos(rLinearPos)
+        , m_nNewWidth(nOrigWidth)
     {
         assert(m_pFontInstance);
     }
-- 
cgit