Kaydet (Commit) 33f57c48 authored tarafından Marco Cecchetti's avatar Marco Cecchetti Kaydeden (comit) Michael Meeks

switch to 64-bit checksum: now BitmapChecksum is a sal_uInt64

Changed hardcoded checksum value in ooxmlimport unit test (testN777345).

Change-Id: Ied43bf626be82c0e7f6c62e965d0704fc645ac19
üst 9644b6c8
......@@ -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) \
......
......@@ -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
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment