diff options
| author | Denton Woods <denton.woods@gmail.com> | 2017-01-21 16:54:19 -0600 |
|---|---|---|
| committer | Denton Woods <denton.woods@gmail.com> | 2017-01-21 16:54:19 -0600 |
| commit | 625d54d8f44d16b243f26886d0b9c95cf24c9971 (patch) | |
| tree | 8f0197b535aa46ff04b69a23f1ebd1d88c2fea02 /DevIL/src-IL/src/il_io.cpp | |
| parent | 4a2d7822f12c82e6c32b9b51d52c4bdc13ca9375 (diff) | |
| download | devil-625d54d8f44d16b243f26886d0b9c95cf24c9971.tar.gz | |
- Added support for reading .pam files
- Starting support for DXT10 .dds files
Diffstat (limited to 'DevIL/src-IL/src/il_io.cpp')
| -rw-r--r-- | DevIL/src-IL/src/il_io.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/DevIL/src-IL/src/il_io.cpp b/DevIL/src-IL/src/il_io.cpp index e5af3cac..cc40de5a 100644 --- a/DevIL/src-IL/src/il_io.cpp +++ b/DevIL/src-IL/src/il_io.cpp @@ -125,7 +125,7 @@ ILenum ILAPIENTRY ilTypeFromExt(ILconst_string FileName) else if (!iStrCmp(Ext, IL_TEXT("pix"))) Type = IL_PIX; else if (!iStrCmp(Ext, IL_TEXT("pbm")) || !iStrCmp(Ext, IL_TEXT("pgm")) || - !iStrCmp(Ext, IL_TEXT("pnm")) || !iStrCmp(Ext, IL_TEXT("ppm"))) + !iStrCmp(Ext, IL_TEXT("pnm")) || !iStrCmp(Ext, IL_TEXT("ppm")) || !iStrCmp(Ext, IL_TEXT("pam"))) Type = IL_PNM; else if (!iStrCmp(Ext, IL_TEXT("psd")) || !iStrCmp(Ext, IL_TEXT("pdd"))) Type = IL_PSD; @@ -2058,6 +2058,10 @@ ILboolean ILAPIENTRY ilLoadImage(ILconst_string FileName) bRet = ilLoadPnm(FileName); goto finish; } + if (!iStrCmp(Ext, IL_TEXT("pam"))) { + bRet = ilLoadPnm(FileName); + goto finish; + } #endif #ifndef IL_NO_PSD |