X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.cpp;h=c96ec7507aeee520962acf37fcdb2c4a997f4a17;hb=d7e7f87d173156aa12694ce54d688c40a2eabe2e;hp=323152dc74b220c6730e024cef11f9ce59637f50;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/font.cpp b/source/font.cpp
index 323152dc..c96ec750 100644
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -26,7 +26,7 @@ void Font::set_texture(const Texture2D &t)
 const Texture2D &Font::get_texture() const
 {
 	if(!texture)
-		throw InvalidState("No texture");
+		throw logic_error("No texture");
 	return *texture;
 }
 
@@ -46,7 +46,7 @@ void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, floa
 	glyphs.insert(GlyphMap::value_type(code, glyph));
 }
 
-float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
+float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
 {
 	float x = 0;
 
@@ -56,13 +56,13 @@ float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
 	return x;
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec) const
+void Font::draw_string(const string &str, StringCodec::Decoder &dec) const
 {
 	Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
 	draw_string(str, dec, imm);
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &bld) const
+void Font::draw_string(const string &str, StringCodec::Decoder &dec, PrimitiveBuilder &bld) const
 {
 	MatrixStack::Push push_mtx(bld.matrix());
 	Bind bind_tex(get_texture(), true);
@@ -145,7 +145,7 @@ void Font::Loader::texture()
 
 void Font::Loader::texture_ref(const string &name)
 {
-	obj.texture = get_collection().get<Texture2D>(name);
+	obj.texture = &get_collection().get<Texture2D>(name);
 	obj.texture.keep();
 }