mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work around compilation errors on 64-bit Windows

Browse Source 
Again the ULONG clashes on 64-bit Windows cause pain. Work around by
using pre/postwin.h, and that then necessitates use of explict
WIN_BYTE instead of just BYTE. Sigh...
This commit is contained in:
Tor Lillqvist
2011-01-25 01:32:10 +02:00
parent 53b28adfef
commit eb841ee609
3 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
canvas/source/directx/dx_canvashelper_texturefill.cxx
View File

@@ -342,9 +342,9 @@ namespace dxcanvas
boost::tuples::tie(nIndex,fAlpha)=aLerper.lerp(fT); boost::tuples::tie(nIndex,fAlpha)=aLerper.lerp(fT);
const Gdiplus::Color aFillColor( const Gdiplus::Color aFillColor(
static_cast<BYTE>( basegfx::tools::lerp(rColors[nIndex].GetRed(),rColors[nIndex+1].GetRed(),fAlpha) ), static_cast<WIN_BYTE>( basegfx::tools::lerp(rColors[nIndex].GetRed(),rColors[nIndex+1].GetRed(),fAlpha) ),
static_cast<BYTE>( basegfx::tools::lerp(rColors[nIndex].GetGreen(),rColors[nIndex+1].GetGreen(),fAlpha) ), static_cast<WIN_BYTE>( basegfx::tools::lerp(rColors[nIndex].GetGreen(),rColors[nIndex+1].GetGreen(),fAlpha) ),
static_cast<BYTE>( basegfx::tools::lerp(rColors[nIndex].GetBlue(),rColors[nIndex+1].GetBlue(),fAlpha) ) ); static_cast<WIN_BYTE>( basegfx::tools::lerp(rColors[nIndex].GetBlue(),rColors[nIndex+1].GetBlue(),fAlpha) ) );
aFillBrush.SetColor( aFillColor ); aFillBrush.SetColor( aFillColor );
aCurrPath.Reset(); aCurrPath.StartFigure(); aCurrPath.Reset(); aCurrPath.StartFigure();

20
canvas/source/directx/dx_surfacebitmap.cxx
View File

@@ -370,7 +370,7 @@ namespace dxcanvas
pResult.reset(new Gdiplus::Bitmap( maSize.getX(),maSize.getY(), pResult.reset(new Gdiplus::Bitmap( maSize.getX(),maSize.getY(),
aSurfaceDesc.lPitch, aSurfaceDesc.lPitch,
nFormat, nFormat,
(BYTE *)aSurfaceDesc.lpSurface )); (WIN_BYTE *)aSurfaceDesc.lpSurface ));
// unlock the directx surface // unlock the directx surface
mpSurface->Unlock(NULL); mpSurface->Unlock(NULL);
@@ -387,7 +387,7 @@ namespace dxcanvas
pResult.reset(new Gdiplus::Bitmap( maSize.getX(),maSize.getY(), pResult.reset(new Gdiplus::Bitmap( maSize.getX(),maSize.getY(),
aLockedRect.Pitch, aLockedRect.Pitch,
nFormat, nFormat,
(BYTE *)aLockedRect.pBits )); (WIN_BYTE *)aLockedRect.pBits ));
mpSurface->UnlockRect(); mpSurface->UnlockRect();
} }
@@ -560,7 +560,7 @@ namespace dxcanvas
if(FAILED(mpSurface->Lock(NULL,&aSurfaceDesc,dwFlags,NULL))) if(FAILED(mpSurface->Lock(NULL,&aSurfaceDesc,dwFlags,NULL)))
return uno::Sequence< sal_Int8 >(); return uno::Sequence< sal_Int8 >();
sal_uInt8 *pSrc = (sal_uInt8 *)((((BYTE *)aSurfaceDesc.lpSurface)+(rect.Y1*aSurfaceDesc.lPitch))+rect.X1); sal_uInt8 *pSrc = (sal_uInt8 *)((((WIN_BYTE *)aSurfaceDesc.lpSurface)+(rect.Y1*aSurfaceDesc.lPitch))+rect.X1);
sal_uInt8 *pDst = (sal_uInt8 *)aRes.getArray(); sal_uInt8 *pDst = (sal_uInt8 *)aRes.getArray();
sal_uInt32 nSegmentSizeInBytes = nWidth<<4; sal_uInt32 nSegmentSizeInBytes = nWidth<<4;
for(sal_uInt32 y=0; y<nHeight; ++y) for(sal_uInt32 y=0; y<nHeight; ++y)
@@ -576,7 +576,7 @@ namespace dxcanvas
if(FAILED(mpSurface->LockRect(&aLockedRect,NULL,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY))) if(FAILED(mpSurface->LockRect(&aLockedRect,NULL,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY)))
return uno::Sequence< sal_Int8 >(); return uno::Sequence< sal_Int8 >();
sal_uInt8 *pSrc = (sal_uInt8 *)((((BYTE *)aLockedRect.pBits)+(rect.Y1*aLockedRect.Pitch))+rect.X1); sal_uInt8 *pSrc = (sal_uInt8 *)((((WIN_BYTE *)aLockedRect.pBits)+(rect.Y1*aLockedRect.Pitch))+rect.X1);
sal_uInt8 *pDst = (sal_uInt8 *)aRes.getArray(); sal_uInt8 *pDst = (sal_uInt8 *)aRes.getArray();
sal_uInt32 nSegmentSizeInBytes = nWidth<<4; sal_uInt32 nSegmentSizeInBytes = nWidth<<4;
for(sal_uInt32 y=0; y<nHeight; ++y) for(sal_uInt32 y=0; y<nHeight; ++y)
@@ -643,7 +643,7 @@ namespace dxcanvas
throw uno::RuntimeException(); throw uno::RuntimeException();
sal_uInt8 *pSrc = (sal_uInt8 *)data.getConstArray(); sal_uInt8 *pSrc = (sal_uInt8 *)data.getConstArray();
sal_uInt8 *pDst = (sal_uInt8 *)((((BYTE *)aSurfaceDesc.lpSurface)+(rect.Y1*aSurfaceDesc.lPitch))+rect.X1); sal_uInt8 *pDst = (sal_uInt8 *)((((WIN_BYTE *)aSurfaceDesc.lpSurface)+(rect.Y1*aSurfaceDesc.lPitch))+rect.X1);
sal_uInt32 nSegmentSizeInBytes = nWidth<<4; sal_uInt32 nSegmentSizeInBytes = nWidth<<4;
for(sal_uInt32 y=0; y<nHeight; ++y) for(sal_uInt32 y=0; y<nHeight; ++y)
{ {
@@ -660,7 +660,7 @@ namespace dxcanvas
throw uno::RuntimeException(); throw uno::RuntimeException();
sal_uInt8 *pSrc = (sal_uInt8 *)data.getConstArray(); sal_uInt8 *pSrc = (sal_uInt8 *)data.getConstArray();
sal_uInt8 *pDst = (sal_uInt8 *)((((BYTE *)aLockedRect.pBits)+(rect.Y1*aLockedRect.Pitch))+rect.X1); sal_uInt8 *pDst = (sal_uInt8 *)((((WIN_BYTE *)aLockedRect.pBits)+(rect.Y1*aLockedRect.Pitch))+rect.X1);
sal_uInt32 nSegmentSizeInBytes = nWidth<<4; sal_uInt32 nSegmentSizeInBytes = nWidth<<4;
for(sal_uInt32 y=0; y<nHeight; ++y) for(sal_uInt32 y=0; y<nHeight; ++y)
{ {
@@ -722,7 +722,7 @@ namespace dxcanvas
if(FAILED(mpSurface->Lock(NULL,&aSurfaceDesc,dwFlags,NULL))) if(FAILED(mpSurface->Lock(NULL,&aSurfaceDesc,dwFlags,NULL)))
throw uno::RuntimeException(); throw uno::RuntimeException();
sal_uInt32 *pDst = (sal_uInt32 *)((((BYTE *)aSurfaceDesc.lpSurface)+(pos.Y*aSurfaceDesc.lPitch))+pos.X); sal_uInt32 *pDst = (sal_uInt32 *)((((WIN_BYTE *)aSurfaceDesc.lpSurface)+(pos.Y*aSurfaceDesc.lPitch))+pos.X);
*pDst = aColor.GetValue(); *pDst = aColor.GetValue();
mpSurface->Unlock(NULL); mpSurface->Unlock(NULL);
#else #else
@@ -731,7 +731,7 @@ namespace dxcanvas
if(FAILED(mpSurface->LockRect(&aLockedRect,NULL,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY))) if(FAILED(mpSurface->LockRect(&aLockedRect,NULL,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY)))
throw uno::RuntimeException(); throw uno::RuntimeException();
sal_uInt32 *pDst = (sal_uInt32 *)((((BYTE *)aLockedRect.pBits)+(pos.Y*aLockedRect.Pitch))+pos.X); sal_uInt32 *pDst = (sal_uInt32 *)((((WIN_BYTE *)aLockedRect.pBits)+(pos.Y*aLockedRect.Pitch))+pos.X);
*pDst = aColor.GetValue(); *pDst = aColor.GetValue();
mpSurface->UnlockRect(); mpSurface->UnlockRect();
#endif #endif
@@ -780,7 +780,7 @@ namespace dxcanvas
if(FAILED(mpSurface->Lock(NULL,&aSurfaceDesc,dwFlags,NULL))) if(FAILED(mpSurface->Lock(NULL,&aSurfaceDesc,dwFlags,NULL)))
throw uno::RuntimeException(); throw uno::RuntimeException();
sal_uInt32 *pDst = (sal_uInt32 *)((((BYTE *)aSurfaceDesc.lpSurface)+(pos.Y*aSurfaceDesc.lPitch))+pos.X); sal_uInt32 *pDst = (sal_uInt32 *)((((WIN_BYTE *)aSurfaceDesc.lpSurface)+(pos.Y*aSurfaceDesc.lPitch))+pos.X);
Gdiplus::Color aColor(*pDst); Gdiplus::Color aColor(*pDst);
mpSurface->Unlock(NULL); mpSurface->Unlock(NULL);
#else #else
@@ -789,7 +789,7 @@ namespace dxcanvas
if(FAILED(mpSurface->LockRect(&aLockedRect,NULL,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY))) if(FAILED(mpSurface->LockRect(&aLockedRect,NULL,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY)))
throw uno::RuntimeException(); throw uno::RuntimeException();
sal_uInt32 *pDst = (sal_uInt32 *)((((BYTE *)aLockedRect.pBits)+(pos.Y*aLockedRect.Pitch))+pos.X); sal_uInt32 *pDst = (sal_uInt32 *)((((WIN_BYTE *)aLockedRect.pBits)+(pos.Y*aLockedRect.Pitch))+pos.X);
Gdiplus::Color aColor(*pDst); Gdiplus::Color aColor(*pDst);
mpSurface->UnlockRect(); mpSurface->UnlockRect();
#endif #endif

10
canvas/source/directx/dx_winstuff.hxx
View File

@@ -66,7 +66,7 @@
#undef WB_RIGHT #undef WB_RIGHT
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> // TODO(Q1): extract minimal set of required headers for gdiplus #include <tools/prewin.h>
#if DIRECTX_VERSION < 0x0900 #if DIRECTX_VERSION < 0x0900
@@ -107,6 +107,8 @@ using ::std::min;
#include <gdiplus.h> #include <gdiplus.h>
#include <tools/postwin.h>
#ifdef min #ifdef min
# undef min # undef min
#endif #endif
@@ -216,12 +218,6 @@ namespace dxcanvas
#pragma warning(pop) #pragma warning(pop)
#endif #endif
#undef DELETE
#undef BOOL
#undef INT32
#undef UINT32
#undef PolyPolygon
#endif /* _DXCANVAS_WINSTUFF_HXX */ #endif /* _DXCANVAS_WINSTUFF_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */