diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-07-05 18:15:50 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-07-06 10:47:33 +0200 |
| commit | 670117dd9659910fe2cbde92356b12ef1ceb8399 (patch) | |
| tree | 5e4ad99b8b23d274fe589772097cee99f64cebae /vcl/qt5/Qt5Bitmap.cxx | |
| parent | bd39726fe67cad9eb133daf4a8ab8c2b19dddfe1 (diff) | |
Qt5 multiple small fixes
* just assert palettes, which are larger then the bitmap support;
smaller then maximum palettes are ok
* 1bit images are encoded by the most significant bit (N1BitMsbPal)
=> adapt the alpha mask decoding
* drawLine update height and width need an additional pixel
* drawn objects can be filled *and* have an outline
* show cairo usage in about dialog
Change-Id: I301708386feb3cc1c86b27f47f0e76594a1e7357
Diffstat (limited to 'vcl/qt5/Qt5Bitmap.cxx')
| -rw-r--r-- | vcl/qt5/Qt5Bitmap.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx index 824bfc28b89a..adc46651fe41 100644 --- a/vcl/qt5/Qt5Bitmap.cxx +++ b/vcl/qt5/Qt5Bitmap.cxx @@ -38,11 +38,11 @@ bool Qt5Bitmap::Create(const Size& rSize, sal_uInt16 nBitCount, const BitmapPale && "Unsupported BitCount!"); if (nBitCount == 1) - assert(2 == rPal.GetEntryCount()); + assert(2 >= rPal.GetEntryCount()); if (nBitCount == 4) - assert(16 == rPal.GetEntryCount()); + assert(16 >= rPal.GetEntryCount()); if (nBitCount == 8) - assert(256 == rPal.GetEntryCount()); + assert(256 >= rPal.GetEntryCount()); if (nBitCount == 4) { @@ -230,7 +230,7 @@ BitmapBuffer* Qt5Bitmap::AcquireBuffer(BitmapAccessMode /*nMode*/) switch (pBuffer->mnBitCount) { case 1: - pBuffer->mnFormat = ScanlineFormat::N1BitLsbPal | ScanlineFormat::TopDown; + pBuffer->mnFormat = ScanlineFormat::N1BitMsbPal | ScanlineFormat::TopDown; pBuffer->maPalette = m_aPalette; break; case 4: |