diff options
Diffstat (limited to 'basebmp/inc/basebmp/rgbmaskpixelformats.hxx')
-rw-r--r-- | basebmp/inc/basebmp/rgbmaskpixelformats.hxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx b/basebmp/inc/basebmp/rgbmaskpixelformats.hxx index 47f7c2bf6199..9c0269d5a0dd 100644 --- a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx +++ b/basebmp/inc/basebmp/rgbmaskpixelformats.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,8 +68,8 @@ namespace basebmp @tpl SwapBytes When true, the final pixel values will be byte-swapped before passed on. - */ -template< typename PixelType, + */ +template< typename PixelType, typename ColorType, unsigned int RedMask, unsigned int GreenMask, @@ -82,7 +82,7 @@ template< typename PixelType, typedef typename ColorTraits<ColorType>::component_type component_type; // calc corrective shifts for all three channels in advance - enum { + enum { red_shift = numberOfTrailingZeros<RedMask>::value, green_shift = numberOfTrailingZeros<GreenMask>::value, blue_shift = numberOfTrailingZeros<BlueMask>::value, @@ -93,19 +93,19 @@ template< typename PixelType, }; }; -template< typename PixelType, +template< typename PixelType, typename ColorType, unsigned int RedMask, unsigned int GreenMask, unsigned int BlueMask, - bool SwapBytes > struct RGBMaskGetter : + bool SwapBytes > struct RGBMaskGetter : public RGBMaskFunctorBase<PixelType, ColorType, RedMask, GreenMask, BlueMask, SwapBytes>, - public std::unary_function<PixelType, ColorType> + public std::unary_function<PixelType, ColorType> { typedef RGBMaskFunctorBase<PixelType, ColorType, @@ -115,7 +115,7 @@ template< typename PixelType, SwapBytes> base_type; ColorType operator()( PixelType v ) const - { + { v = SwapBytes ? byteSwap(v) : v; const typename base_type::unsigned_pixel_type red (v & RedMask); @@ -125,7 +125,7 @@ template< typename PixelType, // shift color nibbles to right-aligend position. ORing it // channel value shifted twice the number of channel bits, to // spread the value into the component_type range - ColorType res( (shiftRight(red, + ColorType res( (shiftRight(red, base_type::red_shift-8* (signed)sizeof(typename base_type::component_type)+ base_type::red_bits)) | @@ -133,7 +133,7 @@ template< typename PixelType, base_type::red_shift-8* (signed)sizeof(typename base_type::component_type)+ 2*base_type::red_bits)), - + (shiftRight(green, base_type::green_shift-8* (signed)sizeof(typename base_type::component_type)+ @@ -142,7 +142,7 @@ template< typename PixelType, base_type::green_shift-8* (signed)sizeof(typename base_type::component_type)+ 2*base_type::green_bits)), - + (shiftRight(blue, base_type::blue_shift-8* (signed)sizeof(typename base_type::component_type)+ @@ -155,19 +155,19 @@ template< typename PixelType, } }; -template< typename PixelType, +template< typename PixelType, typename ColorType, unsigned int RedMask, unsigned int GreenMask, unsigned int BlueMask, - bool SwapBytes > struct RGBMaskSetter : + bool SwapBytes > struct RGBMaskSetter : public RGBMaskFunctorBase<PixelType, ColorType, RedMask, GreenMask, BlueMask, SwapBytes>, - public std::unary_function<ColorType, PixelType> + public std::unary_function<ColorType, PixelType> { typedef RGBMaskFunctorBase<PixelType, ColorType, @@ -182,7 +182,7 @@ template< typename PixelType, const typename base_type::unsigned_pixel_type green(c.getGreen()); const typename base_type::unsigned_pixel_type blue (c.getBlue()); - typename base_type::unsigned_pixel_type res( + typename base_type::unsigned_pixel_type res( (shiftLeft(red, base_type::red_shift-8* (signed)sizeof(typename base_type::component_type)+ @@ -202,7 +202,7 @@ template< typename PixelType, //----------------------------------------------------------------------------- -template< typename PixelType, +template< typename PixelType, unsigned int RedMask, unsigned int GreenMask, unsigned int BlueMask, |