| il.h | | il.h | |
| //-------------------------------------------------------------------------
---- | | //-------------------------------------------------------------------------
---- | |
| // | | // | |
| // ImageLib Sources | | // ImageLib Sources | |
| // Copyright (C) 2000-2002 by Denton Woods | | // Copyright (C) 2000-2002 by Denton Woods | |
|
| // Last modified: 05/15/2002 <--Y2K Compliant! =] | | // Last modified: 05/28/2002 <--Y2K Compliant! =] | |
| // | | // | |
| // Filename: il/il.h | | // Filename: il/il.h | |
| // | | // | |
| // Description: The main include file for DevIL | | // Description: The main include file for DevIL | |
| // | | // | |
| //-------------------------------------------------------------------------
---- | | //-------------------------------------------------------------------------
---- | |
| | | | |
| #ifndef __il_h_ | | #ifndef __il_h_ | |
| #ifndef __IL_H__ | | #ifndef __IL_H__ | |
| | | | |
| | | | |
| skipping to change at line 33 | | skipping to change at line 33 | |
| //#define IL_NO_BMP | | //#define IL_NO_BMP | |
| //#define IL_NO_CUT | | //#define IL_NO_CUT | |
| //#define IL_NO_CHEAD | | //#define IL_NO_CHEAD | |
| //#define IL_NO_DCX | | //#define IL_NO_DCX | |
| //#define IL_NO_DDS | | //#define IL_NO_DDS | |
| //#define IL_NO_DOOM | | //#define IL_NO_DOOM | |
| //#define IL_NO_GIF | | //#define IL_NO_GIF | |
| //#define IL_NO_ICO | | //#define IL_NO_ICO | |
| //#define IL_NO_JPG | | //#define IL_NO_JPG | |
| //#define IL_NO_LIF | | //#define IL_NO_LIF | |
|
| //#define IL_NO_LBM | | | |
| //#define IL_NO_MDL | | //#define IL_NO_MDL | |
| //#define IL_NO_MNG | | //#define IL_NO_MNG | |
| //#define IL_NO_PCD | | //#define IL_NO_PCD | |
| //#define IL_NO_PCX | | //#define IL_NO_PCX | |
| //#define IL_NO_PIC | | //#define IL_NO_PIC | |
|
| | | //#define IL_NO_PIX | |
| //#define IL_NO_PNG | | //#define IL_NO_PNG | |
| //#define IL_NO_PNM | | //#define IL_NO_PNM | |
| //#define IL_NO_PSD | | //#define IL_NO_PSD | |
| //#define IL_NO_PSP | | //#define IL_NO_PSP | |
|
| | | //#define IL_NO_PXR | |
| //#define IL_NO_RAW | | //#define IL_NO_RAW | |
| //#define IL_NO_SGI | | //#define IL_NO_SGI | |
| //#define IL_NO_TGA | | //#define IL_NO_TGA | |
| //#define IL_NO_TIF | | //#define IL_NO_TIF | |
| //#define IL_NO_WAL | | //#define IL_NO_WAL | |
|
| | | //#define IL_NO_XPM | |
| | | | |
| // Compiling Options | | // Compiling Options | |
| #define IL_INLINE_ASM | | #define IL_INLINE_ASM | |
| //#define IL_DEBUG | | //#define IL_DEBUG | |
| //#define IL_STATIC_LIB | | //#define IL_STATIC_LIB | |
| //#define IL_NO_LCMS | | //#define IL_NO_LCMS | |
| #ifdef _WIN32 | | #ifdef _WIN32 | |
| #define IL_USE_JPEGLIB_UNMODIFIED | | #define IL_USE_JPEGLIB_UNMODIFIED | |
| #endif | | #endif | |
| | | | |
| | | | |
| skipping to change at line 154 | | skipping to change at line 156 | |
| #define IL_UNSIGNED_INT 0x14
05 | | #define IL_UNSIGNED_INT 0x14
05 | |
| #define IL_FLOAT 0x14
06 | | #define IL_FLOAT 0x14
06 | |
| #define IL_DOUBLE 0x14
0A | | #define IL_DOUBLE 0x14
0A | |
| | | | |
| #define IL_VENDOR 0x1F
00 | | #define IL_VENDOR 0x1F
00 | |
| | | | |
| // | | // | |
| // IL-specific #define's | | // IL-specific #define's | |
| // | | // | |
| | | | |
|
| #define IL_VERSION_1_4_2 1 | | #define IL_VERSION_1_5_0 1 | |
| #define IL_VERSION 142 | | #define IL_VERSION 150 | |
| | | | |
| // Attribute Bits | | // Attribute Bits | |
| #define IL_ORIGIN_BIT 0x00000001 | | #define IL_ORIGIN_BIT 0x00000001 | |
| #define IL_FILE_BIT 0x00
000002 | | #define IL_FILE_BIT 0x00
000002 | |
| #define IL_PAL_BIT 0x00
000004 | | #define IL_PAL_BIT 0x00
000004 | |
| #define IL_FORMAT_BIT 0x00000008 | | #define IL_FORMAT_BIT 0x00000008 | |
| #define IL_TYPE_BIT 0x00
000010 | | #define IL_TYPE_BIT 0x00
000010 | |
| #define IL_COMPRESS_BIT 0x00
000020 | | #define IL_COMPRESS_BIT 0x00
000020 | |
| #define IL_LOADFAIL_BIT 0x00
000040 | | #define IL_LOADFAIL_BIT 0x00
000040 | |
| #define IL_FORMAT_SPECIFIC_BIT 0x00000080 | | #define IL_FORMAT_SPECIFIC_BIT 0x00000080 | |
| | | | |
| skipping to change at line 208 | | skipping to change at line 210 | |
| #define IL_WAL 0x04
32 | | #define IL_WAL 0x04
32 | |
| #define IL_LIF 0x04
34 | | #define IL_LIF 0x04
34 | |
| #define IL_MNG 0x04
35 | | #define IL_MNG 0x04
35 | |
| #define IL_JNG 0x04
35 | | #define IL_JNG 0x04
35 | |
| #define IL_GIF 0x04
36 | | #define IL_GIF 0x04
36 | |
| #define IL_DDS 0x04
37 | | #define IL_DDS 0x04
37 | |
| #define IL_DCX 0x04
38 | | #define IL_DCX 0x04
38 | |
| #define IL_PSD 0x04
39 | | #define IL_PSD 0x04
39 | |
| #define IL_EXIF
0x043A | | #define IL_EXIF
0x043A | |
| #define IL_PSP 0x04
3B | | #define IL_PSP 0x04
3B | |
|
| | | #define IL_PIX 0x04 | |
| | | 3C | |
| | | #define IL_PXR 0x04 | |
| | | 3D | |
| | | #define IL_XPM 0x04 | |
| | | 3E | |
| | | | |
| #define IL_JASC_PAL 0x04
75 | | #define IL_JASC_PAL 0x04
75 | |
| | | | |
| // Error Types | | // Error Types | |
| #define IL_NO_ERROR 0x00
00 | | #define IL_NO_ERROR 0x00
00 | |
| #define IL_INVALID_ENUM 0x05
01 | | #define IL_INVALID_ENUM 0x05
01 | |
| #define IL_OUT_OF_MEMORY 0x0502 | | #define IL_OUT_OF_MEMORY 0x0502 | |
| #define IL_FORMAT_NOT_SUPPORTED 0x0503 | | #define IL_FORMAT_NOT_SUPPORTED 0x0503 | |
| #define IL_INTERNAL_ERROR 0x0504 | | #define IL_INTERNAL_ERROR 0x0504 | |
| #define IL_INVALID_VALUE 0x0505 | | #define IL_INVALID_VALUE 0x0505 | |
| | | | |
| skipping to change at line 315 | | skipping to change at line 320 | |
| #define IL_TGA_AUTHCOMMENT_STRING 0x0719 | | #define IL_TGA_AUTHCOMMENT_STRING 0x0719 | |
| #define IL_PNG_AUTHNAME_STRING 0x071A | | #define IL_PNG_AUTHNAME_STRING 0x071A | |
| #define IL_PNG_TITLE_STRING 0x071B | | #define IL_PNG_TITLE_STRING 0x071B | |
| #define IL_PNG_DESCRIPTION_STRING 0x071C | | #define IL_PNG_DESCRIPTION_STRING 0x071C | |
| #define IL_TIF_DESCRIPTION_STRING 0x071D | | #define IL_TIF_DESCRIPTION_STRING 0x071D | |
| #define IL_TIF_HOSTCOMPUTER_STRING 0x071E | | #define IL_TIF_HOSTCOMPUTER_STRING 0x071E | |
| #define IL_TIF_DOCUMENTNAME_STRING 0x071F | | #define IL_TIF_DOCUMENTNAME_STRING 0x071F | |
| #define IL_TIF_AUTHNAME_STRING 0x0720 | | #define IL_TIF_AUTHNAME_STRING 0x0720 | |
| #define IL_JPG_SAVE_FORMAT 0x0721 | | #define IL_JPG_SAVE_FORMAT 0x0721 | |
| #define IL_CHEAD_HEADER_STRING 0x0722 | | #define IL_CHEAD_HEADER_STRING 0x0722 | |
|
| | | #define IL_PCD_PICNUM 0x0723 | |
| | | | |
| // DXTC definitions | | // DXTC definitions | |
| #define IL_DXTC_FORMAT 0x0705 | | #define IL_DXTC_FORMAT 0x0705 | |
| #define IL_DXT1
0x0706 | | #define IL_DXT1
0x0706 | |
| #define IL_DXT2
0x0707 | | #define IL_DXT2
0x0707 | |
| #define IL_DXT3
0x0708 | | #define IL_DXT3
0x0708 | |
| #define IL_DXT4
0x0709 | | #define IL_DXT4
0x0709 | |
| #define IL_DXT5
0x070A | | #define IL_DXT5
0x070A | |
| #define IL_DXT_NO_COMP 0x070B | | #define IL_DXT_NO_COMP 0x070B | |
|
| | | #define IL_KEEP_DXTC_DATA 0x070C | |
| | | #define IL_DXTC_DATA_FORMAT 0x070D | |
| | | | |
| // Cube map definitions | | // Cube map definitions | |
| #define IL_CUBEMAP_POSITIVEX 0x00000400 | | #define IL_CUBEMAP_POSITIVEX 0x00000400 | |
| #define IL_CUBEMAP_NEGATIVEX 0x00000800 | | #define IL_CUBEMAP_NEGATIVEX 0x00000800 | |
| #define IL_CUBEMAP_POSITIVEY 0x00001000 | | #define IL_CUBEMAP_POSITIVEY 0x00001000 | |
| #define IL_CUBEMAP_NEGATIVEY 0x00002000 | | #define IL_CUBEMAP_NEGATIVEY 0x00002000 | |
| #define IL_CUBEMAP_POSITIVEZ 0x00004000 | | #define IL_CUBEMAP_POSITIVEZ 0x00004000 | |
| #define IL_CUBEMAP_NEGATIVEZ 0x00008000 | | #define IL_CUBEMAP_NEGATIVEZ 0x00008000 | |
| | | | |
| // Values | | // Values | |
| | | | |
| skipping to change at line 398 | | skipping to change at line 406 | |
| #else | | #else | |
| #define ILAPI __declspec(dllimport) | | #define ILAPI __declspec(dllimport) | |
| #endif | | #endif | |
| #endif | | #endif | |
| #elif __APPLE__ | | #elif __APPLE__ | |
| #define ILAPI extern | | #define ILAPI extern | |
| #else | | #else | |
| #define ILAPI | | #define ILAPI | |
| #endif | | #endif | |
| | | | |
|
| #define IL_SEEK_SET 0 | | #define IL_SEEK_SET 0 | |
| #define IL_SEEK_CUR 1 | | #define IL_SEEK_CUR 1 | |
| #define IL_SEEK_END 2 | | #define IL_SEEK_END 2 | |
| | | #define IL_EOF -1 | |
| | | | |
| // Callback functions for file reading | | // Callback functions for file reading | |
| typedef void* ILHANDLE; | | typedef void* ILHANDLE; | |
| typedef ILvoid (ILAPIENTRY *fCloseRProc)(ILHANDLE); | | typedef ILvoid (ILAPIENTRY *fCloseRProc)(ILHANDLE); | |
| typedef ILboolean (ILAPIENTRY *fEofProc) (ILHANDLE); | | typedef ILboolean (ILAPIENTRY *fEofProc) (ILHANDLE); | |
| typedef ILint (ILAPIENTRY *fGetcProc) (ILHANDLE); | | typedef ILint (ILAPIENTRY *fGetcProc) (ILHANDLE); | |
| typedef ILHANDLE (ILAPIENTRY *fOpenRProc) (const ILstring); | | typedef ILHANDLE (ILAPIENTRY *fOpenRProc) (const ILstring); | |
| typedef ILint (ILAPIENTRY *fReadProc) (void*, ILuint, ILuint, ILH
ANDLE); | | typedef ILint (ILAPIENTRY *fReadProc) (void*, ILuint, ILuint, ILH
ANDLE); | |
| typedef ILint (ILAPIENTRY *fSeekRProc) (ILHANDLE, ILint, ILint); | | typedef ILint (ILAPIENTRY *fSeekRProc) (ILHANDLE, ILint, ILint); | |
| typedef ILint (ILAPIENTRY *fTellRProc) (ILHANDLE); | | typedef ILint (ILAPIENTRY *fTellRProc) (ILHANDLE); | |
| | | | |
| skipping to change at line 425 | | skipping to change at line 434 | |
| typedef ILint (ILAPIENTRY *fPutcProc) (ILubyte, ILHANDLE); | | typedef ILint (ILAPIENTRY *fPutcProc) (ILubyte, ILHANDLE); | |
| typedef ILint (ILAPIENTRY *fSeekWProc) (ILHANDLE, ILint, ILint); | | typedef ILint (ILAPIENTRY *fSeekWProc) (ILHANDLE, ILint, ILint); | |
| typedef ILint (ILAPIENTRY *fTellWProc) (ILHANDLE); | | typedef ILint (ILAPIENTRY *fTellWProc) (ILHANDLE); | |
| typedef ILint (ILAPIENTRY *fWriteProc) (const void*, ILuint, ILuin
t, ILHANDLE); | | typedef ILint (ILAPIENTRY *fWriteProc) (const void*, ILuint, ILuin
t, ILHANDLE); | |
| | | | |
| // Callback functions for allocation and deallocation | | // Callback functions for allocation and deallocation | |
| typedef ILvoid* (ILAPIENTRY *mAlloc)(ILuint); | | typedef ILvoid* (ILAPIENTRY *mAlloc)(ILuint); | |
| typedef ILvoid (ILAPIENTRY *mFree) (ILvoid*); | | typedef ILvoid (ILAPIENTRY *mFree) (ILvoid*); | |
| | | | |
| // Registered format procedures | | // Registered format procedures | |
|
| typedef ILboolean (ILAPIENTRY *IL_LOADPROC)(const ILstring); | | typedef ILenum (ILAPIENTRY *IL_LOADPROC)(const ILstring); | |
| typedef ILboolean (ILAPIENTRY *IL_SAVEPROC)(const ILstring); | | typedef ILenum (ILAPIENTRY *IL_SAVEPROC)(const ILstring); | |
| | | | |
| // ImageLib Functions | | // ImageLib Functions | |
| ILAPI ILboolean ILAPIENTRY ilActiveImage(ILuint Number); | | ILAPI ILboolean ILAPIENTRY ilActiveImage(ILuint Number); | |
| ILAPI ILboolean ILAPIENTRY ilActiveLayer(ILuint Number); | | ILAPI ILboolean ILAPIENTRY ilActiveLayer(ILuint Number); | |
| ILAPI ILboolean ILAPIENTRY ilActiveMipmap(ILuint Number); | | ILAPI ILboolean ILAPIENTRY ilActiveMipmap(ILuint Number); | |
| ILAPI ILboolean ILAPIENTRY ilApplyPal(const ILstring FileNam
e); | | ILAPI ILboolean ILAPIENTRY ilApplyPal(const ILstring FileNam
e); | |
| ILAPI ILboolean ILAPIENTRY ilApplyProfile(const ILstring InP
rofile, const ILstring OutProfile); | | ILAPI ILboolean ILAPIENTRY ilApplyProfile(const ILstring InP
rofile, const ILstring OutProfile); | |
| ILAPI ILvoid ILAPIENTRY ilBindImage(ILuint Image); | | ILAPI ILvoid ILAPIENTRY ilBindImage(ILuint Image); | |
| ILAPI ILboolean ILAPIENTRY ilBlit(ILuint Src, ILint DestX, I
Lint DestY, ILint DestZ, ILuint SrcX, ILuint SrcY, ILuint SrcZ, ILuint Widt
h, ILuint Height, ILuint Depth); | | ILAPI ILboolean ILAPIENTRY ilBlit(ILuint Src, ILint DestX, I
Lint DestY, ILint DestZ, ILuint SrcX, ILuint SrcY, ILuint SrcZ, ILuint Widt
h, ILuint Height, ILuint Depth); | |
| ILAPI ILvoid ILAPIENTRY ilClearColour(ILclampf Red, ILclampf Gree
n, ILclampf Blue, ILclampf Alpha); | | ILAPI ILvoid ILAPIENTRY ilClearColour(ILclampf Red, ILclampf Gree
n, ILclampf Blue, ILclampf Alpha); | |
| | | | |
| skipping to change at line 455 | | skipping to change at line 464 | |
| ILAPI ILboolean ILAPIENTRY ilDefaultImage(ILvoid); | | ILAPI ILboolean ILAPIENTRY ilDefaultImage(ILvoid); | |
| ILAPI ILvoid ILAPIENTRY ilDeleteImages(ILsizei Num, const ILuint
*Images); | | ILAPI ILvoid ILAPIENTRY ilDeleteImages(ILsizei Num, const ILuint
*Images); | |
| ILAPI ILboolean ILAPIENTRY ilDisable(ILenum Mode); | | ILAPI ILboolean ILAPIENTRY ilDisable(ILenum Mode); | |
| ILAPI ILboolean ILAPIENTRY ilEnable(ILenum Mode); | | ILAPI ILboolean ILAPIENTRY ilEnable(ILenum Mode); | |
| ILAPI ILboolean ILAPIENTRY ilFormatFunc(ILenum Mode); | | ILAPI ILboolean ILAPIENTRY ilFormatFunc(ILenum Mode); | |
| ILAPI ILvoid ILAPIENTRY ilGenImages(ILsizei Num, ILuint *Images); | | ILAPI ILvoid ILAPIENTRY ilGenImages(ILsizei Num, ILuint *Images); | |
| ILAPI ILubyte* ILAPIENTRY ilGetAlpha(ILenum Type); | | ILAPI ILubyte* ILAPIENTRY ilGetAlpha(ILenum Type); | |
| ILAPI ILboolean ILAPIENTRY ilGetBoolean(ILenum Mode); | | ILAPI ILboolean ILAPIENTRY ilGetBoolean(ILenum Mode); | |
| ILAPI ILvoid ILAPIENTRY ilGetBooleanv(ILenum Mode, ILboolean *Par
am); | | ILAPI ILvoid ILAPIENTRY ilGetBooleanv(ILenum Mode, ILboolean *Par
am); | |
| ILAPI ILubyte* ILAPIENTRY ilGetData(ILvoid); | | ILAPI ILubyte* ILAPIENTRY ilGetData(ILvoid); | |
|
| | | ILAPI ILuint ILAPIENTRY ilGetDXTCData(ILvoid *Buffer, ILuint Buff
erSize, ILenum DXTCFormat); | |
| ILAPI ILenum ILAPIENTRY ilGetError(ILvoid); | | ILAPI ILenum ILAPIENTRY ilGetError(ILvoid); | |
| ILAPI ILint ILAPIENTRY ilGetInteger(ILenum Mode); | | ILAPI ILint ILAPIENTRY ilGetInteger(ILenum Mode); | |
| ILAPI ILvoid ILAPIENTRY ilGetIntegerv(ILenum Mode, ILint *Param); | | ILAPI ILvoid ILAPIENTRY ilGetIntegerv(ILenum Mode, ILint *Param); | |
| ILAPI ILuint ILAPIENTRY ilGetLumpPos(ILvoid); | | ILAPI ILuint ILAPIENTRY ilGetLumpPos(ILvoid); | |
| ILAPI ILubyte* ILAPIENTRY ilGetPalette(ILvoid); | | ILAPI ILubyte* ILAPIENTRY ilGetPalette(ILvoid); | |
| ILAPI const char* ILAPIENTRY ilGetString(ILenum StringName); | | ILAPI const char* ILAPIENTRY ilGetString(ILenum StringName); | |
| ILAPI ILvoid ILAPIENTRY ilHint(ILenum Target, ILenum Mode); | | ILAPI ILvoid ILAPIENTRY ilHint(ILenum Target, ILenum Mode); | |
| ILAPI ILvoid ILAPIENTRY ilInit(ILvoid); | | ILAPI ILvoid ILAPIENTRY ilInit(ILvoid); | |
| ILAPI ILboolean ILAPIENTRY ilIsDisabled(ILenum Mode); | | ILAPI ILboolean ILAPIENTRY ilIsDisabled(ILenum Mode); | |
| ILAPI ILboolean ILAPIENTRY ilIsEnabled(ILenum Mode); | | ILAPI ILboolean ILAPIENTRY ilIsEnabled(ILenum Mode); | |
| | | | |
End of changes. 12 change blocks. |
| 9 lines changed or deleted | | 22 lines changed or added | |
|
| ilut.h | | ilut.h | |
| //-------------------------------------------------------------------------
---- | | //-------------------------------------------------------------------------
---- | |
| // | | // | |
| // ImageLib Utility Toolkit Sources | | // ImageLib Utility Toolkit Sources | |
| // Copyright (C) 2000-2002 by Denton Woods | | // Copyright (C) 2000-2002 by Denton Woods | |
|
| // Last modified: 05/15/2002 <--Y2K Compliant! =] | | // Last modified: 05/28/2002 <--Y2K Compliant! =] | |
| // | | // | |
| // Filename: il/ilut.h | | // Filename: il/ilut.h | |
| // | | // | |
| // Description: The main include file for ILUT | | // Description: The main include file for ILUT | |
| // | | // | |
| //-------------------------------------------------------------------------
---- | | //-------------------------------------------------------------------------
---- | |
| | | | |
| #ifndef __ilut_h_ | | #ifndef __ilut_h_ | |
| #ifndef __ILUT_H__ | | #ifndef __ILUT_H__ | |
| | | | |
| | | | |
| skipping to change at line 27 | | skipping to change at line 27 | |
| #define __ILUT_H__ | | #define __ILUT_H__ | |
| | | | |
| #include <IL/il.h> | | #include <IL/il.h> | |
| #include <IL/ilu.h> | | #include <IL/ilu.h> | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
| #ifdef _WIN32 | | #ifdef _WIN32 | |
|
| #ifdef _MSC_VER | | #ifndef IL_STATIC_LIB | |
| #ifndef _ILUT_BUILD_LIBRARY | | #ifdef _MSC_VER | |
| #ifdef IL_DEBUG | | #ifndef _ILUT_BUILD_LIBRARY | |
| #pragma comment(lib, "ilut-d.lib") | | #ifdef IL_DEBUG | |
| #else | | #pragma comment(lib, "ilut-d.lib") | |
| #pragma comment(lib, "ilut.lib") | | #else | |
| #endif//_DEBUG | | #pragma comment(lib, "ilut.lib") | |
| #endif//_ILUT_BUILD_LIBRARY | | #endif//_DEBUG | |
| #endif//_MSC_VER | | #endif//_ILUT_BUILD_LIBRARY | |
| | | #endif//_MSC_VER | |
| | | #endif//IL_STATIC_LIB | |
| #endif//_WIN32 | | #endif//_WIN32 | |
| | | | |
|
| #define ILUT_VERSION_1_4_2 1 | | #define ILUT_VERSION_1_5_0 1 | |
| #define ILUT_VERSION 142 | | #define ILUT_VERSION 150 | |
| | | | |
| // Attribute Bits | | // Attribute Bits | |
| #define ILUT_OPENGL_BIT 0x00
000001 | | #define ILUT_OPENGL_BIT 0x00
000001 | |
| #define ILUT_D3D_BIT 0x00000002 | | #define ILUT_D3D_BIT 0x00000002 | |
| #define ILUT_ALL_ATTRIB_BITS 0x000FFFFF | | #define ILUT_ALL_ATTRIB_BITS 0x000FFFFF | |
| | | | |
| // Error Types | | // Error Types | |
| #define ILUT_INVALID_ENUM 0x0501 | | #define ILUT_INVALID_ENUM 0x0501 | |
| #define ILUT_OUT_OF_MEMORY 0x0502 | | #define ILUT_OUT_OF_MEMORY 0x0502 | |
| #define ILUT_INVALID_VALUE 0x0505 | | #define ILUT_INVALID_VALUE 0x0505 | |
| #define ILUT_ILLEGAL_OPERATION 0x0506 | | #define ILUT_ILLEGAL_OPERATION 0x0506 | |
| #define ILUT_INVALID_PARAM 0x0509 | | #define ILUT_INVALID_PARAM 0x0509 | |
| #define ILUT_COULD_NOT_OPEN_FILE 0x050A | | #define ILUT_COULD_NOT_OPEN_FILE 0x050A | |
| #define ILUT_STACK_OVERFLOW 0x050E | | #define ILUT_STACK_OVERFLOW 0x050E | |
| #define ILUT_STACK_UNDERFLOW 0x050F | | #define ILUT_STACK_UNDERFLOW 0x050F | |
|
| | | #define ILUT_BAD_DIMENSIONS 0x0511 | |
| #define ILUT_NOT_SUPPORTED 0x0550 | | #define ILUT_NOT_SUPPORTED 0x0550 | |
| | | | |
| // State Definitions | | // State Definitions | |
| #define ILUT_PALETTE_MODE 0x0600 | | #define ILUT_PALETTE_MODE 0x0600 | |
| #define ILUT_OPENGL_CONV 0x0610 | | #define ILUT_OPENGL_CONV 0x0610 | |
| #define ILUT_D3D_MIPLEVELS 0x0620 | | #define ILUT_D3D_MIPLEVELS 0x0620 | |
| #define ILUT_MAXTEX_WIDTH 0x0630 | | #define ILUT_MAXTEX_WIDTH 0x0630 | |
| #define ILUT_MAXTEX_HEIGHT 0x0631 | | #define ILUT_MAXTEX_HEIGHT 0x0631 | |
| #define ILUT_MAXTEX_DEPTH 0x0632 | | #define ILUT_MAXTEX_DEPTH 0x0632 | |
|
| | | #define ILUT_GL_USE_S3TC 0x0634 | |
| | | #define ILUT_D3D_USE_DXTC 0x0634 | |
| | | #define ILUT_GL_GEN_S3TC 0x0635 | |
| | | #define ILUT_D3D_GEN_DXTC 0x0635 | |
| | | #define ILUT_S3TC_FORMAT 0x0705 | |
| | | #define ILUT_DXTC_FORMAT 0x0705 | |
| | | | |
| // Values | | // Values | |
| #define ILUT_VERSION_NUM 0x0DE2 | | #define ILUT_VERSION_NUM 0x0DE2 | |
| | | | |
| // ImageLib Utility Toolkit Functions | | // ImageLib Utility Toolkit Functions | |
| ILAPI ILboolean ILAPIENTRY ilutDisable(ILenum Mode); | | ILAPI ILboolean ILAPIENTRY ilutDisable(ILenum Mode); | |
| ILAPI ILboolean ILAPIENTRY ilutEnable(ILenum Mode); | | ILAPI ILboolean ILAPIENTRY ilutEnable(ILenum Mode); | |
| ILAPI ILboolean ILAPIENTRY ilutGetBoolean(ILenum Mode); | | ILAPI ILboolean ILAPIENTRY ilutGetBoolean(ILenum Mode); | |
| ILAPI ILvoid ILAPIENTRY ilutGetBooleanv(ILenum Mode, ILboolean *P
aram); | | ILAPI ILvoid ILAPIENTRY ilutGetBooleanv(ILenum Mode, ILboolean *P
aram); | |
| ILAPI ILint ILAPIENTRY ilutGetInteger(ILenum Mode); | | ILAPI ILint ILAPIENTRY ilutGetInteger(ILenum Mode); | |
| | | | |
| skipping to change at line 87 | | skipping to change at line 96 | |
| ILAPI ILboolean ILAPIENTRY ilutIsDisabled(ILenum Mode); | | ILAPI ILboolean ILAPIENTRY ilutIsDisabled(ILenum Mode); | |
| ILAPI ILboolean ILAPIENTRY ilutIsEnabled(ILenum Mode); | | ILAPI ILboolean ILAPIENTRY ilutIsEnabled(ILenum Mode); | |
| ILAPI ILvoid ILAPIENTRY ilutPopAttrib(ILvoid); | | ILAPI ILvoid ILAPIENTRY ilutPopAttrib(ILvoid); | |
| ILAPI ILvoid ILAPIENTRY ilutPushAttrib(ILuint Bits); | | ILAPI ILvoid ILAPIENTRY ilutPushAttrib(ILuint Bits); | |
| ILAPI ILvoid ILAPIENTRY ilutSetInteger(ILenum Mode, ILint Param); | | ILAPI ILvoid ILAPIENTRY ilutSetInteger(ILenum Mode, ILint Param); | |
| | | | |
| // The different rendering api's...more to be added later? | | // The different rendering api's...more to be added later? | |
| #define ILUT_OPENGL 0 | | #define ILUT_OPENGL 0 | |
| #define ILUT_ALLEGRO 1 | | #define ILUT_ALLEGRO 1 | |
| #define ILUT_WIN32 2 | | #define ILUT_WIN32 2 | |
|
| | | #define ILUT_DIRECT3D8 3 | |
| | | | |
| ILAPI ILboolean ILAPIENTRY ilutRenderer(ILenum Renderer); | | ILAPI ILboolean ILAPIENTRY ilutRenderer(ILenum Renderer); | |
| | | | |
| // Includes specific config | | // Includes specific config | |
| #ifdef DJGPP | | #ifdef DJGPP | |
| #define ILUT_USE_ALLEGRO | | #define ILUT_USE_ALLEGRO | |
| #elif _WIN32_WCE | | #elif _WIN32_WCE | |
| #define ILUT_USE_WIN32 | | #define ILUT_USE_WIN32 | |
| #elif _WIN32 | | #elif _WIN32 | |
| //#ifdef __GNUC__ //__CYGWIN32__ (Cygwin seems to not define this wi
th DevIL builds) | | //#ifdef __GNUC__ //__CYGWIN32__ (Cygwin seems to not define this wi
th DevIL builds) | |
| | | | |
| skipping to change at line 176 | | skipping to change at line 186 | |
| #ifdef ILUT_USE_BEOS | | #ifdef ILUT_USE_BEOS | |
| ILAPI BBitmap ILAPIENTRY ilutConvertToBBitmap(ILvoid); | | ILAPI BBitmap ILAPIENTRY ilutConvertToBBitmap(ILvoid); | |
| #endif//ILUT_USE_BEOS | | #endif//ILUT_USE_BEOS | |
| | | | |
| // ImageLib Utility Toolkit's Win32 GDI Functions | | // ImageLib Utility Toolkit's Win32 GDI Functions | |
| #ifdef ILUT_USE_WIN32 | | #ifdef ILUT_USE_WIN32 | |
| #ifdef _WIN32 | | #ifdef _WIN32 | |
| #define WIN32_LEAN_AND_MEAN | | #define WIN32_LEAN_AND_MEAN | |
| #include <windows.h> | | #include <windows.h> | |
| ILAPI HBITMAP ILAPIENTRY ilutConvertToHBitmap(HDC hDC); | | ILAPI HBITMAP ILAPIENTRY ilutConvertToHBitmap(HDC hDC); | |
|
| | | ILAPI ILvoid ILAPIENTRY ilutFreePaddedData(ILubyte *Data)
; | |
| ILAPI ILvoid ILAPIENTRY ilutGetBmpInfo(BITMAPINFO *Info); | | ILAPI ILvoid ILAPIENTRY ilutGetBmpInfo(BITMAPINFO *Info); | |
| ILAPI HPALETTE ILAPIENTRY ilutGetHPal(ILvoid); | | ILAPI HPALETTE ILAPIENTRY ilutGetHPal(ILvoid); | |
| ILAPI ILubyte* ILAPIENTRY ilutGetPaddedData(ILvoid); | | ILAPI ILubyte* ILAPIENTRY ilutGetPaddedData(ILvoid); | |
| ILAPI ILboolean ILAPIENTRY ilutGetWinClipboard(ILvoid); | | ILAPI ILboolean ILAPIENTRY ilutGetWinClipboard(ILvoid); | |
| ILAPI ILboolean ILAPIENTRY ilutLoadResource(HINSTANCE hInst,
ILint ID, const ILstring ResourceType, ILenum Type); | | ILAPI ILboolean ILAPIENTRY ilutLoadResource(HINSTANCE hInst,
ILint ID, const ILstring ResourceType, ILenum Type); | |
| ILAPI ILboolean ILAPIENTRY ilutSetHBitmap(HBITMAP Bitmap); | | ILAPI ILboolean ILAPIENTRY ilutSetHBitmap(HBITMAP Bitmap); | |
| ILAPI ILboolean ILAPIENTRY ilutSetHPal(HPALETTE Pal); | | ILAPI ILboolean ILAPIENTRY ilutSetHPal(HPALETTE Pal); | |
| ILAPI ILboolean ILAPIENTRY ilutSetWinClipboard(ILvoid); | | ILAPI ILboolean ILAPIENTRY ilutSetWinClipboard(ILvoid); | |
| ILAPI HBITMAP ILAPIENTRY ilutWinLoadImage(const ILstring F
ileName, HDC hDC); | | ILAPI HBITMAP ILAPIENTRY ilutWinLoadImage(const ILstring F
ileName, HDC hDC); | |
| ILAPI ILboolean ILAPIENTRY ilutWinLoadUrl(const ILstring Url
); | | ILAPI ILboolean ILAPIENTRY ilutWinLoadUrl(const ILstring Url
); | |
| | | | |
End of changes. 7 change blocks. |
| 12 lines changed or deleted | | 23 lines changed or added | |
|