From 59fd1008ca9cf4e9f75fdd6ee8ec53a2c7d7a13b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 11 Mar 2011 10:21:46 +0000 Subject: 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 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7328 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp | 26 +++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp') diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp index be98e939ab..72643c617f 100644 --- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp @@ -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]); } } } -- cgit v1.2.3