mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-16 13:23:59 +02:00
Code Issues Projects Releases Wiki Activity

- attempt to get non ascii file paths working in megaglest (Japanese etc...)

Browse Source
This commit is contained in:
Mark Vejvoda
2011-05-18 21:49:11 +00:00
parent 727c7b33d9
commit 60b8093f5b
34 changed files with 519 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
source/shared_lib/include/graphics/FileReader.h
View File

@@ -141,7 +141,12 @@ public:
template <typename T>
static inline T* readFromFileReaders(vector<FileReader<T> const *>* readers, const string& filepath) {
//try to assign file
#ifdef WIN32
FILE *fp = _wfopen(utf8_decode(filepath).c_str(), L"rb");
ifstream file(fp);
#else
ifstream file(filepath.c_str(), ios::in | ios::binary);
#endif
if (!file.is_open()) { //An error occured; TODO: Which one - throw an exception, print error message?
throw runtime_error("Could not open file " + filepath);
}
@@ -155,18 +160,39 @@ static inline T* readFromFileReaders(vector<FileReader<T> const *>* readers, con
continue;
}
if (ret != NULL) {
file.close();
#ifdef WIN32
fclose(fp);
#endif
return ret;
}
}
file.close();
#ifdef WIN32
fclose(fp);
#endif
return NULL;
}
template <typename T>
static inline T* readFromFileReaders(vector<FileReader<T> const *>* readers, const string& filepath, T* object) {
//try to assign file
ifstream file(filepath.c_str(), ios::in | ios::binary);
#ifdef WIN32
wstring wstr = utf8_decode(filepath);
FILE *fp = _wfopen(wstr.c_str(), L"rb");
int fileErrno = errno;
ifstream file(fp);
#else
ifstream file(friendly_path.c_str(), ios::in | ios::binary);
#endif
if (!file.is_open()) { //An error occured; TODO: Which one - throw an exception, print error message?
throw runtime_error("Could not open file [" + filepath + "]");
#ifdef WIN32
DWORD error = GetLastError();
throw runtime_error("Could not open file, result: " + intToStr(error) + " - " + intToStr(fileErrno) + " [" + filepath + "]");
#else
throw runtime_error("Could not open file [" + friendly_path + "]");
#endif
}
for (typename vector<FileReader<T> const *>::const_iterator i = readers->begin(); i != readers->end(); ++i) {
T* ret = NULL;
@@ -178,9 +204,17 @@ static inline T* readFromFileReaders(vector<FileReader<T> const *>* readers, con
continue;
}
if (ret != NULL) {
file.close();
#ifdef WIN32
fclose(fp);
#endif
return ret;
}
}
file.close();
#ifdef WIN32
fclose(fp);
#endif
return NULL;
}
@@ -292,11 +326,22 @@ bool FileReader<T>::canRead(ifstream& file) const {
*/
template <typename T>
T* FileReader<T>::read(const string& filepath) const {
#ifdef WIN32
FILE *fp = _wfopen(utf8_decode(filepath).c_str(), L"rb");
ifstream file(fp);
#else
ifstream file(filepath.c_str(), ios::in | ios::binary);
#endif
if (!file.is_open()) { //An error occured; TODO: Which one - throw an exception, print error message?
throw runtime_error("Could not open file " + filepath);
}
return read(file,filepath);
T* ret = read(file,filepath);
file.close();
#ifdef WIN32
fclose(fp);
#endif
return ret;
}
/**Reads a file
@@ -306,11 +351,22 @@ T* FileReader<T>::read(const string& filepath) const {
*/
template <typename T>
T* FileReader<T>::read(const string& filepath, T* object) const {
#ifdef WIN32
FILE *fp = _wfopen(utf8_decode(filepath).c_str(), L"rb");
ifstream file(fp);
#else
ifstream file(filepath.c_str(), ios::in | ios::binary);
#endif
if (!file.is_open()) { //An error occured; TODO: Which one - throw an exception, print error message?
throw runtime_error("Could not open file " + filepath);
}
return read(file,filepath,object);
T* ret = read(file,filepath,object);
file.close();
#ifdef WIN32
fclose(fp);
#endif
return ret;
}