summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-05-17 23:23:02 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2013-05-18 00:35:53 +0200
commite4088a68aa3d69da60f5a1e93c06ca8be3ff764f (patch)
tree510729680f4732cf80c7a000b446f5e99e5bb692 /vcl
parent81ec93f8448d32933e2697613449baf573b63e42 (diff)
Drop unused mpGlyphPositions array
Change-Id: I858832a41ef140fa9916e05548edf2df6b0af451
Diffstat (limited to 'vcl')
-rw-r--r--vcl/coretext/salcoretextlayout.cxx10
1 files changed, 1 insertions, 9 deletions
diff --git a/vcl/coretext/salcoretextlayout.cxx b/vcl/coretext/salcoretextlayout.cxx
index 650506d61b84..d2c2d48cf519 100644
--- a/vcl/coretext/salcoretextlayout.cxx
+++ b/vcl/coretext/salcoretextlayout.cxx
@@ -81,7 +81,6 @@ private:
mutable CGSize* mpGlyphAdvances;
- mutable CGPoint* mpGlyphPositions;
mutable CTTypesetterRef mpTypesetter;
mutable CTLineRef mpLine;
mutable bool mbHasBoundRectangle;
@@ -108,7 +107,6 @@ CoreTextLayout::CoreTextLayout(CoreTextStyleInfo* style) :
mpCharWidths(NULL),
mpGlyphs2Chars(NULL),
mpGlyphAdvances(NULL),
- mpGlyphPositions(NULL),
mpTypesetter(NULL),
mpLine(NULL),
mbHasBoundRectangle(false),
@@ -196,10 +194,6 @@ void CoreTextLayout::InvalidateMeasurements()
delete[] mpGlyphAdvances;
mpGlyphAdvances = NULL;
}
- if( mpGlyphPositions ) {
- delete[] mpGlyphPositions;
- mpGlyphPositions = NULL;
- }
mbHasBoundRectangle = false;
}
@@ -601,7 +595,6 @@ void CoreTextLayout::GetMeasurements()
mpCharWidths = new CGFloat[ mnCharCount ];
mpGlyphs2Chars = new int[ mnGlyphCount ];
mpGlyphAdvances = new CGSize[ mnGlyphCount ];
- mpGlyphPositions = new CGPoint[ mnGlyphCount ];
CFArrayRef runs = CTLineGetGlyphRuns( mpLine );
const CFIndex nRuns = CFArrayGetCount( runs );
@@ -630,7 +623,6 @@ void CoreTextLayout::GetMeasurements()
CTRunGetGlyphs( run, CFRangeMake( 0, 0 ), &mpGlyphs[ lineGlyphIx ] );
- CTRunGetPositions( run, CFRangeMake( 0, 0 ), &mpGlyphPositions[ lineGlyphIx ] );
CTRunGetAdvances( run, CFRangeMake( 0, 0 ), &mpGlyphAdvances[ lineGlyphIx ] );
for ( CFIndex runGlyphIx = 0 ; runGlyphIx < runGlyphCount; lineGlyphIx++, runGlyphIx++ )
@@ -645,7 +637,7 @@ void CoreTextLayout::GetMeasurements()
for ( int i = 0; i < runGlyphCount; i++ ) {
const int ix = lineRunGlyphStartIx + i;
if ( i < 7 ) {
- glyphPositionInfo << " " << mpGlyphs[ ix ] << "@" << mpGlyphPositions[ ix ];
+ glyphPositionInfo << " " << mpGlyphs[ ix ];
glyphAdvancesInfo << " " << mpGlyphAdvances[ ix ];
} else if (i == 7 ) {
glyphPositionInfo << "...";