[Libreoffice-commits] core.git: 4 commits - vcl/source
Caolán McNamara
caolanm at redhat.com
Mon Mar 27 12:51:55 UTC 2017
vcl/source/gdi/dibtools.cxx | 375 +++++++++++++++++++++-----------------------
1 file changed, 187 insertions(+), 188 deletions(-)
New commits:
commit 155886c99ba55ef28bd902cfe7256cbc1f4d2d01
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 27 12:32:56 2017 +0100
move bitmap allocation after palette read
Change-Id: Ie7b2d64bde48d49c6e389c0770f2456187107bda
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index a05f90932cab..5b672ed42912 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -897,15 +897,6 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_u
}
const Size aSizePixel(aHeader.nWidth, aHeader.nHeight);
- BitmapPalette aPalette;
- Bitmap aNewBmp(aSizePixel, nBitCount, &aPalette);
- Bitmap::ScopedWriteAccess pAcc(aNewBmp);
- if (!pAcc)
- return false;
- if (pAcc->Width() != aHeader.nWidth || pAcc->Height() != aHeader.nHeight)
- {
- return false;
- }
AlphaMask aNewBmpAlpha;
AlphaMask::ScopedWriteAccess pAccAlpha;
bool bAlphaPossible(pBmpAlpha && aHeader.nBitCount == 32);
@@ -933,16 +924,25 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_u
}
// read palette
+ BitmapPalette aPalette;
if (nColors)
{
aPalette.SetEntryCount(nColors);
ImplReadDIBPalette(*pIStm, aPalette, aHeader.nSize != DIBCOREHEADERSIZE);
- pAcc->SetPalette(aPalette);
}
if (pIStm->GetError())
return false;
+ Bitmap aNewBmp(aSizePixel, nBitCount, &aPalette);
+ Bitmap::ScopedWriteAccess pAcc(aNewBmp);
+ if (!pAcc)
+ return false;
+ if (pAcc->Width() != aHeader.nWidth || pAcc->Height() != aHeader.nHeight)
+ {
+ return false;
+ }
+
if(nOffset)
{
pIStm->SeekRel(nOffset - (pIStm->Tell() - nStmPos));
commit ec1015430dcfd5a6e20a13d878bc34ce3149b8ea
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 27 12:31:00 2017 +0100
return early on error
no logc change intended
Change-Id: I9a000ccc53b13d2948264b18ae0abf29a6ddc33c
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 7486b59da9e3..a05f90932cab 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -761,230 +761,228 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_u
{
DIBV5Header aHeader;
const sal_uLong nStmPos = rIStm.Tell();
- bool bRet(false);
bool bTopDown(false);
- if(ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown, bMSOFormat) && aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount)
+ if (!ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown, bMSOFormat) && aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount)
+ return false;
+
+ // In case ImplReadDIB() didn't call ImplReadDIBFileHeader() before
+ // this method, nOffset is 0, that's OK.
+ if (nOffset && aHeader.nSize > nOffset)
{
- // In case ImplReadDIB() didn't call ImplReadDIBFileHeader() before
- // this method, nOffset is 0, that's OK.
- if (nOffset && aHeader.nSize > nOffset)
- {
- // Header size claims to extend into the image data.
- // Looks like an error.
- return false;
- }
+ // Header size claims to extend into the image data.
+ // Looks like an error.
+ return false;
+ }
- const sal_uInt16 nBitCount(discretizeBitcount(aHeader.nBitCount));
+ const sal_uInt16 nBitCount(discretizeBitcount(aHeader.nBitCount));
- sal_uInt16 nColors(0);
- SvStream* pIStm;
- std::unique_ptr<SvMemoryStream> pMemStm;
- std::vector<sal_uInt8> aData;
+ sal_uInt16 nColors(0);
+ SvStream* pIStm;
+ std::unique_ptr<SvMemoryStream> pMemStm;
+ std::vector<sal_uInt8> aData;
- if (aHeader.nBitCount <= 8)
+ if (aHeader.nBitCount <= 8)
+ {
+ if(aHeader.nColsUsed)
{
- if(aHeader.nColsUsed)
- {
- nColors = (sal_uInt16)aHeader.nColsUsed;
- }
- else
- {
- nColors = ( 1 << aHeader.nBitCount );
- }
+ nColors = (sal_uInt16)aHeader.nColsUsed;
+ }
+ else
+ {
+ nColors = ( 1 << aHeader.nBitCount );
}
+ }
+
+ if (ZCOMPRESS == aHeader.nCompression)
+ {
+ sal_uInt32 nCodedSize(0);
+ sal_uInt32 nUncodedSize(0);
+
+ // read coding information
+ rIStm.ReadUInt32( nCodedSize ).ReadUInt32( nUncodedSize ).ReadUInt32( aHeader.nCompression );
+ if (nCodedSize > rIStm.remainingSize())
+ nCodedSize = sal_uInt32(rIStm.remainingSize());
+ size_t nSizeInc(4 * rIStm.remainingSize());
+ if (nUncodedSize < nSizeInc)
+ nSizeInc = nUncodedSize;
- if(ZCOMPRESS == aHeader.nCompression)
+ if (nSizeInc > 0)
{
- sal_uInt32 nCodedSize(0);
- sal_uInt32 nUncodedSize(0);
-
- // read coding information
- rIStm.ReadUInt32( nCodedSize ).ReadUInt32( nUncodedSize ).ReadUInt32( aHeader.nCompression );
- if (nCodedSize > rIStm.remainingSize())
- nCodedSize = sal_uInt32(rIStm.remainingSize());
- size_t nSizeInc(4 * rIStm.remainingSize());
- if (nUncodedSize < nSizeInc)
- nSizeInc = nUncodedSize;
-
- if (nSizeInc > 0)
+ // decode buffer
+ const sal_uLong nCodedPos = rIStm.Tell();
+ ZCodec aCodec;
+ aCodec.BeginCompression();
+ aData.resize(nSizeInc);
+ size_t nDataPos(0);
+ while (nUncodedSize > nDataPos)
{
- // decode buffer
- const sal_uLong nCodedPos = rIStm.Tell();
- ZCodec aCodec;
- aCodec.BeginCompression();
- aData.resize(nSizeInc);
- size_t nDataPos(0);
- while (nUncodedSize > nDataPos)
+ assert(aData.size() > nDataPos);
+ const size_t nToRead(std::min<size_t>(nUncodedSize - nDataPos, aData.size() - nDataPos));
+ assert(nToRead > 0);
+ assert(!aData.empty());
+ const long nRead = aCodec.Read(rIStm, aData.data() + nDataPos, sal_uInt32(nToRead));
+ if (nRead > 0)
{
- assert(aData.size() > nDataPos);
- const size_t nToRead(std::min<size_t>(nUncodedSize - nDataPos, aData.size() - nDataPos));
- assert(nToRead > 0);
- assert(!aData.empty());
- const long nRead = aCodec.Read(rIStm, aData.data() + nDataPos, sal_uInt32(nToRead));
- if (nRead > 0)
- {
- nDataPos += static_cast<unsigned long>(nRead);
- // we haven't read everything yet: resize buffer and continue
- if (nDataPos < nUncodedSize)
- aData.resize(aData.size() + nSizeInc);
- }
- else
- {
- break;
- }
+ nDataPos += static_cast<unsigned long>(nRead);
+ // we haven't read everything yet: resize buffer and continue
+ if (nDataPos < nUncodedSize)
+ aData.resize(aData.size() + nSizeInc);
+ }
+ else
+ {
+ break;
}
- // truncate the data buffer to actually read size
- aData.resize(nDataPos);
- // set the real uncoded size
- nUncodedSize = sal_uInt32(aData.size());
- aCodec.EndCompression();
-
- // Seek behind the encoded block. There might have been bytes left or the codec might have read more than necessary.
- rIStm.Seek(nCodedSize + nCodedPos);
- }
-
- if (aData.empty())
- {
- // add something so we can take address of the first element
- aData.resize(1);
- nUncodedSize = 0;
}
-
- // set decoded bytes to memory stream,
- // from which we will read the bitmap data
- pMemStm.reset(new SvMemoryStream);
- pIStm = pMemStm.get();
- assert(!aData.empty());
- pMemStm->SetBuffer(aData.data(), nUncodedSize, nUncodedSize);
- nOffset = 0;
+ // truncate the data buffer to actually read size
+ aData.resize(nDataPos);
+ // set the real uncoded size
+ nUncodedSize = sal_uInt32(aData.size());
+ aCodec.EndCompression();
+
+ // Seek behind the encoded block. There might have been bytes left or the codec might have read more than necessary.
+ rIStm.Seek(nCodedSize + nCodedPos);
}
- else
+
+ if (aData.empty())
{
- pIStm = &rIStm;
+ // add something so we can take address of the first element
+ aData.resize(1);
+ nUncodedSize = 0;
}
- const sal_Int64 nBitsPerLine (static_cast<sal_Int64>(aHeader.nWidth) * static_cast<sal_Int64>(aHeader.nBitCount));
- if (nBitsPerLine > SAL_MAX_UINT32)
- return false;
- const sal_uInt64 nAlignedWidth(AlignedWidth4Bytes(static_cast<sal_uLong>(nBitsPerLine)));
+ // set decoded bytes to memory stream,
+ // from which we will read the bitmap data
+ pMemStm.reset(new SvMemoryStream);
+ pIStm = pMemStm.get();
+ assert(!aData.empty());
+ pMemStm->SetBuffer(aData.data(), nUncodedSize, nUncodedSize);
+ nOffset = 0;
+ }
+ else
+ {
+ pIStm = &rIStm;
+ }
+
+ const sal_Int64 nBitsPerLine (static_cast<sal_Int64>(aHeader.nWidth) * static_cast<sal_Int64>(aHeader.nBitCount));
+ if (nBitsPerLine > SAL_MAX_UINT32)
+ return false;
+ const sal_uInt64 nAlignedWidth(AlignedWidth4Bytes(static_cast<sal_uLong>(nBitsPerLine)));
- switch (aHeader.nCompression)
+ switch (aHeader.nCompression)
+ {
+ case RLE_8:
+ if (aHeader.nBitCount != 8)
+ return false;
+ break;
+ case RLE_4:
+ if (aHeader.nBitCount != 4)
+ return false;
+ break;
+ case BITFIELDS:
+ break;
+ case ZCOMPRESS:
+ case COMPRESS_NONE:
{
- case RLE_8:
- if (aHeader.nBitCount != 8)
- return false;
- break;
- case RLE_4:
- if (aHeader.nBitCount != 4)
- return false;
- break;
- case BITFIELDS:
- break;
- case ZCOMPRESS:
- case COMPRESS_NONE:
- {
- // (partially) check the image dimensions to avoid potential large bitmap allocation if the input is damaged
- sal_uInt64 nMaxWidth = pIStm->remainingSize();
- if (aHeader.nHeight != 0)
- nMaxWidth /= aHeader.nHeight;
- if (nMaxWidth < nAlignedWidth)
- return false;
- break;
- }
- default:
+ // (partially) check the image dimensions to avoid potential large bitmap allocation if the input is damaged
+ sal_uInt64 nMaxWidth = pIStm->remainingSize();
+ if (aHeader.nHeight != 0)
+ nMaxWidth /= aHeader.nHeight;
+ if (nMaxWidth < nAlignedWidth)
return false;
+ break;
}
-
- const Size aSizePixel(aHeader.nWidth, aHeader.nHeight);
- BitmapPalette aPalette;
- Bitmap aNewBmp(aSizePixel, nBitCount, &aPalette);
- Bitmap::ScopedWriteAccess pAcc(aNewBmp);
- if (!pAcc)
- return false;
- if (pAcc->Width() != aHeader.nWidth || pAcc->Height() != aHeader.nHeight)
- {
+ default:
return false;
- }
- AlphaMask aNewBmpAlpha;
- AlphaMask::ScopedWriteAccess pAccAlpha;
- bool bAlphaPossible(pBmpAlpha && aHeader.nBitCount == 32);
+ }
- if (bAlphaPossible)
- {
- const bool bRedSet(0 != aHeader.nV5RedMask);
- const bool bGreenSet(0 != aHeader.nV5GreenMask);
- const bool bBlueSet(0 != aHeader.nV5BlueMask);
-
- // some clipboard entries have alpha mask on zero to say that there is
- // no alpha; do only use this when the other masks are set. The MS docu
- // says that masks are only to be set when bV5Compression is set to
- // BI_BITFIELDS, but there seem to exist a wild variety of usages...
- if((bRedSet || bGreenSet || bBlueSet) && (0 == aHeader.nV5AlphaMask))
- {
- bAlphaPossible = false;
- }
- }
+ const Size aSizePixel(aHeader.nWidth, aHeader.nHeight);
+ BitmapPalette aPalette;
+ Bitmap aNewBmp(aSizePixel, nBitCount, &aPalette);
+ Bitmap::ScopedWriteAccess pAcc(aNewBmp);
+ if (!pAcc)
+ return false;
+ if (pAcc->Width() != aHeader.nWidth || pAcc->Height() != aHeader.nHeight)
+ {
+ return false;
+ }
+ AlphaMask aNewBmpAlpha;
+ AlphaMask::ScopedWriteAccess pAccAlpha;
+ bool bAlphaPossible(pBmpAlpha && aHeader.nBitCount == 32);
- if (bAlphaPossible)
+ if (bAlphaPossible)
+ {
+ const bool bRedSet(0 != aHeader.nV5RedMask);
+ const bool bGreenSet(0 != aHeader.nV5GreenMask);
+ const bool bBlueSet(0 != aHeader.nV5BlueMask);
+
+ // some clipboard entries have alpha mask on zero to say that there is
+ // no alpha; do only use this when the other masks are set. The MS docu
+ // says that masks are only to be set when bV5Compression is set to
+ // BI_BITFIELDS, but there seem to exist a wild variety of usages...
+ if((bRedSet || bGreenSet || bBlueSet) && (0 == aHeader.nV5AlphaMask))
{
- aNewBmpAlpha = AlphaMask(aSizePixel);
- pAccAlpha = AlphaMask::ScopedWriteAccess(aNewBmpAlpha);
+ bAlphaPossible = false;
}
+ }
- // read palette
- if (nColors)
- {
- aPalette.SetEntryCount(nColors);
- ImplReadDIBPalette(*pIStm, aPalette, aHeader.nSize != DIBCOREHEADERSIZE);
- pAcc->SetPalette(aPalette);
- }
+ if (bAlphaPossible)
+ {
+ aNewBmpAlpha = AlphaMask(aSizePixel);
+ pAccAlpha = AlphaMask::ScopedWriteAccess(aNewBmpAlpha);
+ }
- // read bits
- bool bAlphaUsed(false);
+ // read palette
+ if (nColors)
+ {
+ aPalette.SetEntryCount(nColors);
+ ImplReadDIBPalette(*pIStm, aPalette, aHeader.nSize != DIBCOREHEADERSIZE);
+ pAcc->SetPalette(aPalette);
+ }
- if(!pIStm->GetError())
- {
- if(nOffset)
- {
- pIStm->SeekRel(nOffset - (pIStm->Tell() - nStmPos));
- }
+ if (pIStm->GetError())
+ return false;
- bRet = ImplReadDIBBits(*pIStm, aHeader, *pAcc, pAccAlpha.get(), bTopDown, bAlphaUsed, nAlignedWidth);
+ if(nOffset)
+ {
+ pIStm->SeekRel(nOffset - (pIStm->Tell() - nStmPos));
+ }
- if(bRet && aHeader.nXPelsPerMeter && aHeader.nYPelsPerMeter)
- {
- MapMode aMapMode(
- MapUnit::MapMM,
- Point(),
- Fraction(1000, aHeader.nXPelsPerMeter),
- Fraction(1000, aHeader.nYPelsPerMeter));
-
- aNewBmp.SetPrefMapMode(aMapMode);
- aNewBmp.SetPrefSize(Size(aHeader.nWidth, aHeader.nHeight));
- }
- }
+ // read bits
+ bool bAlphaUsed(false);
+ bool bRet = ImplReadDIBBits(*pIStm, aHeader, *pAcc, pAccAlpha.get(), bTopDown, bAlphaUsed, nAlignedWidth);
- pAcc.reset();
+ if (bRet && aHeader.nXPelsPerMeter && aHeader.nYPelsPerMeter)
+ {
+ MapMode aMapMode(
+ MapUnit::MapMM,
+ Point(),
+ Fraction(1000, aHeader.nXPelsPerMeter),
+ Fraction(1000, aHeader.nYPelsPerMeter));
+
+ aNewBmp.SetPrefMapMode(aMapMode);
+ aNewBmp.SetPrefSize(Size(aHeader.nWidth, aHeader.nHeight));
+ }
- if(bAlphaPossible)
- {
- pAccAlpha.reset();
+ pAcc.reset();
- if(!bAlphaUsed)
- {
- bAlphaPossible = false;
- }
- }
+ if (bAlphaPossible)
+ {
+ pAccAlpha.reset();
- if(bRet)
+ if(!bAlphaUsed)
{
- rBmp = aNewBmp;
+ bAlphaPossible = false;
+ }
+ }
- if(bAlphaPossible)
- {
- *pBmpAlpha = aNewBmpAlpha;
- }
+ if (bRet)
+ {
+ rBmp = aNewBmp;
+
+ if(bAlphaPossible)
+ {
+ *pBmpAlpha = aNewBmpAlpha;
}
}
commit aad792b3720957e715cf10d9bfa648a3905497ed
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 27 12:25:10 2017 +0100
reuse palette object
Change-Id: I72035a49d30955cdc6334f6064a1a2e902c1a9f0
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 5ac640a167e7..7486b59da9e3 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -897,8 +897,8 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_u
}
const Size aSizePixel(aHeader.nWidth, aHeader.nHeight);
- BitmapPalette aDummyPal;
- Bitmap aNewBmp(aSizePixel, nBitCount, &aDummyPal);
+ BitmapPalette aPalette;
+ Bitmap aNewBmp(aSizePixel, nBitCount, &aPalette);
Bitmap::ScopedWriteAccess pAcc(aNewBmp);
if (!pAcc)
return false;
@@ -935,7 +935,7 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_u
// read palette
if (nColors)
{
- BitmapPalette aPalette(nColors);
+ aPalette.SetEntryCount(nColors);
ImplReadDIBPalette(*pIStm, aPalette, aHeader.nSize != DIBCOREHEADERSIZE);
pAcc->SetPalette(aPalette);
}
commit dfed481524113a1be03d29ec8a9e13bb96052895
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 27 12:22:15 2017 +0100
process palette standalone
Change-Id: I489a5cdecf4a5c856e9e5fdd03e6f9c920c0a4d5
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 1f2b0a63e26d..5ac640a167e7 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -288,9 +288,9 @@ bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& rHeader, bool& bTopDown
return rIStm.good();
}
-bool ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, bool bQuad )
+bool ImplReadDIBPalette(SvStream& rIStm, BitmapPalette& rPal, bool bQuad)
{
- const sal_uInt16 nColors = rAcc.GetPaletteEntryCount();
+ const sal_uInt16 nColors = rPal.GetEntryCount();
const sal_uLong nPalSize = nColors * ( bQuad ? 4UL : 3UL );
BitmapColor aPalColor;
@@ -310,7 +310,7 @@ bool ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, bool bQuad )
if( bQuad )
pTmpEntry++;
- rAcc.SetPaletteColor( i, aPalColor );
+ rPal[i] = aPalColor;
}
return( rIStm.GetError() == 0UL );
@@ -935,8 +935,9 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_u
// read palette
if (nColors)
{
- pAcc->SetPaletteEntryCount(nColors);
- ImplReadDIBPalette(*pIStm, *pAcc, aHeader.nSize != DIBCOREHEADERSIZE);
+ BitmapPalette aPalette(nColors);
+ ImplReadDIBPalette(*pIStm, aPalette, aHeader.nSize != DIBCOREHEADERSIZE);
+ pAcc->SetPalette(aPalette);
}
// read bits
More information about the Libreoffice-commits
mailing list