diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-06 09:46:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-06 16:45:13 +0000 |
| commit | c7258cfccdf9f4c5235da1b135801f957a5b0ec1 (patch) | |
| tree | d5af5085ad1327afe2d41045ea452e017fea1fb6 /vcl/generic/glyphs | |
| parent | 027c383584bff4ea2aa7aa2b9e294e614087f28f (diff) | |
shared_ptr<T>(new T(args)) -> make_shared<T>(args)
and boost:make_shared->std::make_shared
Change-Id: Ic1e187c52c856a7b27817967b2caa8920f23a98d
Diffstat (limited to 'vcl/generic/glyphs')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 635abb30a671..16f123f81595 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -93,7 +93,7 @@ static FT_Library aLibFT = 0; // enable linking with old FT versions static int nFTVERSION = 0; -typedef std::unordered_map<const char*, boost::shared_ptr<FtFontFile>, rtl::CStringHash, rtl::CStringEqual> FontFileList; +typedef std::unordered_map<const char*, std::shared_ptr<FtFontFile>, rtl::CStringHash, rtl::CStringEqual> FontFileList; namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; } @@ -558,14 +558,14 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI ) mnLoadFlags |= FT_LOAD_NO_BITMAP; } -void ServerFont::SetFontOptions( boost::shared_ptr<ImplFontOptions> pFontOptions) +void ServerFont::SetFontOptions(std::shared_ptr<ImplFontOptions> xFontOptions) { - mpFontOptions = pFontOptions; + mxFontOptions = xFontOptions; - if (!mpFontOptions) + if (!mxFontOptions) return; - FontAutoHint eHint = mpFontOptions->GetUseAutoHint(); + FontAutoHint eHint = mxFontOptions->GetUseAutoHint(); if( eHint == AUTOHINT_DONTKNOW ) eHint = mbUseGamma ? AUTOHINT_TRUE : AUTOHINT_FALSE; @@ -576,11 +576,11 @@ void ServerFont::SetFontOptions( boost::shared_ptr<ImplFontOptions> pFontOptions mnLoadFlags |= FT_LOAD_NO_HINTING; mnLoadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; //#88334# - if( mpFontOptions->DontUseAntiAlias() ) + if (mxFontOptions->DontUseAntiAlias()) mnPrioAntiAlias = 0; - if( mpFontOptions->DontUseEmbeddedBitmaps() ) + if (mxFontOptions->DontUseEmbeddedBitmaps()) mnPrioEmbedded = 0; - if( mpFontOptions->DontUseHinting() ) + if (mxFontOptions->DontUseHinting()) mnPrioAutoHint = 0; if( mnPrioAutoHint <= 0 ) @@ -590,7 +590,7 @@ void ServerFont::SetFontOptions( boost::shared_ptr<ImplFontOptions> pFontOptions if( !(mnLoadFlags & FT_LOAD_NO_HINTING) ) { mnLoadFlags |= FT_LOAD_TARGET_NORMAL; - switch( mpFontOptions->GetHintStyle() ) + switch (mxFontOptions->GetHintStyle()) { case HINT_NONE: mnLoadFlags |= FT_LOAD_NO_HINTING; @@ -611,9 +611,9 @@ void ServerFont::SetFontOptions( boost::shared_ptr<ImplFontOptions> pFontOptions mnLoadFlags |= FT_LOAD_NO_BITMAP; } -boost::shared_ptr<ImplFontOptions> ServerFont::GetFontOptions() const +std::shared_ptr<ImplFontOptions> ServerFont::GetFontOptions() const { - return mpFontOptions; + return mxFontOptions; } const OString& ServerFont::GetFontFileName() const |