Commit 3715b6376e222d3e0a3adc4cec5d739d0a1ae9f0
2001-12-10T21:30:58
Added include for mmgr
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 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191
diff --git a/src/FTBitmapGlyph.cpp b/src/FTBitmapGlyph.cpp
index 6429171..bb3cd6c 100755
--- a/src/FTBitmapGlyph.cpp
+++ b/src/FTBitmapGlyph.cpp
@@ -1,4 +1,7 @@
#include "FTBitmapGlyph.h"
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTBitmapGlyph::FTBitmapGlyph( FT_Glyph glyph)
diff --git a/src/FTFace.cpp b/src/FTFace.cpp
index 02f55fb..996c213 100755
--- a/src/FTFace.cpp
+++ b/src/FTFace.cpp
@@ -1,7 +1,10 @@
#include "FTFace.h"
#include "FTLibrary.h"
#include "FTCharmap.h"
-#include "FTGL.h"
+
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTFace::FTFace()
@@ -24,6 +27,8 @@ FTFace::~FTFace()
bool FTFace::Open( const char* filename)
{
ftFace = new FT_Face;
+
+ // FIXME check library for errors
err = FT_New_Face( *FTLibrary::Instance().GetLibrary(), filename, 0, ftFace);
if( err)
diff --git a/src/FTGLBitmapFont.cpp b/src/FTGLBitmapFont.cpp
index e0cb944..1fc4b59 100755
--- a/src/FTGLBitmapFont.cpp
+++ b/src/FTGLBitmapFont.cpp
@@ -1,6 +1,8 @@
#include "FTGLBitmapFont.h"
-#include "FTGlyphContainer.h"
#include "FTBitmapGlyph.h"
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTGLBitmapFont::FTGLBitmapFont()
diff --git a/src/FTGLExtrdFont.cpp b/src/FTGLExtrdFont.cpp
index bfd633b..67d26f3 100644
--- a/src/FTGLExtrdFont.cpp
+++ b/src/FTGLExtrdFont.cpp
@@ -1,9 +1,8 @@
#include "FTGLExtrdFont.h"
-#include "FTGlyphContainer.h"
-#include "FTGL.h"
#include "FTExtrdGlyph.h"
-
-//#include "mmgr.h"
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTGLExtrdFont::FTGLExtrdFont()
diff --git a/src/FTGLOutlineFont.cpp b/src/FTGLOutlineFont.cpp
index eb5a342..0f594bd 100755
--- a/src/FTGLOutlineFont.cpp
+++ b/src/FTGLOutlineFont.cpp
@@ -1,7 +1,8 @@
#include "FTGLOutlineFont.h"
-#include "FTGlyphContainer.h"
-#include "FTGL.h"
#include "FTOutlineGlyph.h"
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTGLOutlineFont::FTGLOutlineFont()
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index b2023b5..e1ced15 100755
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -1,6 +1,8 @@
#include "FTGLPixmapFont.h"
-#include "FTGlyphContainer.h"
#include "FTPixmapGlyph.h"
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTGLPixmapFont::FTGLPixmapFont()
diff --git a/src/FTGLPolygonFont.cpp b/src/FTGLPolygonFont.cpp
index bd81f9b..31fd9e4 100755
--- a/src/FTGLPolygonFont.cpp
+++ b/src/FTGLPolygonFont.cpp
@@ -1,7 +1,8 @@
#include "FTGLPolygonFont.h"
-#include "FTGlyphContainer.h"
-#include "FTGL.h"
#include "FTPolyGlyph.h"
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTGLPolygonFont::FTGLPolygonFont()
diff --git a/src/FTGlyph.cpp b/src/FTGlyph.cpp
index de8d878..974121e 100755
--- a/src/FTGlyph.cpp
+++ b/src/FTGlyph.cpp
@@ -1,4 +1,7 @@
#include "FTGlyph.h"
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTGlyph::FTGlyph()
diff --git a/src/FTGlyphContainer.cpp b/src/FTGlyphContainer.cpp
index fc9d8de..284771e 100755
--- a/src/FTGlyphContainer.cpp
+++ b/src/FTGlyphContainer.cpp
@@ -1,6 +1,9 @@
#include "FTGlyphContainer.h"
#include "FTGlyph.h"
#include "FTFace.h"
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTGlyphContainer::FTGlyphContainer( FTFace* f, unsigned int g, bool p)
diff --git a/src/FTLibrary.cpp b/src/FTLibrary.cpp
index 72788c0..772df48 100755
--- a/src/FTLibrary.cpp
+++ b/src/FTLibrary.cpp
@@ -1,4 +1,7 @@
#include "FTLibrary.h"
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTLibrary& FTLibrary::Instance()
diff --git a/src/FTPixmapGlyph.cpp b/src/FTPixmapGlyph.cpp
index 465d95b..897fc54 100755
--- a/src/FTPixmapGlyph.cpp
+++ b/src/FTPixmapGlyph.cpp
@@ -1,5 +1,7 @@
#include "FTPixmapGlyph.h"
-#include "FTGL.h"
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTPixmapGlyph::FTPixmapGlyph( FT_Glyph glyph)
diff --git a/src/FTSize.cpp b/src/FTSize.cpp
index a3271b6..88244ad 100755
--- a/src/FTSize.cpp
+++ b/src/FTSize.cpp
@@ -1,5 +1,7 @@
#include "FTSize.h"
-#include "FTGL.h"
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTSize::FTSize()
diff --git a/src/FTTextureGlyph.cpp b/src/FTTextureGlyph.cpp
index 05b4aa1..e7cfd17 100755
--- a/src/FTTextureGlyph.cpp
+++ b/src/FTTextureGlyph.cpp
@@ -1,7 +1,7 @@
#include "FTTextureGlyph.h"
-#include "FTGL.h"
-
-//#include "mmgr.h"
+#ifdef FTGL_DEBUG
+ #include "mmgr.h"
+#endif
FTTextureGlyph::FTTextureGlyph( FT_Glyph glyph, int id, int xOffset, int yOffset, GLsizei width, GLsizei height)