Kaydet (Commit) 1dd4590f authored tarafından Chris Sherlock's avatar Chris Sherlock Kaydeden (comit) Tomaž Vajngerl

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/50298Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTomaž Vajngerl <quikee@gmail.com>
üst 1daf4db9
......@@ -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
......
......@@ -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();
......
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