From c7cc1a91329ba85681c94e2f49d0526d560e2206 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 17 Jan 2015 18:14:57 +0100 Subject: [PATCH] Some more loplugin:cstylecast: canvas Change-Id: I3654875c560ba4c2d88b023e3b2104c6f43bb4a0 --- canvas/source/cairo/cairo_canvasbitmap.cxx | 2 +- canvas/source/cairo/cairo_canvashelper.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 40b642a396f2..87210f04bb65 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -183,7 +183,7 @@ namespace cairocanvas unsigned int nStride = cairo_image_surface_get_stride( pPixels ); for( unsigned long y = 0; y < (unsigned long) aSize.Height(); y++ ) { - sal_uInt32 *pPix = (sal_uInt32 *)(pSrc + nStride * y); + sal_uInt32 *pPix = reinterpret_cast(pSrc + nStride * y); for( unsigned long x = 0; x < (unsigned long) aSize.Width(); x++ ) { sal_uInt8 nAlpha = (*pPix >> 24); diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 68e05feb2640..9e271bd8b278 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -1574,7 +1574,7 @@ namespace cairocanvas const Format eFormat( mbHaveAlpha ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24 ); uno::Sequence< sal_Int8 > aRes( 4*nWidth*nHeight ); sal_Int8* pData = aRes.getArray(); - cairo_surface_t* pImageSurface = cairo_image_surface_create_for_data( (unsigned char *) pData, + cairo_surface_t* pImageSurface = cairo_image_surface_create_for_data( reinterpret_cast(pData), eFormat, nWidth, nHeight, 4*nWidth ); cairo_t* pCairo = cairo_create( pImageSurface );