diff options
author | Biswapriyo Nath <nathbappai@gmail.com> | 2021-08-25 12:23:25 +0530 |
---|---|---|
committer | Biswapriyo Nath <nathbappai@gmail.com> | 2021-10-14 19:22:40 +0530 |
commit | 6d8786787df74a3d010a9795b7f5b95392a8b8ef (patch) | |
tree | 337941f71aff00ce5d75578791fe4aa5e056d7a7 /src | |
parent | d2b4ac4ba8191836429f96602ee7bbc8bf72e0b5 (diff) | |
download | qtimageformats-6d8786787df74a3d010a9795b7f5b95392a8b8ef.tar.gz |
Fix invalid conversion compiler error in mng plugin
This adds MNG_DECL (i.e. stdcall) attribute to mng related functions.
Without this, the i686 MinGW gcc shows this error:
invalid conversion from 'void* (*)(mng_size_t)' {aka 'void* (*)(unsigned int)'}
to 'mng_memalloc' {aka 'void* (__attribute__((stdcall)) *)(unsigned int)'} [-fpermissive]
Change-Id: I5aac8480472f803fa347b26e7d2fa6c7796d72e3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/imageformats/mng/qmnghandler.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/imageformats/mng/qmnghandler.cpp b/src/plugins/imageformats/mng/qmnghandler.cpp index a3a731c..2d95fe8 100644 --- a/src/plugins/imageformats/mng/qmnghandler.cpp +++ b/src/plugins/imageformats/mng/qmnghandler.cpp @@ -80,7 +80,7 @@ class QMngHandlerPrivate QMngHandler *q_ptr; }; -static mng_bool myerror(mng_handle /*hMNG*/, +static mng_bool MNG_DECL myerror(mng_handle /*hMNG*/, mng_int32 iErrorcode, mng_int8 /*iSeverity*/, mng_chunkid iChunkname, @@ -99,29 +99,29 @@ static mng_bool myerror(mng_handle /*hMNG*/, return MNG_TRUE; } -static mng_ptr myalloc(mng_size_t iSize) +static mng_ptr MNG_DECL myalloc(mng_size_t iSize) { return (mng_ptr)calloc(1, iSize); } -static void myfree(mng_ptr pPtr, mng_size_t /*iSize*/) +static void MNG_DECL myfree(mng_ptr pPtr, mng_size_t /*iSize*/) { free(pPtr); } -static mng_bool myopenstream(mng_handle) +static mng_bool MNG_DECL myopenstream(mng_handle) { return MNG_TRUE; } -static mng_bool myclosestream(mng_handle hMNG) +static mng_bool MNG_DECL myclosestream(mng_handle hMNG) { QMngHandlerPrivate *pMydata = reinterpret_cast<QMngHandlerPrivate *>(mng_get_userdata(hMNG)); pMydata->haveReadAll = true; return MNG_TRUE; } -static mng_bool myreaddata(mng_handle hMNG, +static mng_bool MNG_DECL myreaddata(mng_handle hMNG, mng_ptr pBuf, mng_uint32 iSize, mng_uint32p pRead) @@ -130,7 +130,7 @@ static mng_bool myreaddata(mng_handle hMNG, return pMydata->readData(pBuf, iSize, pRead); } -static mng_bool mywritedata(mng_handle hMNG, +static mng_bool MNG_DECL mywritedata(mng_handle hMNG, mng_ptr pBuf, mng_uint32 iSize, mng_uint32p pWritten) @@ -139,7 +139,7 @@ static mng_bool mywritedata(mng_handle hMNG, return pMydata->writeData(pBuf, iSize, pWritten); } -static mng_bool myprocessheader(mng_handle hMNG, +static mng_bool MNG_DECL myprocessheader(mng_handle hMNG, mng_uint32 iWidth, mng_uint32 iHeight) { @@ -147,14 +147,14 @@ static mng_bool myprocessheader(mng_handle hMNG, return pMydata->processHeader(iWidth, iHeight); } -static mng_ptr mygetcanvasline(mng_handle hMNG, +static mng_ptr MNG_DECL mygetcanvasline(mng_handle hMNG, mng_uint32 iLinenr) { QMngHandlerPrivate *pMydata = reinterpret_cast<QMngHandlerPrivate *>(mng_get_userdata(hMNG)); return (mng_ptr)pMydata->image.scanLine(iLinenr); } -static mng_bool myrefresh(mng_handle /*hMNG*/, +static mng_bool MNG_DECL myrefresh(mng_handle /*hMNG*/, mng_uint32 /*iX*/, mng_uint32 /*iY*/, mng_uint32 /*iWidth*/, @@ -163,13 +163,13 @@ static mng_bool myrefresh(mng_handle /*hMNG*/, return MNG_TRUE; } -static mng_uint32 mygettickcount(mng_handle hMNG) +static mng_uint32 MNG_DECL mygettickcount(mng_handle hMNG) { QMngHandlerPrivate *pMydata = reinterpret_cast<QMngHandlerPrivate *>(mng_get_userdata(hMNG)); return pMydata->elapsed++; } -static mng_bool mysettimer(mng_handle hMNG, +static mng_bool MNG_DECL mysettimer(mng_handle hMNG, mng_uint32 iMsecs) { QMngHandlerPrivate *pMydata = reinterpret_cast<QMngHandlerPrivate *>(mng_get_userdata(hMNG)); @@ -178,7 +178,7 @@ static mng_bool mysettimer(mng_handle hMNG, return MNG_TRUE; } -static mng_bool myprocessterm(mng_handle hMNG, +static mng_bool MNG_DECL myprocessterm(mng_handle hMNG, mng_uint8 iTermaction, mng_uint8 /*iIteraction*/, mng_uint32 /*iDelay*/, @@ -190,7 +190,7 @@ static mng_bool myprocessterm(mng_handle hMNG, return MNG_TRUE; } -static mng_bool mytrace(mng_handle, +static mng_bool MNG_DECL mytrace(mng_handle, mng_int32 iFuncnr, mng_int32 iFuncseq, mng_pchar zFuncname) |