summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Cecchetti <marco.cecchetti@collabora.com>2015-08-28 15:35:43 +0200
committerMarco Cecchetti <marco.cecchetti@collabora.com>2015-08-31 19:31:15 +0200
commit6022f7dab0c874ac6f29bfbe0fc9a1655fd291a7 (patch)
treed02655e0920b401bd0420dce2dd37b5e266018e0
parentaf3891ed2fe18e5a41b8453f5c3b27534fe821a6 (diff)
switch to 64-bit checksum: now BitmapChecksum is a sal_uInt64
Changed hardcoded checksum value in ooxmlimport unit test (testN777345). Change-Id: Ied43bf626be82c0e7f6c62e965d0704fc645ac19
-rw-r--r--include/vcl/checksum.hxx5
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx2
2 files changed, 3 insertions, 4 deletions
diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx
index 83facefd6c9e..6efb4acf83f2 100644
--- a/include/vcl/checksum.hxx
+++ b/include/vcl/checksum.hxx
@@ -125,11 +125,10 @@ static const sal_uInt64 vcl_crc64Table[256] = {
0x29b7d047efec8728ULL
};
-#define BITMAP_CHECKSUM_SIZE 4
+#define BITMAP_CHECKSUM_SIZE 8
#define BITMAP_CHECKSUM_BITS BOOST_PP_MUL(BITMAP_CHECKSUM_SIZE, 8)
-typedef sal_uLong BitmapChecksum;
-
+typedef sal_uInt64 BitmapChecksum;
typedef sal_uInt8 BitmapChecksumOctetArray[BITMAP_CHECKSUM_SIZE];
#define BITMAP_CHECKSUM_SET_OCTET(z, i, unused) \
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 83a616bb82d3..98ce91a1802d 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -750,7 +750,7 @@ DECLARE_OOXMLIMPORT_TEST(testN777345, "n777345.docx")
Graphic aGraphic(xGraphic);
// If this changes later, feel free to update it, but make sure it's not
// the checksum of a white/transparent placeholder rectangle.
- CPPUNIT_ASSERT_EQUAL(sal_uLong(1256330431U), aGraphic.GetChecksum());
+ CPPUNIT_ASSERT_EQUAL(BitmapChecksum(3652741777587093783), aGraphic.GetChecksum());
#endif
}