piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Wrapped fopen/close/read/write functions inside a simple "IOFile" class. Reading, writing, and error checking became simpler in most cases. It should be near impossible to forget to close a file now that the destructor takes care of it. (I hope this fixes Issue 3635) I have tested the functionality of most things, but it is possible I broke something. :p

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7328 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2011-03-11 10:21:46 +00:00
parent 4f69672b2b
commit 59fd1008ca
68 changed files with 1112 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
View File

@ -105,22 +105,20 @@ void TexDecoder_OpenCL_Initialize()
filename = File::GetUserPath(D_OPENCL_IDX) + "kernel.bin";
snprintf(dolphin_rev, HEADER_SIZE, "%-31s", svn_rev_str);
FILE *input = NULL;
input = fopen(filename.c_str(), "rb");
if (input == NULL)
{
File::IOFile input(filename, "rb");
if (!input)
{
binary_size = 0;
}
else
{
binary_size = File::GetSize(input);
binary_size = input.GetSize();
header = new char[HEADER_SIZE];
binary = new char[binary_size];
fread(header, sizeof(char), HEADER_SIZE, input);
binary_size = fread(binary, sizeof(char),
binary_size - HEADER_SIZE, input);
fclose(input);
input.ReadBytes(header, HEADER_SIZE);
input.ReadBytes(binary, binary_size);
}
}
if (binary_size > 0)
@ -202,19 +200,17 @@ void TexDecoder_OpenCL_Initialize()
if (!err)
{
filename = File::GetUserPath(D_OPENCL_IDX) + "kernel.bin";
FILE *output = NULL;
output = fopen(filename.c_str(), "wb");
if (output == NULL)
File::IOFile output(filename, "wb");
if (!output)
{
binary_size = 0;
}
else
{
// Supporting one OpenCL device for now
fwrite(dolphin_rev, sizeof(char), HEADER_SIZE, output);
fwrite(binaries[0], sizeof(char), binary_sizes[0], output);
fclose(output);
output.WriteBytes(dolphin_rev, HEADER_SIZE);
output.WriteBytes(binaries[0], binary_sizes[0]);
}
}
}