solenv/clang-format/blacklist | 1 - vcl/qa/cppunit/BitmapTest.cxx | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-)
New commits: commit 1dd4590f817cce0b9e973c4767551067067702b5 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Sun Feb 25 17:31:49 2018 +1100 vcl: remove vcl/qa/cppunit/BitmapTest.cxx from clang-format blacklist I am actively working on bitmap tests, it is much easier if I just make a seperate commit which runs clang-format over this file, gives a clear line of demarcation so you can see what is being changed. Change-Id: I70357c935aaeac4cabdf95a98b2cc8e40fd736e0 Reviewed-on: https://gerrit.libreoffice.org/50298 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Tomaž Vajngerl <qui...@gmail.com> diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 9fdf7746c1f7..a0be17a89a7b 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -18002,7 +18002,6 @@ vcl/osx/salsys.cxx vcl/osx/saltimer.cxx vcl/osx/service_entry.cxx vcl/qa/cppunit/BitmapProcessorTest.cxx -vcl/qa/cppunit/BitmapTest.cxx vcl/qa/cppunit/app/test_IconThemeInfo.cxx vcl/qa/cppunit/app/test_IconThemeScanner.cxx vcl/qa/cppunit/app/test_IconThemeSelector.cxx diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx index 22b8893a8328..8c05a12d300d 100644 --- a/vcl/qa/cppunit/BitmapTest.cxx +++ b/vcl/qa/cppunit/BitmapTest.cxx @@ -30,7 +30,6 @@ namespace { - class BitmapTest : public CppUnit::TestFixture { void testCreation(); @@ -171,12 +170,13 @@ void BitmapTest::testScale() } } -typedef std::unordered_map<sal_uInt64, const char *> CRCHash; +typedef std::unordered_map<sal_uInt64, const char*> CRCHash; -void checkAndInsert(CRCHash &rHash, sal_uInt64 nCRC, const char *pLocation) +void checkAndInsert(CRCHash& rHash, sal_uInt64 nCRC, const char* pLocation) { auto it = rHash.find(nCRC); - if (it != rHash.end()) { + if (it != rHash.end()) + { OStringBuffer aBuf("CRC collision between "); aBuf.append(pLocation); aBuf.append(" and "); @@ -188,12 +188,12 @@ void checkAndInsert(CRCHash &rHash, sal_uInt64 nCRC, const char *pLocation) rHash[nCRC] = pLocation; } -void checkAndInsert(CRCHash &rHash, Bitmap const & rBmp, const char *pLocation) +void checkAndInsert(CRCHash& rHash, Bitmap const& rBmp, const char* pLocation) { checkAndInsert(rHash, rBmp.GetChecksum(), pLocation); } -Bitmap getAsBitmap(VclPtr<OutputDevice> const & pOut) +Bitmap getAsBitmap(VclPtr<OutputDevice> const& pOut) { return pOut->GetBitmap(Point(), pOut->GetOutputSizePixel()); } @@ -202,7 +202,7 @@ void BitmapTest::testCRC() { CRCHash aCRCs; - Bitmap aBitmap(Size(1023,759), 24, nullptr); + Bitmap aBitmap(Size(1023, 759), 24, nullptr); aBitmap.Erase(COL_BLACK); checkAndInsert(aCRCs, aBitmap, "black bitmap"); aBitmap.Invert(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits