include/vcl/checksum.hxx | 47 ----------
vcl/Library_vcl.mk | 1
vcl/qa/cppunit/svm/svmtest.cxx | 22 ++--
vcl/source/animate/Animation.cxx | 9 +
vcl/source/animate/AnimationFrame.cxx | 15 +--
vcl/source/bitmap/BitmapEx.cxx | 3
vcl/source/bitmap/bitmappalette.cxx | 3
vcl/source/bitmap/checksum.cxx | 154 ----------------------------------
vcl/source/bitmap/salbmp.cxx | 7 -
vcl/source/filter/svm/SvmWriter.cxx | 149 ++++++++++++++++----------------
vcl/source/gdi/pdfwriter_impl.cxx | 3
vcl/source/gdi/vectorgraphicdata.cxx | 3
vcl/source/graphic/GraphicID.cxx | 5 -
13 files changed, 116 insertions(+), 305 deletions(-)
New commits:
commit d9f2b74241eb6136db767ec56c10be1cc0292599
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Oct 27 11:18:13 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Nov 3 17:00:27 2023 +0100
tdf#152571 speedup slow draw file save
with lots of images, we seem to spend lots of time calculating
CRC. Replace the vcl checksum/CRC with rtl_crc32 in sal/, which
forwards to the zlib implementation, which has all kinds of
nice SIMD code for performance.
Change-Id: I295e2ee91b3450fa558b06e67aac0fbb20b85f52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158529
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158873
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx
index 34d8ed77ad0f..ea2c9adb2e51 100644
--- a/include/vcl/checksum.hxx
+++ b/include/vcl/checksum.hxx
@@ -16,18 +16,15 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-
-#ifndef INCLUDED_VCL_INC_CHECKSUM_HXX
-#define INCLUDED_VCL_INC_CHECKSUM_HXX
+#pragma once
#include <sal/config.h>
#include <sal/types.h>
#include <vcl/dllapi.h>
-#define BITMAP_CHECKSUM_SIZE 8
+#define BITMAP_CHECKSUM_SIZE 4
-typedef sal_uInt64 BitmapChecksum;
+typedef sal_uInt32 BitmapChecksum;
typedef sal_uInt8 BitmapChecksumOctetArray[BITMAP_CHECKSUM_SIZE];
template< sal_uInt8 N = 0 >
@@ -43,42 +40,4 @@ inline void BCToBCOA< BITMAP_CHECKSUM_SIZE >(
BitmapChecksum, BitmapChecksumOcte
return;
}
-extern "C" {
-
-/*========================================================================
- *
- * vcl_crc64 interface.
- *
- *======================================================================*/
-/** Evaluate CRC64 over given data.
-
- This function evaluates the CRC polynomial 0xEDB88320.
-
- @param Crc [in] CRC64 over previous data or zero.
- @param Data [in] data buffer.
- @param DatLen [in] data buffer length.
- @return new CRC64 value.
- */
-VCL_DLLPUBLIC sal_uInt64 vcl_crc64 (
- sal_uInt64 Crc,
- const void *Data, sal_uInt32 DatLen
-) SAL_THROW_EXTERN_C();
-
-
-const sal_uInt64* vcl_get_crc64_table();
-
-}
-
-inline BitmapChecksum vcl_get_checksum (
- BitmapChecksum Checksum,
- const void *Data,
- sal_uInt32 DatLen
-)
-{
- return static_cast<BitmapChecksum>(vcl_crc64( Checksum, Data, DatLen ));
-}
-
-
-#endif // INCLUDED_VCL_INC_CHECKSUM_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index af8e3119732d..9fd8db050b39 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -371,7 +371,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/bitmap/BitmapColorQuantizationFilter \
vcl/source/bitmap/BitmapSimpleColorQuantizationFilter \
vcl/source/bitmap/BitmapTools \
- vcl/source/bitmap/checksum \
vcl/source/bitmap/Octree \
vcl/source/bitmap/salbmp \
vcl/source/image/Image \
diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index 8b43f828ac7d..12964db160c4 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -942,11 +942,11 @@ void SvmTest::checkBitmaps(const GDIMetaFile& rMetaFile)
#if defined OSL_BIGENDIAN
"5e01ddcc"
#else
- "b8dee5da"
+ "469f0820"
#endif
}});
assertXPathAttrs(pDoc, "/metafile/bmpscale[1]", {
- {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc",
"281fc589"}
+ {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc",
"4937e32d"}
});
assertXPathAttrs(pDoc, "/metafile/bmpscalepart[1]", {
{"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight",
"4"},
@@ -955,7 +955,7 @@ void SvmTest::checkBitmaps(const GDIMetaFile& rMetaFile)
#if defined OSL_BIGENDIAN
"b8dee5da"
#else
- "5e01ddcc"
+ "3789377b"
#endif
}
});
@@ -1017,14 +1017,14 @@ void SvmTest::checkBitmapExs(const GDIMetaFile&
rMetaFile, bool bIsSvmFile)
"33b4a07c",
"742c3e35",
#else
- "d8377d4f",
- "281fc589",
- "5e01ddcc",
- "4df0e464",
- "17df308f", // 1-bit
- "3c80d829", // 4-bit color bitmap - same as 8-bit color bitmap
- "3c80d829",
- "71efc447",
+ "ac936607",
+ "4937e32d",
+ "3789377b",
+ "839e8cce",
+ "236aaf55", // 1-bit
+ "2949ccc7", // 4-bit color bitmap - same as 8-bit color bitmap
+ "2949ccc7",
+ "e5df8aad",
#endif
};
diff --git a/vcl/source/animate/Animation.cxx b/vcl/source/animate/Animation.cxx
index 9f890c6568d3..5f2b8ce153ee 100644
--- a/vcl/source/animate/Animation.cxx
+++ b/vcl/source/animate/Animation.cxx
@@ -20,6 +20,7 @@
#include <algorithm>
#include <sal/config.h>
+#include <rtl/crc.h>
#include <tools/stream.hxx>
#include <tools/GenericTypeSerializer.hxx>
#include <sal/log.hxx>
@@ -144,18 +145,18 @@ BitmapChecksum Animation::GetChecksum() const
BitmapChecksum nCrc = GetBitmapEx().GetChecksum();
UInt32ToSVBT32(maFrames.size(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(maGlobalSize.Width(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(maGlobalSize.Height(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
for (auto const& i : maFrames)
{
BCToBCOA(i->GetChecksum(), aBCOA);
- nCrc = vcl_get_checksum(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
+ nCrc = rtl_crc32(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
}
return nCrc;
diff --git a/vcl/source/animate/AnimationFrame.cxx
b/vcl/source/animate/AnimationFrame.cxx
index e2f9bae931fb..93b5cbe7802c 100644
--- a/vcl/source/animate/AnimationFrame.cxx
+++ b/vcl/source/animate/AnimationFrame.cxx
@@ -21,6 +21,7 @@
#include <o3tl/underlyingenumvalue.hxx>
#include <tools/solar.h>
#include <vcl/animate/AnimationFrame.hxx>
+#include <rtl/crc.h>
BitmapChecksum AnimationFrame::GetChecksum() const
{
@@ -28,25 +29,25 @@ BitmapChecksum AnimationFrame::GetChecksum() const
SVBT32 aBT32;
Int32ToSVBT32(maPositionPixel.X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(maPositionPixel.Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(maSizePixel.Width(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(maSizePixel.Height(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(mnWait, aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
UInt32ToSVBT32(o3tl::to_underlying(meDisposal), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
UInt32ToSVBT32(sal_uInt32(mbUserInput), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
return nCrc;
}
diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx
index ad4adca6319e..42783cf0c5ff 100644
--- a/vcl/source/bitmap/BitmapEx.cxx
+++ b/vcl/source/bitmap/BitmapEx.cxx
@@ -18,6 +18,7 @@
*/
#include <sal/log.hxx>
+#include <rtl/crc.h>
#include <rtl/math.hxx>
#include <o3tl/underlyingenumvalue.hxx>
#include <osl/diagnose.h>
@@ -235,7 +236,7 @@ BitmapChecksum BitmapEx::GetChecksum() const
{
BitmapChecksumOctetArray aBCOA;
BCToBCOA( maAlphaMask.GetChecksum(), aBCOA );
- nCrc = vcl_get_checksum( nCrc, aBCOA, BITMAP_CHECKSUM_SIZE );
+ nCrc = rtl_crc32( nCrc, aBCOA, BITMAP_CHECKSUM_SIZE );
}
return nCrc;
diff --git a/vcl/source/bitmap/bitmappalette.cxx
b/vcl/source/bitmap/bitmappalette.cxx
index e0bf53db033e..97bfe4a62051 100644
--- a/vcl/source/bitmap/bitmappalette.cxx
+++ b/vcl/source/bitmap/bitmappalette.cxx
@@ -21,6 +21,7 @@
#include <sal/log.hxx>
#include <osl/diagnose.h>
+#include <rtl/crc.h>
#include <tools/helpers.hxx>
#include <vcl/BitmapPalette.hxx>
@@ -120,7 +121,7 @@ BitmapColor* BitmapPalette::ImplGetColorBuffer() { return
mpImpl->GetBitmapData(
BitmapChecksum BitmapPalette::GetChecksum() const
{
auto const& rBitmapData = mpImpl->GetBitmapData();
- return vcl_get_checksum(0, rBitmapData.data(), rBitmapData.size() *
sizeof(BitmapColor));
+ return rtl_crc32(0, rBitmapData.data(), rBitmapData.size() *
sizeof(BitmapColor));
}
bool BitmapPalette::operator==(const BitmapPalette& rOther) const
diff --git a/vcl/source/bitmap/checksum.cxx b/vcl/source/bitmap/checksum.cxx
deleted file mode 100644
index a5c92c5559d4..000000000000
--- a/vcl/source/bitmap/checksum.cxx
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sal/types.h>
-#include <vcl/checksum.hxx>
-
-
-/*========================================================================
- *
- * vcl_crc64Table (CRC polynomial 0x95AC9329AC4BC9B5ULL).
- *
- *======================================================================*/
-const sal_uInt64 vcl_crc64Table[256] = {
- 0x0000000000000000ULL, 0x7ad870c830358979ULL, 0xf5b0e190606b12f2ULL,
- 0x8f689158505e9b8bULL, 0xc038e5739841b68fULL, 0xbae095bba8743ff6ULL,
- 0x358804e3f82aa47dULL, 0x4f50742bc81f2d04ULL, 0xab28ecb46814fe75ULL,
- 0xd1f09c7c5821770cULL, 0x5e980d24087fec87ULL, 0x24407dec384a65feULL,
- 0x6b1009c7f05548faULL, 0x11c8790fc060c183ULL, 0x9ea0e857903e5a08ULL,
- 0xe478989fa00bd371ULL, 0x7d08ff3b88be6f81ULL, 0x07d08ff3b88be6f8ULL,
- 0x88b81eabe8d57d73ULL, 0xf2606e63d8e0f40aULL, 0xbd301a4810ffd90eULL,
- 0xc7e86a8020ca5077ULL, 0x4880fbd87094cbfcULL, 0x32588b1040a14285ULL,
- 0xd620138fe0aa91f4ULL, 0xacf86347d09f188dULL, 0x2390f21f80c18306ULL,
- 0x594882d7b0f40a7fULL, 0x1618f6fc78eb277bULL, 0x6cc0863448deae02ULL,
- 0xe3a8176c18803589ULL, 0x997067a428b5bcf0ULL, 0xfa11fe77117cdf02ULL,
- 0x80c98ebf2149567bULL, 0x0fa11fe77117cdf0ULL, 0x75796f2f41224489ULL,
- 0x3a291b04893d698dULL, 0x40f16bccb908e0f4ULL, 0xcf99fa94e9567b7fULL,
- 0xb5418a5cd963f206ULL, 0x513912c379682177ULL, 0x2be1620b495da80eULL,
- 0xa489f35319033385ULL, 0xde51839b2936bafcULL, 0x9101f7b0e12997f8ULL,
- 0xebd98778d11c1e81ULL, 0x64b116208142850aULL, 0x1e6966e8b1770c73ULL,
- 0x8719014c99c2b083ULL, 0xfdc17184a9f739faULL, 0x72a9e0dcf9a9a271ULL,
- 0x08719014c99c2b08ULL, 0x4721e43f0183060cULL, 0x3df994f731b68f75ULL,
- 0xb29105af61e814feULL, 0xc849756751dd9d87ULL, 0x2c31edf8f1d64ef6ULL,
- 0x56e99d30c1e3c78fULL, 0xd9810c6891bd5c04ULL, 0xa3597ca0a188d57dULL,
- 0xec09088b6997f879ULL, 0x96d1784359a27100ULL, 0x19b9e91b09fcea8bULL,
- 0x636199d339c963f2ULL, 0xdf7adabd7a6e2d6fULL, 0xa5a2aa754a5ba416ULL,
- 0x2aca3b2d1a053f9dULL, 0x50124be52a30b6e4ULL, 0x1f423fcee22f9be0ULL,
- 0x659a4f06d21a1299ULL, 0xeaf2de5e82448912ULL, 0x902aae96b271006bULL,
- 0x74523609127ad31aULL, 0x0e8a46c1224f5a63ULL, 0x81e2d7997211c1e8ULL,
- 0xfb3aa75142244891ULL, 0xb46ad37a8a3b6595ULL, 0xceb2a3b2ba0eececULL,
- 0x41da32eaea507767ULL, 0x3b024222da65fe1eULL, 0xa2722586f2d042eeULL,
- 0xd8aa554ec2e5cb97ULL, 0x57c2c41692bb501cULL, 0x2d1ab4dea28ed965ULL,
- 0x624ac0f56a91f461ULL, 0x1892b03d5aa47d18ULL, 0x97fa21650afae693ULL,
- 0xed2251ad3acf6feaULL, 0x095ac9329ac4bc9bULL, 0x7382b9faaaf135e2ULL,
- 0xfcea28a2faafae69ULL, 0x8632586aca9a2710ULL, 0xc9622c4102850a14ULL,
- 0xb3ba5c8932b0836dULL, 0x3cd2cdd162ee18e6ULL, 0x460abd1952db919fULL,
- 0x256b24ca6b12f26dULL, 0x5fb354025b277b14ULL, 0xd0dbc55a0b79e09fULL,
- 0xaa03b5923b4c69e6ULL, 0xe553c1b9f35344e2ULL, 0x9f8bb171c366cd9bULL,
- 0x10e3202993385610ULL, 0x6a3b50e1a30ddf69ULL, 0x8e43c87e03060c18ULL,
- 0xf49bb8b633338561ULL, 0x7bf329ee636d1eeaULL, 0x012b592653589793ULL,
- 0x4e7b2d0d9b47ba97ULL, 0x34a35dc5ab7233eeULL, 0xbbcbcc9dfb2ca865ULL,
- 0xc113bc55cb19211cULL, 0x5863dbf1e3ac9decULL, 0x22bbab39d3991495ULL,
- 0xadd33a6183c78f1eULL, 0xd70b4aa9b3f20667ULL, 0x985b3e827bed2b63ULL,
- 0xe2834e4a4bd8a21aULL, 0x6debdf121b863991ULL, 0x1733afda2bb3b0e8ULL,
- 0xf34b37458bb86399ULL, 0x8993478dbb8deae0ULL, 0x06fbd6d5ebd3716bULL,
- 0x7c23a61ddbe6f812ULL, 0x3373d23613f9d516ULL, 0x49aba2fe23cc5c6fULL,
- 0xc6c333a67392c7e4ULL, 0xbc1b436e43a74e9dULL, 0x95ac9329ac4bc9b5ULL,
- 0xef74e3e19c7e40ccULL, 0x601c72b9cc20db47ULL, 0x1ac40271fc15523eULL,
- 0x5594765a340a7f3aULL, 0x2f4c0692043ff643ULL, 0xa02497ca54616dc8ULL,
- 0xdafce7026454e4b1ULL, 0x3e847f9dc45f37c0ULL, 0x445c0f55f46abeb9ULL,
- 0xcb349e0da4342532ULL, 0xb1eceec59401ac4bULL, 0xfebc9aee5c1e814fULL,
- 0x8464ea266c2b0836ULL, 0x0b0c7b7e3c7593bdULL, 0x71d40bb60c401ac4ULL,
- 0xe8a46c1224f5a634ULL, 0x927c1cda14c02f4dULL, 0x1d148d82449eb4c6ULL,
- 0x67ccfd4a74ab3dbfULL, 0x289c8961bcb410bbULL, 0x5244f9a98c8199c2ULL,
- 0xdd2c68f1dcdf0249ULL, 0xa7f41839ecea8b30ULL, 0x438c80a64ce15841ULL,
- 0x3954f06e7cd4d138ULL, 0xb63c61362c8a4ab3ULL, 0xcce411fe1cbfc3caULL,
- 0x83b465d5d4a0eeceULL, 0xf96c151de49567b7ULL, 0x76048445b4cbfc3cULL,
- 0x0cdcf48d84fe7545ULL, 0x6fbd6d5ebd3716b7ULL, 0x15651d968d029fceULL,
- 0x9a0d8ccedd5c0445ULL, 0xe0d5fc06ed698d3cULL, 0xaf85882d2576a038ULL,
- 0xd55df8e515432941ULL, 0x5a3569bd451db2caULL, 0x20ed197575283bb3ULL,
- 0xc49581ead523e8c2ULL, 0xbe4df122e51661bbULL, 0x3125607ab548fa30ULL,
- 0x4bfd10b2857d7349ULL, 0x04ad64994d625e4dULL, 0x7e7514517d57d734ULL,
- 0xf11d85092d094cbfULL, 0x8bc5f5c11d3cc5c6ULL, 0x12b5926535897936ULL,
- 0x686de2ad05bcf04fULL, 0xe70573f555e26bc4ULL, 0x9ddd033d65d7e2bdULL,
- 0xd28d7716adc8cfb9ULL, 0xa85507de9dfd46c0ULL, 0x273d9686cda3dd4bULL,
- 0x5de5e64efd965432ULL, 0xb99d7ed15d9d8743ULL, 0xc3450e196da80e3aULL,
- 0x4c2d9f413df695b1ULL, 0x36f5ef890dc31cc8ULL, 0x79a59ba2c5dc31ccULL,
- 0x037deb6af5e9b8b5ULL, 0x8c157a32a5b7233eULL, 0xf6cd0afa9582aa47ULL,
- 0x4ad64994d625e4daULL, 0x300e395ce6106da3ULL, 0xbf66a804b64ef628ULL,
- 0xc5bed8cc867b7f51ULL, 0x8aeeace74e645255ULL, 0xf036dc2f7e51db2cULL,
- 0x7f5e4d772e0f40a7ULL, 0x05863dbf1e3ac9deULL, 0xe1fea520be311aafULL,
- 0x9b26d5e88e0493d6ULL, 0x144e44b0de5a085dULL, 0x6e963478ee6f8124ULL,
- 0x21c640532670ac20ULL, 0x5b1e309b16452559ULL, 0xd476a1c3461bbed2ULL,
- 0xaeaed10b762e37abULL, 0x37deb6af5e9b8b5bULL, 0x4d06c6676eae0222ULL,
- 0xc26e573f3ef099a9ULL, 0xb8b627f70ec510d0ULL, 0xf7e653dcc6da3dd4ULL,
- 0x8d3e2314f6efb4adULL, 0x0256b24ca6b12f26ULL, 0x788ec2849684a65fULL,
- 0x9cf65a1b368f752eULL, 0xe62e2ad306bafc57ULL, 0x6946bb8b56e467dcULL,
- 0x139ecb4366d1eea5ULL, 0x5ccebf68aecec3a1ULL, 0x2616cfa09efb4ad8ULL,
- 0xa97e5ef8cea5d153ULL, 0xd3a62e30fe90582aULL, 0xb0c7b7e3c7593bd8ULL,
- 0xca1fc72bf76cb2a1ULL, 0x45775673a732292aULL, 0x3faf26bb9707a053ULL,
- 0x70ff52905f188d57ULL, 0x0a2722586f2d042eULL, 0x854fb3003f739fa5ULL,
- 0xff97c3c80f4616dcULL, 0x1bef5b57af4dc5adULL, 0x61372b9f9f784cd4ULL,
- 0xee5fbac7cf26d75fULL, 0x9487ca0fff135e26ULL, 0xdbd7be24370c7322ULL,
- 0xa10fceec0739fa5bULL, 0x2e675fb4576761d0ULL, 0x54bf2f7c6752e8a9ULL,
- 0xcdcf48d84fe75459ULL, 0xb71738107fd2dd20ULL, 0x387fa9482f8c46abULL,
- 0x42a7d9801fb9cfd2ULL, 0x0df7adabd7a6e2d6ULL, 0x772fdd63e7936bafULL,
- 0xf8474c3bb7cdf024ULL, 0x829f3cf387f8795dULL, 0x66e7a46c27f3aa2cULL,
- 0x1c3fd4a417c62355ULL, 0x935745fc4798b8deULL, 0xe98f353477ad31a7ULL,
- 0xa6df411fbfb21ca3ULL, 0xdc0731d78f8795daULL, 0x536fa08fdfd90e51ULL,
- 0x29b7d047efec8728ULL
-};
-
-/*========================================================================
- *
- * vcl_crc64 implementation.
- *
- *======================================================================*/
-#define UPDCRC64(crc, octet) \
- (vcl_crc64Table[((crc) ^ (octet)) & 0xff] ^ ((crc) >> 8))
-
-/*
- * vcl_crc64.
- */
-sal_uInt64 vcl_crc64 (
- sal_uInt64 Crc,
- const void *Data, sal_uInt32 DatLen) SAL_THROW_EXTERN_C()
-{
- if (Data)
- {
- const sal_uInt8 *p = static_cast<const sal_uInt8 *>(Data);
- const sal_uInt8 *q = p + DatLen;
-
- Crc = ~Crc;
- while (p < q)
- Crc = UPDCRC64(Crc, *(p++));
- Crc = ~Crc;
- }
- return Crc;
-}
-
-/*
- * vcl_get_crc64_table.
- */
-const sal_uInt64* vcl_get_crc64_table()
-{
- return vcl_crc64Table;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/bitmap/salbmp.cxx b/vcl/source/bitmap/salbmp.cxx
index 88cabc0968bc..1d6ef99a586d 100644
--- a/vcl/source/bitmap/salbmp.cxx
+++ b/vcl/source/bitmap/salbmp.cxx
@@ -19,15 +19,16 @@
#include <salbmp.hxx>
#include <o3tl/enumarray.hxx>
+#include <rtl/crc.h>
static BitmapChecksum scanlineChecksum(BitmapChecksum nCrc, const sal_uInt8*
bits, int lineBitsCount, sal_uInt8 extraBitsMask)
{
if( lineBitsCount / 8 > 0 )
- nCrc = vcl_get_checksum( nCrc, bits, lineBitsCount / 8 );
+ nCrc = rtl_crc32( nCrc, bits, lineBitsCount / 8 );
if( extraBitsMask != 0 )
{
sal_uInt8 extraByte = bits[ lineBitsCount / 8 ] & extraBitsMask;
- nCrc = vcl_get_checksum( nCrc, &extraByte, 1 );
+ nCrc = rtl_crc32( nCrc, &extraByte, 1 );
}
return nCrc;
}
@@ -70,7 +71,7 @@ void SalBitmap::updateChecksum() const
if( pBuf->mnFormat & ScanlineFormat::TopDown )
{
if( pBuf->mnScanlineSize == lineBitsCount / 8 )
- nCrc = vcl_get_checksum(nCrc, pBuf->mpBits,
pBuf->mnScanlineSize * pBuf->mnHeight);
+ nCrc = rtl_crc32(nCrc, pBuf->mpBits, pBuf->mnScanlineSize *
pBuf->mnHeight);
else // Do not include padding with undefined content in the
checksum.
for( tools::Long y = 0; y < pBuf->mnHeight; ++y )
nCrc = scanlineChecksum(nCrc, pBuf->mpBits + y *
pBuf->mnScanlineSize, lineBitsCount, extraBitsMask);
diff --git a/vcl/source/filter/svm/SvmWriter.cxx
b/vcl/source/filter/svm/SvmWriter.cxx
index 7eacba78b88e..09c7cce21e87 100644
--- a/vcl/source/filter/svm/SvmWriter.cxx
+++ b/vcl/source/filter/svm/SvmWriter.cxx
@@ -20,7 +20,7 @@
#include <vcl/filter/SvmWriter.hxx>
#include <vcl/TypeSerializer.hxx>
#include <vcl/dibtools.hxx>
-
+#include <rtl/crc.h>
#include <tools/vcompat.hxx>
#include <osl/thread.h>
@@ -91,16 +91,16 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
MetaBmpAction* pAct = static_cast<MetaBmpAction*>(pAction);
ShortToSVBT16(static_cast<sal_uInt16>(pAct->GetType()), aBT16);
- nCrc = vcl_get_checksum(nCrc, aBT16, 2);
+ nCrc = rtl_crc32(nCrc, aBT16, 2);
BCToBCOA(pAct->GetBitmap().GetChecksum(), aBCOA);
- nCrc = vcl_get_checksum(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
+ nCrc = rtl_crc32(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
Int32ToSVBT32(pAct->GetPoint().X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetPoint().Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
}
break;
@@ -109,22 +109,22 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
MetaBmpScaleAction* pAct =
static_cast<MetaBmpScaleAction*>(pAction);
ShortToSVBT16(static_cast<sal_uInt16>(pAct->GetType()), aBT16);
- nCrc = vcl_get_checksum(nCrc, aBT16, 2);
+ nCrc = rtl_crc32(nCrc, aBT16, 2);
BCToBCOA(pAct->GetBitmap().GetChecksum(), aBCOA);
- nCrc = vcl_get_checksum(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
+ nCrc = rtl_crc32(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
Int32ToSVBT32(pAct->GetPoint().X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetPoint().Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSize().Width(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSize().Height(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
}
break;
@@ -133,34 +133,34 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
MetaBmpScalePartAction* pAct =
static_cast<MetaBmpScalePartAction*>(pAction);
ShortToSVBT16(static_cast<sal_uInt16>(pAct->GetType()), aBT16);
- nCrc = vcl_get_checksum(nCrc, aBT16, 2);
+ nCrc = rtl_crc32(nCrc, aBT16, 2);
BCToBCOA(pAct->GetBitmap().GetChecksum(), aBCOA);
- nCrc = vcl_get_checksum(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
+ nCrc = rtl_crc32(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
Int32ToSVBT32(pAct->GetDestPoint().X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetDestPoint().Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetDestSize().Width(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetDestSize().Height(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSrcPoint().X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSrcPoint().Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSrcSize().Width(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSrcSize().Height(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
}
break;
@@ -169,16 +169,16 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
MetaBmpExAction* pAct = static_cast<MetaBmpExAction*>(pAction);
ShortToSVBT16(static_cast<sal_uInt16>(pAct->GetType()), aBT16);
- nCrc = vcl_get_checksum(nCrc, aBT16, 2);
+ nCrc = rtl_crc32(nCrc, aBT16, 2);
BCToBCOA(pAct->GetBitmapEx().GetChecksum(), aBCOA);
- nCrc = vcl_get_checksum(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
+ nCrc = rtl_crc32(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
Int32ToSVBT32(pAct->GetPoint().X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetPoint().Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
}
break;
@@ -187,22 +187,22 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
MetaBmpExScaleAction* pAct =
static_cast<MetaBmpExScaleAction*>(pAction);
ShortToSVBT16(static_cast<sal_uInt16>(pAct->GetType()), aBT16);
- nCrc = vcl_get_checksum(nCrc, aBT16, 2);
+ nCrc = rtl_crc32(nCrc, aBT16, 2);
BCToBCOA(pAct->GetBitmapEx().GetChecksum(), aBCOA);
- nCrc = vcl_get_checksum(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
+ nCrc = rtl_crc32(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
Int32ToSVBT32(pAct->GetPoint().X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetPoint().Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSize().Width(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSize().Height(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
}
break;
@@ -211,34 +211,34 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
MetaBmpExScalePartAction* pAct =
static_cast<MetaBmpExScalePartAction*>(pAction);
ShortToSVBT16(static_cast<sal_uInt16>(pAct->GetType()), aBT16);
- nCrc = vcl_get_checksum(nCrc, aBT16, 2);
+ nCrc = rtl_crc32(nCrc, aBT16, 2);
BCToBCOA(pAct->GetBitmapEx().GetChecksum(), aBCOA);
- nCrc = vcl_get_checksum(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
+ nCrc = rtl_crc32(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
Int32ToSVBT32(pAct->GetDestPoint().X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetDestPoint().Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetDestSize().Width(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetDestSize().Height(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSrcPoint().X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSrcPoint().Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSrcSize().Width(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSrcSize().Height(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
}
break;
@@ -247,19 +247,19 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
MetaMaskAction* pAct = static_cast<MetaMaskAction*>(pAction);
ShortToSVBT16(static_cast<sal_uInt16>(pAct->GetType()), aBT16);
- nCrc = vcl_get_checksum(nCrc, aBT16, 2);
+ nCrc = rtl_crc32(nCrc, aBT16, 2);
BCToBCOA(pAct->GetBitmap().GetChecksum(), aBCOA);
- nCrc = vcl_get_checksum(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
+ nCrc = rtl_crc32(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
UInt32ToSVBT32(sal_uInt32(pAct->GetColor()), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetPoint().X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetPoint().Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
}
break;
@@ -268,25 +268,25 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
MetaMaskScaleAction* pAct =
static_cast<MetaMaskScaleAction*>(pAction);
ShortToSVBT16(static_cast<sal_uInt16>(pAct->GetType()), aBT16);
- nCrc = vcl_get_checksum(nCrc, aBT16, 2);
+ nCrc = rtl_crc32(nCrc, aBT16, 2);
BCToBCOA(pAct->GetBitmap().GetChecksum(), aBCOA);
- nCrc = vcl_get_checksum(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
+ nCrc = rtl_crc32(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
UInt32ToSVBT32(sal_uInt32(pAct->GetColor()), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetPoint().X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetPoint().Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSize().Width(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSize().Height(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
}
break;
@@ -295,45 +295,44 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
MetaMaskScalePartAction* pAct =
static_cast<MetaMaskScalePartAction*>(pAction);
ShortToSVBT16(static_cast<sal_uInt16>(pAct->GetType()), aBT16);
- nCrc = vcl_get_checksum(nCrc, aBT16, 2);
+ nCrc = rtl_crc32(nCrc, aBT16, 2);
BCToBCOA(pAct->GetBitmap().GetChecksum(), aBCOA);
- nCrc = vcl_get_checksum(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
+ nCrc = rtl_crc32(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
UInt32ToSVBT32(sal_uInt32(pAct->GetColor()), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetDestPoint().X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetDestPoint().Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetDestSize().Width(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetDestSize().Height(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSrcPoint().X(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSrcPoint().Y(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSrcSize().Width(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
Int32ToSVBT32(pAct->GetSrcSize().Height(), aBT32);
- nCrc = vcl_get_checksum(nCrc, aBT32, 4);
+ nCrc = rtl_crc32(nCrc, aBT32, 4);
}
break;
case MetaActionType::EPS:
{
MetaEPSAction* pAct = static_cast<MetaEPSAction*>(pAction);
- nCrc = vcl_get_checksum(nCrc, pAct->GetLink().GetData(),
- pAct->GetLink().GetDataSize());
+ nCrc = rtl_crc32(nCrc, pAct->GetLink().GetData(),
pAct->GetLink().GetDataSize());
}
break;
@@ -360,9 +359,9 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
const basegfx::B2DPoint
aPoint(rPolygon.getB2DPoint(b));
DoubleToSVBT64(aPoint.getX(), aSVBT64);
- nCrc = vcl_get_checksum(nCrc, aSVBT64, 8);
+ nCrc = rtl_crc32(nCrc, aSVBT64, 8);
DoubleToSVBT64(aPoint.getY(), aSVBT64);
- nCrc = vcl_get_checksum(nCrc, aSVBT64, 8);
+ nCrc = rtl_crc32(nCrc, aSVBT64, 8);
if (bControl)
{
@@ -371,9 +370,9 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
const basegfx::B2DPoint
aCtrl(rPolygon.getPrevControlPoint(b));
DoubleToSVBT64(aCtrl.getX(), aSVBT64);
- nCrc = vcl_get_checksum(nCrc, aSVBT64, 8);
+ nCrc = rtl_crc32(nCrc, aSVBT64, 8);
DoubleToSVBT64(aCtrl.getY(), aSVBT64);
- nCrc = vcl_get_checksum(nCrc, aSVBT64, 8);
+ nCrc = rtl_crc32(nCrc, aSVBT64, 8);
}
if (rPolygon.isNextControlPointUsed(b))
@@ -381,22 +380,22 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
const basegfx::B2DPoint
aCtrl(rPolygon.getNextControlPoint(b));
DoubleToSVBT64(aCtrl.getX(), aSVBT64);
- nCrc = vcl_get_checksum(nCrc, aSVBT64, 8);
+ nCrc = rtl_crc32(nCrc, aSVBT64, 8);
DoubleToSVBT64(aCtrl.getY(), aSVBT64);
- nCrc = vcl_get_checksum(nCrc, aSVBT64, 8);
+ nCrc = rtl_crc32(nCrc, aSVBT64, 8);
}
}
}
}
sal_uInt8 tmp = static_cast<sal_uInt8>(rAct.IsClipping());
- nCrc = vcl_get_checksum(nCrc, &tmp, 1);
+ nCrc = rtl_crc32(nCrc, &tmp, 1);
}
else
{
SvmWriter aWriter(aMemStm);
aWriter.MetaActionHandler(pAction, &aWriteData);
- nCrc = vcl_get_checksum(nCrc, aMemStm.GetData(),
aMemStm.Tell());
+ nCrc = rtl_crc32(nCrc, aMemStm.GetData(), aMemStm.Tell());
aMemStm.Seek(0);
}
}
@@ -406,7 +405,7 @@ BitmapChecksum SvmWriter::GetChecksum(const GDIMetaFile&
rMetaFile)
{
SvmWriter aWriter(aMemStm);
aWriter.MetaActionHandler(pAction, &aWriteData);
- nCrc = vcl_get_checksum(nCrc, aMemStm.GetData(),
aMemStm.Tell());
+ nCrc = rtl_crc32(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 c2da628382d2..d3cb95ea7d0a 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -49,6 +49,7 @@
#include <officecfg/Office/Common.hxx>
#include <osl/file.hxx>
#include <osl/thread.h>
+#include <rtl/crc.h>
#include <rtl/digest.h>
#include <rtl/uri.hxx>
#include <rtl/ustrbuf.hxx>
@@ -9754,7 +9755,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 = vcl_get_checksum( 0, pStream->GetData(), aID.m_nSize
);
+ aID.m_nChecksum = rtl_crc32( 0, pStream->GetData(), aID.m_nSize );
if( ! rAlphaMask.IsEmpty() )
aID.m_nMaskChecksum = rAlphaMask.GetChecksum();
diff --git a/vcl/source/gdi/vectorgraphicdata.cxx
b/vcl/source/gdi/vectorgraphicdata.cxx
index 7dc51073adeb..9d94b171a45f 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -37,6 +37,7 @@
#include <comphelper/sequence.hxx>
#include <comphelper/propertysequence.hxx>
#include <comphelper/propertyvalue.hxx>
+#include <rtl/crc.h>
#include <vcl/svapp.hxx>
#include <vcl/outdev.hxx>
#include <vcl/wmfexternal.hxx>
@@ -350,7 +351,7 @@ const BitmapEx& VectorGraphicData::getReplacement() const
BitmapChecksum VectorGraphicData::GetChecksum() const
{
- return vcl_get_checksum(0, maDataContainer.getData(),
maDataContainer.getSize());
+ return rtl_crc32(0, maDataContainer.getData(), maDataContainer.getSize());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/graphic/GraphicID.cxx b/vcl/source/graphic/GraphicID.cxx
index 61cdee3c2ede..d78acea53013 100644
--- a/vcl/source/graphic/GraphicID.cxx
+++ b/vcl/source/graphic/GraphicID.cxx
@@ -20,6 +20,7 @@
#include <graphic/GraphicID.hxx>
#include <impgraph.hxx>
+#include <rtl/crc.h>
#include <rtl/strbuf.hxx>
GraphicID::GraphicID(ImpGraphic const& rGraphic)
@@ -39,8 +40,8 @@ GraphicID::GraphicID(ImpGraphic const& rGraphic)
mnID1 |= rVectorGraphicDataPtr->getBinaryDataContainer().getSize();
mnID2 = basegfx::fround(rRange.getWidth());
mnID3 = basegfx::fround(rRange.getHeight());
- mnID4 = vcl_get_checksum(0,
rVectorGraphicDataPtr->getBinaryDataContainer().getData(),
-
rVectorGraphicDataPtr->getBinaryDataContainer().getSize());
+ mnID4 = rtl_crc32(0,
rVectorGraphicDataPtr->getBinaryDataContainer().getData(),
+
rVectorGraphicDataPtr->getBinaryDataContainer().getSize());
}
else if (rGraphic.isAnimated())
{
