Copy ProgramData::uniform_slots in copy constructor and operator=

[libs/gl.git] / source / font.cpp

diff --git a/source/font.cpp b/source/font.cpp
index 069ecf0fa40db27feeaca1e592204fd1a3934408..1005609eb16a8ed1a08377c276a7c152c61d22a0 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -64,7 +64,7 @@ float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
 
 void Font::draw_string(const string &str, StringCodec::Decoder &dec, const Color &color) const
 {
-       Bind bind_tex(get_texture(), true);
+       BindRestore bind_tex(get_texture());
        Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
        imm.color(color);
        build_string(str, dec, imm);
@@ -182,12 +182,12 @@ Font::Glyph::Loader::Loader(Glyph &g):
        add("advance",   &Glyph::advance);
 }
 
-void Font::Glyph::Loader::texcoords(float x1, float y1, float x2, float y2)
+void Font::Glyph::Loader::texcoords(float x1_, float y1_, float x2_, float y2_)
 {
-       obj.x1 = x1;
-       obj.y1 = y1;
-       obj.x2 = x2;
-       obj.y2 = y2;
+       obj.x1 = x1_;
+       obj.y1 = y1_;
+       obj.x2 = x2_;
+       obj.y2 = y2_;
 }
 
 } // namespace GL