filter/source/graphicfilter/ipcx/ipcx.cxx | 45 ++++++++++++++----------------
1 file changed, 21 insertions(+), 24 deletions(-)
New commits:
commit 2524f4528988a118eb4729a48b86d85a2d50967a
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Mon Feb 12 12:14:43 2018 +0200
use RawBitmap in PCXReader
part of making Bitmap an internal detail of vcl
Change-Id: I7965a122a0c6b6ae3146cf4be8f6141d2b0ab627
Reviewed-on: https://gerrit.libreoffice.org/49634
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx
b/filter/source/graphicfilter/ipcx/ipcx.cxx
index 7364137083b6..c06a5159ec5e 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -20,7 +20,7 @@
#include <memory>
#include <vcl/graph.hxx>
-#include <vcl/bitmapaccess.hxx>
+#include <vcl/BitmapTools.hxx>
class FilterConfigItem;
@@ -32,7 +32,8 @@ private:
SvStream& m_rPCX; // the PCX file to read
- Bitmap aBmp;
+ std::unique_ptr<vcl::bitmap::RawBitmap> mpBitmap;
+ std::vector<Color> mvPalette;
sal_uInt8 nVersion; // PCX-Version
sal_uInt8 nEncoding; // compression type
sal_uLong nBitsPerPlanePix; // bits per plane per pixel
@@ -47,7 +48,7 @@ private:
bool bStatus; // from now on do not read status
from stream ( SJ )
- void ImplReadBody(BitmapWriteAccess * pAcc);
+ void ImplReadBody();
void ImplReadPalette( sal_uLong nCol );
void ImplReadHeader();
@@ -98,24 +99,21 @@ bool PCXReader::ReadPCX(Graphic & rGraphic)
// Write BMP header and conditionally (maybe invalid for now) color
palette:
if (bStatus)
{
- aBmp = Bitmap( Size( nWidth, nHeight ), nDestBitsPerPixel );
- Bitmap::ScopedWriteAccess pAcc(aBmp);
- if ( !pAcc )
- return false;
+ mpBitmap.reset( new vcl::bitmap::RawBitmap( Size( nWidth, nHeight ) )
);
if ( nDestBitsPerPixel <= 8 )
{
sal_uInt16 nColors = 1 << nDestBitsPerPixel;
sal_uInt8* pPal = pPalette.get();
- pAcc->SetPaletteEntryCount( nColors );
+ mvPalette.resize( nColors );
for ( sal_uInt16 i = 0; i < nColors; i++, pPal += 3 )
{
- pAcc->SetPaletteColor( i, BitmapColor ( pPal[ 0 ], pPal[ 1 ],
pPal[ 2 ] ) );
+ mvPalette[i] = Color( pPal[ 0 ], pPal[ 1 ], pPal[ 2 ] );
}
}
// read bitmap data
- ImplReadBody(pAcc.get());
+ ImplReadBody();
// If an extended color palette exists at the end of the file, then
read it and
// and write again in palette:
@@ -124,16 +122,16 @@ bool PCXReader::ReadPCX(Graphic & rGraphic)
sal_uInt8* pPal = pPalette.get();
m_rPCX.SeekRel(1);
ImplReadPalette(256);
- pAcc->SetPaletteEntryCount( 256 );
+ mvPalette.resize( 256 );
for ( sal_uInt16 i = 0; i < 256; i++, pPal += 3 )
{
- pAcc->SetPaletteColor( i, BitmapColor ( pPal[ 0 ], pPal[ 1 ],
pPal[ 2 ] ) );
+ mvPalette[i] = Color( pPal[ 0 ], pPal[ 1 ], pPal[ 2 ] );
}
}
if ( bStatus )
{
- rGraphic = aBmp;
+ rGraphic = vcl::bitmap::CreateFromData(std::move(*mpBitmap));
return true;
}
}
@@ -200,7 +198,7 @@ void PCXReader::ImplReadHeader()
}
}
-void PCXReader::ImplReadBody(BitmapWriteAccess * pAcc)
+void PCXReader::ImplReadBody()
{
sal_uInt8 *pPlane[ 4 ], * pDest;
sal_uLong i, nx, ny, np, nCount, nPercent;
@@ -277,7 +275,6 @@ void PCXReader::ImplReadBody(BitmapWriteAccess * pAcc)
sal_uInt8 *pSource2 = pPlane[ 1 ];
sal_uInt8 *pSource3 = pPlane[ 2 ];
sal_uInt8 *pSource4 = pPlane[ 3 ];
- Scanline pScanline = pAcc->GetScanline( ny );
switch ( nBitsPerPlanePix + ( nPlanes << 8 ) )
{
// 2 colors
@@ -286,9 +283,9 @@ void PCXReader::ImplReadBody(BitmapWriteAccess * pAcc)
{
sal_uLong nShift = ( i & 7 ) ^ 7;
if ( nShift == 0 )
- pAcc->SetPixelOnData( pScanline, i,
BitmapColor(*(pSource1++) & 1) );
+ mpBitmap->SetPixel( ny, i, mvPalette[*(pSource1++) &
1] );
else
- pAcc->SetPixelOnData( pScanline, i,
BitmapColor((*pSource1 >> nShift ) & 1) );
+ mpBitmap->SetPixel( ny, i, mvPalette[(*pSource1 >>
nShift ) & 1] );
}
break;
// 4 colors
@@ -310,14 +307,14 @@ void PCXReader::ImplReadBody(BitmapWriteAccess * pAcc)
nCol = ( *pSource1++ ) & 0x03;
break;
}
- pAcc->SetPixelOnData( pScanline, i, BitmapColor(nCol) );
+ mpBitmap->SetPixel( ny, i, mvPalette[nCol] );
}
break;
// 256 colors
case 0x108 :
for ( i = 0; i < nWidth; i++ )
{
- pAcc->SetPixelOnData( pScanline, i,
BitmapColor(*pSource1++) );
+ mpBitmap->SetPixel( ny, i, mvPalette[*pSource1++] );
}
break;
// 8 colors
@@ -328,14 +325,14 @@ void PCXReader::ImplReadBody(BitmapWriteAccess * pAcc)
if ( nShift == 0 )
{
nCol = ( *pSource1++ & 1) + ( ( *pSource2++ << 1 ) & 2
) + ( ( *pSource3++ << 2 ) & 4 );
- pAcc->SetPixelOnData( pScanline, i, BitmapColor(nCol)
);
+ mpBitmap->SetPixel( ny, i, mvPalette[nCol] );
}
else
{
nCol = sal::static_int_cast< sal_uInt8 >(
( ( *pSource1 >> nShift ) & 1) + ( ( ( *pSource2
>> nShift ) << 1 ) & 2 ) +
( ( ( *pSource3 >> nShift ) << 2 ) & 4 ));
- pAcc->SetPixelOnData( pScanline, i, BitmapColor(nCol)
);
+ mpBitmap->SetPixel( ny, i, mvPalette[nCol] );
}
}
break;
@@ -348,14 +345,14 @@ void PCXReader::ImplReadBody(BitmapWriteAccess * pAcc)
{
nCol = ( *pSource1++ & 1) + ( ( *pSource2++ << 1 ) & 2
) + ( ( *pSource3++ << 2 ) & 4 ) +
( ( *pSource4++ << 3 ) & 8 );
- pAcc->SetPixelOnData( pScanline, i, BitmapColor(nCol)
);
+ mpBitmap->SetPixel( ny, i, mvPalette[nCol] );
}
else
{
nCol = sal::static_int_cast< sal_uInt8 >(
( ( *pSource1 >> nShift ) & 1) + ( ( ( *pSource2
>> nShift ) << 1 ) & 2 ) +
( ( ( *pSource3 >> nShift ) << 2 ) & 4 ) + ( ( (
*pSource4 >> nShift ) << 3 ) & 8 ));
- pAcc->SetPixelOnData( pScanline, i, BitmapColor(nCol)
);
+ mpBitmap->SetPixel( ny, i, mvPalette[nCol] );
}
}
break;
@@ -363,7 +360,7 @@ void PCXReader::ImplReadBody(BitmapWriteAccess * pAcc)
case 0x308 :
for ( i = 0; i < nWidth; i++ )
{
- pAcc->SetPixelOnData( pScanline, i, Color( *pSource1++,
*pSource2++, *pSource3++ ) );
+ mpBitmap->SetPixel( ny, i, Color( *pSource1++,
*pSource2++, *pSource3++ ) );
}
break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
