From 47d3e82e4f2c0c06231c952a0cc2456b712da0cc Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 12 Sep 2015 12:21:12 +0100 Subject: boost->std MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9b4f884c6313a53fea543ea6f93175205351ad14 Reviewed-on: https://gerrit.libreoffice.org/18517 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- basebmp/source/bitmapdevice.cxx | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'basebmp') diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 41a32feed7e4..961f07b05463 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -375,9 +375,9 @@ namespace damaged( basegfx::B2IBox( rDamagePoint, aEnd ) ); } - static boost::shared_ptr getCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) + static std::shared_ptr getCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) { - return boost::dynamic_pointer_cast< BitmapRenderer >( bmp ); + return std::dynamic_pointer_cast< BitmapRenderer >( bmp ); } virtual bool isCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const SAL_OVERRIDE @@ -387,9 +387,9 @@ namespace return getCompatibleBitmap(bmp).get() != NULL; } - boost::shared_ptr getCompatibleClipMask( const BitmapDeviceSharedPtr& bmp ) const + std::shared_ptr getCompatibleClipMask( const BitmapDeviceSharedPtr& bmp ) const { - boost::shared_ptr pMask( boost::dynamic_pointer_cast( bmp )); + std::shared_ptr pMask( std::dynamic_pointer_cast( bmp )); if( !pMask ) return pMask; @@ -404,12 +404,12 @@ namespace { // TODO(P1): dynamic_cast usually called twice for // compatible formats - return boost::dynamic_pointer_cast( bmp ).get() != NULL; + return std::dynamic_pointer_cast( bmp ).get() != NULL; } - static boost::shared_ptr getCompatibleAlphaMask( const BitmapDeviceSharedPtr& bmp ) + static std::shared_ptr getCompatibleAlphaMask( const BitmapDeviceSharedPtr& bmp ) { - return boost::dynamic_pointer_cast( bmp ); + return std::dynamic_pointer_cast( bmp ); } virtual void clear_i( Color fillColor, @@ -445,7 +445,7 @@ namespace DrawMode drawMode, const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE { - boost::shared_ptr pMask( getCompatibleClipMask(rClip) ); + std::shared_ptr pMask( getCompatibleClipMask(rClip) ); OSL_ASSERT( pMask ); const vigra::Diff2D offset(rPt.getX(), @@ -562,7 +562,7 @@ namespace composite_iterator_type getMaskedIter( const BitmapDeviceSharedPtr& rClip ) const { - boost::shared_ptr pMask( getCompatibleClipMask(rClip) ); + std::shared_ptr pMask( getCompatibleClipMask(rClip) ); OSL_ASSERT( pMask ); return composite_iterator_type( maBegin, @@ -713,7 +713,7 @@ namespace const Iterator& begin, const RawAcc& acc) { - boost::shared_ptr pSrcBmp( getCompatibleBitmap(rSrcBitmap) ); + std::shared_ptr pSrcBmp( getCompatibleBitmap(rSrcBitmap) ); OSL_ASSERT( pSrcBmp ); scaleImage( @@ -867,8 +867,8 @@ namespace const basegfx::B2IBox& rSrcRect, const basegfx::B2IPoint& rDstPoint ) SAL_OVERRIDE { - boost::shared_ptr pMask( getCompatibleClipMask(rAlphaMask) ); - boost::shared_ptr pAlpha( getCompatibleAlphaMask(rAlphaMask) ); + std::shared_ptr pMask( getCompatibleClipMask(rAlphaMask) ); + std::shared_ptr pAlpha( getCompatibleAlphaMask(rAlphaMask) ); if( pAlpha ) { @@ -917,8 +917,8 @@ namespace const basegfx::B2IPoint& rDstPoint, const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE { - boost::shared_ptr pMask( getCompatibleClipMask(rAlphaMask) ); - boost::shared_ptr pAlpha( getCompatibleAlphaMask(rAlphaMask) ); + std::shared_ptr pMask( getCompatibleClipMask(rAlphaMask) ); + std::shared_ptr pAlpha( getCompatibleAlphaMask(rAlphaMask) ); if( pAlpha ) { @@ -935,7 +935,7 @@ namespace } else if( pMask ) { - boost::shared_ptr pClipMask( getCompatibleClipMask(rClip) ); + std::shared_ptr pClipMask( getCompatibleClipMask(rClip) ); OSL_ASSERT( pClipMask ); // setup a ((iter,mask),clipMask) composite composite @@ -982,8 +982,8 @@ namespace const Iterator& begin, const Acc& acc) { - boost::shared_ptr pSrcBmp( getCompatibleBitmap(rSrcBitmap) ); - boost::shared_ptr pMask( getCompatibleClipMask(rMask) ); + std::shared_ptr pSrcBmp( getCompatibleBitmap(rSrcBitmap) ); + std::shared_ptr pMask( getCompatibleClipMask(rMask) ); OSL_ASSERT( pMask && pSrcBmp ); scaleImage( @@ -1829,7 +1829,7 @@ PaletteMemorySharedVector createStandardPalette( if( pPal || nNumEntries <= 0 ) return pPal; - boost::shared_ptr< std::vector > pLocalPal( + std::shared_ptr< std::vector > pLocalPal( new std::vector(nNumEntries) ); const sal_Int32 nIncrement( 0x00FFFFFF/nNumEntries ); -- cgit