kc3-lang/ftgl

diff --git a/demo/FTGLDemo.cpp b/demo/FTGLDemo.cpp
index d0d9e61..3616551 100644
--- a/demo/FTGLDemo.cpp
+++ b/demo/FTGLDemo.cpp
@@ -261,7 +261,7 @@ void renderFontmetrics()
         glBegin(GL_LINES);
             glColor3f(0.0, 0.0, 1.0);
             glVertex3f(0.0, 0.0, 0.0);
-            glVertex3f(fonts[current_font]->Advance(myString).Xf(), 0.0, 0.0);
+            glVertex3f(fonts[current_font]->Advance(myString), 0.0, 0.0);
             glVertex3f(0.0, fonts[current_font]->Ascender(), 0.0);
             glVertex3f(0.0, fonts[current_font]->Descender(), 0.0);
         glEnd();
diff --git a/demo/FTGLMFontDemo.cpp b/demo/FTGLMFontDemo.cpp
index efde368..33dea74 100644
--- a/demo/FTGLMFontDemo.cpp
+++ b/demo/FTGLMFontDemo.cpp
@@ -272,7 +272,7 @@ void renderFontmetrics()
         glBegin(GL_LINES);
             glColor3f(0.0, 0.0, 1.0);
             glVertex3f(0.0, 0.0, 0.0);
-            glVertex3f(fonts[current_font]->Advance(myString).Xf(), 0.0, 0.0);
+            glVertex3f(fonts[current_font]->Advance(myString), 0.0, 0.0);
             glVertex3f(0.0, fonts[current_font]->Ascender(), 0.0);
             glVertex3f(0.0, fonts[current_font]->Descender(), 0.0);
         glEnd();
diff --git a/src/FTFont/FTFont.cpp b/src/FTFont/FTFont.cpp
index 2ea7377..fb59656 100644
--- a/src/FTFont/FTFont.cpp
+++ b/src/FTFont/FTFont.cpp
@@ -168,17 +168,15 @@ FTPoint FTFont::Render(const wchar_t * string, const int len,
 }
 
 
-FTPoint FTFont::Advance(const char * string, const int len,
-                        FTPoint position, FTPoint spacing)
+float FTFont::Advance(const char * string, const int len, FTPoint spacing)
 {
-    return impl->Advance(string, len, position, spacing);
+    return impl->Advance(string, len, spacing);
 }
 
 
-FTPoint FTFont::Advance(const wchar_t * string, const int len,
-                        FTPoint position, FTPoint spacing)
+float FTFont::Advance(const wchar_t * string, const int len, FTPoint spacing)
 {
-    return impl->Advance(string, len, position, spacing);
+    return impl->Advance(string, len, spacing);
 }
 
 
@@ -380,7 +378,7 @@ inline FTBBox FTFontImpl::BBoxI(const T* string, const int len,
             totalBBox = glyphList->BBox(thisChar);
             totalBBox += position;
 
-            position += glyphList->Advance(thisChar, nextChar);
+            position += FTPoint(glyphList->Advance(thisChar, nextChar), 0.0);
         }
 
         /* Expand totalBox by each glyph in string */
@@ -397,7 +395,8 @@ inline FTBBox FTFontImpl::BBoxI(const T* string, const int len,
                 tempBBox += position;
                 totalBBox |= tempBBox;
 
-                position += glyphList->Advance(thisChar, nextChar);
+                position += FTPoint(glyphList->Advance(thisChar, nextChar),
+                                    0.0);
             }
         }
     }
@@ -422,9 +421,10 @@ FTBBox FTFontImpl::BBox(const wchar_t *string, const int len,
 
 
 template <typename T>
-inline FTPoint FTFontImpl::AdvanceI(const T* string, const int len,
-                                    FTPoint position, FTPoint spacing)
+inline float FTFontImpl::AdvanceI(const T* string, const int len,
+                                  FTPoint spacing)
 {
+    float advance = 0.0f;
     FTUnicodeStringItr<T> ustr(string);
 
     for(int i = 0; (len < 0 && *ustr) || (len >= 0 && i < len); i++)
@@ -434,32 +434,29 @@ inline FTPoint FTFontImpl::AdvanceI(const T* string, const int len,
 
         if(CheckGlyph(thisChar))
         {
-            position += glyphList->Advance(thisChar, nextChar);
+            advance += glyphList->Advance(thisChar, nextChar);
         }
 
         if(nextChar)
         {
-            position += spacing;
+            advance += spacing.Xf();
         }
     }
 
-    return position;
+    return advance;
 }
 
 
-FTPoint FTFontImpl::Advance(const char* string, const int len,
-                            FTPoint position, FTPoint spacing)
+float FTFontImpl::Advance(const char* string, const int len, FTPoint spacing)
 {
     /* The chars need to be unsigned because they are cast to int later */
-    return AdvanceI((const unsigned char *)string,
-                    len, position, spacing);
+    return AdvanceI((const unsigned char *)string, len, spacing);
 }
 
 
-FTPoint FTFontImpl::Advance(const wchar_t* string, const int len,
-                            FTPoint position, FTPoint spacing)
+float FTFontImpl::Advance(const wchar_t* string, const int len, FTPoint spacing)
 {
-    return AdvanceI(string, len, position, spacing);
+    return AdvanceI(string, len, spacing);
 }
 
 
@@ -468,7 +465,7 @@ inline FTPoint FTFontImpl::RenderI(const T* string, const int len,
                                    FTPoint position, FTPoint spacing,
                                    int renderMode)
 {
-     // for multibyte - we can't rely on sizeof(T) == character
+    // for multibyte - we can't rely on sizeof(T) == character
     FTUnicodeStringItr<T> ustr(string);
 
     for(int i = 0; (len < 0 && *ustr) || (len >= 0 && i < len); i++)
diff --git a/src/FTFont/FTFontGlue.cpp b/src/FTFont/FTFontGlue.cpp
index cb5c334..ccb4e95 100644
--- a/src/FTFont/FTFontGlue.cpp
+++ b/src/FTFont/FTFontGlue.cpp
@@ -200,15 +200,8 @@ void ftglGetFontBBox(FTGLfont *f, const char* s, int len, float c[6])
 }
 
 // float FTFont::Advance(const char* string);
-extern "C++" {
-C_FUN(static FTPoint, _ftglGetFontAdvance, (FTGLfont *f, char const *s),
-      return static_ftpoint, Advance, (s));
-}
-
-float ftglGetFontAdvance(FTGLfont *f, const char* s)
-{
-    return _ftglGetFontAdvance(f, s).Xf();
-}
+C_FUN(float, ftglGetFontAdvance, (FTGLfont *f, char const *s),
+      return 0.0, Advance, (s));
 
 // virtual void Render(const char* string, int renderMode);
 extern "C++" {
diff --git a/src/FTFont/FTFontImpl.h b/src/FTFont/FTFontImpl.h
index 7962e8e..e9dd3d2 100644
--- a/src/FTFont/FTFontImpl.h
+++ b/src/FTFont/FTFontImpl.h
@@ -79,11 +79,9 @@ class FTFontImpl
 
         virtual FTBBox BBox(const wchar_t *s, const int len, FTPoint, FTPoint);
 
-        virtual FTPoint Advance(const char *s, const int len,
-                                FTPoint, FTPoint);
+        virtual float Advance(const char *s, const int len, FTPoint);
 
-        virtual FTPoint Advance(const wchar_t *s, const int len,
-                                FTPoint, FTPoint);
+        virtual float Advance(const wchar_t *s, const int len, FTPoint);
 
         virtual FTPoint Render(const char *s, const int len,
                                FTPoint, FTPoint, int);
@@ -144,8 +142,7 @@ class FTFontImpl
 
         /* Internal generic Advance() implementation */
         template <typename T>
-        inline FTPoint AdvanceI(const T *s, const int len,
-                                FTPoint position, FTPoint spacing);
+        inline float AdvanceI(const T *s, const int len, FTPoint spacing);
 
         /* Internal generic Render() implementation */
         template <typename T>
diff --git a/src/FTGL/FTFont.h b/src/FTGL/FTFont.h
index 9887600..608b1a0 100644
--- a/src/FTGL/FTFont.h
+++ b/src/FTGL/FTFont.h
@@ -289,14 +289,12 @@ class FTGL_EXPORT FTFont
          * @param len  The length of the string. If < 0 then all characters
          *             will be checked until a null character is encountered
          *             (optional).
-         * @param position  The pen position of the first character (optional).
          * @param spacing  A displacement vector to add after each character
          *                 has been checked (optional).
-         * @return  The new pen position after the last character.
+         * @return  The string's advance width.
          */
-        virtual FTPoint Advance(const char* string, const int len = -1,
-                                FTPoint position = FTPoint(),
-                                FTPoint spacing = FTPoint());
+        virtual float Advance(const char* string, const int len = -1,
+                              FTPoint spacing = FTPoint());
 
         /**
          * Get the advance for a string.
@@ -305,14 +303,12 @@ class FTGL_EXPORT FTFont
          * @param len  The length of the string. If < 0 then all characters
          *             will be checked until a null character is encountered
          *             (optional).
-         * @param position  The pen position of the first character (optional).
          * @param spacing  A displacement vector to add after each character
          *                 has been checked (optional).
-         * @return  The new pen position after the last character.
+         * @return  The string's advance width.
          */
-        virtual FTPoint Advance(const wchar_t* string, const int len = -1,
-                                FTPoint position = FTPoint(),
-                                FTPoint spacing = FTPoint());
+        virtual float Advance(const wchar_t* string, const int len = -1,
+                              FTPoint spacing = FTPoint());
 
         /**
          * Render a string of characters.
diff --git a/src/FTGL/FTGlyph.h b/src/FTGL/FTGlyph.h
index bffe244..b446d96 100644
--- a/src/FTGL/FTGlyph.h
+++ b/src/FTGL/FTGlyph.h
@@ -95,7 +95,7 @@ class FTGL_EXPORT FTGlyph
          *
          * @return  advance width.
          */
-        virtual const FTPoint& Advance() const;
+        virtual float Advance() const;
 
         /**
          * Return the bounding box for this glyph.
@@ -174,13 +174,9 @@ FTGL_EXPORT void ftglRenderGlyph(FTGLglyph *glyph, FTGL_DOUBLE penx,
  * Return the advance for a glyph.
  *
  * @param glyph  An FTGLglyph* object.
- * @param advancex  A pointer to an FTGL_DOUBLE where to write the advance's X
- *                  component.
- * @param advancey  A pointer to an FTGL_DOUBLE where to write the advance's Y
- *                  component.
+ * @param return  The advance's X component.
  */
-FTGL_EXPORT void ftglGetGlyphAdvance(FTGLglyph *glyph, FTGL_DOUBLE *advancex,
-                                     FTGL_DOUBLE *advancey);
+FTGL_EXPORT float ftglGetGlyphAdvance(FTGLglyph *glyph);
 
 /**
  * Return the bounding box for a glyph.
diff --git a/src/FTGlyph/FTGlyph.cpp b/src/FTGlyph/FTGlyph.cpp
index 8c3eab7..4116ebf 100644
--- a/src/FTGlyph/FTGlyph.cpp
+++ b/src/FTGlyph/FTGlyph.cpp
@@ -54,7 +54,7 @@ FTGlyph::~FTGlyph()
 }
 
 
-const FTPoint& FTGlyph::Advance() const
+float FTGlyph::Advance() const
 {
     return impl->Advance();
 }
@@ -82,7 +82,8 @@ FTGlyphImpl::FTGlyphImpl(FT_GlyphSlot glyph, bool useList) : err(0)
     if(glyph)
     {
         bBox = FTBBox(glyph);
-        advance = FTPoint(glyph->advance.x / 64.0f, glyph->advance.y / 64.0f, 0.0f);
+        advance = FTPoint(glyph->advance.x / 64.0f,
+                          glyph->advance.y / 64.0f);
     }
 }
 
@@ -91,9 +92,9 @@ FTGlyphImpl::~FTGlyphImpl()
 {}
 
 
-const FTPoint& FTGlyphImpl::Advance() const
+float FTGlyphImpl::Advance() const
 {
-    return advance;
+    return advance.Xf();
 }
 
 
diff --git a/src/FTGlyph/FTGlyphGlue.cpp b/src/FTGlyph/FTGlyphGlue.cpp
index d377461..dddc31b 100644
--- a/src/FTGlyph/FTGlyphGlue.cpp
+++ b/src/FTGlyph/FTGlyphGlue.cpp
@@ -104,7 +104,7 @@ public:
         destroyCallback(baseGlyph, data);
     }
 
-    const FTPoint& Advance() const { return baseGlyph->ptr->Advance(); }
+    float Advance() const { return baseGlyph->ptr->Advance(); }
 
     const FTPoint& Render(const FTPoint& pen, int renderMode)
     {
@@ -175,19 +175,8 @@ void ftglRenderGlyph(FTGLglyph *g, FTGL_DOUBLE penx, FTGL_DOUBLE peny,
     *advancey = ret.Y();
 }
 
-// const FTPoint& FTGlyph::Advance() const;
-extern "C++" {
-C_FUN(static const FTPoint&, _ftglGetGlyphAdvance, (FTGLglyph *g),
-      return static_ftpoint, Advance, ());
-}
-
-void ftglGetGlyphAdvance(FTGLglyph *g, FTGL_DOUBLE *advancex,
-                         FTGL_DOUBLE *advancey)
-{
-    FTPoint ret = _ftglGetGlyphAdvance(g);
-    *advancex = ret.X();
-    *advancey = ret.Y();
-}
+// float FTGlyph::Advance() const;
+C_FUN(float, ftglGetGlyphAdvance, (FTGLglyph *g), return 0.0, Advance, ());
 
 // const FTBBox& FTGlyph::BBox() const;
 extern "C++" {
diff --git a/src/FTGlyph/FTGlyphImpl.h b/src/FTGlyph/FTGlyphImpl.h
index e25ad40..d470d0f 100644
--- a/src/FTGlyph/FTGlyphImpl.h
+++ b/src/FTGlyph/FTGlyphImpl.h
@@ -37,7 +37,7 @@ class FTGlyphImpl
 
         virtual ~FTGlyphImpl();
 
-        const FTPoint& Advance() const;
+        float Advance() const;
 
         const FTBBox& BBox() const;
 
diff --git a/src/FTGlyphContainer.cpp b/src/FTGlyphContainer.cpp
index b18750c..c5fc8f1 100644
--- a/src/FTGlyphContainer.cpp
+++ b/src/FTGlyphContainer.cpp
@@ -88,13 +88,13 @@ FTBBox FTGlyphContainer::BBox(const unsigned int charCode) const
 }
 
 
-FTPoint FTGlyphContainer::Advance(const unsigned int charCode,
-                                  const unsigned int nextCharCode)
+float FTGlyphContainer::Advance(const unsigned int charCode,
+                                const unsigned int nextCharCode)
 {
     unsigned int left = charMap->FontIndex(charCode);
     unsigned int right = charMap->FontIndex(nextCharCode);
 
-    return face->KernAdvance(left, right) + Glyph(charCode)->Advance();
+    return face->KernAdvance(left, right).Xf() + Glyph(charCode)->Advance();
 }
 
 
diff --git a/src/FTGlyphContainer.h b/src/FTGlyphContainer.h
index 5e133d7..d27b69c 100644
--- a/src/FTGlyphContainer.h
+++ b/src/FTGlyphContainer.h
@@ -107,8 +107,8 @@ class FTGlyphContainer
         * @param nextCharacterCode the next glyph in a string
         * @return                  advance width
         */
-        FTPoint Advance(const unsigned int characterCode,
-                        const unsigned int nextCharacterCode);
+        float Advance(const unsigned int characterCode,
+                      const unsigned int nextCharacterCode);
 
         /**
          * Renders a character
diff --git a/src/FTLayout/FTSimpleLayout.cpp b/src/FTLayout/FTSimpleLayout.cpp
index 505c813..bcc65a6 100644
--- a/src/FTLayout/FTSimpleLayout.cpp
+++ b/src/FTLayout/FTSimpleLayout.cpp
@@ -222,7 +222,7 @@ inline void FTSimpleLayoutImpl::WrapTextI(const T *buf, const int len,
         glyphBounds = currentFont->BBox(itr.getBufferFromHere(), 1);
         glyphWidth = glyphBounds.Upper().Xf() - glyphBounds.Lower().Xf();
 
-        advance = currentFont->Advance(itr.getBufferFromHere(), 1).Xf();
+        advance = currentFont->Advance(itr.getBufferFromHere(), 1);
         prevWidth = currentWidth;
         // Compute the width of all glyphs up to the end of buf[i]
         currentWidth = nextStart + glyphWidth;
diff --git a/test/FTFont-Test.cpp b/test/FTFont-Test.cpp
index ca28b1a..1bd4333 100644
--- a/test/FTFont-Test.cpp
+++ b/test/FTFont-Test.cpp
@@ -12,10 +12,14 @@ class TestGlyph : public FTGlyph
 {
     public:
         TestGlyph(FT_GlyphSlot glyph)
-        :   FTGlyph(glyph)
+        :   FTGlyph(glyph),
+            advance(FTPoint(Advance(), 0.0))
         {}
 
-        const FTPoint& Render(const FTPoint& pen, int renderMode){ return Advance(); }
+        const FTPoint& Render(const FTPoint& pen, int renderMode){ return advance; }
+
+    private:
+        FTPoint advance;
 };
 
 
@@ -127,7 +131,7 @@ class FTFontTest : public CppUnit::TestCase
             CPPUNIT_ASSERT_DOUBLES_EQUAL(0, testFont->Descender(), 0.01);
             CPPUNIT_ASSERT_DOUBLES_EQUAL(0, testFont->LineHeight(), 0.01);
 
-            float advance = testFont->Advance(GOOD_UNICODE_TEST_STRING).Xf();
+            float advance = testFont->Advance(GOOD_UNICODE_TEST_STRING);
             CPPUNIT_ASSERT_EQUAL(advance, 0.f);
 
             CPPUNIT_ASSERT(testFont->FaceSize(FONT_POINT_SIZE));
@@ -227,7 +231,7 @@ class FTFontTest : public CppUnit::TestCase
         {
             BadGlyphTestFont* font = new BadGlyphTestFont(GOOD_FONT_FILE);
 
-            float advance = font->Advance(GOOD_ASCII_TEST_STRING).Xf();
+            float advance = font->Advance(GOOD_ASCII_TEST_STRING);
             CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, advance, 0.01);
         }
 
@@ -236,16 +240,16 @@ class FTFontTest : public CppUnit::TestCase
             CPPUNIT_ASSERT(testFont->FaceSize(FONT_POINT_SIZE));
             CPPUNIT_ASSERT_EQUAL(testFont->Error(), 0);
 
-            float advance = testFont->Advance(GOOD_ASCII_TEST_STRING).Xf();
+            float advance = testFont->Advance(GOOD_ASCII_TEST_STRING);
             CPPUNIT_ASSERT_DOUBLES_EQUAL(312.10, advance, 0.01);
 
-            advance = testFont->Advance(BAD_ASCII_TEST_STRING).Xf();
+            advance = testFont->Advance(BAD_ASCII_TEST_STRING);
             CPPUNIT_ASSERT_DOUBLES_EQUAL(0, advance, 0.01);
 
-            advance = testFont->Advance(GOOD_UNICODE_TEST_STRING).Xf();
+            advance = testFont->Advance(GOOD_UNICODE_TEST_STRING);
             CPPUNIT_ASSERT_DOUBLES_EQUAL(144, advance, 0.01);
 
-            advance = testFont->Advance(BAD_UNICODE_TEST_STRING).Xf();
+            advance = testFont->Advance(BAD_UNICODE_TEST_STRING);
             CPPUNIT_ASSERT_DOUBLES_EQUAL(0, advance, 0.01);
         }
 
diff --git a/test/FTGlyph-Test.cpp b/test/FTGlyph-Test.cpp
index 2fb5b6a..e916bfb 100644
--- a/test/FTGlyph-Test.cpp
+++ b/test/FTGlyph-Test.cpp
@@ -13,10 +13,14 @@ class TestGlyph : public FTGlyph
 {
     public:
         TestGlyph(FT_GlyphSlot glyph)
-        :   FTGlyph(glyph)
+        :   FTGlyph(glyph),
+            advance(FTPoint(Advance(), 0.0))
         {}
 
-        const FTPoint& Render(const FTPoint& pen, int renderMode) { return Advance(); };
+        const FTPoint& Render(const FTPoint& pen, int renderMode) { return advance; };
+
+    private:
+        FTPoint advance;
 };
 
 
@@ -37,12 +41,7 @@ class FTGlyphTest : public CppUnit::TestCase
         {
             TestGlyph testGlyph(0);
 
-            FTPoint testPoint;
-
-            CPPUNIT_ASSERT(testPoint == testGlyph.Advance());
-            CPPUNIT_ASSERT_EQUAL(testPoint.X(), testGlyph.Advance().X());
-            CPPUNIT_ASSERT_EQUAL(testPoint.Y(), testGlyph.Advance().Y());
-            CPPUNIT_ASSERT_EQUAL(testPoint.Z(), testGlyph.Advance().Z());
+            CPPUNIT_ASSERT(0.0 == testGlyph.Advance());
 
             CPPUNIT_ASSERT_DOUBLES_EQUAL(0, testGlyph.BBox().Upper().Y(), 0.01);
 
@@ -55,12 +54,9 @@ class FTGlyphTest : public CppUnit::TestCase
             setUpFreetype(CHARACTER_CODE_A);
             TestGlyph testGlyph(face->glyph);
 
-            FTPoint testPoint(47.0, 0.0, 0.0);
-            FTPoint nextPoint = testGlyph.Advance();
-            CPPUNIT_ASSERT(testPoint == nextPoint);
-            CPPUNIT_ASSERT_DOUBLES_EQUAL(testPoint.X(), nextPoint.X(), 0.0001);
-            CPPUNIT_ASSERT_DOUBLES_EQUAL(testPoint.Y(), nextPoint.Y(), 0.0001);
-            CPPUNIT_ASSERT_DOUBLES_EQUAL(testPoint.Z(), nextPoint.Z(), 0.0001);
+            float testPoint = 47.0;
+            float nextPoint = testGlyph.Advance();
+            CPPUNIT_ASSERT_DOUBLES_EQUAL(testPoint, nextPoint, 0.0001);
 
             CPPUNIT_ASSERT_DOUBLES_EQUAL(51.39, testGlyph.BBox().Upper().Y(), 0.01);
 
diff --git a/test/FTGlyphContainer-Test.cpp b/test/FTGlyphContainer-Test.cpp
index 73520b7..b840a3c 100644
--- a/test/FTGlyphContainer-Test.cpp
+++ b/test/FTGlyphContainer-Test.cpp
@@ -86,7 +86,7 @@ class FTGlyphContainerTest : public CppUnit::TestCase
             TestGlyph* glyph = new TestGlyph();
 
             glyphContainer->Add(glyph, CHARACTER_CODE_A);
-            float advance = glyphContainer->Advance(CHARACTER_CODE_A, 0).Xf();
+            float advance = glyphContainer->Advance(CHARACTER_CODE_A, 0);
 
             CPPUNIT_ASSERT_DOUBLES_EQUAL(50, advance, 0.01);
         }