diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 07:55:38 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 07:55:38 +0000 |
| commit | be9e63de9c3b66b8eaeede4517b1721785670532 (patch) | |
| tree | fe3b3e4d047bab860ccc3989aaa45328dd39bf08 /basebmp | |
| parent | fd4b823329335e41f0b8afae0958bcf07cc0d25c (diff) | |
INTEGRATION: CWS aquavcl01 (1.26.22); FILE MERGED
2007/06/22 19:06:25 thb 1.26.22.3: #i78704# Unified the two 32bpp formats
2007/06/22 15:41:58 pl 1.26.22.2: #i78704# thb: fix xor clipping
2007/06/21 09:00:07 pl 1.26.22.1: #i78704# add a new pixelformat, minor cosmetics
Diffstat (limited to 'basebmp')
| -rw-r--r-- | basebmp/source/bitmapdevice.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 805bc1c85982..817a28ae687e 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bitmapdevice.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: hr $ $Date: 2007-06-27 12:42:01 $ + * last change: $Author: rt $ $Date: 2007-07-05 08:55:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -217,11 +217,8 @@ namespace Masks::clipmask_polarity>::type raw_maskedaccessor_type; typedef typename accessor_selector::template wrap_accessor< raw_maskedaccessor_type >::type masked_accessor_type; - typedef typename raw_xor_accessor_traits::template masked_accessor< - mask_rawaccessor_type, - dest_iterator_type, - mask_iterator_type, - Masks::clipmask_polarity>::type raw_maskedxor_accessor_type; + typedef typename AccessorTraits< + raw_maskedaccessor_type>::xor_accessor raw_maskedxor_accessor_type; typedef typename accessor_selector::template wrap_accessor< raw_maskedxor_accessor_type >::type masked_xoraccessor_type; @@ -1817,6 +1814,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const basegfx::B2IVector& r 16, // SIXTEEN_BIT_MSB_TC_MASK 24, // TWENTYFOUR_BIT_TC_MASK 32, // THIRTYTWO_BIT_TC_MASK + 32, // THIRTYTWO_BIT_TC_MASK_ARGB }; sal_Int32 nScanlineStride(0); @@ -1951,6 +1949,11 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const basegfx::B2IVector& r return createRenderer<PixelFormatTraits_RGB32_888,StdMasks>( aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); + + case Format::THIRTYTWO_BIT_TC_MASK_ARGB: + return createRenderer<PixelFormatTraits_BGR32_888,StdMasks>( + aBounds, nScanlineFormat, nScanlineStride, + pFirstScanline, pMem, pPal ); } // TODO(F3): other formats not yet implemented |