mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS thbpp10 (1.11.188); FILE MERGED

Browse Source 
2008/01/14 16:09:52 thb 1.11.188.1: #i79846# Wrong check for 16bpp bitmaps
This commit is contained in:
Vladimir Glazounov
2008-01-29 07:04:44 +00:00
parent 37d14873f7
commit b78b839dc3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vcl/win/source/gdi/salbmp.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: salbmp.cxx,v $ * $RCSfile: salbmp.cxx,v $
* *
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* last change: $Author: hr $ $Date: 2007-06-27 20:57:18 $ * last change: $Author: vg $ $Date: 2008-01-29 08:04:44 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -497,7 +497,7 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ )
*(UINT32*) &pBI->bmiColors[ 1 ], *(UINT32*) &pBI->bmiColors[ 1 ],
*(UINT32*) &pBI->bmiColors[ 2 ] ); *(UINT32*) &pBI->bmiColors[ 2 ] );
} }
else if( pBIH->biCompression == 16 ) else if( pBIH->biBitCount == 16 )
pBuffer->maColorMask = ColorMask( 0x00007c00UL, 0x000003e0UL, 0x0000001fUL ); pBuffer->maColorMask = ColorMask( 0x00007c00UL, 0x000003e0UL, 0x0000001fUL );
else else
pBuffer->maColorMask = ColorMask( 0x00ff0000UL, 0x0000ff00UL, 0x000000ffUL ); pBuffer->maColorMask = ColorMask( 0x00ff0000UL, 0x0000ff00UL, 0x000000ffUL );