RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

formatting

This commit is contained in:
Dave Schuyler 2003-10-23 03:53:02 +00:00
parent e00bb1e88e
commit 6010b4ed0f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
panda/src/text/textNode.cxx
View File

@ -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
}