diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-30 14:01:22 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-30 14:01:22 +0000 |
| commit | 5117c33255b6170aac714dd12b43442b564be720 (patch) | |
| tree | 38851b347afbb35f13ecfdf6dcae3bf89c065467 /vcl/aqua | |
| parent | 79eefe6d355dc916d82f4fb984957a753c2d281f (diff) | |
INTEGRATION: CWS i91009 (1.34.40); FILE MERGED
2008/06/25 08:48:20 hdu 1.34.40.1: #i91009# from CWS aquavcl08: fix ImplPixelFormat32::ReadPixel()
Diffstat (limited to 'vcl/aqua')
| -rw-r--r-- | vcl/aqua/source/gdi/salbmp.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx index 40524226640a..6ccb0c0af144 100644 --- a/vcl/aqua/source/gdi/salbmp.cxx +++ b/vcl/aqua/source/gdi/salbmp.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salbmp.cxx,v $ - * $Revision: 1.34 $ + * $Revision: 1.35 $ * * This file is part of OpenOffice.org. * @@ -275,6 +275,7 @@ public: }; class ImplPixelFormat32 : public ImplPixelFormat +// currently ARGB-format for 32bit depth { public: virtual void SkipPixel( sal_uInt32 nPixel ) @@ -283,8 +284,9 @@ public: } virtual ColorData ReadPixel() { - pData++; - return RGB_COLORDATA( *pData++, *pData++, *pData++ ); + const ColorData c = RGB_COLORDATA( pData[1], pData[2], pData[3] ); + pData += 4; + return c; } virtual void WritePixel( ColorData nColor ) { @@ -296,6 +298,7 @@ public: }; class ImplPixelFormat24 : public ImplPixelFormat +// currently BGR-format for 24bit depth { public: virtual void SkipPixel( sal_uInt32 nPixel ) @@ -317,6 +320,7 @@ public: }; class ImplPixelFormat16 : public ImplPixelFormat +// currently R5G6B5-format for 16bit depth { protected: sal_uInt16* pData16; @@ -471,6 +475,7 @@ void AquaSalBitmap::ConvertBitmapData( sal_uInt32 nWidth, sal_uInt32 nHeight, { // simple case, same format, so just copy memcpy( pDestData, pSrcData, nHeight * nDestBytesPerRow ); + return; } // try accelerated conversion if possible |