diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 07:54:38 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 07:54:38 +0000 |
| commit | 8ba9f202f1916d54b626fb0d5915a61e91366115 (patch) | |
| tree | e0411f7ec4d25a13a467bc07e8d504f83662ac13 /basebmp/inc/basebmp | |
| parent | 35e3bd6011469f80baa797396457f995851b5abf (diff) | |
INTEGRATION: CWS aquavcl01 (1.2.18); FILE MERGED
2007/06/22 19:06:24 thb 1.2.18.3: #i78704# Unified the two 32bpp formats
2007/06/22 15:49:55 ericb 1.2.18.2: add PowerPC endianness
2007/06/21 09:00:07 pl 1.2.18.1: #i78704# add a new pixelformat, minor cosmetics
Diffstat (limited to 'basebmp/inc/basebmp')
| -rw-r--r-- | basebmp/inc/basebmp/rgbmaskpixelformats.hxx | 61 |
1 files changed, 35 insertions, 26 deletions
diff --git a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx b/basebmp/inc/basebmp/rgbmaskpixelformats.hxx index bbaf5e6f2b54..d1a8353aad57 100644 --- a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx +++ b/basebmp/inc/basebmp/rgbmaskpixelformats.hxx @@ -4,9 +4,9 @@ * * $RCSfile: rgbmaskpixelformats.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2006-10-12 13:46:55 $ + * last change: $Author: rt $ $Date: 2007-07-05 08:54:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,12 +76,12 @@ namespace basebmp When true, the final pixel values will be byte-swapped before passed on. */ -template< typename PixelType, - typename ColorType, - int RedMask, - int GreenMask, - int BlueMask, - bool SwapBytes > struct RGBMaskFunctorBase +template< typename PixelType, + typename ColorType, + unsigned int RedMask, + unsigned int GreenMask, + unsigned int BlueMask, + bool SwapBytes > struct RGBMaskFunctorBase { typedef PixelType pixel_type; typedef ColorType color_type; @@ -100,12 +100,12 @@ template< typename PixelType, }; }; -template< typename PixelType, - typename ColorType, - int RedMask, - int GreenMask, - int BlueMask, - bool SwapBytes > struct RGBMaskGetter : +template< typename PixelType, + typename ColorType, + unsigned int RedMask, + unsigned int GreenMask, + unsigned int BlueMask, + bool SwapBytes > struct RGBMaskGetter : public RGBMaskFunctorBase<PixelType, ColorType, RedMask, @@ -162,12 +162,12 @@ template< typename PixelType, } }; -template< typename PixelType, - typename ColorType, - int RedMask, - int GreenMask, - int BlueMask, - bool SwapBytes > struct RGBMaskSetter : +template< typename PixelType, + typename ColorType, + unsigned int RedMask, + unsigned int GreenMask, + unsigned int BlueMask, + bool SwapBytes > struct RGBMaskSetter : public RGBMaskFunctorBase<PixelType, ColorType, RedMask, @@ -209,11 +209,11 @@ template< typename PixelType, //----------------------------------------------------------------------------- -template< typename PixelType, - int RedMask, - int GreenMask, - int BlueMask, - bool SwapBytes > struct PixelFormatTraitsTemplate_RGBMask +template< typename PixelType, + unsigned int RedMask, + unsigned int GreenMask, + unsigned int BlueMask, + bool SwapBytes > struct PixelFormatTraitsTemplate_RGBMask { typedef PixelType pixel_type; @@ -278,10 +278,19 @@ typedef PixelFormatTraitsTemplate_RGBMask< 0xFF0000, 0x00FF00, 0x0000FF, - false > PixelFormatTraits_RGB32_888; + BASEBMP_TRUECOLORMASK_LSB_SWAP > PixelFormatTraits_RGB32_888; BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_RGB32_888::getter_type, PixelFormatTraits_RGB32_888::setter_type); +// 32bpp endian-sensitive BGR +typedef PixelFormatTraitsTemplate_RGBMask< + sal_uInt32, + 0xFF0000, + 0x00FF00, + 0x0000FF, + BASEBMP_TRUECOLORMASK_MSB_SWAP > PixelFormatTraits_BGR32_888; +BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGR32_888::getter_type, + PixelFormatTraits_BGR32_888::setter_type); } // namespace basebmp |