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

- some cleanup related to image loaders (valgrind complaints)

Browse Source
This commit is contained in:
Mark Vejvoda
2010-09-14 15:59:04 +00:00
parent e7efda5080
commit 689b810d46
5 changed files with 55 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/shared_lib/sources/graphics/BMPReader.cpp
View File

@@ -52,8 +52,15 @@ struct BitmapInfoHeader{
#pragma pack(pop)
/**Returns a string containing the extensions we want, intitialisation is guaranteed*/
static inline const string* getExtensionsBmp() {
static const string extensions[] = {"bmp", ""};
//static inline const string* getExtensionsBmp() {
static inline std::vector<string> getExtensionsBmp() {
//static const string extensions[] = {"bmp", ""};
static std::vector<string> extensions;
if(extensions.size() == 0) {
extensions.push_back("bmp");
}
return extensions;
}

11
source/shared_lib/sources/graphics/JPGReader.cpp
View File

@@ -56,8 +56,15 @@ static void term_source (j_decompress_ptr cinfo) {
/**Return an array containing the used extensions,
* initialized*/
static inline const string* getExtensions() {
static const string extensions[] = {"jpg", "jpeg", ""};
//static inline const string* getExtensions() {
//static const string extensions[] = {"jpg", "jpeg", ""};
static inline std::vector<string> getExtensions() {
static std::vector<string> extensions;
if(extensions.size() == 0) {
extensions.push_back("jpg");
extensions.push_back("jpeg");
}
return extensions;
}

9
source/shared_lib/sources/graphics/PNGReader.cpp
View File

@@ -44,8 +44,13 @@ static void user_write_data(png_structp png_ptr, png_bytep data, png_size_t leng
static void user_flush_data(png_structp png_ptr) {}
/**Get Extension array, initialised*/
static inline const string* getExtensionsPng() {
static const string extensions[] = {"png", ""};
//static inline const string* getExtensionsPng() {
static inline std::vector<string> getExtensionsPng() {
//static const string extensions[] = {"png", ""};
static std::vector<string> extensions;
if(extensions.size() == 0) {
extensions.push_back("png");
}
return extensions;
}

10
source/shared_lib/sources/graphics/TGAReader.cpp
View File

@@ -52,8 +52,14 @@ static const int tgaUncompressedBw= 3;
// =====================================================
/**Get Extension array, initialised*/
static inline const string* getExtensionStrings() {
static const string extensions[] = {"tga", ""};
//static inline const string* getExtensionStrings() {
static inline std::vector<string> getExtensionStrings() {
//static const string extensions[] = {"tga", ""};
static std::vector<string> extensions;
if(extensions.size() == 0) {
extensions.push_back("tga");
}
return extensions;
}