|
|
@@ -1719,26 +1719,26 @@ load_default_font() {
|
|
|
}
|
|
|
|
|
|
// Then, attempt to load the compiled-in font, if we have one.
|
|
|
-#ifdef COMPILE_IN_DEFAULT_FONT
|
|
|
-#ifdef HAVE_FREETYPE
|
|
|
+ #ifdef COMPILE_IN_DEFAULT_FONT
|
|
|
+ #ifdef HAVE_FREETYPE
|
|
|
// Loading the compiled-in FreeType font is relatively easy.
|
|
|
_default_font = new DynamicTextFont((const char *)default_font_data,
|
|
|
default_font_size, 0);
|
|
|
|
|
|
-#else
|
|
|
+ #else
|
|
|
// The compiled-in Bam font requires creating a BamFile object to
|
|
|
// decode it.
|
|
|
string data((const char *)default_font_data, default_font_size);
|
|
|
|
|
|
-#ifdef HAVE_ZLIB
|
|
|
+ #ifdef HAVE_ZLIB
|
|
|
// The font data is stored compressed; decompress it on-the-fly.
|
|
|
istringstream inz(data);
|
|
|
IDecompressStream in(&inz, false);
|
|
|
|
|
|
-#else
|
|
|
+ #else
|
|
|
// The font data is stored uncompressed, so just load it.
|
|
|
istringstream in(data);
|
|
|
-#endif // HAVE_ZLIB
|
|
|
+ #endif // HAVE_ZLIB
|
|
|
|
|
|
BamFile bam_file;
|
|
|
if (bam_file.open_read(in, "default font stream")) {
|
|
|
@@ -1748,6 +1748,6 @@ load_default_font() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-#endif // HAVE_FREETYPE
|
|
|
-#endif // COMPILE_IN_DEFAULT_FONT
|
|
|
+ #endif // HAVE_FREETYPE
|
|
|
+ #endif // COMPILE_IN_DEFAULT_FONT
|
|
|
}
|