Commit 263722f7ba2a74ea97eeaf7bb7dfb987609ff110
2001-10-25T04:03:06
Re-ordered initialisation lists to keep project builder happy (MAC OSX)
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
diff --git a/src/FTCharmap.cpp b/src/FTCharmap.cpp
index 31107c6..ae9075b 100644
--- a/src/FTCharmap.cpp
+++ b/src/FTCharmap.cpp
@@ -2,8 +2,8 @@
FTCharmap::FTCharmap( FT_Face face)
-: err(0),
- ftFace( face)
+: ftFace( face),
+ err(0)
{
ftEncoding = face->charmap->encoding;
}
diff --git a/src/FTFace.cpp b/src/FTFace.cpp
index ad47ca3..02f55fb 100755
--- a/src/FTFace.cpp
+++ b/src/FTFace.cpp
@@ -5,9 +5,9 @@
FTFace::FTFace()
-: ftFace(0),
+: charMap(0),
+ ftFace(0),
numCharMaps(0),
- charMap(0),
numGlyphs(0),
err(0)
{}
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index ca504e1..5b1dfbb 100755
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -21,14 +21,14 @@ inline UInt32 NextPowerOf2( UInt32 in)
FTGLTextureFont::FTGLTextureFont()
-: numTextures(1),
- textMem(0),
- padding(1),
- maxTextSize(0),
+: maxTextSize(0),
textureWidth(0),
textureHeight(0),
+ numTextures(1),
+ textMem(0),
glyphHeight(0),
- glyphWidth(0)
+ glyphWidth(0),
+ padding(1)
{}
diff --git a/src/FTSize.cpp b/src/FTSize.cpp
index f5bf65f..31a76db 100755
--- a/src/FTSize.cpp
+++ b/src/FTSize.cpp
@@ -3,8 +3,8 @@
FTSize::FTSize()
-: size(0),
- ftFace(0),
+: ftFace(0),
+ size(0),
err(0)
{}
diff --git a/src/FTVectoriser.cpp b/src/FTVectoriser.cpp
index 54c66ac..27e98a2 100644
--- a/src/FTVectoriser.cpp
+++ b/src/FTVectoriser.cpp
@@ -28,8 +28,8 @@ void FTContour::AddPoint( const float x, const float y)
FTVectoriser::FTVectoriser( const FT_Glyph glyph)
-: contourFlag(0),
- contour(0),
+: contour(0),
+ contourFlag(0),
kBSTEPSIZE( 0.2)
{
FT_OutlineGlyph outline = (FT_OutlineGlyph)glyph;