diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-08 07:33:38 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-08 07:33:38 +0000 |
| commit | 32c239b70d929b25319eb8fc82191419562b649c (patch) | |
| tree | e46428890384d008a6194aa5d3292a0a62e6db80 /vcl/source/gdi/bmpacc.cxx | |
| parent | f514760e173bc788dbdd3b09813d955004d28dd5 (diff) | |
INTEGRATION: CWS pngperf (1.7.18); FILE MERGED
2006/08/21 10:48:51 hdu 1.7.18.4: #i67660# get rid of assertions about non-matching color format
2006/08/14 19:48:41 hdu 1.7.18.3: RESYNC: (1.8-1.9); FILE MERGED
2006/04/13 09:08:25 hdu 1.7.18.2: RESYNC: (1.7-1.8); FILE MERGED
2005/11/15 12:24:23 hdu 1.7.18.1: RESYNC: fix constness issues after resync
Diffstat (limited to 'vcl/source/gdi/bmpacc.cxx')
| -rw-r--r-- | vcl/source/gdi/bmpacc.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 4bb11c49a5ae..3dbeab939a0c 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bmpacc.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2006-09-08 07:46:52 $ + * last change: $Author: vg $ $Date: 2006-09-08 08:33:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -369,13 +369,14 @@ void BitmapWriteAccess::CopyScanline( long nY, const BitmapReadAccess& rReadAcc memcpy( mpScanBuf[ nY ], rReadAcc.GetScanline( nY ), rReadAcc.GetScanlineSize() ); } else + // TODO: use fastbmp infrastructure for( long nX = 0L, nWidth = Min( mpBuffer->mnWidth, rReadAcc.Width() ); nX < nWidth; nX++ ) SetPixel( nY, nX, rReadAcc.GetPixel( nY, nX ) ); } // ------------------------------------------------------------------ -void BitmapWriteAccess::CopyScanline( long nY, const Scanline aSrcScanline, +void BitmapWriteAccess::CopyScanline( long nY, ConstScanline aSrcScanline, ULONG nSrcScanlineFormat, ULONG nSrcScanlineSize ) { const ULONG nFormat = BMP_SCANLINE_FORMAT( nSrcScanlineFormat ); @@ -398,6 +399,7 @@ void BitmapWriteAccess::CopyScanline( long nY, const Scanline aSrcScanline, nFormat != BMP_FORMAT_24BIT_TC_MASK && nFormat != BMP_FORMAT_32BIT_TC_MASK, "No support for pixel formats with color masks yet!" ); + // TODO: use fastbmp infrastructure FncGetPixel pFncGetPixel; switch( nFormat ) |