diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-26 15:32:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-26 15:33:40 +0100 |
| commit | 513fc2916053db5ee7ffaf9f53c271a05cef8981 (patch) | |
| tree | 7f24849841f33f3e1b2737762548c8525bca780e /vcl/generic | |
| parent | 41982607d0c9b69efd5789762bbdae6c7301ee8b (diff) | |
const_cast: convert some C-style casts and remove some redundant ones
Change-Id: I17c57a85bcda98ef36ddefd6562d4681d0c7d5fc
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/fontmanager/fontconfig.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 8504ef083c39..2a354cca4cf4 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -922,7 +922,7 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport) gchar **fonts = (gchar**)g_malloc((m_aCurrentRequests.size() + 1) * sizeof(gchar*)); gchar **font = fonts; for (std::vector<OString>::const_iterator aI = m_aCurrentRequests.begin(); aI != m_aCurrentRequests.end(); ++aI) - *font++ = (gchar*)aI->getStr(); + *font++ = const_cast<gchar*>(aI->getStr()); *font = NULL; gboolean res = dbus_g_proxy_call(proxy, "InstallFontconfigResources", &error, G_TYPE_UINT, xid, /* xid */ diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index c79c883a4890..887b5f4fb482 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -262,7 +262,7 @@ FT_FaceRec_* FtFontInfo::GetFaceFT() if (!maFaceFT && mpFontFile->Map()) { FT_Error rc = FT_New_Memory_Face( aLibFT, - (FT_Byte*)mpFontFile->GetBuffer(), + mpFontFile->GetBuffer(), mpFontFile->GetFileSize(), mnFaceNum, &maFaceFT ); if( (rc != FT_Err_Ok) || (maFaceFT->num_glyphs <= 0) ) maFaceFT = NULL; |