Commit c4e1b0fda10e4e3640e8d375e502380de802a4c8
2002-11-28T09:40:05
Got rid of the tabs
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130
diff --git a/src/FTGlyphContainer.cpp b/src/FTGlyphContainer.cpp
index 0fe9eb0..4950fac 100755
--- a/src/FTGlyphContainer.cpp
+++ b/src/FTGlyphContainer.cpp
@@ -1,80 +1,80 @@
-#include "FTGlyphContainer.h"
-#include "FTGlyph.h"
-#include "FTFace.h"
+#include "FTGlyphContainer.h"
+#include "FTGlyph.h"
+#include "FTFace.h"
FTGlyphContainer::FTGlyphContainer( FTFace* f, unsigned int g, bool p)
-: preCache( p),
- numGlyphs( g),
- face( f),
- err( 0)
+: preCache( p),
+ numGlyphs( g),
+ face( f),
+ err( 0)
{
- // Fill the glyphlist with null glyphs
- glyphs.resize( g, NULL);
+ // Fill the glyphlist with null glyphs
+ glyphs.resize( g, NULL);
}
FTGlyphContainer::~FTGlyphContainer()
{
- GlyphVector::iterator iter;
- for( iter = glyphs.begin(); iter != glyphs.end(); ++iter)
- {
- if( *iter)
- {
- delete *iter;
- }
- }
-
- glyphs.clear();
+ GlyphVector::iterator iter;
+ for( iter = glyphs.begin(); iter != glyphs.end(); ++iter)
+ {
+ if( *iter)
+ {
+ delete *iter;
+ }
+ }
+
+ glyphs.clear();
}
bool FTGlyphContainer::Add( FTGlyph* tempGlyph, unsigned int g)
{
- glyphs[g] = tempGlyph;
- return true;
+ glyphs[g] = tempGlyph;
+ return true;
}
FTGlyph* FTGlyphContainer::Glyph( const unsigned int c) const
{
- return glyphs[face->CharIndex( c)];
+ return glyphs[face->CharIndex( c)];
}
FTBBox FTGlyphContainer::BBox( const unsigned int index) const
{
- return glyphs[face->CharIndex( index)]->BBox();
+ return glyphs[face->CharIndex( index)]->BBox();
}
float FTGlyphContainer::Advance( unsigned int index, unsigned int next)
{
- unsigned int left = face->CharIndex( index);
- unsigned int right = face->CharIndex( next);
-
- float width = face->KernAdvance( left, right).x;
- width += glyphs[left]->Advance();
-
- return width;
+ unsigned int left = face->CharIndex( index);
+ unsigned int right = face->CharIndex( next);
+
+ float width = face->KernAdvance( left, right).x;
+ width += glyphs[left]->Advance();
+
+ return width;
}
FTPoint FTGlyphContainer::render( unsigned int index, unsigned int next, FTPoint pen)
{
- FTPoint kernAdvance;
+ FTPoint kernAdvance;
float advance = 0;
-
- unsigned int left = face->CharIndex( index);
- unsigned int right = face->CharIndex( next);
-
- kernAdvance = face->KernAdvance( left, right);
-
- if( !face->Error())
- {
- advance = glyphs[left]->Render( pen);
- }
-
- kernAdvance.x = advance + kernAdvance.x;
-// kernAdvance.y = advance.y + kernAdvance.y;
- return kernAdvance;
+
+ unsigned int left = face->CharIndex( index);
+ unsigned int right = face->CharIndex( next);
+
+ kernAdvance = face->KernAdvance( left, right);
+
+ if( !face->Error())
+ {
+ advance = glyphs[left]->Render( pen);
+ }
+
+ kernAdvance.x = advance + kernAdvance.x;
+// kernAdvance.y = advance.y + kernAdvance.y;
+ return kernAdvance;
}