diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 18:24:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 18:24:50 +0000 |
| commit | 43d6da035aa1a5d4b3af91e1afa8d354319e91f3 (patch) | |
| tree | 9d859e8b2a4ace3dc958611f50f3aa1e336719f4 /vcl/source/gdi/impimage.cxx | |
| parent | ad7d7ee5a0f61a530ee80c0f5d68823f9644e0ab (diff) | |
INTEGRATION: CWS warnings01 (1.18.68); FILE MERGED
2006/03/17 16:12:47 pl 1.18.68.3: #i55991# removed warnings for windows platform
2005/11/04 17:25:00 pl 1.18.68.2: #i55991# removed warnings for linux/solaris
2005/10/21 17:31:14 pl 1.18.68.1: #i55991# removed warnings for linux platform
Diffstat (limited to 'vcl/source/gdi/impimage.cxx')
| -rw-r--r-- | vcl/source/gdi/impimage.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 44675c58179c..5d832c39b29c 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: impimage.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: rt $ $Date: 2005-09-09 12:01:31 $ + * last change: $Author: hr $ $Date: 2006-06-19 19:24:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -148,8 +148,8 @@ BOOL ImplImageRefData::IsEqual( const ImplImageRefData& rData ) // ----------------- ImplImageData::ImplImageData( const BitmapEx& rBmpEx ) : - maBmpEx( rBmpEx ), - mpImageBitmap( NULL ) + mpImageBitmap( NULL ), + maBmpEx( rBmpEx ) { } @@ -264,7 +264,7 @@ void ImplImageBmp::Expand( USHORT nGrowSize ) { const ULONG nDX = nGrowSize * maSize.Width(); const USHORT nOldSize = mnSize; - BYTE* pNewAry = new BYTE[ mnSize += nGrowSize ]; + BYTE* pNewAry = new BYTE[ mnSize = sal::static_int_cast<USHORT>(mnSize+nGrowSize) ]; maBmpEx.Expand( nDX, 0UL ); @@ -566,7 +566,11 @@ void ImplImageBmp::Draw( USHORT nPos, OutputDevice* pOutDev, // ----------------------------------------------------------------------- -void ImplImageBmp::ImplUpdateDisplayBmp( OutputDevice* pOutDev ) +void ImplImageBmp::ImplUpdateDisplayBmp( OutputDevice* +#if defined WIN || defined WNT +pOutDev +#endif +) { if( !mpDisplayBmp && !maBmpEx.IsEmpty() ) { |