diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-01-21 16:04:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-01-21 16:30:15 +0100 |
| commit | a73e606b8cd714520285b4e40890db9fd27d7ba5 (patch) | |
| tree | 109b2ed6931b00f9ebb6df1328a43ccf003dbd3e /sw | |
| parent | 08680c58de1271ce42a72ce4105e5a3337d0498c (diff) | |
Quickfix for deterministic SvpSalBitmap checksums
...that include the junk parts of the mpDIB->mpBits array in the calculation.
MALLOC_PERTURB_=153 in gb_CppunitTest_malloc_check
(solenv/gbuild/platform/unxgcc.mk) causes those junk bytes to normally contain
0x66 on Linux, but ASan makes them contain 0xBE instead.
Change-Id: I74429c5e539e667cb936b3a486de31867eef3e50
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 635137ec7869..5fd2bf8c0ae7 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -773,7 +773,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(BitmapChecksum(SAL_CONST_UINT64(17166884950237449306)), aGraphic.GetChecksum()); + CPPUNIT_ASSERT_EQUAL(BitmapChecksum(SAL_CONST_UINT64(12149824012634930130)), aGraphic.GetChecksum()); #endif } |