X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.cpp;h=af6b17f85e14946b23088909c26cd056dcbe4768;hb=1021ce203ab092edf5f94770e742d56a3b8cd23b;hp=08846a4c75acd587fa47bce8dd1b835cbd42e153;hpb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f;p=libs%2Fgltk.git

diff --git a/source/text.cpp b/source/text.cpp
index 08846a4..af6b17f 100644
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -231,8 +231,8 @@ void Text::process_lines(const Part &part, const Geometry &parent, unsigned firs
 	int y_offset = static_cast<int>(-font.get_descent()*font_size);
 
 	const Sides &margin = part.get_margin();
-	unsigned n_lines = min(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U));
-	first_row = min(first_row, lines.size()-n_lines);
+	unsigned n_lines = min<unsigned>(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U));
+	first_row = min<unsigned>(first_row, lines.size()-n_lines);
 
 	for(unsigned i=0; i<n_lines; ++i)
 	{