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

mingw64: cast to pointer from integer of different size in extensions

Browse Source 
Change-Id: Ie2162b71e4e9de9fe24ce54815e5139774bb2ec0
This commit is contained in:
Fridrich Štrba
2013-06-10 13:10:54 +02:00
parent 3e7eb8bcad
commit 0986d0d558
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/source/plugin/win/sysplug.cxx
View File

@@ -389,8 +389,8 @@ int32_t PluginComm_Impl::NPP_Write( NPP instance, NPStream* stream, int32_t offs
m_eCall = eNPP_Write; m_eCall = eNPP_Write;
m_aArgs[0] = (void*)instance; m_aArgs[0] = (void*)instance;
m_aArgs[1] = (void*)stream; m_aArgs[1] = (void*)stream;
m_aArgs[2] = (void*)offset; m_aArgs[2] = (void*)(sal_IntPtr)offset;
m_aArgs[3] = (void*)len; m_aArgs[3] = (void*)(sal_IntPtr)len;
m_aArgs[4] = buffer; m_aArgs[4] = buffer;
return (NPError)execute(); return (NPError)execute();
} }

16
extensions/source/scanner/scanwin.cxx
View File

@@ -87,7 +87,7 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
Link aNotifyLink; Link aNotifyLink;
DSMENTRYPROC pDSM; DSMENTRYPROC pDSM;
osl::Module* pMod; osl::Module* pMod;
ULONG nCurState; ULONG_PTR nCurState;
HWND hTwainWnd; HWND hTwainWnd;
HHOOK hTwainHook; HHOOK hTwainHook;
bool mbCloseFrameOnExit; bool mbCloseFrameOnExit;
@@ -98,7 +98,7 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
void ImplOpenSource(); void ImplOpenSource();
bool ImplEnableSource(); bool ImplEnableSource();
void ImplXfer(); void ImplXfer();
void ImplFallback( ULONG nEvent ); void ImplFallback( ULONG_PTR nEvent );
void ImplSendCloseEvent(); void ImplSendCloseEvent();
void ImplDeregisterCloseListener(); void ImplDeregisterCloseListener();
void ImplRegisterCloseListener(); void ImplRegisterCloseListener();
@@ -332,7 +332,7 @@ bool ImpTwain::ImplHandleMsg( void* pMsg )
{ {
case MSG_XFERREADY: case MSG_XFERREADY:
{ {
ULONG nEvent = TWAIN_EVENT_QUIT; ULONG_PTR nEvent = TWAIN_EVENT_QUIT;
if( 5 == nCurState ) if( 5 == nCurState )
{ {
@@ -392,19 +392,19 @@ void ImpTwain::ImplXfer()
if( ( nXRes != -1 ) && ( nYRes != - 1 ) && ( nWidth != - 1 ) && ( nHeight != - 1 ) ) if( ( nXRes != -1 ) && ( nYRes != - 1 ) && ( nWidth != - 1 ) && ( nHeight != - 1 ) )
{ {
// set resolution of bitmap // set resolution of bitmap
BITMAPINFOHEADER* pBIH = (BITMAPINFOHEADER*) GlobalLock( (HGLOBAL) hDIB ); BITMAPINFOHEADER* pBIH = (BITMAPINFOHEADER*) GlobalLock( (HGLOBAL) (sal_IntPtr) hDIB );
static const double fFactor = 100.0 / 2.54; static const double fFactor = 100.0 / 2.54;
pBIH->biXPelsPerMeter = FRound( fFactor * nXRes ); pBIH->biXPelsPerMeter = FRound( fFactor * nXRes );
pBIH->biYPelsPerMeter = FRound( fFactor * nYRes ); pBIH->biYPelsPerMeter = FRound( fFactor * nYRes );
GlobalUnlock( (HGLOBAL) hDIB ); GlobalUnlock( (HGLOBAL) (sal_IntPtr) hDIB );
} }
mrMgr.SetData( (void*)(long) hDIB ); mrMgr.SetData( (void*) (sal_IntPtr) hDIB );
} }
else else
GlobalFree( (HGLOBAL) hDIB ); GlobalFree( (HGLOBAL) (sal_IntPtr) hDIB );
nCurState = 7; nCurState = 7;
} }
@@ -416,7 +416,7 @@ void ImpTwain::ImplXfer()
} }
} }
void ImpTwain::ImplFallback( ULONG nEvent ) void ImpTwain::ImplFallback( ULONG_PTR nEvent )
{ {
Application::PostUserEvent( LINK( this, ImpTwain, ImplFallbackHdl ), (void*) nEvent ); Application::PostUserEvent( LINK( this, ImpTwain, ImplFallbackHdl ), (void*) nEvent );
} }