From 6010b4ed0fc328abba5ede7b7df8bdc0fd1b4c1e Mon Sep 17 00:00:00 2001 From: Dave Schuyler Date: Thu, 23 Oct 2003 03:53:02 +0000 Subject: [PATCH] formatting --- panda/src/text/textNode.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/panda/src/text/textNode.cxx b/panda/src/text/textNode.cxx index 03689ef45d..671c804fa3 100644 --- a/panda/src/text/textNode.cxx +++ b/panda/src/text/textNode.cxx @@ -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 }