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

[Caolán McNamara]

 filter/source/graphicfilter/egif/egif.cxx    |   14 +++++++-------
 filter/source/graphicfilter/egif/giflzwc.cxx |    8 +++-----
 filter/source/graphicfilter/egif/giflzwc.hxx |    2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 47efda5b9c95c89cf4dd4c4e7479a555a7615f91
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 31 16:41:14 2017 +0000

    de-sal_uLong egif
    
    Change-Id: I4d18c60f618d2b3c04ad256324ee2620cc583775
    Reviewed-on: https://gerrit.libreoffice.org/44162
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index d8e7eb3f4591..db6838f6a288 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -34,16 +34,16 @@ class GIFWriter
     Bitmap              aAccBmp;
     SvStream& m_rGIF;
     BitmapReadAccess*   m_pAcc;
-    sal_uLong           nMinPercent;
-    sal_uLong           nMaxPercent;
-    sal_uLong           nLastPercent;
+    sal_uInt32          nMinPercent;
+    sal_uInt32          nMaxPercent;
+    sal_uInt32          nLastPercent;
     long                nActX;
     long                nActY;
     sal_Int32           nInterlaced;
     bool                bStatus;
     bool                bTransparent;
 
-    void                MayCallback( sal_uLong nPercent );
+    void                MayCallback(sal_uInt32 nPercent);
     void                WriteSignature( bool bGIF89a );
     void                WriteGlobalHeader( const Size& rSize );
     void                WriteLoopExtension( const Animation& rAnimation );
@@ -211,7 +211,7 @@ void GIFWriter::WriteAnimation( const Animation& rAnimation )
         const double fStep = 100. / nCount;
 
         nMinPercent = 0;
-        nMaxPercent = (sal_uLong) fStep;
+        nMaxPercent = (sal_uInt32)fStep;
 
         for( sal_uInt16 i = 0; i < nCount; i++ )
         {
@@ -220,13 +220,13 @@ void GIFWriter::WriteAnimation( const Animation& rAnimation )
             WriteBitmapEx( rAnimBmp.aBmpEx, rAnimBmp.aPosPix, true,
                            rAnimBmp.nWait, rAnimBmp.eDisposal );
             nMinPercent = nMaxPercent;
-            nMaxPercent = (sal_uLong) ( nMaxPercent + fStep );
+            nMaxPercent = (sal_uInt32)(nMaxPercent + fStep);
         }
     }
 }
 
 
-void GIFWriter::MayCallback( sal_uLong nPercent )
+void GIFWriter::MayCallback(sal_uInt32 nPercent)
 {
     if ( xStatusIndicator.is() )
     {
diff --git a/filter/source/graphicfilter/egif/giflzwc.cxx b/filter/source/graphicfilter/egif/giflzwc.cxx
index b6d2f8be9b97..8fc3718f5197 100644
--- a/filter/source/graphicfilter/egif/giflzwc.cxx
+++ b/filter/source/graphicfilter/egif/giflzwc.cxx
@@ -34,7 +34,7 @@ private:
     std::array<sal_uInt8, 255>
                     pBlockBuf;
     sal_uInt8       nBlockBufSize;
-    sal_uLong       nBitsBuf;
+    sal_uInt32      nBitsBuf;
     sal_uInt16      nBitsBufSize;
 
 public:
@@ -65,7 +65,7 @@ inline void GIFImageDataOutputStream::WriteBits( sal_uInt16 nCode, sal_uInt16 nC
     if( nBitsBufSize+nCodeLen>32 )
         FlushBitsBufsFullBytes();
 
-    nBitsBuf |= (sal_uLong) nCode << nBitsBufSize;
+    nBitsBuf |= (sal_uInt32)nCode << nBitsBufSize;
     nBitsBufSize = nBitsBufSize + nCodeLen;
 }
 
@@ -153,8 +153,7 @@ void GIFLZWCompressor::StartCompression( SvStream& rGIF, sal_uInt16 nPixelSize )
     }
 }
 
-
-void GIFLZWCompressor::Compress( sal_uInt8* pSrc, sal_uLong nSize )
+void GIFLZWCompressor::Compress(sal_uInt8* pSrc, sal_uInt32 nSize)
 {
     if( pIDOS )
     {
@@ -212,7 +211,6 @@ void GIFLZWCompressor::Compress( sal_uInt8* pSrc, sal_uLong nSize )
     }
 }
 
-
 void GIFLZWCompressor::EndCompression()
 {
     if( pIDOS )
diff --git a/filter/source/graphicfilter/egif/giflzwc.hxx b/filter/source/graphicfilter/egif/giflzwc.hxx
index 1d0f1e21d3bc..0c51ff55d7b8 100644
--- a/filter/source/graphicfilter/egif/giflzwc.hxx
+++ b/filter/source/graphicfilter/egif/giflzwc.hxx
@@ -46,7 +46,7 @@ public:
                                 ~GIFLZWCompressor();
 
     void                        StartCompression( SvStream& rGIF, sal_uInt16 nPixelSize );
-    void                        Compress( sal_uInt8* pSrc, sal_uLong nSize );
+    void                        Compress(sal_uInt8* pSrc, sal_uInt32 nSize);
     void                        EndCompression();
 };