vcl/inc/impgraph.hxx | 1
vcl/source/filter/ixbm/xbmread.cxx | 159 +++++++++++++++++--------------------
vcl/source/gdi/impgraph.cxx | 15 ++-
3 files changed, 87 insertions(+), 88 deletions(-)
New commits:
commit 95d7b543059be9cbf97fe28b1705be05b54a3b4f
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Sat Mar 23 20:03:02 2024 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Sat Mar 30 15:22:11 2024 +0100
vcl: add resetLastUsed to ImpGraph
We reset the last used member variable in many places in the same
way, so instead of duplicating the implementation, add that to a
method.
Change-Id: I747559ecf1a6736f976b4d560ab5052c19431898
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165207
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 35542db74641..23d482aded23 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -217,6 +217,7 @@ private:
bool canReduceMemory() const override;
bool reduceMemory() override;
std::chrono::high_resolution_clock::time_point getLastUsed() const
override;
+ void resetLastUsed() const;
public:
void resetChecksum() { mnChecksum = 0; }
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 42ea57c1a820..57aece29bcd6 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -230,7 +230,7 @@ ImpGraphic& ImpGraphic::operator=( const ImpGraphic&
rImpGraphic )
mpGfxLink = rImpGraphic.mpGfxLink;
maVectorGraphicData = rImpGraphic.maVectorGraphicData;
- maLastUsed = std::chrono::high_resolution_clock::now();
+ resetLastUsed();
changeExisting(mnSizeBytes);
}
@@ -257,7 +257,7 @@ ImpGraphic& ImpGraphic::operator=(ImpGraphic&& rImpGraphic)
rImpGraphic.clear();
rImpGraphic.mbDummyContext = false;
- maLastUsed = std::chrono::high_resolution_clock::now();
+ resetLastUsed();
changeExisting(mnSizeBytes);
@@ -1364,7 +1364,7 @@ bool ImpGraphic::ensureAvailable() const
bResult = pThis->swapIn();
}
- maLastUsed = std::chrono::high_resolution_clock::now();
+ resetLastUsed();
return bResult;
}
@@ -1491,7 +1491,7 @@ bool ImpGraphic::swapIn()
updateFromLoadedGraphic(aGraphic.ImplGetImpGraphic());
- maLastUsed = std::chrono::high_resolution_clock::now();
+ resetLastUsed();
bReturn = true;
}
else if (mpGfxLink && mpGfxLink->IsNative())
@@ -1522,7 +1522,7 @@ bool ImpGraphic::swapIn()
updateFromLoadedGraphic(pImpGraphic);
}
- maLastUsed = std::chrono::high_resolution_clock::now();
+ resetLastUsed();
bReturn = true;
}
else
@@ -1774,4 +1774,9 @@ std::chrono::high_resolution_clock::time_point
ImpGraphic::getLastUsed() const
return maLastUsed;
}
+void ImpGraphic::resetLastUsed() const
+{
+ maLastUsed = std::chrono::high_resolution_clock::now();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 023ae9a825218686d444e2cbe770e743f70c73b9
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Sat Mar 23 20:02:11 2024 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Sat Mar 30 15:22:04 2024 +0100
vcl: cleanup and prefixmembers of XBMReader
Change-Id: Ib424c3818a7441f9a1c3a7fb2be2d0a7b9682ee7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165206
Tested-by: Tomaž Vajngerl <qui...@gmail.com>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/vcl/source/filter/ixbm/xbmread.cxx
b/vcl/source/filter/ixbm/xbmread.cxx
index 11fded73ffd4..7b475ddab7de 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -45,78 +45,71 @@ enum ReadState
class XBMReader : public GraphicReader
{
- SvStream& rIStm;
- Bitmap aBmp1;
- BitmapScopedWriteAccess pAcc1;
- std::unique_ptr<short[]>
- pHexTable;
- BitmapColor aWhite;
- BitmapColor aBlack;
- tools::Long nLastPos;
- tools::Long nWidth;
- tools::Long nHeight;
- bool bStatus;
-
- void InitTable();
- OString FindTokenLine( SvStream* pInStm, const char* pTok1, const
char* pTok2 );
- int ParseDefine( const char* pDefine );
- void ParseData( SvStream* pInStm, const OString& aLastLine,
XBMFormat eFormat );
+ SvStream& mrStream;
+ Bitmap maBitmap;
+ BitmapScopedWriteAccess mpWriteAccess;
+ std::array<short, 256> mpHexTable = { 0 };
+ BitmapColor maWhite;
+ BitmapColor maBlack;
+ tools::Long mnLastPos = 0;
+ tools::Long nWidth = 0;
+ tools::Long nHeight = 0;
+ bool bStatus = true;
+
+ void InitTable();
+ OString FindTokenLine(SvStream* pInStm, const char* pTok1, const char*
pTok2);
+ int ParseDefine(const char* pDefine);
+ void ParseData(SvStream* pInStm, const OString& aLastLine, XBMFormat
eFormat);
public:
- explicit XBMReader( SvStream& rStm );
+ explicit XBMReader(SvStream& rStream);
- ReadState ReadXBM( Graphic& rGraphic );
+ ReadState ReadXBM(Graphic& rGraphic);
};
}
-XBMReader::XBMReader( SvStream& rStm ) :
- rIStm ( rStm ),
- nLastPos ( rStm.Tell() ),
- nWidth ( 0 ),
- nHeight ( 0 ),
- bStatus ( true )
+XBMReader::XBMReader(SvStream& rStream)
+ : mrStream(rStream)
+ , mnLastPos(rStream.Tell())
{
- pHexTable.reset( new short[ 256 ] );
maUpperName = "SVIXBM";
InitTable();
}
void XBMReader::InitTable()
{
- memset( pHexTable.get(), 0, sizeof( short ) * 256 );
-
- pHexTable[int('0')] = 0;
- pHexTable[int('1')] = 1;
- pHexTable[int('2')] = 2;
- pHexTable[int('3')] = 3;
- pHexTable[int('4')] = 4;
- pHexTable[int('5')] = 5;
- pHexTable[int('6')] = 6;
- pHexTable[int('7')] = 7;
- pHexTable[int('8')] = 8;
- pHexTable[int('9')] = 9;
- pHexTable[int('A')] = 10;
- pHexTable[int('B')] = 11;
- pHexTable[int('C')] = 12;
- pHexTable[int('D')] = 13;
- pHexTable[int('E')] = 14;
- pHexTable[int('F')] = 15;
- pHexTable[int('X')] = 0;
- pHexTable[int('a')] = 10;
- pHexTable[int('b')] = 11;
- pHexTable[int('c')] = 12;
- pHexTable[int('d')] = 13;
- pHexTable[int('e')] = 14;
- pHexTable[int('f')] = 15;
- pHexTable[int('x')] = 0;
- pHexTable[int(' ')] = -1;
- pHexTable[int(',')] = -1;
- pHexTable[int('}')] = -1;
- pHexTable[int('
')] = -1;
- pHexTable[int(' ')] = -1;
- pHexTable[int('
+ mpHexTable[int('0')] = 0;
+ mpHexTable[int('1')] = 1;
+ mpHexTable[int('2')] = 2;
+ mpHexTable[int('3')] = 3;
+ mpHexTable[int('4')] = 4;
+ mpHexTable[int('5')] = 5;
+ mpHexTable[int('6')] = 6;
+ mpHexTable[int('7')] = 7;
+ mpHexTable[int('8')] = 8;
+ mpHexTable[int('9')] = 9;
+ mpHexTable[int('A')] = 10;
+ mpHexTable[int('B')] = 11;
+ mpHexTable[int('C')] = 12;
+ mpHexTable[int('D')] = 13;
+ mpHexTable[int('E')] = 14;
+ mpHexTable[int('F')] = 15;
+ mpHexTable[int('X')] = 0;
+ mpHexTable[int('a')] = 10;
+ mpHexTable[int('b')] = 11;
+ mpHexTable[int('c')] = 12;
+ mpHexTable[int('d')] = 13;
+ mpHexTable[int('e')] = 14;
+ mpHexTable[int('f')] = 15;
+ mpHexTable[int('x')] = 0;
+ mpHexTable[int(' ')] = -1;
+ mpHexTable[int(',')] = -1;
+ mpHexTable[int('}')] = -1;
+ mpHexTable[int('
')] = -1;
+ mpHexTable[int(' ')] = -1;
+ mpHexTable[int('
}
OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1,
@@ -167,11 +160,11 @@ int XBMReader::ParseDefine( const char* pDefine )
cTmp = *pTmp--;
// search last digit
- while (pHexTable[ cTmp ] == -1 && pTmp >= pDefine)
+ while (mpHexTable[ cTmp ] == -1 && pTmp >= pDefine)
cTmp = *pTmp--;
// move before number
- while (pHexTable[ cTmp ] != -1 && pTmp >= pDefine)
+ while (mpHexTable[ cTmp ] != -1 && pTmp >= pDefine)
cTmp = *pTmp--;
// move to start of number
@@ -237,7 +230,7 @@ void XBMReader::ParseData( SvStream* pInStm, const OString&
aLastLine, XBMFormat
if (cChar==',') // sequence completed, ',' already skipped
for next loop
break;
- const short nTable = pHexTable[ cChar ];
+ const short nTable = mpHexTable[cChar];
if( rtl::isAsciiHexDigit( cChar ) || !nTable )
{
@@ -254,9 +247,9 @@ void XBMReader::ParseData( SvStream* pInStm, const OString&
aLastLine, XBMFormat
if( bProcessed )
{
- Scanline pScanline = pAcc1->GetScanline(nRow);
+ Scanline pScanline = mpWriteAccess->GetScanline(nRow);
while( ( nCol < nWidth ) && ( nBit < nBits ) )
- pAcc1->SetPixelOnData(pScanline, nCol++, ( nValue & (
1 << nBit++ ) ) ? aBlack : aWhite);
+ mpWriteAccess->SetPixelOnData(pScanline, nCol++, (
nValue & ( 1 << nBit++ ) ) ? maBlack : maWhite);
if( nCol == nWidth )
{
@@ -275,16 +268,16 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
sal_uInt8 cDummy;
// check if we can read ALL
- rIStm.Seek( STREAM_SEEK_TO_END );
- rIStm.ReadUChar( cDummy );
+ mrStream.Seek( STREAM_SEEK_TO_END );
+ mrStream.ReadUChar( cDummy );
// if we cannot read all
// we return and wait for new data
- if ( rIStm.GetError() != ERRCODE_IO_PENDING )
+ if (mrStream.GetError() != ERRCODE_IO_PENDING )
{
- rIStm.Seek( nLastPos );
+ mrStream.Seek(mnLastPos);
bStatus = false;
- OString aLine = FindTokenLine( &rIStm, "#define", "_width" );
+ OString aLine = FindTokenLine(&mrStream, "#define", "_width");
if ( bStatus )
{
@@ -292,14 +285,14 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
if ( ( nValue = ParseDefine( aLine.getStr() ) ) > 0 )
{
nWidth = nValue;
- aLine = FindTokenLine( &rIStm, "#define", "_height" );
+ aLine = FindTokenLine(&mrStream, "#define", "_height");
// if height was not received, we search again
// from start of the file
if ( !bStatus )
{
- rIStm.Seek( nLastPos );
- aLine = FindTokenLine( &rIStm, "#define", "_height" );
+ mrStream.Seek(mnLastPos);
+ aLine = FindTokenLine(&mrStream, "#define", "_height");
}
}
else
@@ -310,7 +303,7 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
if ( ( nValue = ParseDefine( aLine.getStr() ) ) > 0 )
{
nHeight = nValue;
- aLine = FindTokenLine( &rIStm, "static", "_bits" );
+ aLine = FindTokenLine(&mrStream, "static", "_bits");
if ( bStatus )
{
@@ -325,19 +318,19 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
//xbms are a minimum of one character per 8 pixels, so
if the file isn't
//even that long, it's not all there
- if (rIStm.remainingSize() <
(static_cast<sal_uInt64>(nWidth) * nHeight) / 8)
+ if (mrStream.remainingSize() <
(static_cast<sal_uInt64>(nWidth) * nHeight) / 8)
bStatus = false;
if ( bStatus && nWidth && nHeight )
{
- aBmp1 = Bitmap(Size(nWidth, nHeight),
vcl::PixelFormat::N8_BPP, &Bitmap::GetGreyPalette(256));
- pAcc1 = aBmp1;
+ maBitmap = Bitmap(Size(nWidth, nHeight),
vcl::PixelFormat::N8_BPP, &Bitmap::GetGreyPalette(256));
+ mpWriteAccess = maBitmap;
- if( pAcc1 )
+ if (mpWriteAccess)
{
- aWhite = pAcc1->GetBestMatchingColor(
COL_WHITE );
- aBlack = pAcc1->GetBestMatchingColor(
COL_BLACK );
- ParseData( &rIStm, aLine, eFormat );
+ maWhite =
mpWriteAccess->GetBestMatchingColor(COL_WHITE);
+ maBlack =
mpWriteAccess->GetBestMatchingColor(COL_BLACK);
+ ParseData(&mrStream, aLine, eFormat);
}
else
bStatus = false;
@@ -347,13 +340,13 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
}
}
- if (bStatus && pAcc1)
+ if (bStatus && mpWriteAccess)
{
- Bitmap aBlackBmp(Size(pAcc1->Width(), pAcc1->Height()),
vcl::PixelFormat::N8_BPP, &Bitmap::GetGreyPalette(256));
+ Bitmap aBlackBmp(Size(mpWriteAccess->Width(),
mpWriteAccess->Height()), vcl::PixelFormat::N8_BPP,
&Bitmap::GetGreyPalette(256));
- pAcc1.reset();
+ mpWriteAccess.reset();
aBlackBmp.Erase( COL_BLACK );
- rGraphic = BitmapEx( aBlackBmp, aBmp1 );
+ rGraphic = BitmapEx(aBlackBmp, maBitmap);
eReadState = XBMREAD_OK;
}
else
@@ -361,7 +354,7 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
}
else
{
- rIStm.ResetError();
+ mrStream.ResetError();
eReadState = XBMREAD_NEED_MORE;
}
