diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-20 09:40:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-25 13:19:25 +0000 |
| commit | d9ac7def8ba320853e8865535a7a14f9af77521e (patch) | |
| tree | 4aef3ff57b2208fd01633f838c83afe727c26544 /vcl/headless | |
| parent | 102196f06400864ef49af961352b5c285ee1f3ab (diff) | |
Convert BMP_FORMAT to scoped enum
Change-Id: I751ab762b6e6f961e9e73a8a2ca92a3f5a5eb1c8
Reviewed-on: https://gerrit.libreoffice.org/25189
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/svpbmp.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index 180ad2c5d0d6..756caee0537b 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -75,20 +75,20 @@ BitmapBuffer* ImplCreateDIB( switch (nBitCount) { case 1: - pDIB->mnFormat = BMP_FORMAT_1BIT_MSB_PAL; + pDIB->mnFormat = ScanlineFormat::N1BitMsbPal; break; case 4: - pDIB->mnFormat = BMP_FORMAT_4BIT_MSN_PAL; + pDIB->mnFormat = ScanlineFormat::N4BitMsnPal; break; case 8: - pDIB->mnFormat = BMP_FORMAT_8BIT_PAL; + pDIB->mnFormat = ScanlineFormat::N8BitPal; break; case 16: { #ifdef OSL_BIGENDIAN - pDIB->mnFormat= BMP_FORMAT_16BIT_TC_MSB_MASK; + pDIB->mnFormat= ScanlineFormat::N16BitTcMsbMask; #else - pDIB->mnFormat= BMP_FORMAT_16BIT_TC_LSB_MASK; + pDIB->mnFormat= ScanlineFormat::N16BitTcLsbMask; #endif ColorMaskElement aRedMask(0xf800); aRedMask.CalcMaskShift(); @@ -109,7 +109,7 @@ BitmapBuffer* ImplCreateDIB( } } - pDIB->mnFormat |= BMP_FORMAT_TOP_DOWN; + pDIB->mnFormat |= ScanlineFormat::TopDown; pDIB->mnWidth = rSize.Width(); pDIB->mnHeight = rSize.Height(); pDIB->mnScanlineSize = AlignedWidth4Bytes( pDIB->mnWidth * nBitCount ); |