From b97aa3faa03e5944aac8f3c35a8c198fba295e83 Mon Sep 17 00:00:00 2001 From: Daniel Robertson Date: Fri, 17 Jul 2015 12:28:01 -0400 Subject: Remove the unnecessary type definition: HPBYTE HPBYTE is a duplicate defintion of Scanline as seen below. include/vcl/salbtype.hxx: 34: typedef sal_uInt8* HPBYTE; 35: typedef HPBYTE Scanline; Remove the definition of HPBYTE and inline the definition of Scanline. Replace all instances with sal_uInt8*. Change-Id: I8a79a9d6c45af57fbabf8d3e6a04a1b5eba15a7b Reviewed-on: https://gerrit.libreoffice.org/17175 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- vcl/win/source/gdi/salbmp.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vcl/win') diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 42088b739ac6..52c28784adac 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -51,7 +51,7 @@ // - Inlines - -inline void ImplSetPixel4( const HPBYTE pScanline, long nX, const BYTE cIndex ) +inline void ImplSetPixel4( const sal_uInt8* pScanline, long nX, const BYTE cIndex ) { BYTE& rByte = pScanline[ nX >> 1 ]; @@ -951,11 +951,11 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf, const Size& rSizePixel, bool bRLE4 ) { - HPBYTE pRLE = (HPBYTE) pSrcBuf; - HPBYTE pDIB = (HPBYTE) pDstBuf; - HPBYTE pRow = (HPBYTE) pDstBuf; + sal_uInt8* pRLE = (sal_uInt8*) pSrcBuf; + sal_uInt8* pDIB = (sal_uInt8*) pDstBuf; + sal_uInt8* pRow = (sal_uInt8*) pDstBuf; sal_uLong nWidthAl = AlignedWidth4Bytes( rSizePixel.Width() * ( bRLE4 ? 4UL : 8UL ) ); - HPBYTE pLast = pDIB + rSizePixel.Height() * nWidthAl - 1; + sal_uInt8* pLast = pDIB + rSizePixel.Height() * nWidthAl - 1; sal_uLong nCountByte; sal_uLong nRunByte; sal_uLong i; -- cgit