Kaydet (Commit) 01d96add authored tarafından Noel Grandin's avatar Noel Grandin

fix windows build

after commit b97aa3fa
"Remove the unnecessary type definition: HPBYTE"

Change-Id: Ifd73ecb7e923ef38826d24c3d251be29eda472bf
üst e1953f22
...@@ -51,12 +51,20 @@ ...@@ -51,12 +51,20 @@
// - Inlines - // - 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 ]; BYTE& rByte = pScanline[ nX >> 1 ];
( nX & 1 ) ? ( rByte &= 0xf0, rByte |= ( cIndex & 0x0f ) ) : if ( nX & 1 )
( rByte &= 0x0f, rByte |= ( cIndex << 4 ) ); {
rByte &= 0xf0;
rByte |= cIndex & 0x0f;
}
else
{
rByte &= 0x0f;
rByte |= cIndex << 4;
}
} }
// Helper class to manage Gdiplus::Bitmap instances inside of // Helper class to manage Gdiplus::Bitmap instances inside of
...@@ -954,11 +962,11 @@ void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf, ...@@ -954,11 +962,11 @@ void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf,
sal_uInt8* pRLE = (sal_uInt8*) pSrcBuf; sal_uInt8* pRLE = (sal_uInt8*) pSrcBuf;
sal_uInt8* pDIB = (sal_uInt8*) pDstBuf; sal_uInt8* pDIB = (sal_uInt8*) pDstBuf;
sal_uInt8* pRow = (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_uInt8* pLast = pDIB + rSizePixel.Height() * nWidthAl - 1;
sal_uLong nCountByte; sal_uLong nCountByte;
sal_uLong nRunByte; sal_uLong nRunByte;
sal_uLong i; sal_uLong i;
BYTE cTmp; BYTE cTmp;
bool bEndDecoding = FALSE; bool bEndDecoding = FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment