diff options
author | Noel Grandin <noel@peralex.com> | 2015-07-29 09:48:43 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-07-29 09:48:43 +0200 |
commit | 01d96add97c49607317b51ac64a36c229f9da0ec (patch) | |
tree | 066457b6c107c757ae80ebdfab58ff52d96dab7e | |
parent | e1953f22097d6f895fe27ea21635c37d3cb48f51 (diff) |
fix windows build
after commit b97aa3faa03e5944aac8f3c35a8c198fba295e83
"Remove the unnecessary type definition: HPBYTE"
Change-Id: Ifd73ecb7e923ef38826d24c3d251be29eda472bf
-rw-r--r-- | vcl/win/source/gdi/salbmp.cxx | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 52c28784adac..014700570d45 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -51,12 +51,20 @@ // - Inlines - -inline void ImplSetPixel4( const sal_uInt8* pScanline, long nX, const BYTE cIndex ) +inline void ImplSetPixel4( sal_uInt8* pScanline, long nX, const BYTE cIndex ) { BYTE& rByte = pScanline[ nX >> 1 ]; - ( nX & 1 ) ? ( rByte &= 0xf0, rByte |= ( cIndex & 0x0f ) ) : - ( rByte &= 0x0f, rByte |= ( cIndex << 4 ) ); + if ( nX & 1 ) + { + rByte &= 0xf0; + rByte |= cIndex & 0x0f; + } + else + { + rByte &= 0x0f; + rByte |= cIndex << 4; + } } // Helper class to manage Gdiplus::Bitmap instances inside of @@ -954,11 +962,11 @@ void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* 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 ) ); + sal_uLong nWidthAl = AlignedWidth4Bytes( rSizePixel.Width() * ( bRLE4 ? 4UL : 8UL ) ); sal_uInt8* pLast = pDIB + rSizePixel.Height() * nWidthAl - 1; - sal_uLong nCountByte; - sal_uLong nRunByte; - sal_uLong i; + sal_uLong nCountByte; + sal_uLong nRunByte; + sal_uLong i; BYTE cTmp; bool bEndDecoding = FALSE; |