vcl_get_checksum wraps the call to the real checksum function

Change-Id: I72916f18966756ecc99e77f1b164e99377eb456e

7 files changed, 101 insertions, 92 deletions

diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx
index 53c2f1620b47..2987fdae4cc0 100644
--- a/include/vcl/checksum.hxx
+++ b/include/vcl/checksum.hxx
@@ -152,6 +152,15 @@ SAL_DLLPUBLIC sal_uInt64 SAL_CALL vcl_crc64 (
 }
 #endif
 
+inline BitmapChecksum vcl_get_checksum (
+    BitmapChecksum  Checksum,
+    const void *Data,
+    sal_uInt32 DatLen
+)
+{
+    return (BitmapChecksum)(vcl_crc64( Checksum, Data, DatLen ));
+}
+
 
 #endif // INCLUDED_VCL_INC_CHECKSUM_HXX
 
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index a9160e1232d0..f8e68f428db3 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -39,7 +39,7 @@ class VCL_PLUGIN_PUBLIC SalBitmap
 {
 public:
 
-    typedef sal_uInt64      ChecksumType;
+    typedef BitmapChecksum  ChecksumType;
 
                             SalBitmap() : mbChecksumValid(false) {}
     virtual                 ~SalBitmap();
@@ -96,7 +96,7 @@ protected:
         if (pBuf)
         {
             pThis->ReleaseBuffer(pBuf, BITMAP_READ_ACCESS);
-            nCrc = vcl_crc64(0, pBuf->mpBits, pBuf->mnScanlineSize * pBuf->mnHeight);
+            nCrc = vcl_get_checksum(0, pBuf->mpBits, pBuf->mnScanlineSize * pBuf->mnHeight);
             pThis->maChecksum = nCrc;
             pThis->mbChecksumValid = true;
         }
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index f4f17ffa13e9..db0e803d3add 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -576,7 +576,7 @@ bool OpenGLSalBitmap::calcChecksumGL(OpenGLTexture& rInputTexture, ChecksumType&
     std::vector<sal_uInt8> aBuf( aFinalTexture.GetWidth() * aFinalTexture.GetHeight() * 4 );
     aFinalTexture.Read(GL_RGBA, GL_UNSIGNED_BYTE, aBuf.data());
 
-    ChecksumType nCrc = vcl_crc64(0, aBuf.data(), aBuf.size());
+    ChecksumType nCrc = vcl_get_checksum(0, aBuf.data(), aBuf.size());
 
     rChecksum = nCrc;
     return true;
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index cb5c934be8d2..c5803e4ca1ea 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -37,25 +37,25 @@ BitmapChecksum AnimationBitmap::GetChecksum() const
     SVBT32      aBT32;
 
     UInt32ToSVBT32( aPosPix.X(), aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     UInt32ToSVBT32( aPosPix.Y(), aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     UInt32ToSVBT32( aSizePix.Width(), aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     UInt32ToSVBT32( aSizePix.Height(), aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     UInt32ToSVBT32( (long) nWait, aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     UInt32ToSVBT32( (long) eDisposal, aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     UInt32ToSVBT32( (long) bUserInput, aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     return nCrc;
 }
@@ -212,21 +212,21 @@ BitmapChecksum Animation::GetChecksum() const
     BitmapChecksum  nCrc = GetBitmapEx().GetChecksum();
 
     UInt32ToSVBT32( maList.size(), aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     UInt32ToSVBT32( maGlobalSize.Width(), aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     UInt32ToSVBT32( maGlobalSize.Height(), aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     UInt32ToSVBT32( (long) meCycleMode, aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     for( size_t i = 0, nCount = maList.size(); i < nCount; i++ )
     {
         UInt32ToSVBT32( maList[ i ]->GetChecksum(), aBT32 );
-        nCrc = rtl_crc32( nCrc, aBT32, 4 );
+        nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
     }
 
     return nCrc;
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 9559e9fe41fc..ab935d21bc9e 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -314,15 +314,15 @@ BitmapChecksum BitmapEx::GetChecksum() const
     SVBT32      aBT32;
 
     UInt32ToSVBT32( (long) eTransparent, aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     UInt32ToSVBT32( (long) bAlpha, aBT32 );
-    nCrc = rtl_crc32( nCrc, aBT32, 4 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
     if( ( TRANSPARENT_BITMAP == eTransparent ) && !aMask.IsEmpty() )
     {
         UInt32ToSVBT32( aMask.GetChecksum(), aBT32 );
-        nCrc = rtl_crc32( nCrc, aBT32, 4 );
+        nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
     }
 
     return nCrc;
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index a4946bb81117..d69914e699b0 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2361,16 +2361,16 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
                 MetaBmpAction* pAct = static_cast<MetaBmpAction*>(pAction);
 
                 ShortToSVBT16( static_cast<sal_uInt16>(pAct->GetType()), aBT16 );
-                nCrc = rtl_crc32( nCrc, aBT16, 2 );
+                nCrc = vcl_get_checksum( nCrc, aBT16, 2 );
 
                 UInt32ToSVBT32( pAct->GetBitmap().GetChecksum(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetPoint().X(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetPoint().Y(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
             }
             break;
 
@@ -2379,22 +2379,22 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
                 MetaBmpScaleAction* pAct = static_cast<MetaBmpScaleAction*>(pAction);
 
                 ShortToSVBT16( static_cast<sal_uInt16>(pAct->GetType()), aBT16 );
-                nCrc = rtl_crc32( nCrc, aBT16, 2 );
+                nCrc = vcl_get_checksum( nCrc, aBT16, 2 );
 
                 UInt32ToSVBT32( pAct->GetBitmap().GetChecksum(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetPoint().X(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetPoint().Y(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSize().Width(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSize().Height(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
             }
             break;
 
@@ -2403,34 +2403,34 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
                 MetaBmpScalePartAction* pAct = static_cast<MetaBmpScalePartAction*>(pAction);
 
                 ShortToSVBT16( static_cast<sal_uInt16>(pAct->GetType()), aBT16 );
-                nCrc = rtl_crc32( nCrc, aBT16, 2 );
+                nCrc = vcl_get_checksum( nCrc, aBT16, 2 );
 
                 UInt32ToSVBT32( pAct->GetBitmap().GetChecksum(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetDestPoint().X(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetDestPoint().Y(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetDestSize().Width(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetDestSize().Height(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSrcPoint().X(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSrcPoint().Y(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSrcSize().Width(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSrcSize().Height(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
             }
             break;
 
@@ -2439,16 +2439,16 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
                 MetaBmpExAction* pAct = static_cast<MetaBmpExAction*>(pAction);
 
                 ShortToSVBT16( static_cast<sal_uInt16>(pAct->GetType()), aBT16 );
-                nCrc = rtl_crc32( nCrc, aBT16, 2 );
+                nCrc = vcl_get_checksum( nCrc, aBT16, 2 );
 
                 UInt32ToSVBT32( pAct->GetBitmapEx().GetChecksum(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetPoint().X(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetPoint().Y(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
             }
             break;
 
@@ -2457,22 +2457,22 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
                 MetaBmpExScaleAction* pAct = static_cast<MetaBmpExScaleAction*>(pAction);
 
                 ShortToSVBT16( static_cast<sal_uInt16>(pAct->GetType()), aBT16 );
-                nCrc = rtl_crc32( nCrc, aBT16, 2 );
+                nCrc = vcl_get_checksum( nCrc, aBT16, 2 );
 
                 UInt32ToSVBT32( pAct->GetBitmapEx().GetChecksum(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetPoint().X(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetPoint().Y(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSize().Width(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSize().Height(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
             }
             break;
 
@@ -2481,34 +2481,34 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
                 MetaBmpExScalePartAction* pAct = static_cast<MetaBmpExScalePartAction*>(pAction);
 
                 ShortToSVBT16( static_cast<sal_uInt16>(pAct->GetType()), aBT16 );
-                nCrc = rtl_crc32( nCrc, aBT16, 2 );
+                nCrc = vcl_get_checksum( nCrc, aBT16, 2 );
 
                 UInt32ToSVBT32( pAct->GetBitmapEx().GetChecksum(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetDestPoint().X(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetDestPoint().Y(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetDestSize().Width(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetDestSize().Height(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSrcPoint().X(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSrcPoint().Y(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSrcSize().Width(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSrcSize().Height(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
             }
             break;
 
@@ -2517,19 +2517,19 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
                 MetaMaskAction* pAct = static_cast<MetaMaskAction*>(pAction);
 
                 ShortToSVBT16( static_cast<sal_uInt16>(pAct->GetType()), aBT16 );
-                nCrc = rtl_crc32( nCrc, aBT16, 2 );
+                nCrc = vcl_get_checksum( nCrc, aBT16, 2 );
 
                 UInt32ToSVBT32( pAct->GetBitmap().GetChecksum(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetColor().GetColor(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetPoint().X(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetPoint().Y(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
             }
             break;
 
@@ -2538,25 +2538,25 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
                 MetaMaskScaleAction* pAct = static_cast<MetaMaskScaleAction*>(pAction);
 
                 ShortToSVBT16( static_cast<sal_uInt16>(pAct->GetType()), aBT16 );
-                nCrc = rtl_crc32( nCrc, aBT16, 2 );
+                nCrc = vcl_get_checksum( nCrc, aBT16, 2 );
 
                 UInt32ToSVBT32( pAct->GetBitmap().GetChecksum(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetColor().GetColor(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetPoint().X(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetPoint().Y(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSize().Width(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSize().Height(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
             }
             break;
 
@@ -2565,44 +2565,44 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
                 MetaMaskScalePartAction* pAct = static_cast<MetaMaskScalePartAction*>(pAction);
 
                 ShortToSVBT16( static_cast<sal_uInt16>(pAct->GetType()), aBT16 );
-                nCrc = rtl_crc32( nCrc, aBT16, 2 );
+                nCrc = vcl_get_checksum( nCrc, aBT16, 2 );
 
                 UInt32ToSVBT32( pAct->GetBitmap().GetChecksum(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetColor().GetColor(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetDestPoint().X(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetDestPoint().Y(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetDestSize().Width(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetDestSize().Height(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSrcPoint().X(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSrcPoint().Y(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSrcSize().Width(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
 
                 UInt32ToSVBT32( pAct->GetSrcSize().Height(), aBT32 );
-                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+                nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
             }
             break;
 
             case MetaActionType::EPS :
             {
                 MetaEPSAction* pAct = static_cast<MetaEPSAction*>(pAction);
-                nCrc = rtl_crc32( nCrc, pAct->GetLink().GetData(), pAct->GetLink().GetDataSize() );
+                nCrc = vcl_get_checksum( nCrc, pAct->GetLink().GetData(), pAct->GetLink().GetDataSize() );
             }
             break;
 
@@ -2631,9 +2631,9 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
                             const basegfx::B2DPoint aPoint(aPolygon.getB2DPoint(b));
 
                             DoubleToSVBT64(aPoint.getX(), aSVBT64);
-                            nCrc = rtl_crc32(nCrc, aSVBT64, 8);
+                            nCrc = vcl_get_checksum(nCrc, aSVBT64, 8);
                             DoubleToSVBT64(aPoint.getY(), aSVBT64);
-                            nCrc = rtl_crc32(nCrc, aSVBT64, 8);
+                            nCrc = vcl_get_checksum(nCrc, aSVBT64, 8);
 
                             if(bControl)
                             {
@@ -2642,9 +2642,9 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
                                     const basegfx::B2DPoint aCtrl(aPolygon.getPrevControlPoint(b));
 
                                     DoubleToSVBT64(aCtrl.getX(), aSVBT64);
-                                    nCrc = rtl_crc32(nCrc, aSVBT64, 8);
+                                    nCrc = vcl_get_checksum(nCrc, aSVBT64, 8);
                                     DoubleToSVBT64(aCtrl.getY(), aSVBT64);
-                                    nCrc = rtl_crc32(nCrc, aSVBT64, 8);
+                                    nCrc = vcl_get_checksum(nCrc, aSVBT64, 8);
                                 }
 
                                 if(aPolygon.isNextControlPointUsed(b))
@@ -2652,21 +2652,21 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
                                     const basegfx::B2DPoint aCtrl(aPolygon.getNextControlPoint(b));
 
                                     DoubleToSVBT64(aCtrl.getX(), aSVBT64);
-                                    nCrc = rtl_crc32(nCrc, aSVBT64, 8);
+                                    nCrc = vcl_get_checksum(nCrc, aSVBT64, 8);
                                     DoubleToSVBT64(aCtrl.getY(), aSVBT64);
-                                    nCrc = rtl_crc32(nCrc, aSVBT64, 8);
+                                    nCrc = vcl_get_checksum(nCrc, aSVBT64, 8);
                                 }
                             }
                         }
                     }
 
                     sal_uInt8 tmp = (sal_uInt8)rAct.IsClipping();
-                    nCrc = rtl_crc32(nCrc, &tmp, 1);
+                    nCrc = vcl_get_checksum(nCrc, &tmp, 1);
                 }
                 else
                 {
                     pAction->Write( aMemStm, &aWriteData );
-                    nCrc = rtl_crc32( nCrc, aMemStm.GetData(), aMemStm.Tell() );
+                    nCrc = vcl_get_checksum( nCrc, aMemStm.GetData(), aMemStm.Tell() );
                     aMemStm.Seek( 0 );
                 }
             }
@@ -2675,7 +2675,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const
             default:
             {
                 pAction->Write( aMemStm, &aWriteData );
-                nCrc = rtl_crc32( nCrc, aMemStm.GetData(), aMemStm.Tell() );
+                nCrc = vcl_get_checksum( nCrc, aMemStm.GetData(), aMemStm.Tell() );
                 aMemStm.Seek( 0 );
             }
             break;
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 36d96e9e3741..c3185ec8e886 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -11516,7 +11516,7 @@ void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const
     aID.m_aPixelSize    = rSizePixel;
     aID.m_nSize         = pStream->Tell();
     pStream->Seek( STREAM_SEEK_TO_BEGIN );
-    aID.m_nChecksum     = rtl_crc32( 0, pStream->GetData(), aID.m_nSize );
+    aID.m_nChecksum     = vcl_get_checksum( 0, pStream->GetData(), aID.m_nSize );
     if( ! rMask.IsEmpty() )
         aID.m_nMaskChecksum = rMask.GetChecksum();