* Rename FTTextureGlyphImpl::pos to FTTextureGlyphImpl::corner because pos was misleading.
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
diff --git a/src/FTGlyph/FTTextureGlyph.cpp b/src/FTGlyph/FTTextureGlyph.cpp
index 9827729..7525976 100644
--- a/src/FTGlyph/FTTextureGlyph.cpp
+++ b/src/FTGlyph/FTTextureGlyph.cpp
@@ -111,8 +111,7 @@ FTTextureGlyphImpl::FTTextureGlyphImpl(FT_GlyphSlot glyph, int id, int xOffset,
uv[1].X(static_cast<float>(xOffset + destWidth) / static_cast<float>(width));
uv[1].Y(static_cast<float>(yOffset + destHeight) / static_cast<float>(height));
- pos.X(glyph->bitmap_left);
- pos.Y(glyph->bitmap_top);
+ corner = FTPoint(glyph->bitmap_left, glyph->bitmap_top);
}
@@ -131,8 +130,8 @@ const FTPoint& FTTextureGlyphImpl::RenderImpl(const FTPoint& pen,
activeTextureID = glTextureID;
}
- dx = floor(pen.Xf() + pos.Xf());
- dy = floor(pen.Yf() + pos.Yf());
+ dx = floor(pen.Xf() + corner.Xf());
+ dy = floor(pen.Yf() + corner.Yf());
glBegin(GL_QUADS);
glTexCoord2f(uv[0].Xf(), uv[0].Yf());
diff --git a/src/FTGlyph/FTTextureGlyphImpl.h b/src/FTGlyph/FTTextureGlyphImpl.h
index 0a8323f..180f2bf 100644
--- a/src/FTGlyph/FTTextureGlyphImpl.h
+++ b/src/FTGlyph/FTTextureGlyphImpl.h
@@ -62,7 +62,7 @@ class FTTextureGlyphImpl : public FTGlyphImpl
/**
* Vector from the pen position to the topleft corner of the pixmap
*/
- FTPoint pos;
+ FTPoint corner;
/**
* The texture co-ords of this glyph within the texture.