il.h | il.h | |||
---|---|---|---|---|
skipping to change at line 506 | skipping to change at line 506 | |||
ILAPI ILvoid ILAPIENTRY ilSetWrite(fOpenWProc, fCloseWProc, fPutc Proc, fSeekWProc, fTellWProc, fWriteProc); | ILAPI ILvoid ILAPIENTRY ilSetWrite(fOpenWProc, fCloseWProc, fPutc Proc, fSeekWProc, fTellWProc, fWriteProc); | |||
ILAPI ILvoid ILAPIENTRY ilShutDown(ILvoid); | ILAPI ILvoid ILAPIENTRY ilShutDown(ILvoid); | |||
ILAPI ILboolean ILAPIENTRY ilTexImage(ILuint Width, ILuint H eight, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, ILvoid *Data) ; | ILAPI ILboolean ILAPIENTRY ilTexImage(ILuint Width, ILuint H eight, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, ILvoid *Data) ; | |||
ILAPI ILboolean ILAPIENTRY ilTypeFunc(ILenum Mode); | ILAPI ILboolean ILAPIENTRY ilTypeFunc(ILenum Mode); | |||
ILAPI ILboolean ILAPIENTRY ilLoadData(const ILstring FileNam e, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp); | ILAPI ILboolean ILAPIENTRY ilLoadData(const ILstring FileNam e, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp); | |||
ILAPI ILboolean ILAPIENTRY ilLoadDataF(ILHANDLE File, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp); | ILAPI ILboolean ILAPIENTRY ilLoadDataF(ILHANDLE File, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp); | |||
ILAPI ILboolean ILAPIENTRY ilLoadDataL(ILvoid *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp); | ILAPI ILboolean ILAPIENTRY ilLoadDataL(ILvoid *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp); | |||
ILAPI ILboolean ILAPIENTRY ilSaveData(const ILstring FileNam e); | ILAPI ILboolean ILAPIENTRY ilSaveData(const ILstring FileNam e); | |||
#if !defined(IL_NO_JPG) && !defined(IL_USE_IJL) | ILAPI ILboolean ILAPIENTRY ilLoadFromJpegStruct(ILvoid* JpegDecompre | |||
#ifdef _MSC_VER | ssorPtr); | |||
#pragma pack(push, erroneous_warnings, 1) | ILAPI ILboolean ILAPIENTRY ilSaveFromJpegStruct(ILvoid* JpegCompress | |||
// remove 'FAR' : macro redefinition warning | orPtr); | |||
#pragma warning(disable : 4005) | ||||
// remove benign redefinition of type warning | ||||
#pragma warning(disable : 4142) | ||||
#endif | ||||
#include <jpeglib.h> | ||||
ILAPI ILboolean ILAPIENTRY ilLoadFromJpegStruct(struct jpeg_decompre | ||||
ss_struct* JpegDecompressorPtr); | ||||
ILAPI ILboolean ILAPIENTRY ilSaveFromJpegStruct(struct jpeg_compress | ||||
_struct* JpegCompressorPtr); | ||||
#ifdef _MSC_VER | ||||
#pragma pack(pop, erroneous_warnings) | ||||
#endif | ||||
#endif | ||||
// For all those weirdos that spell "colour" without the 'u'. | // For all those weirdos that spell "colour" without the 'u'. | |||
#define ilClearColor ilClearColour | #define ilClearColor ilClearColour | |||
#define ilKeyColor ilKeyColour | #define ilKeyColor ilKeyColour | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
} | } | |||
#endif | #endif | |||
#endif // __IL_H__ | #endif // __IL_H__ | |||
End of changes. 1 change blocks. | ||||
19 lines changed or deleted | 4 lines changed or added | |||
ilu.h | ilu.h | |||
---|---|---|---|---|
skipping to change at line 151 | skipping to change at line 151 | |||
ILAPI ILboolean ILAPIENTRY iluRotate(ILfloat Angle); | ILAPI ILboolean ILAPIENTRY iluRotate(ILfloat Angle); | |||
ILAPI ILboolean ILAPIENTRY iluRotate3D(ILfloat x, ILfloat y, ILfloat z, ILfloat Angle); | ILAPI ILboolean ILAPIENTRY iluRotate3D(ILfloat x, ILfloat y, ILfloat z, ILfloat Angle); | |||
ILAPI ILboolean ILAPIENTRY iluSaturate1f(ILfloat Saturation) ; | ILAPI ILboolean ILAPIENTRY iluSaturate1f(ILfloat Saturation) ; | |||
ILAPI ILboolean ILAPIENTRY iluSaturate4f(ILfloat r, ILfloat g, ILfloat b, ILfloat Saturation); | ILAPI ILboolean ILAPIENTRY iluSaturate4f(ILfloat r, ILfloat g, ILfloat b, ILfloat Saturation); | |||
ILAPI ILboolean ILAPIENTRY iluScale(ILuint Width, ILuint Hei ght, ILuint Depth); | ILAPI ILboolean ILAPIENTRY iluScale(ILuint Width, ILuint Hei ght, ILuint Depth); | |||
ILAPI ILboolean ILAPIENTRY iluScaleColours(ILfloat r, ILfloa t g, ILfloat b); | ILAPI ILboolean ILAPIENTRY iluScaleColours(ILfloat r, ILfloa t g, ILfloat b); | |||
ILAPI ILboolean ILAPIENTRY iluSharpen(ILfloat Factor, ILuint Iter); | ILAPI ILboolean ILAPIENTRY iluSharpen(ILfloat Factor, ILuint Iter); | |||
ILAPI ILboolean ILAPIENTRY iluSwapColours(ILvoid); | ILAPI ILboolean ILAPIENTRY iluSwapColours(ILvoid); | |||
ILAPI ILboolean ILAPIENTRY iluWave(ILfloat Angle); | ILAPI ILboolean ILAPIENTRY iluWave(ILfloat Angle); | |||
ILAPI ILuint ILAPIENTRY iluScaleTest(ILuint Width, ILuint Height, ILubyte F | ||||
ilter); | ||||
#define iluColorsUsed iluColoursUsed | #define iluColorsUsed iluColoursUsed | |||
#define iluSwapColors iluSwapColours | #define iluSwapColors iluSwapColours | |||
#define iluReplaceColor iluReplaceColour | #define iluReplaceColor iluReplaceColour | |||
#define iluScaleColor iluScaleColour | #define iluScaleColor iluScaleColour | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
} | } | |||
#endif | #endif | |||
#endif // __ILU_H__ | #endif // __ILU_H__ | |||
End of changes. 1 change blocks. | ||||
3 lines changed or deleted | 0 lines changed or added | |||
ilut.h | ilut.h | |||
---|---|---|---|---|
skipping to change at line 44 | skipping to change at line 44 | |||
#endif//_ILUT_BUILD_LIBRARY | #endif//_ILUT_BUILD_LIBRARY | |||
#endif//_MSC_VER | #endif//_MSC_VER | |||
#endif//_WIN32 | #endif//_WIN32 | |||
#define ILUT_VERSION_1_3_0 1 | #define ILUT_VERSION_1_3_0 1 | |||
#define ILUT_VERSION 130 | #define ILUT_VERSION 130 | |||
// 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_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 | |||
// 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); | |||
ILAPI ILvoid ILAPIENTRY ilutGetIntegerv(ILenum Mode, ILint *Param ); | ILAPI ILvoid ILAPIENTRY ilutGetIntegerv(ILenum Mode, ILint *Param ); | |||
ILAPI const char* ILAPIENTRY ilutGetString(ILenum StringName); | ILAPI const char* ILAPIENTRY ilutGetString(ILenum StringName); | |||
ILAPI ILvoid ILAPIENTRY ilutInit(ILvoid); | ILAPI ILvoid ILAPIENTRY ilutInit(ILvoid); | |||
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? | |||
skipping to change at line 98 | skipping to change at line 98 | |||
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) | |||
#include "config.h" | #include "config.h" | |||
/*// Temporary fix for the SDL main() linker bug. | ||||
#ifdef ILUT_USE_SDL | ||||
#undef ILUT_USE_SDL | ||||
#endif//ILUT_USE_SDL*/ | ||||
/*#else | /*#else | |||
#define ILUT_USE_WIN32 | #define ILUT_USE_WIN32 | |||
#define ILUT_USE_OPENGL | #define ILUT_USE_OPENGL | |||
#define ILUT_USE_SDL | #define ILUT_USE_SDL | |||
#define ILUT_USE_DIRECTX8 | #define ILUT_USE_DIRECTX8 | |||
#endif*/ | #endif*/ | |||
#elif BEOS // Don't know the #define | #elif BEOS // Don't know the #define | |||
#define ILUT_USE_BEOS | #define ILUT_USE_BEOS | |||
#define ILUT_USE_OPENGL | #define ILUT_USE_OPENGL | |||
#elif MACOSX | #elif MACOSX | |||
End of changes. 6 change blocks. | ||||
5 lines changed or deleted | 11 lines changed or added | |||