diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-03-25 12:06:21 +0900 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-03-27 10:45:15 +0900 |
commit | 132ad4f1416126a74f8b48f65da786a4e0ec8c1b (patch) | |
tree | c264d7115cd2d385b00994ae0c72db683b9fd756 /vcl/source/gdi/bmpacc.cxx | |
parent | 44c6c4da9545d69ad02f5e8ea1314388e1eacec7 (diff) |
vcl: get rid of macros for lazy people in bmpacc
Change-Id: I4b64a70e185f061c7d7e1e895d85ffb47ee60101
Diffstat (limited to 'vcl/source/gdi/bmpacc.cxx')
-rw-r--r-- | vcl/source/gdi/bmpacc.cxx | 112 |
1 files changed, 96 insertions, 16 deletions
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 33e5038a529f..cdda5dcb87be 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -171,22 +171,102 @@ bool BitmapReadAccess::ImplSetAccessPointers( sal_uLong nFormat ) switch( nFormat ) { - CASE_FORMAT( _1BIT_MSB_PAL ) - CASE_FORMAT( _1BIT_LSB_PAL ) - CASE_FORMAT( _4BIT_MSN_PAL ) - CASE_FORMAT( _4BIT_LSN_PAL ) - CASE_FORMAT( _8BIT_PAL ) - CASE_FORMAT( _8BIT_TC_MASK ) - CASE_FORMAT( _16BIT_TC_MSB_MASK ) - CASE_FORMAT( _16BIT_TC_LSB_MASK ) - CASE_FORMAT( _24BIT_TC_BGR ) - CASE_FORMAT( _24BIT_TC_RGB ) - CASE_FORMAT( _24BIT_TC_MASK ) - CASE_FORMAT( _32BIT_TC_ABGR ) - CASE_FORMAT( _32BIT_TC_ARGB ) - CASE_FORMAT( _32BIT_TC_BGRA ) - CASE_FORMAT( _32BIT_TC_RGBA ) - CASE_FORMAT( _32BIT_TC_MASK ) + case BMP_FORMAT_1BIT_MSB_PAL: + { + mFncGetPixel = GetPixelFor_1BIT_MSB_PAL; + mFncSetPixel = SetPixelFor_1BIT_MSB_PAL; + } + break; + case BMP_FORMAT_1BIT_LSB_PAL: + { + mFncGetPixel = GetPixelFor_1BIT_LSB_PAL; + mFncSetPixel = SetPixelFor_1BIT_LSB_PAL; + } + break; + case BMP_FORMAT_4BIT_MSN_PAL: + { + mFncGetPixel = GetPixelFor_4BIT_MSN_PAL; + mFncSetPixel = SetPixelFor_4BIT_MSN_PAL; + } + break; + case BMP_FORMAT_4BIT_LSN_PAL: + { + mFncGetPixel = GetPixelFor_4BIT_LSN_PAL; + mFncSetPixel = SetPixelFor_4BIT_LSN_PAL; + } + break; + case BMP_FORMAT_8BIT_PAL: + { + mFncGetPixel = GetPixelFor_8BIT_PAL; + mFncSetPixel = SetPixelFor_8BIT_PAL; + } + break; + case BMP_FORMAT_8BIT_TC_MASK: + { + mFncGetPixel = GetPixelFor_8BIT_TC_MASK; + mFncSetPixel = SetPixelFor_8BIT_TC_MASK; + } + break; + case BMP_FORMAT_16BIT_TC_MSB_MASK: + { + mFncGetPixel = GetPixelFor_16BIT_TC_MSB_MASK; + mFncSetPixel = SetPixelFor_16BIT_TC_MSB_MASK; + } + break; + case BMP_FORMAT_16BIT_TC_LSB_MASK: + { + mFncGetPixel = GetPixelFor_16BIT_TC_LSB_MASK; + mFncSetPixel = SetPixelFor_16BIT_TC_LSB_MASK; + } + break; + case BMP_FORMAT_24BIT_TC_BGR: + { + mFncGetPixel = GetPixelFor_24BIT_TC_BGR; + mFncSetPixel = SetPixelFor_24BIT_TC_BGR; + } + break; + case BMP_FORMAT_24BIT_TC_RGB: + { + mFncGetPixel = GetPixelFor_24BIT_TC_RGB; + mFncSetPixel = SetPixelFor_24BIT_TC_RGB; + } + break; + case BMP_FORMAT_24BIT_TC_MASK: + { + mFncGetPixel = GetPixelFor_24BIT_TC_MASK; + mFncSetPixel = SetPixelFor_24BIT_TC_MASK; + } + break; + case BMP_FORMAT_32BIT_TC_ABGR: + { + mFncGetPixel = GetPixelFor_32BIT_TC_ABGR; + mFncSetPixel = SetPixelFor_32BIT_TC_ABGR; + } + break; + case BMP_FORMAT_32BIT_TC_ARGB: + { + mFncGetPixel = GetPixelFor_32BIT_TC_ARGB; + mFncSetPixel = SetPixelFor_32BIT_TC_ARGB; + } + break; + case BMP_FORMAT_32BIT_TC_BGRA: + { + mFncGetPixel = GetPixelFor_32BIT_TC_BGRA; + mFncSetPixel = SetPixelFor_32BIT_TC_BGRA; + } + break; + case BMP_FORMAT_32BIT_TC_RGBA: + { + mFncGetPixel = GetPixelFor_32BIT_TC_RGBA; + mFncSetPixel = SetPixelFor_32BIT_TC_RGBA; + } + break; + case BMP_FORMAT_32BIT_TC_MASK: + { + mFncGetPixel = GetPixelFor_32BIT_TC_MASK; + mFncSetPixel = SetPixelFor_32BIT_TC_MASK; + } + break; default: bRet = false; |