[XaraXtreme-dev] Fix for bug 1124

[Martin Wuerthner <lists@xxxxxxxxxxxxxxx>]

Find attached below a fix for bug 1124
http://bugzilla.xara.com/show_bug.cgi?id=1124

The font that prevented XaraLX from starting was called "Typeface © 
Draftlight/Aeryn/Wind-Up Records 2003. All Rights Reserved". I guess, 
FreeType reports the wrong name for this font. Fonts with excessively 
long names are now ignored.

Martin

Index: wxOil/ftfonts.cpp
===================================================================
--- wxOil/ftfonts.cpp	(Revision 1297)
+++ wxOil/ftfonts.cpp	(Arbeitskopie)
@@ -146,6 +146,11 @@
 	return e1.elfLogFont.FaceName.CompareTo(e2.elfLogFont.FaceName, FALSE) < 0;
 }
 
+bool operator==(const ENUMLOGFONT &e1, const ENUMLOGFONT &e2)
+{
+	return e1.elfLogFont.FaceName.CompareTo(e2.elfLogFont.FaceName, FALSE) == 0;
+}
+
 /********************************************************************************************
 
 >	FTFont::FTFont()
@@ -512,7 +517,17 @@
 
 bool MyFontEnumerator::OnFacename(const wxString& font)
 {
-	// we need to pass a ENUMLOGFONT structure to the kernel
+	// we need to pass an ENUMLOGFONT structure to the kernel
+	// TRACEUSER("wuerthne", _T("OnFacename %s"), (const TCHAR*)font);
+
+	// We can only handle names that have less than 64 characters. Longer
+	// names are not sensible but there are silly fonts out there that have
+	// names exceeding our limit (even though the one font that highlighted
+	// this problem seemed to have its copyright message reported as the name
+	// which would look silly on the menu anyway). Truncating the name does
+	// not make any sense because we would not be able to handle it later on,
+	// so the best we can do is to silently ignore the font.
+	if (font.length() > 63) return TRUE;
 	String_64 OurFontName = font;
 	
 	ENUMLOGFONT OurEnumLogFont;