diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-28 18:58:31 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-28 19:09:18 +0100 |
| commit | fb09b1f3c6e57cb8e679af982f88b96660c14a4c (patch) | |
| tree | 096d185ba2c714dffeffab447d81fa253c34b94a /canvas | |
| parent | Clean up C-style casts from pointers to void (diff) | |
| download | core-fb09b1f3c6e57cb8e679af982f88b96660c14a4c.tar.gz core-fb09b1f3c6e57cb8e679af982f88b96660c14a4c.zip | |
Clean up C-style casts from pointers to void
Change-Id: Ic903d2429672159691fef58d0d7a15433c884250
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index d86b72913a5b..72969790e49f 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -441,7 +441,7 @@ namespace cairocanvas if( aBmpEx.IsTransparent() || aBmpEx.IsAlpha() ) pAlphaReadAcc = aAlpha.AcquireReadAccess(); - data = (unsigned char*) malloc( nWidth*nHeight*4 ); + data = static_cast<unsigned char*>(malloc( nWidth*nHeight*4 )); long nOff = 0; ::Color aColor; diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index decdde53344a..f5a197846e72 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -520,7 +520,7 @@ namespace cairocanvas font_face = cairo_win32_font_face_create_for_hfont(rSysFontData.hFont); #elif defined CAIRO_HAS_FT_FONT - font_face = cairo_ft_font_face_create_for_ft_face((FT_Face)rSysFontData.nFontId, + font_face = cairo_ft_font_face_create_for_ft_face(static_cast<FT_Face>(rSysFontData.nFontId), rSysFontData.nFontFlags); #else # error Native API needed. |