[Libreoffice-commits] core.git: vcl/source

[Tor Lillqvist]

 vcl/source/gdi/dibtools.cxx |   25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

New commits:
commit e63be69226a6282d0dac1bc327d8fa8f7e7bbada
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jun 21 11:24:37 2016 +0300

    Put more local functions into the unnamed namespace
    
    Change-Id: I483a1943c3c229aa839a72b333061f92c6b728ba

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 4e2dd86..7ef9463 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -40,9 +40,9 @@
 
 typedef sal_Int32 FXPT2DOT30;
 
-// Avoid conflict with wingdi.h
 namespace
 {
+
 struct CIEXYZ
 {
     FXPT2DOT30      aXyzX;
@@ -143,20 +143,17 @@ struct DIBV5Header : public DIBInfoHeader
     ~DIBV5Header()
     {}
 };
-}
-namespace
+
+inline sal_uInt16 discretizeBitcount( sal_uInt16 nInputCount )
 {
-    inline sal_uInt16 discretizeBitcount( sal_uInt16 nInputCount )
-    {
-        return ( nInputCount <= 1 ) ? 1 :
-               ( nInputCount <= 4 ) ? 4 :
-               ( nInputCount <= 8 ) ? 8 : 24;
-    }
+    return ( nInputCount <= 1 ) ? 1 :
+           ( nInputCount <= 4 ) ? 4 :
+           ( nInputCount <= 8 ) ? 8 : 24;
+}
 
-    inline bool isBitfieldCompression( ScanlineFormat nScanlineFormat )
-    {
-        return (ScanlineFormat::N16BitTcLsbMask == nScanlineFormat) || (ScanlineFormat::N32BitTcMask == nScanlineFormat);
-    }
+inline bool isBitfieldCompression( ScanlineFormat nScanlineFormat )
+{
+    return (ScanlineFormat::N16BitTcLsbMask == nScanlineFormat) || (ScanlineFormat::N32BitTcMask == nScanlineFormat);
 }
 
 bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& rHeader, bool& bTopDown, bool bMSOFormat)
@@ -1631,6 +1628,8 @@ bool ImplWriteDIB(
     return bRet;
 }
 
+} // unnamed namespace
+
 bool ReadDIB(
     Bitmap& rTarget,
     SvStream& rIStm,