strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS vcl26 (1.3.102); FILE MERGED

Browse source 
2004/08/11 16:03:49 pl 1.3.102.1: removed lots of warnings
This commit is contained in:
Jens-Heiner Rechtien 2004-09-08 14:52:56 +00:00
parent 2cf3a45e6a
commit 81db43f5a4
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dtrans/source/X11/bmp.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: bmp.cxx,v $ * $RCSfile: bmp.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: vg $ $Date: 2003-04-15 17:10:05 $ * last change: $Author: hr $ $Date: 2004-09-08 15:52:56 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -239,8 +239,8 @@ static sal_uInt8* X11_getPaletteBmpFromImage(
writeLE( nColors, pBuffer+50 ); writeLE( nColors, pBuffer+50 );
XColor aColors[256]; XColor aColors[256];
if( nColors > (1<<nBitCount) ) // paranoia if( nColors > (1U << nBitCount) ) // paranoia
nColors = (1 << nBitCount); nColors = (1U << nBitCount);
for( unsigned long nPixel = 0; nPixel < nColors; nPixel++ ) for( unsigned long nPixel = 0; nPixel < nColors; nPixel++ )
{ {
aColors[nPixel].flags = DoRed | DoGreen | DoBlue; aColors[nPixel].flags = DoRed | DoGreen | DoBlue;
@ -451,9 +451,9 @@ PixmapHolder::PixmapHolder( Display* pDisplay ) :
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
static const char* pClasses[] = static const char* pClasses[] =
{ "StaticGray", "GrayScale", "StaticColor", "PseudoColor", "TrueColor", "DirectColor" }; { "StaticGray", "GrayScale", "StaticColor", "PseudoColor", "TrueColor", "DirectColor" };
fprintf( stderr, "PixmapHolder visual: id = 0x%x, class = %s (%d), depth=%d; color map = 0x%x\n", fprintf( stderr, "PixmapHolder visual: id = 0x%lx, class = %s (%d), depth=%d; color map = 0x%lx\n",
m_aInfo.visualid, m_aInfo.visualid,
(m_aInfo.c_class >= 0 && m_aInfo.c_class < sizeof(pClasses)/sizeof(pClasses[0])) ? pClasses[m_aInfo.c_class] : "<unknown>", (m_aInfo.c_class >= 0 && unsigned(m_aInfo.c_class) < sizeof(pClasses)/sizeof(pClasses[0])) ? pClasses[m_aInfo.c_class] : "<unknown>",
m_aInfo.c_class, m_aInfo.c_class,
m_aInfo.depth, m_aInfo.depth,
m_aColormap ); m_aColormap );
@ -545,10 +545,10 @@ void PixmapHolder::setBitmapDataPalette( const sal_uInt8* pData, XImage* pImage
} }
// allocate buffer to hold header and scanlines, initialize to zero // allocate buffer to hold header and scanlines, initialize to zero
for( int y = 0; y < nHeight; y++ ) for( unsigned int y = 0; y < nHeight; y++ )
{ {
const sal_uInt8* pScanline = pBMData + (nHeight-1-y)*nScanlineSize; const sal_uInt8* pScanline = pBMData + (nHeight-1-y)*nScanlineSize;
for( int x = 0; x < nWidth; x++ ) for( unsigned int x = 0; x < nWidth; x++ )
{ {
int nCol = 0; int nCol = 0;
switch( nDepth ) switch( nDepth )