summaryrefslogtreecommitdiff
path: root/DevIL/src-IL/src/il_io.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'DevIL/src-IL/src/il_io.cpp')
-rw-r--r--DevIL/src-IL/src/il_io.cpp59
1 files changed, 59 insertions, 0 deletions
diff --git a/DevIL/src-IL/src/il_io.cpp b/DevIL/src-IL/src/il_io.cpp
index cc40de5a..01f324dd 100644
--- a/DevIL/src-IL/src/il_io.cpp
+++ b/DevIL/src-IL/src/il_io.cpp
@@ -79,6 +79,8 @@ ILenum ILAPIENTRY ilTypeFromExt(ILconst_string FileName)
Type = IL_BLP;
else if (!iStrCmp(Ext, IL_TEXT("cut")))
Type = IL_CUT;
+ else if (!iStrCmp(Ext, IL_TEXT("ch")) || !iStrCmp(Ext, IL_TEXT("ct")) || !iStrCmp(Ext, IL_TEXT("sct")))
+ Type = IL_SCITEX;
else if (!iStrCmp(Ext, IL_TEXT("dcm")) || !iStrCmp(Ext, IL_TEXT("dicom")))
Type = IL_DICOM;
else if (!iStrCmp(Ext, IL_TEXT("dpx")))
@@ -214,6 +216,11 @@ ILenum ILAPIENTRY ilDetermineTypeF(ILHANDLE File)
return IL_BMP;
#endif
+ #ifndef IL_NO_BLP
+ if (ilIsValidBlpF(File))
+ return IL_BLP;
+ #endif
+
#ifndef IL_NO_EXR
if (ilIsValidExrF(File))
return IL_EXR;
@@ -299,6 +306,11 @@ ILenum ILAPIENTRY ilDetermineTypeF(ILHANDLE File)
return IL_SGI;
#endif
+ #ifndef IL_NO_SCITEX
+ if (ilIsValidScitexF(File))
+ return IL_SCITEX;
+ #endif
+
#ifndef IL_NO_SUN
if (ilIsValidSunF(File))
return IL_SUN;
@@ -360,6 +372,11 @@ ILenum ILAPIENTRY ilDetermineTypeL(const void *Lump, ILuint Size)
return IL_BMP;
#endif
+ #ifndef IL_NO_BLP
+ if (ilIsValidBlpL(Lump, Size))
+ return IL_BLP;
+ #endif
+
#ifndef IL_NO_EXR
if (ilIsValidExrL(Lump, Size))
return IL_EXR;
@@ -440,6 +457,11 @@ ILenum ILAPIENTRY ilDetermineTypeL(const void *Lump, ILuint Size)
return IL_PSP;
#endif
+ #ifndef IL_NO_SCITEX
+ if (ilIsValidScitexL(Lump, Size))
+ return IL_SCITEX;
+ #endif
+
#ifndef IL_NO_SGI
if (ilIsValidSgiL(Lump, Size))
return IL_SGI;
@@ -515,6 +537,11 @@ ILboolean ILAPIENTRY ilIsValid(ILenum Type, ILconst_string FileName)
return ilIsValidBmp(FileName);
#endif
+ #ifndef IL_NO_BLP
+ case IL_BLP:
+ return ilIsValidBlp(FileName);
+ #endif
+
#ifndef IL_NO_DICOM
case IL_DICOM:
return ilIsValidDicom(FileName);
@@ -600,6 +627,11 @@ ILboolean ILAPIENTRY ilIsValid(ILenum Type, ILconst_string FileName)
return ilIsValidPsp(FileName);
#endif
+ #ifndef IL_NO_SCITEX
+ case IL_SCITEX:
+ return ilIsValidScitex(FileName);
+ #endif
+
#ifndef IL_NO_SGI
case IL_SGI:
return ilIsValidSgi(FileName);
@@ -665,6 +697,11 @@ ILboolean ILAPIENTRY ilIsValidF(ILenum Type, ILHANDLE File)
return ilIsValidPngF(File);
#endif
+ #ifndef IL_NO_BLP
+ case IL_BLP:
+ return ilIsValidBlpF(File);
+ #endif
+
#ifndef IL_NO_BMP
case IL_BMP:
return ilIsValidBmpF(File);
@@ -755,6 +792,11 @@ ILboolean ILAPIENTRY ilIsValidF(ILenum Type, ILHANDLE File)
return ilIsValidPspF(File);
#endif
+ #ifndef IL_NO_SCITEX
+ case IL_SCITEX:
+ return ilIsValidScitexF(File);
+ #endif
+
#ifndef IL_NO_SGI
case IL_SGI:
return ilIsValidSgiF(File);
@@ -825,6 +867,11 @@ ILboolean ILAPIENTRY ilIsValidL(ILenum Type, void *Lump, ILuint Size)
return ilIsValidBmpL(Lump, Size);
#endif
+ #ifndef IL_NO_BLP
+ case IL_BLP:
+ return ilIsValidBlpL(Lump, Size);
+ #endif
+
#ifndef IL_NO_DICOM
case IL_DICOM:
return ilIsValidDicomL(Lump, Size);
@@ -910,6 +957,11 @@ ILboolean ILAPIENTRY ilIsValidL(ILenum Type, void *Lump, ILuint Size)
return ilIsValidPspL(Lump, Size);
#endif
+ #ifndef IL_NO_SCITEX
+ case IL_SCITEX:
+ return ilIsValidScitexL(Lump, Size);
+ #endif
+
#ifndef IL_NO_SGI
case IL_SGI:
return ilIsValidSgiL(Lump, Size);
@@ -1879,6 +1931,13 @@ ILboolean ILAPIENTRY ilLoadImage(ILconst_string FileName)
}
#endif
+ #ifndef IL_NO_SCITEX
+ if (!iStrCmp(Ext, IL_TEXT("ch")) || !iStrCmp(Ext, IL_TEXT("ct")) || !iStrCmp(Ext, IL_TEXT("sct"))) {
+ bRet = ilLoadScitex(FileName);
+ goto finish;
+ }
+ #endif
+
#ifndef IL_NO_DPX
if (!iStrCmp(Ext, IL_TEXT("dpx"))) {
bRet = ilLoadDpx(FileName);