vcl/win/source/gdi/winlayout.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d23a1f4dabda939a216293c150c3679b0979d0bd
Author: Tor Lillqvist <t...@collabora.com>
Date: Sun Aug 30 08:31:27 2015 +0300
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
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 056c48a..a7f44e2 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -105,7 +105,7 @@ public:
const OpenGLGlyphCacheChunk& GetCachedGlyphChunkFor(int nGlyphIndex)
const;
};
-#ifdef SAL_DETAIL_ENABLE_LOG_INFO
+#ifdef SAL_LOG_INFO
namespace {
@@ -150,7 +150,7 @@ void DumpGlyphBitmap(HDC hDC)
} // anonymous namespace
-#endif // SAL_DETAIL_ENABLE_LOG_INFO
+#endif // SAL_LOG_INFO
template< typename charT, typename traits >
inline std::basic_ostream<charT, traits> & operator <<(
@@ -428,7 +428,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout& rLayou
if (hNonAntialiasedFont != NULL)
DeleteObject(hNonAntialiasedFont);
-#ifdef SAL_DETAIL_ENABLE_LOG_INFO
+#ifdef SAL_LOG_INFO
SAL_INFO("vcl.gdi.opengl", "this=" << this << " now: " <<
maOpenGLGlyphCache);
DumpGlyphBitmap(aDC.getCompatibleHDC());
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
