diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 18:31:51 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 18:31:51 +0000 |
| commit | 2414aff0c3bd558baadbb6a73b18b57c7a85c5ba (patch) | |
| tree | b9c2566fa8d22e630808eb64c10f43a31b423b0e /vcl/source/gdi/salmisc.cxx | |
| parent | 9450b07ad198ce12ef9b3d673a5c1f4c620868d6 (diff) | |
INTEGRATION: CWS warnings01 (1.7.70); FILE MERGED
2006/03/17 16:12:53 pl 1.7.70.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'vcl/source/gdi/salmisc.cxx')
| -rw-r--r-- | vcl/source/gdi/salmisc.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index 9bdb44200730..1dc787c2d4e8 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salmisc.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-09 12:11:43 $ + * last change: $Author: hr $ $Date: 2006-06-19 19:31:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,9 +112,9 @@ static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuff for( USHORT i = 0, nSrcCount = aColMap.GetEntryCount(), nDstCount = rDstBuffer.maPalette.GetEntryCount(); i < nSrcCount; i++ ) { if( ( i < nDstCount ) && ( rSrcBuffer.maPalette[ i ] == rDstBuffer.maPalette[ i ] ) ) - aIndex.SetIndex( i ); + aIndex.SetIndex( sal::static_int_cast<BYTE>(i) ); else - aIndex.SetIndex( rDstBuffer.maPalette.GetBestIndex( rSrcBuffer.maPalette[ i ] ) ); + aIndex.SetIndex( sal::static_int_cast<BYTE>(rDstBuffer.maPalette.GetBestIndex( rSrcBuffer.maPalette[ i ] )) ); pColMapBuf[ i ] = aIndex; } @@ -270,7 +270,9 @@ static void ImplTCToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffe { for( long nB = 0; nB < 16; nB++ ) { - BitmapColor aCol( nR << 4, nG << 4, nB << 4 ); + BitmapColor aCol( sal::static_int_cast<BYTE>(nR << 4), + sal::static_int_cast<BYTE>(nG << 4), + sal::static_int_cast<BYTE>(nB << 4) ); pColToPalMap[ ImplIndexFromColor( aCol ) ] = (BYTE) rDstBuffer.maPalette.GetBestIndex( aCol ); } } |