diff options
Diffstat (limited to 'filter/source/graphicfilter')
-rw-r--r-- | filter/source/graphicfilter/egif/egif.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/eos2met/eos2met.cxx | 6 | ||||
-rw-r--r-- | filter/source/graphicfilter/epict/epict.cxx | 6 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/bundles.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/class4.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/ieps/ieps.cxx | 6 | ||||
-rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 8 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipict/ipict.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipsd/ipsd.cxx | 4 |
9 files changed, 23 insertions, 23 deletions
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 621cf32fe43e..d2b1695d999e 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -26,7 +26,7 @@ #include <vcl/fltcall.hxx> #include <vcl/FilterConfigItem.hxx> #include "giflzwc.hxx" -#include <boost/scoped_array.hpp> +#include <memory> // - GIFWriter - @@ -481,7 +481,7 @@ void GIFWriter::WriteAccess() GIFLZWCompressor aCompressor; const long nWidth = m_pAcc->Width(); const long nHeight = m_pAcc->Height(); - boost::scoped_array<sal_uInt8> pBuffer; + std::unique_ptr<sal_uInt8[]> pBuffer; const sal_uLong nFormat = m_pAcc->GetScanlineFormat(); bool bNative = ( BMP_FORMAT_8BIT_PAL == nFormat ); diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 1f5b80cbad5f..dac76c9efd06 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -37,7 +37,7 @@ #include <svl/solar.hrc> #include <vcl/gdimetafiletools.hxx> #include <vcl/dibtools.hxx> -#include <boost/scoped_array.hpp> +#include <memory> // -----------------------------Field Types------------------------------- @@ -675,7 +675,7 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap) pMET->WriteUChar( 0x08 ).WriteUChar( 0x08 ); } - boost::scoped_array<sal_uInt8> pBuf(new sal_uInt8[nBytesPerLine]); + std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8[nBytesPerLine]); ny=0; while (ny<nHeight) { @@ -1952,7 +1952,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) METSetChrAngle( nOrientation = aGDIFont.GetOrientation() ); METSetChrSet(FindChrSet(aGDIFont)); aStr = pA->GetText().copy(pA->GetIndex(),pA->GetLen()); - boost::scoped_array<long> pDXAry(new long[aStr.getLength()]); + std::unique_ptr<long[]> pDXAry(new long[aStr.getLength()]); nNormSize = pVDev->GetTextArray( aStr, pDXAry.get() ); for ( i = 0; i < aStr.getLength(); i++ ) diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 9610b3717a9a..23f846433bc1 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -38,7 +38,7 @@ #include <o3tl/numeric.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <boost/scoped_array.hpp> +#include <memory> // PictWriter struct PictWriterAttrStackMember { @@ -1142,7 +1142,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, pPict->WriteUInt16( 0 ); // (?) // allocate memory for a row: - boost::scoped_array<sal_uInt8> pPix(new sal_uInt8[ nSrcRowBytes ]); + std::unique_ptr<sal_uInt8[]> pPix(new sal_uInt8[ nSrcRowBytes ]); // remember position of the map-data in the target: nDstMapPos=pPict->Tell(); @@ -1739,7 +1739,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) Point aPt( pA->GetPoint() ); OUString aStr = pA->GetText().copy( pA->GetIndex(),pA->GetLen() ); ScopedVclPtrInstance< VirtualDevice > pVirDev; - boost::scoped_array<long> pDXAry(new long[ aStr.getLength() ]); + std::unique_ptr<long[]> pDXAry(new long[ aStr.getLength() ]); sal_Int32 nNormSize( pVirDev->GetTextArray( aStr,pDXAry.get() ) ); if (aSrcFont.GetAlign()!=ALIGN_BASELINE) diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx index d310891c1ceb..6062b9b3a9c5 100644 --- a/filter/source/graphicfilter/icgm/bundles.cxx +++ b/filter/source/graphicfilter/icgm/bundles.cxx @@ -21,7 +21,7 @@ #include "bundles.hxx" #include <tools/stream.hxx> -#include <boost/scoped_array.hpp> +#include <memory> Bundle& Bundle::operator=( Bundle& rSource ) { @@ -184,7 +184,7 @@ void CGMFList::InsertName( sal_uInt8* pSource, sal_uInt32 nSize ) pFontEntry = aFontEntryList[ nFontNameCount ]; } nFontNameCount++; - boost::scoped_array<sal_Int8> pBuf(new sal_Int8[ nSize ]); + std::unique_ptr<sal_Int8[]> pBuf(new sal_Int8[ nSize ]); memcpy( pBuf.get(), pSource, nSize ); sal_Int8* pFound = ImplSearchEntry( pBuf.get(), reinterpret_cast<sal_Int8 const *>("ITALIC"), nSize, 6 ); if ( pFound ) diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx index 4544a3ff6b90..e484e52d739f 100644 --- a/filter/source/graphicfilter/icgm/class4.cxx +++ b/filter/source/graphicfilter/icgm/class4.cxx @@ -22,7 +22,7 @@ #include <chart.hxx> #include <outact.hxx> #include <math.h> -#include <boost/scoped_array.hpp> +#include <memory> using namespace ::com::sun::star; @@ -271,7 +271,7 @@ void CGM::ImplDoClass4() mpOutAct->CloseRegion(); sal_uInt16 nPoints = 0; - boost::scoped_array<Point> pPoints(new Point[ 0x4000 ]); + std::unique_ptr<Point[]> pPoints(new Point[ 0x4000 ]); tools::PolyPolygon aPolyPolygon; FloatPoint aFloatPoint; diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 2ebffb103fe9..634983fffc3b 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -35,7 +35,7 @@ #include <osl/process.h> #include <osl/file.hxx> #include <osl/thread.h> -#include <boost/scoped_array.hpp> +#include <memory> class FilterConfigItem; @@ -417,14 +417,14 @@ void CreateMtfReplacementAction( GDIMetaFile& rMtf, SvStream& rStrm, sal_uInt32 .WriteUInt32( nTPos ).WriteUInt32( nSizeTIFF ); if ( nSizeWMF ) { - boost::scoped_array<sal_uInt8> pBuf(new sal_uInt8[ nSizeWMF ]); + std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8[ nSizeWMF ]); rStrm.Seek( nOrigPos + nPosWMF ); rStrm.Read( pBuf.get(), nSizeWMF ); aReplacement.Write( pBuf.get(), nSizeWMF ); } if ( nSizeTIFF ) { - boost::scoped_array<sal_uInt8> pBuf(new sal_uInt8[ nSizeTIFF ]); + std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8[ nSizeTIFF ]); rStrm.Seek( nOrigPos + nPosTIFF ); rStrm.Read( pBuf.get(), nSizeTIFF ); aReplacement.Write( pBuf.get(), nSizeTIFF ); diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index c32808e08b86..f1b99812f092 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -26,7 +26,7 @@ #include <vcl/lineinfo.hxx> #include <math.h> -#include <boost/scoped_array.hpp> +#include <memory> class FilterConfigItem; @@ -1003,7 +1003,7 @@ void OS2METReader::ReadChrStr(bool bGivenPos, bool bMove, bool bExtra, sal_uInt1 } if (nLen > pOS2MET->remainingSize()) throw css::uno::Exception("attempt to read past end of input", 0); - boost::scoped_array<char> pChr(new char[nLen+1]); + std::unique_ptr<char[]> pChr(new char[nLen+1]); for (i=0; i<nLen; i++) pOS2MET->ReadChar( pChr[i] ); pChr[nLen] = 0; @@ -2205,7 +2205,7 @@ void OS2METReader::ReadImageData(sal_uInt16 nDataID, sal_uInt16 nDataLen) } // OK, now the map data is being pushed. Unfortunately OS2 and BMP // do have a different RGB ordering when using 24-bit - boost::scoped_array<sal_uInt8> pBuf(new sal_uInt8[nDataLen]); + std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8[nDataLen]); pOS2MET->Read(pBuf.get(),nDataLen); if (p->nBitsPerPixel==24) { sal_uLong i, j, nAlign, nBytesPerLine; @@ -2527,7 +2527,7 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) pOrdFile = new SvMemoryStream; pOrdFile->SetEndian(SvStreamEndian::LITTLE); } - boost::scoped_array<sal_uInt8> pBuf(new sal_uInt8[nFieldSize]); + std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8[nFieldSize]); pOS2MET->Read(pBuf.get(),nFieldSize); pOrdFile->Write(pBuf.get(),nFieldSize); break; diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 6621eddd3c60..e6b7fd028755 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -28,7 +28,7 @@ #include "ipict.hxx" #include "shape.hxx" -#include <boost/scoped_array.hpp> +#include <memory> #include <vcl/FilterConfigItem.hxx> // complete FilterConfigItem for GraphicImport under -fsanitize=function @@ -1053,7 +1053,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo if (nWidth > nMaxWidth) BITMAPERROR; - boost::scoped_array<sal_uInt8> pScanline(new sal_uInt8[static_cast<size_t>(nWidth) * nCmpCount]); + std::unique_ptr<sal_uInt8[]> pScanline(new sal_uInt8[static_cast<size_t>(nWidth) * nCmpCount]); for ( ny = 0; ny < nHeight; ny++ ) { nSrcBitsPos = pPict->Tell(); diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index c25468ca90e7..be25647dc0ec 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -22,7 +22,7 @@ #include <vcl/bmpacc.hxx> #include <vcl/outdev.hxx> #include <tools/fract.hxx> -#include <boost/scoped_array.hpp> +#include <memory> class FilterConfigItem; @@ -572,7 +572,7 @@ bool PSDReader::ImplReadBody() if ( mpFileHeader->nMode == PSD_CMYK ) { sal_uInt32 nBlack, nBlackMax = 0; - boost::scoped_array<sal_uInt8> pBlack(new sal_uInt8[ mpFileHeader->nRows * mpFileHeader->nColumns ]); + std::unique_ptr<sal_uInt8[]> pBlack(new sal_uInt8[ mpFileHeader->nRows * mpFileHeader->nColumns ]); nY = 0; while ( nY < mpFileHeader->nRows ) { |