Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix some type conversions warnings.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-07-07 18:10:55 -07:00
parent 88ce95470c
commit 10f1f198fb
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/FileSystems/BlockDevices.cpp
View file

@ -314,7 +314,7 @@ bool NPDRMDemoBlockDevice::ReadBlock(int blockNumber, u8 *outPtr)
readBuf = blockBuf; readBuf = blockBuf;
readSize = fread(readBuf, 1, table[block].size, f); readSize = fread(readBuf, 1, table[block].size, f);
if(readSize!=table[block].size){ if(readSize != (size_t)table[block].size){
if(block==(numBlocks-1)) if(block==(numBlocks-1))
return true; return true;
else else

8
Core/HLE/scePsmf.cpp
View file

@ -114,7 +114,7 @@ public:
void DoState(PointerWrap &p); void DoState(PointerWrap &p);
bool isValidCurrentStreamNumber() { bool isValidCurrentStreamNumber() {
return currentStreamNum >= 0 && currentStreamNum < streamMap.size(); // urgh, checking size isn't really right here. return currentStreamNum >= 0 && currentStreamNum < (int)streamMap.size(); // urgh, checking size isn't really right here.
} }
void setStreamNum(int num); void setStreamNum(int num);
@ -467,7 +467,7 @@ u32 scePsmfGetNumberOfStreams(u32 psmfStruct)
return psmf->numStreams; return psmf->numStreams;
} }
u32 scePsmfGetNumberOfSpecificStreams(u32 psmfStruct, u32 streamType) u32 scePsmfGetNumberOfSpecificStreams(u32 psmfStruct, int streamType)
{ {
Psmf *psmf = getPsmf(psmfStruct); Psmf *psmf = getPsmf(psmfStruct);
if (!psmf) { if (!psmf) {
@ -630,7 +630,7 @@ u32 scePsmfGetPsmfVersion(u32 psmfStruct)
u32 scePsmfVerifyPsmf(u32 psmfAddr) u32 scePsmfVerifyPsmf(u32 psmfAddr)
{ {
int magic = Memory::Read_U32(psmfAddr); u32 magic = Memory::Read_U32(psmfAddr);
if (magic != PSMF_MAGIC) { if (magic != PSMF_MAGIC) {
ERROR_LOG(HLE, "scePsmfVerifyPsmf(%08x): bad magic %08x", psmfAddr, magic); ERROR_LOG(HLE, "scePsmfVerifyPsmf(%08x): bad magic %08x", psmfAddr, magic);
return ERROR_PSMF_NOT_FOUND; return ERROR_PSMF_NOT_FOUND;
@ -1263,7 +1263,7 @@ const HLEFunction scePsmf[] = {
{0x0BA514E5, WrapU_UU<scePsmfGetVideoInfo>, "scePsmfGetVideoInfo"}, {0x0BA514E5, WrapU_UU<scePsmfGetVideoInfo>, "scePsmfGetVideoInfo"},
{0xA83F7113, WrapU_UU<scePsmfGetAudioInfo>, "scePsmfGetAudioInfo"}, {0xA83F7113, WrapU_UU<scePsmfGetAudioInfo>, "scePsmfGetAudioInfo"},
{0x971A3A90, WrapU_U<scePsmfCheckEPMap>, "scePsmfCheckEPmap"}, {0x971A3A90, WrapU_U<scePsmfCheckEPMap>, "scePsmfCheckEPmap"},
{0x68d42328, WrapU_UU<scePsmfGetNumberOfSpecificStreams>, "scePsmfGetNumberOfSpecificStreams"}, {0x68d42328, WrapU_UI<scePsmfGetNumberOfSpecificStreams>, "scePsmfGetNumberOfSpecificStreams"},
{0x5b70fcc1, WrapU_UU<scePsmfQueryStreamOffset>, "scePsmfQueryStreamOffset"}, {0x5b70fcc1, WrapU_UU<scePsmfQueryStreamOffset>, "scePsmfQueryStreamOffset"},
{0x9553cc91, WrapU_UU<scePsmfQueryStreamSize>, "scePsmfQueryStreamSize"}, {0x9553cc91, WrapU_UU<scePsmfQueryStreamSize>, "scePsmfQueryStreamSize"},
{0xB78EB9E9, WrapU_UU<scePsmfGetHeaderSize>, "scePsmfGetHeaderSize"}, {0xB78EB9E9, WrapU_UU<scePsmfGetHeaderSize>, "scePsmfGetHeaderSize"},