diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-03-28 16:43:39 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-03-28 16:52:36 +0200 |
| commit | ae00e71afd36f7215669c34e8ea8cafaeed6e468 (patch) | |
| tree | de3aa1726cb66a996f148e2a8ce8207ae4c2b612 /vcl | |
| parent | b6f77d2702721d25ae7be5a749b65a53f55f5ee2 (diff) | |
Bin rest of DBG_WARNING[123]
Change-Id: Iaaf36d012e353f73f083c9c0ebbbb6d0953b16c8
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/bmpfast.cxx | 50 |
1 files changed, 12 insertions, 38 deletions
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index 30c1ccfa8399..949e21af0c16 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -446,16 +446,10 @@ inline bool ImplConvertFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc return ImplConvertToBitmap<BMP_FORMAT_32BIT_TC_RGBA>( aSrcType, rDst, rSrc ); } -#ifdef DEBUG static int nNotAccelerated = 0; - if( rSrc.mnWidth * rSrc.mnHeight >= 4000 ) - if( ++nNotAccelerated == 100 ) - { - int foo = 0; (void)foo; // so no warning is created when building on pro with debug - DBG_WARNING2( "ImplConvertFromBitmap for not accelerated case (0x%04X->0x%04X)", - rSrc.mnFormat, rDst.mnFormat ); - } -#endif + SAL_WARN_IF( rSrc.mnWidth * rSrc.mnHeight >= 4000 && ++nNotAccelerated == 100, + "vcl.gdi", + "ImplConvertFromBitmap for not accelerated case (" << std::hex << rSrc.mnFormat << "->" << rDst.mnFormat << ")" ); return false; } @@ -561,17 +555,10 @@ bool ImplFastBitmapConversion( BitmapBuffer& rDst, const BitmapBuffer& rSrc, return ImplConvertFromBitmap<BMP_FORMAT_32BIT_TC_RGBA>( rDst, rSrc ); } -#ifdef DEBUG static int nNotAccelerated = 0; - if( rSrc.mnWidth * rSrc.mnHeight >= 4000 ) - { - if( ++nNotAccelerated == 100 ) - { - int foo = 0; (void)foo; // so no warning is created when building on pro with debug - DBG_WARNING2( "ImplFastBitmapConversion for not accelerated case (0x%04X->0x%04X)", rSrc.mnFormat, rDst.mnFormat ); - } - } -#endif + SAL_WARN_IF( rSrc.mnWidth * rSrc.mnHeight >= 4000 && ++nNotAccelerated == 100, + "vcl.gdi", + "ImplFastBitmapConversion for not accelerated case (" << std::hex << rSrc.mnFormat << "->" << rDst.mnFormat << ")" ); return false; } @@ -696,17 +683,10 @@ bool ImplBlendFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc, const Bi return ImplBlendToBitmap<BMP_FORMAT_32BIT_TC_RGBA>( aSrcType, rDst, rSrc, rMsk ); } -#ifdef DEBUG static int nNotAccelerated = 0; - if( rSrc.mnWidth * rSrc.mnHeight >= 4000 ) - if( ++nNotAccelerated == 100 ) - { - int foo = 0; (void)foo; // so no warning is created when building on pro with debug - DBG_WARNING3( "ImplBlendFromBitmap for not accelerated case (0x%04X*0x%04X->0x%04X)", - rSrc.mnFormat, rMsk.mnFormat, rDst.mnFormat ); - } -#endif - + SAL_WARN_IF( rSrc.mnWidth * rSrc.mnHeight >= 4000 && ++nNotAccelerated == 100, + "vcl.gdi", + "ImplBlendFromBitmap for not accelerated case (" << std::hex << rSrc.mnFormat << "*" << rMsk.mnFormat << "->" << rDst.mnFormat ); return false; } @@ -819,16 +799,10 @@ bool ImplFastBitmapBlending( BitmapWriteAccess& rDstWA, return ImplBlendFromBitmap<BMP_FORMAT_32BIT_TC_RGBA>( rDst, rSrc, rMsk ); } -#ifdef DEBUG static int nNotAccelerated = 0; - if( rSrc.mnWidth * rSrc.mnHeight >= 4000 ) - if( ++nNotAccelerated == 100 ) - { - int foo = 0; (void)foo; // so no warning is created when building on pro with debug - DBG_WARNING3( "ImplFastBlend for not accelerated case (0x%04X*0x%04X->0x%04X)", - rSrc.mnFormat, rMsk.mnFormat, rDst.mnFormat ); - } -#endif + SAL_WARN_IF( rSrc.mnWidth * rSrc.mnHeight >= 4000 && ++nNotAccelerated == 100, + "vcl.gdi", + "ImplFastBlend for not accelerated case (" << std::hex << rSrc.mnFormat << "*" << rMsk.mnFormat << "->" << rDst.mnFormat << ")" ); return false; } |