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 --- Source/Core/VideoCommon/Src/ImageWrite.cpp | 44 ++++++++++++++---------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'Source/Core/VideoCommon/Src/ImageWrite.cpp') diff --git a/Source/Core/VideoCommon/Src/ImageWrite.cpp b/Source/Core/VideoCommon/Src/ImageWrite.cpp index 404932e054..23b0e73427 100644 --- a/Source/Core/VideoCommon/Src/ImageWrite.cpp +++ b/Source/Core/VideoCommon/Src/ImageWrite.cpp @@ -15,11 +15,11 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include #include #include #include "ImageWrite.h" +#include "FileUtil.h" #pragma pack(push, 1) @@ -47,32 +47,30 @@ struct TGA_HEADER bool SaveTGA(const char* filename, int width, int height, void* pdata) { - TGA_HEADER hdr; - FILE* f = fopen(filename, "wb"); - if (f == NULL) - return false; + TGA_HEADER hdr; + File::IOFile f(filename, "wb"); + if (!f) + return false; - _assert_(sizeof(TGA_HEADER) == 18 && sizeof(hdr) == 18); + _assert_(sizeof(TGA_HEADER) == 18 && sizeof(hdr) == 18); - memset(&hdr, 0, sizeof(hdr)); - hdr.imagetype = 2; - hdr.bits = 32; - hdr.width = width; - hdr.height = height; - hdr.descriptor |= 8|(1<<5); // 8bit alpha, flip vertical - - fwrite(&hdr, sizeof(hdr), 1, f); - fwrite(pdata, width * height * 4, 1, f); - fclose(f); - return true; + memset(&hdr, 0, sizeof(hdr)); + hdr.imagetype = 2; + hdr.bits = 32; + hdr.width = width; + hdr.height = height; + hdr.descriptor |= 8|(1<<5); // 8bit alpha, flip vertical + + f.WriteArray(&hdr, 1); + f.WriteBytes(pdata, width * height * 4); + + return true; } bool SaveData(const char* filename, const char* data) { - FILE *f = fopen(filename, "wb"); - if (!f) - return false; - fwrite(data, strlen(data), 1, f); - fclose(f); - return true; + std::ofstream f(filename, std::ios::binary); + f << data; + + return true; } -- cgit v1.2.3