Fix crash when running lyx -dbg insets -e ...

[lyx.git] / src / font.C

diff --git a/src/font.C b/src/font.C
index 5a6f4fa74727db4355a430db335c316c46c65b67..65e2b427665992486acba1ed41f683d6b117e32e 100644 (file)
--- a/src/font.C
+++ b/src/font.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -20,9 +20,11 @@
 #include "FontLoader.h"
 #include "lyxrc.h"
 #include "encoding.h"
+#include "language.h"
 
-// namespace {
-static inline
+namespace {
+
+inline
 XFontStruct * getXFontstruct(LyXFont const & f)
 {
        return fontloader.load(f.family(), f.series(),
@@ -30,12 +32,13 @@ XFontStruct * getXFontstruct(LyXFont const & f)
 }
 
 
-static inline
+inline
 XID getFontID(LyXFont const & f)
 {
        return getXFontstruct(f)->fid;
 }
-// } // end of anon namespace
+
+} // namespace anon
 
 int lyxfont::maxAscent(LyXFont const & f)
 {
@@ -174,7 +177,7 @@ int lyxfont::width(XChar2b const * s, int n, LyXFont const & f)
        } else {
                // emulate smallcaps since X doesn't support this
                unsigned int result = 0;
-               static XChar2b c = {0, 0};
+               static XChar2b c;
                LyXFont smallfont(f);
                smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
                for (int i = 0; i < n; ++i) {