diff options
| author | Marcus Wanners <marcus@wanners.net> | 2009-03-05 15:58:14 +0000 |
|---|---|---|
| committer | Marcus Wanners <marcus@wanners.net> | 2009-03-05 15:58:14 +0000 |
| commit | c0cf64177976ea562a5ea113dd61d72bfd0261c9 (patch) | |
| tree | c2df3688239165bf97073934245b7680bfbd604f /Source/Core | |
| parent | 67af94c339c8fcb3d454c0b42b36e3ce8104f923 (diff) | |
Linux compile fix.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2559 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/Boot/Boot_DOL.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/FileHandlerARC.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/NANDContentLoader.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/Core/Src/Boot/Boot_DOL.cpp b/Source/Core/Core/Src/Boot/Boot_DOL.cpp index 039001c3ea..1010669425 100644 --- a/Source/Core/Core/Src/Boot/Boot_DOL.cpp +++ b/Source/Core/Core/Src/Boot/Boot_DOL.cpp @@ -34,7 +34,7 @@ CDolLoader::CDolLoader(const char* _szFilename) u8* tmpBuffer = new u8[(size_t)size]; FILE* pStream = fopen(_szFilename, "rb"); - fread(tmpBuffer, size_t(size), 1, pStream); + fread(tmpBuffer, (size_t)size, 1, pStream); fclose(pStream); m_bInit = Initialize(tmpBuffer, (u32)size); diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.cpp b/Source/Core/DiscIO/Src/FileHandlerARC.cpp index 7c10f375f9..cc464050c7 100644 --- a/Source/Core/DiscIO/Src/FileHandlerARC.cpp +++ b/Source/Core/DiscIO/Src/FileHandlerARC.cpp @@ -35,7 +35,7 @@ CARCFile::CARCFile(const std::string& _rFilename) if (pReader != NULL) { u64 FileSize = pReader->GetDataSize(); - m_pBuffer = new u8[unsigned int(FileSize)]; + m_pBuffer = new u8[(u32)FileSize]; pReader->Read(0, FileSize, m_pBuffer); delete pReader; diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index 44045f5d6e..ff56b2c6ae 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -106,8 +106,8 @@ bool CNANDContentLoader::CreateFromDirectory(const std::string& _rPath) return false;
}
u64 Size = File::GetSize(TMDFileName.c_str());
- u8* pTMD = new u8[unsigned int(Size)];
- fread(pTMD, size_t(Size), 1, pTMDFile);
+ u8* pTMD = new u8[(u32)Size];
+ fread(pTMD, (size_t)Size, 1, pTMDFile);
fclose(pTMDFile);
//////
@@ -135,11 +135,11 @@ bool CNANDContentLoader::CreateFromDirectory(const std::string& _rPath) if (pFile != NULL)
{
u64 Size = File::GetSize(szFilename);
- rContent.m_pData = new u8[unsigned int(Size)];
+ rContent.m_pData = new u8[(u32)Size];
_dbg_assert_msg_(BOOT, rContent.m_Size==Size, "TMDLoader: Filesize doesnt fit (%s %i)", szFilename, i);
- fread(rContent.m_pData, size_t(Size), 1, pFile);
+ fread(rContent.m_pData, (size_t)Size, 1, pFile);
fclose(pFile);
} else {
ERROR_LOG(DISCIO, "CreateFromDirectory: error opening %s",
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 28fc58ac0a..d57b4fabb5 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -581,7 +581,7 @@ static void WriteStage(char *&p, int n, u32 texture_mask) int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1); int texfun = xfregs.texcoords[texcoord].texmtxinfo.projection; - bool bHasTexCoord = unsigned int(texcoord) < bpmem.genMode.numtexgens; + bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens; bool bHasIndStage = bpmem.tevind[n].IsActive() && bpmem.tevind[n].bt < bpmem.genMode.numindstages; // HACK to handle cases where the tex gen is not enabled |