diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-06-29 21:50:59 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-07-01 07:36:15 +0200 |
| commit | 8663d81828541072999b26451f7d6e6bfcb5f951 (patch) | |
| tree | 860b25d54b3ffab526dc0c0ff4c24ed5d1934fff /vcl/unx | |
| parent | eb959d4a964e973ea1cf4b066f6007878c22fcf5 (diff) | |
remove code duplication for BitmapReadAccess pixel functions
Change-Id: Ib243fea4276cfb86b4fdff8d0c84cea7c4523d82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97487
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 55 |
1 files changed, 1 insertions, 54 deletions
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 03319d1acf53..a79aaab72fd8 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -78,11 +78,6 @@ public: virtual sal_uInt32 GetDepth () const override; }; - bool Bitmap32IsPreMultipled() - { - auto pBackendCapabilities = ImplGetSVData()->mpDefInst->GetBackendCapabilities(); - return pBackendCapabilities->mbSupportsBitmap32; - } } SalPrinterBmp::SalPrinterBmp (BitmapBuffer* pBuffer) @@ -104,55 +99,7 @@ SalPrinterBmp::SalPrinterBmp (BitmapBuffer* pBuffer) } // request read access to the pixels - switch( RemoveScanline( mpBmpBuffer->mnFormat ) ) - { - case ScanlineFormat::N1BitMsbPal: - mpFncGetPixel = BitmapReadAccess::GetPixelForN1BitMsbPal; break; - case ScanlineFormat::N1BitLsbPal: - mpFncGetPixel = BitmapReadAccess::GetPixelForN1BitLsbPal; break; - case ScanlineFormat::N4BitMsnPal: - mpFncGetPixel = BitmapReadAccess::GetPixelForN4BitMsnPal; break; - case ScanlineFormat::N4BitLsnPal: - mpFncGetPixel = BitmapReadAccess::GetPixelForN4BitLsnPal; break; - case ScanlineFormat::N8BitPal: - mpFncGetPixel = BitmapReadAccess::GetPixelForN8BitPal; break; - case ScanlineFormat::N8BitTcMask: - mpFncGetPixel = BitmapReadAccess::GetPixelForN8BitTcMask; break; - case ScanlineFormat::N24BitTcBgr: - mpFncGetPixel = BitmapReadAccess::GetPixelForN24BitTcBgr; break; - case ScanlineFormat::N24BitTcRgb: - mpFncGetPixel = BitmapReadAccess::GetPixelForN24BitTcRgb; break; - case ScanlineFormat::N32BitTcAbgr: - if (Bitmap32IsPreMultipled()) - mpFncGetPixel = BitmapReadAccess::GetPixelForN32BitTcAbgr; - else - mpFncGetPixel = BitmapReadAccess::GetPixelForN32BitTcXbgr; - break; - case ScanlineFormat::N32BitTcArgb: - if (Bitmap32IsPreMultipled()) - mpFncGetPixel = BitmapReadAccess::GetPixelForN32BitTcArgb; - else - mpFncGetPixel = BitmapReadAccess::GetPixelForN32BitTcXrgb; - break; - case ScanlineFormat::N32BitTcBgra: - if (Bitmap32IsPreMultipled()) - mpFncGetPixel = BitmapReadAccess::GetPixelForN32BitTcBgra; - else - mpFncGetPixel = BitmapReadAccess::GetPixelForN32BitTcBgrx; - break; - case ScanlineFormat::N32BitTcRgba: - if (Bitmap32IsPreMultipled()) - mpFncGetPixel = BitmapReadAccess::GetPixelForN32BitTcRgba; - else - mpFncGetPixel = BitmapReadAccess::GetPixelForN32BitTcRgbx; - break; - case ScanlineFormat::N32BitTcMask: - mpFncGetPixel = BitmapReadAccess::GetPixelForN32BitTcMask; break; - default: - OSL_FAIL("Error: SalPrinterBmp::SalPrinterBmp() unknown bitmap format"); - mpFncGetPixel = nullptr; - break; - } + mpFncGetPixel = BitmapReadAccess::GetPixelFunction( mpBmpBuffer->mnFormat ); } sal_uInt32 |