diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-10-10 13:19:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-10-11 11:19:10 +0200 |
| commit | 6f45c0cf86b21772740bb0cafb3d462b058523f3 (patch) | |
| tree | e5ad6dafc77f9ff0233ffcaa61a903d6db7837c0 /vcl | |
| parent | 5dff1f3a995a8e78a156214fd9c32b1005337183 (diff) | |
cool#7318 Calc rendering acceleration
we are spending a lot of time in SalLayoutGlyphsCache::GetLayoutGlyphs,
and most of that is inserting into the GlyphsCache, which has a very
very large key.
Shrink that key a little bit on 64-bit machines, where tools::Long is
64-bit, which is quite unnecessary for FontMetric fields.
Change-Id: I64983d191ba9aeb76671671443ea90f90fd2c401
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157753
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/qa/cppunit/fontmetric.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vcl/qa/cppunit/fontmetric.cxx b/vcl/qa/cppunit/fontmetric.cxx index 8ee42f170a10..bf2585ac38a7 100644 --- a/vcl/qa/cppunit/fontmetric.cxx +++ b/vcl/qa/cppunit/fontmetric.cxx @@ -49,27 +49,27 @@ void VclFontMetricTest::testSpacings() // default constructor should set scalable flag to false FontMetric aFontMetric; - CPPUNIT_ASSERT_EQUAL(tools::Long(0), aFontMetric.GetAscent()); - CPPUNIT_ASSERT_EQUAL(tools::Long(0), aFontMetric.GetDescent()); - CPPUNIT_ASSERT_EQUAL(tools::Long(0), aFontMetric.GetExternalLeading()); - CPPUNIT_ASSERT_EQUAL(tools::Long(0), aFontMetric.GetInternalLeading()); - CPPUNIT_ASSERT_EQUAL(tools::Long(0), aFontMetric.GetLineHeight()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aFontMetric.GetAscent()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aFontMetric.GetDescent()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aFontMetric.GetExternalLeading()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aFontMetric.GetInternalLeading()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aFontMetric.GetLineHeight()); aFontMetric.SetAscent( 100 ); - CPPUNIT_ASSERT_EQUAL(tools::Long(100), aFontMetric.GetAscent()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(100), aFontMetric.GetAscent()); aFontMetric.SetDescent( 100 ); - CPPUNIT_ASSERT_EQUAL(tools::Long(100), aFontMetric.GetDescent()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(100), aFontMetric.GetDescent()); aFontMetric.SetExternalLeading( 100 ); - CPPUNIT_ASSERT_EQUAL(tools::Long(100), aFontMetric.GetExternalLeading()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(100), aFontMetric.GetExternalLeading()); aFontMetric.SetInternalLeading( 100 ); - CPPUNIT_ASSERT_EQUAL(tools::Long(100), aFontMetric.GetInternalLeading()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(100), aFontMetric.GetInternalLeading()); aFontMetric.SetLineHeight( 100 ); - CPPUNIT_ASSERT_EQUAL(tools::Long(100), aFontMetric.GetLineHeight()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(100), aFontMetric.GetLineHeight()); } void VclFontMetricTest::testSlant() @@ -77,10 +77,10 @@ void VclFontMetricTest::testSlant() // default constructor should set scalable flag to false FontMetric aFontMetric; - CPPUNIT_ASSERT_EQUAL(tools::Long(0), aFontMetric.GetSlant()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aFontMetric.GetSlant()); aFontMetric.SetSlant( 45 ); - CPPUNIT_ASSERT_EQUAL(tools::Long(45), aFontMetric.GetSlant()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(45), aFontMetric.GetSlant()); } void VclFontMetricTest::testBulletOffset() @@ -88,10 +88,10 @@ void VclFontMetricTest::testBulletOffset() // default constructor should set scalable flag to false FontMetric aFontMetric; - CPPUNIT_ASSERT_EQUAL(tools::Long(0), aFontMetric.GetBulletOffset()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aFontMetric.GetBulletOffset()); aFontMetric.SetBulletOffset( 45 ); - CPPUNIT_ASSERT_EQUAL(tools::Long(45), aFontMetric.GetBulletOffset()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(45), aFontMetric.GetBulletOffset()); } void VclFontMetricTest::testEqualityOperator() |