Kaydet (Commit) 25d0a907 authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Andras Timar

Don't check SAL_DETAIL_ENABLE_LOG_INFO, check SAL_LOG_INFO

SAL_DETAIL_ENABLE_LOG_INFO is always defined, as "true" or "false". It
is SAL_LOG_INFO that is defined or not, and can be used to avoid
unnecessary non-trivial code that the compiler might not be able to
optimise away.

Change-Id: I9903faab64b39fee86bff3b085cdce3614b0d921
(cherry picked from commit d23a1f4d)
üst 5e463fc3
...@@ -105,7 +105,7 @@ public: ...@@ -105,7 +105,7 @@ public:
const OpenGLGlyphCacheChunk& GetCachedGlyphChunkFor(int nGlyphIndex) const; const OpenGLGlyphCacheChunk& GetCachedGlyphChunkFor(int nGlyphIndex) const;
}; };
#ifdef SAL_DETAIL_ENABLE_LOG_INFO #ifdef SAL_LOG_INFO
namespace { namespace {
...@@ -150,7 +150,7 @@ void DumpGlyphBitmap(OpenGLGlyphCacheChunk& rChunk, HDC hDC) ...@@ -150,7 +150,7 @@ void DumpGlyphBitmap(OpenGLGlyphCacheChunk& rChunk, HDC hDC)
} // anonymous namespace } // anonymous namespace
#endif // SAL_DETAIL_ENABLE_LOG_INFO #endif // SAL_LOG_INFO
template< typename charT, typename traits > template< typename charT, typename traits >
inline std::basic_ostream<charT, traits> & operator <<( inline std::basic_ostream<charT, traits> & operator <<(
...@@ -428,7 +428,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, const WinLayout& rLayou ...@@ -428,7 +428,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, const WinLayout& rLayou
if (hNonAntialiasedFont != NULL) if (hNonAntialiasedFont != NULL)
DeleteObject(hNonAntialiasedFont); DeleteObject(hNonAntialiasedFont);
#ifdef SAL_DETAIL_ENABLE_LOG_INFO #ifdef SAL_LOG_INFO
SAL_INFO("vcl.gdi.opengl", "this=" << this << " now: " << maOpenGLGlyphCache); SAL_INFO("vcl.gdi.opengl", "this=" << this << " now: " << maOpenGLGlyphCache);
DumpGlyphBitmap(aChunk, aDC.getCompatibleHDC()); DumpGlyphBitmap(aChunk, aDC.getCompatibleHDC());
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment