From e4088a68aa3d69da60f5a1e93c06ca8be3ff764f Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Fri, 17 May 2013 23:23:02 +0200
Subject: Drop unused mpGlyphPositions array

Change-Id: I858832a41ef140fa9916e05548edf2df6b0af451
---
 vcl/coretext/salcoretextlayout.cxx | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'vcl/coretext')

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 << "...";
-- 
cgit