diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 12:28:34 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 12:28:34 +0000 |
| commit | 3dc9e7cc990edb5dc1149a20a32011601bc3a8e4 (patch) | |
| tree | 10e46c3e09b34f43ea87e454e4092a9a883db6d1 /vcl/source/gdi/bitmap3.cxx | |
| parent | bfb88aef95a8b2e3e94564c064afa46fde7e6b99 (diff) | |
INTEGRATION: CWS vclcleanup02 (1.3.368); FILE MERGED
2003/12/17 16:04:05 mt 1.3.368.3: #i23061# header cleanup, remove #ifdef ???_CXX and #define ???_CXX, also removed .impl files and fixed soke windows compiler warnings
2003/12/16 18:15:15 mt 1.3.368.2: #i23061# And more cleanups...
2003/12/05 13:22:21 mt 1.3.368.1: #i23061# Code cleanups, fixed gcc WAll warnings
Diffstat (limited to 'vcl/source/gdi/bitmap3.cxx')
| -rw-r--r-- | vcl/source/gdi/bitmap3.cxx | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 77acf71bcc69..bf259ebb61b4 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bitmap3.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: ka $ $Date: 2001-08-27 12:57:08 $ + * last change: $Author: vg $ $Date: 2004-01-06 13:28:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,11 +60,6 @@ ************************************************************************/ #include <stdlib.h> -#define _SV_BITMAP_CXX - -#ifdef W31 -#include <tools/svwin.h> -#endif #include <tools/new.hxx> #ifndef _SV_BMPACC_HXX #include <bmpacc.hxx> @@ -1033,7 +1028,7 @@ BOOL Bitmap::ImplScaleFast( const double& rScaleX, const double& rScaleY ) while( ( nActY < nNewHeight1 ) && ( pLutY[ nActY + 1 ] == nMapY ) ) { - HMEMCPY( pWriteAcc->GetScanline( nActY + 1L ), + memcpy( pWriteAcc->GetScanline( nActY + 1L ), pWriteAcc->GetScanline( nActY ), nScanlineSize ); nActY++; } @@ -1316,11 +1311,6 @@ BOOL Bitmap::Dither( ULONG nDitherFlags, const BitmapPalette* pDitherPal ) return bRet; } -//fuer WIN16 Borland -#ifdef WIN -#pragma codeseg BITMAP3_SEG1 -#endif - // ------------------------------------------------------------------------ BOOL Bitmap::ImplDitherMatrix( const BitmapPalette* pDitherPal ) @@ -1413,7 +1403,6 @@ BOOL Bitmap::ImplDitherFloyd( const BitmapPalette* pDitherPal ) long nX; long nW = nWidth * 3L; long nW2 = nW - 3L; - long nWLen = nW << 2; long nRErr, nGErr, nBErr; long nRC, nGC, nBC; long nTemp; @@ -1491,7 +1480,8 @@ BOOL Bitmap::ImplDitherFloyd( const BitmapPalette* pDitherPal ) pWriteAcc->SetPixel( nYAcc, 0, BitmapColor( (BYTE) ( nVCLBLut[ nBC ] + nVCLGLut[nGC ] + nVCLRLut[nRC ] ) ) ); // mittlere Pixel ueber Schleife - for ( long nX = 3L, nXAcc = 1L; nX < nW2; nXAcc++ ) + long nX, nXAcc; + for ( nX = 3L, nXAcc = 1L; nX < nW2; nXAcc++ ) { CALC_ERRORS; CALC_TABLES7; @@ -1908,12 +1898,12 @@ BOOL Bitmap::ImplReduceMedian( USHORT nColCount ) if( pWAcc ) { const ULONG nSize = 32768UL * sizeof( ULONG ); - HPULONG pColBuf = (HPULONG) SvMemAlloc( nSize ); + ULONG* pColBuf = (ULONG*) SvMemAlloc( nSize ); const long nWidth = pWAcc->Width(); const long nHeight = pWAcc->Height(); long nIndex = 0L; - HMEMSET( (HPBYTE) pColBuf, 0, nSize ); + memset( (HPBYTE) pColBuf, 0, nSize ); // create Buffer if( pRAcc->HasPalette() ) @@ -1986,7 +1976,7 @@ void Bitmap::ImplMedianCut( ULONG* pColBuf, BitmapPalette& rPal, const long nGLen = nG2 - nG1; const long nBLen = nB2 - nB1; long nR, nG, nB; - HPULONG pBuf = pColBuf; + ULONG* pBuf = pColBuf; if( !nRLen && !nGLen && !nBLen ) { |