diff options
| author | Kai Ahrens <ka@openoffice.org> | 2001-06-13 07:48:18 +0000 |
|---|---|---|
| committer | Kai Ahrens <ka@openoffice.org> | 2001-06-13 07:48:18 +0000 |
| commit | 5a498d48175a0cc0bc7265407d6e28e014a0bb5b (patch) | |
| tree | 60fe57aea3876312157cfc86a6df9c9f05df0a8f /dtrans | |
| parent | 2e4960a75f39912b75f3270eb1fa083db6728982 (diff) | |
#88137#: watch for BIT_BITFIELDS flag at bitmaps
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/source/win32/dtobj/FmtFilter.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx index b4f408193ec2..3cffb013501a 100644 --- a/dtrans/source/win32/dtobj/FmtFilter.cxx +++ b/dtrans/source/win32/dtobj/FmtFilter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: FmtFilter.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: tra $ $Date: 2001-05-15 13:37:45 $ + * last change: $Author: ka $ $Date: 2001-06-13 08:48:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,6 +213,8 @@ Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB if( pBmpInfoHdr->biBitCount <= 8 ) nOffset += ( pBmpInfoHdr->biClrUsed ? pBmpInfoHdr->biClrUsed : ( 1 << pBmpInfoHdr->biBitCount ) ) << 2; + else if( ( BI_BITFIELDS == pBmpInfoHdr->biCompression ) && ( ( 16 == pBmpInfoHdr->biBitCount ) || ( 32 == pBmpInfoHdr->biBitCount ) ) ) + nOffset += 12; pBmpFileHdr->bfType = 'MB'; pBmpFileHdr->bfSize = 0; // maybe: nMemSize + sizeof(BITMAPFILEHEADER) |