| il.h | | il.h | |
| //-------------------------------------------------------------------------
---- | | //-------------------------------------------------------------------------
---- | |
| // | | // | |
| // ImageLib Sources | | // ImageLib Sources | |
| // Copyright (C) 2000-2002 by Denton Woods | | // Copyright (C) 2000-2002 by Denton Woods | |
|
| // Last modified: 03/05/2002 <--Y2K Compliant! =] | | // Last modified: 05/15/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 42 | | skipping to change at line 42 | |
| //#define IL_NO_LIF | | //#define IL_NO_LIF | |
| //#define IL_NO_LBM | | //#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_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_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 | |
| | | | |
| // 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 | |
| | | | |
| skipping to change at line 153 | | skipping to change at line 154 | |
| #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_3_0 1 | | #define IL_VERSION_1_4_0 1 | |
| #define IL_VERSION 130 | | #define IL_VERSION 140 | |
| | | | |
| // 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 206 | | skipping to change at line 207 | |
| #define IL_MDL 0x04
31 | | #define IL_MDL 0x04
31 | |
| #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_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 228 | | skipping to change at line 230 | |
| #define IL_INVALID_FILE_HEADER 0x0508 | | #define IL_INVALID_FILE_HEADER 0x0508 | |
| #define IL_INVALID_PARAM 0x0509 | | #define IL_INVALID_PARAM 0x0509 | |
| #define IL_COULD_NOT_OPEN_FILE 0x050A | | #define IL_COULD_NOT_OPEN_FILE 0x050A | |
| #define IL_INVALID_EXTENSION 0x050B | | #define IL_INVALID_EXTENSION 0x050B | |
| #define IL_FILE_ALREADY_EXISTS 0x050C | | #define IL_FILE_ALREADY_EXISTS 0x050C | |
| #define IL_OUT_FORMAT_SAME 0x050D | | #define IL_OUT_FORMAT_SAME 0x050D | |
| #define IL_STACK_OVERFLOW 0x050E | | #define IL_STACK_OVERFLOW 0x050E | |
| #define IL_STACK_UNDERFLOW 0x050F | | #define IL_STACK_UNDERFLOW 0x050F | |
| #define IL_INVALID_CONVERSION 0x0510 | | #define IL_INVALID_CONVERSION 0x0510 | |
| #define IL_BAD_DIMENSIONS 0x0511 | | #define IL_BAD_DIMENSIONS 0x0511 | |
|
| | | #define IL_FILE_READ_ERROR 0x0512 // 0 | |
| | | 5/12/2002: Addition by Sam. | |
| | | | |
| #define IL_LIB_GIF_ERROR 0x05E1 | | #define IL_LIB_GIF_ERROR 0x05E1 | |
| #define IL_LIB_JPEG_ERROR 0x05E2 | | #define IL_LIB_JPEG_ERROR 0x05E2 | |
| #define IL_LIB_PNG_ERROR 0x05E3 | | #define IL_LIB_PNG_ERROR 0x05E3 | |
| #define IL_LIB_TIFF_ERROR 0x05E4 | | #define IL_LIB_TIFF_ERROR 0x05E4 | |
| #define IL_LIB_MNG_ERROR 0x05E5 | | #define IL_LIB_MNG_ERROR 0x05E5 | |
| #define IL_UNKNOWN_ERROR 0x05FF | | #define IL_UNKNOWN_ERROR 0x05FF | |
| | | | |
| // Origin Definitions | | // Origin Definitions | |
| #define IL_ORIGIN_SET 0x0600 | | #define IL_ORIGIN_SET 0x0600 | |
| #define IL_ORIGIN_LOWER_LEFT 0x0601 | | #define IL_ORIGIN_LOWER_LEFT 0x0601 | |
| | | | |
| skipping to change at line 379 | | skipping to change at line 383 | |
| #define IL_PACKSTRUCT __attribute__ ((packed)) | | #define IL_PACKSTRUCT __attribute__ ((packed)) | |
| #else | | #else | |
| #define ILAPIENTRY | | #define ILAPIENTRY | |
| #define IL_PACKSTRUCT | | #define IL_PACKSTRUCT | |
| #endif | | #endif | |
| | | | |
| // This is from Win32's <wingdi.h> and <winnt.h> | | // This is from Win32's <wingdi.h> and <winnt.h> | |
| #if defined(__LCC__) | | #if defined(__LCC__) | |
| #define ILAPI __stdcall | | #define ILAPI __stdcall | |
| #elif _WIN32 | | #elif _WIN32 | |
|
| #ifdef _IL_BUILD_LIBRARY | | #ifdef IL_STATIC_LIB | |
| #define ILAPI __declspec(dllexport) | | #define ILAPI | |
| #else | | #else | |
|
| #define ILAPI __declspec(dllimport) | | #ifdef _IL_BUILD_LIBRARY | |
| | | #define ILAPI __declspec(dllexport) | |
| | | #else | |
| | | #define ILAPI __declspec(dllimport) | |
| | | #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 | |
| | | | |
End of changes. 7 change blocks. |
| 6 lines changed or deleted | | 15 lines changed or added | |
|
| ilu.h | | ilu.h | |
| //-------------------------------------------------------------------------
---- | | //-------------------------------------------------------------------------
---- | |
| // | | // | |
| // ImageLib Utility Sources | | // ImageLib Utility Sources | |
| // Copyright (C) 2000-2002 by Denton Woods | | // Copyright (C) 2000-2002 by Denton Woods | |
|
| // Last modified: 02/05/2002 <--Y2K Compliant! =] | | // Last modified: 05/15/2002 <--Y2K Compliant! =] | |
| // | | // | |
| // Filename: il/ilu.h | | // Filename: il/ilu.h | |
| // | | // | |
| // Description: The main include file for ILU | | // Description: The main include file for ILU | |
| // | | // | |
| //-------------------------------------------------------------------------
---- | | //-------------------------------------------------------------------------
---- | |
| | | | |
| #ifndef __ilu_h_ | | #ifndef __ilu_h_ | |
| #ifndef __ILU_H__ | | #ifndef __ILU_H__ | |
| | | | |
| | | | |
| skipping to change at line 37 | | skipping to change at line 37 | |
| #ifndef _ILU_BUILD_LIBRARY | | #ifndef _ILU_BUILD_LIBRARY | |
| #ifdef IL_DEBUG | | #ifdef IL_DEBUG | |
| #pragma comment(lib, "ilu-d.lib") | | #pragma comment(lib, "ilu-d.lib") | |
| #else | | #else | |
| #pragma comment(lib, "ilu.lib") | | #pragma comment(lib, "ilu.lib") | |
| #endif//_DEBUG | | #endif//_DEBUG | |
| #endif//_ILU_BUILD_LIBRARY | | #endif//_ILU_BUILD_LIBRARY | |
| #endif//_MSC_VER | | #endif//_MSC_VER | |
| #endif//_WIN32 | | #endif//_WIN32 | |
| | | | |
|
| #define ILU_VERSION_1_3_0 1 | | #define ILU_VERSION_1_4_0 1 | |
| #define ILU_VERSION 130 | | #define ILU_VERSION 140 | |
| | | | |
| #define ILU_FILTER 0x26
00 | | #define ILU_FILTER 0x26
00 | |
| #define ILU_NEAREST 0x26
01 | | #define ILU_NEAREST 0x26
01 | |
| #define ILU_LINEAR 0x26
02 | | #define ILU_LINEAR 0x26
02 | |
| #define ILU_BILINEAR 0x2603 | | #define ILU_BILINEAR 0x2603 | |
| #define ILU_SCALE_BOX 0x2604 | | #define ILU_SCALE_BOX 0x2604 | |
| #define ILU_SCALE_TRIANGLE 0x2605 | | #define ILU_SCALE_TRIANGLE 0x2605 | |
| #define ILU_SCALE_BELL 0x2606 | | #define ILU_SCALE_BELL 0x2606 | |
| #define ILU_SCALE_BSPLINE 0x2607 | | #define ILU_SCALE_BSPLINE 0x2607 | |
| #define ILU_SCALE_LANCZOS3 0x2608 | | #define ILU_SCALE_LANCZOS3 0x2608 | |
| | | | |
| skipping to change at line 107 | | skipping to change at line 107 | |
| ILubyte *Palette; // the image's palette | | ILubyte *Palette; // the image's palette | |
| ILenum PalType; // palette type | | ILenum PalType; // palette type | |
| ILuint PalSize; // palette size | | ILuint PalSize; // palette size | |
| ILenum CubeFlags; // flags for what cube map s
ides are present | | ILenum CubeFlags; // flags for what cube map s
ides are present | |
| ILuint NumNext; // number of images followin
g | | ILuint NumNext; // number of images followin
g | |
| ILuint NumMips; // number of mipmaps | | ILuint NumMips; // number of mipmaps | |
| ILuint NumLayers; // number of layers | | ILuint NumLayers; // number of layers | |
| } ILinfo; | | } ILinfo; | |
| | | | |
| // ImageLib Utility Functions | | // ImageLib Utility Functions | |
|
| ILAPI ILboolean ILAPIENTRY iluAlienify(ILvoid); | | ILAPI ILboolean ILAPIENTRY iluAlienify(ILvoid); | |
| ILAPI ILboolean ILAPIENTRY iluBlurAvg(ILuint Iter); | | ILAPI ILboolean ILAPIENTRY iluBlurAvg(ILuint Iter); | |
| ILAPI ILboolean ILAPIENTRY iluBlurGaussian(ILuint Iter); | | ILAPI ILboolean ILAPIENTRY iluBlurGaussian(ILuint It | |
| ILAPI ILboolean ILAPIENTRY iluBuildMipmaps(ILvoid); | | er); | |
| ILAPI ILuint ILAPIENTRY iluColoursUsed(ILvoid); | | ILAPI ILboolean ILAPIENTRY iluBuildMipmaps(ILvoid); | |
| ILAPI ILboolean ILAPIENTRY iluCompareImage(ILuint Comp); | | ILAPI ILuint ILAPIENTRY iluColoursUsed(ILvoid); | |
| ILAPI ILboolean ILAPIENTRY iluContrast(ILfloat Contrast); | | ILAPI ILboolean ILAPIENTRY iluCompareImage(ILuint Co | |
| ILAPI ILboolean ILAPIENTRY iluCrop(ILuint XOff, ILuint YOff, | | mp); | |
| ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth); | | ILAPI ILboolean ILAPIENTRY iluContrast(ILfloat Contr | |
| ILAPI ILvoid ILAPIENTRY iluDeleteImage(ILuint Id); | | ast); | |
| ILAPI ILboolean ILAPIENTRY iluEdgeDetectE(ILvoid); | | ILAPI ILboolean ILAPIENTRY iluCrop(ILuint XOff, ILui | |
| ILAPI ILboolean ILAPIENTRY iluEdgeDetectP(ILvoid); | | nt YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth); | |
| ILAPI ILboolean ILAPIENTRY iluEdgeDetectS(ILvoid); | | ILAPI ILvoid ILAPIENTRY iluDeleteImage(ILuint Id); | |
| ILAPI ILboolean ILAPIENTRY iluEmboss(ILvoid); | | ILAPI ILboolean ILAPIENTRY iluEdgeDetectE(ILvoid); | |
| ILAPI ILboolean ILAPIENTRY iluEnlargeCanvas(ILuint Width, IL | | ILAPI ILboolean ILAPIENTRY iluEdgeDetectP(ILvoid); | |
| uint Height, ILuint Depth); | | ILAPI ILboolean ILAPIENTRY iluEdgeDetectS(ILvoid); | |
| ILAPI ILboolean ILAPIENTRY iluEnlargeImage(ILfloat XDim, ILf | | ILAPI ILboolean ILAPIENTRY iluEmboss(ILvoid); | |
| loat YDim, ILfloat ZDim); | | ILAPI ILboolean ILAPIENTRY iluEnlargeCanvas(ILuint W | |
| ILAPI ILboolean ILAPIENTRY iluEqualize(ILvoid); | | idth, ILuint Height, ILuint Depth); | |
| | | ILAPI ILboolean ILAPIENTRY iluEnlargeImage(ILfloat X | |
| | | Dim, ILfloat YDim, ILfloat ZDim); | |
| | | ILAPI ILboolean ILAPIENTRY iluEqualize(ILvoid); | |
| ILAPI const ILstring ILAPIENTRY iluErrorString(ILenum Error); | | ILAPI const ILstring ILAPIENTRY iluErrorString(ILenum Error); | |
|
| ILAPI ILboolean ILAPIENTRY iluFlipImage(ILvoid); | | ILAPI ILboolean ILAPIENTRY iluFlipImage(ILvoid); | |
| ILAPI ILboolean ILAPIENTRY iluGammaCorrect(ILfloat Gamma); | | ILAPI ILboolean ILAPIENTRY iluGammaCorrect(ILfloat G | |
| ILAPI ILuint ILAPIENTRY iluGenImage(ILvoid); | | amma); | |
| ILAPI ILvoid ILAPIENTRY iluGetImageInfo(ILinfo *Info); | | ILAPI ILuint ILAPIENTRY iluGenImage(ILvoid); | |
| ILAPI ILint ILAPIENTRY iluGetInteger(ILenum Mode); | | ILAPI ILvoid ILAPIENTRY iluGetImageInfo(ILinfo *Info); | |
| ILAPI ILvoid ILAPIENTRY iluGetIntegerv(ILenum Mode, ILint *Param) | | ILAPI ILint ILAPIENTRY iluGetInteger(ILenum Mode | |
| ; | | ); | |
| | | ILAPI ILvoid ILAPIENTRY iluGetIntegerv(ILenum Mode, ILint | |
| | | *Param); | |
| ILAPI const ILstring ILAPIENTRY iluGetString(ILenum StringName); | | ILAPI const ILstring ILAPIENTRY iluGetString(ILenum StringName); | |
|
| ILAPI ILvoid ILAPIENTRY iluImageParameter(ILenum PName, ILenum Pa | | ILAPI ILvoid ILAPIENTRY iluImageParameter(ILenum PName, I | |
| ram); | | Lenum Param); | |
| ILAPI ILvoid ILAPIENTRY iluInit(ILvoid); | | ILAPI ILvoid ILAPIENTRY iluInit(ILvoid); | |
| ILAPI ILuint ILAPIENTRY iluLoadImage(const ILstring FileName); | | ILAPI ILboolean ILAPIENTRY iluInvertAlpha(ILvoid); | |
| ILAPI ILboolean ILAPIENTRY iluMirror(ILvoid); | | ILAPI ILuint ILAPIENTRY iluLoadImage(const ILstring FileN | |
| ILAPI ILboolean ILAPIENTRY iluNegative(ILvoid); | | ame); | |
| ILAPI ILboolean ILAPIENTRY iluNoisify(ILclampf Tolerance); | | ILAPI ILboolean ILAPIENTRY iluMirror(ILvoid); | |
| ILAPI ILboolean ILAPIENTRY iluPixelize(ILuint PixSize); | | ILAPI ILboolean ILAPIENTRY iluNegative(ILvoid); | |
| //ILAPI ILvoid ILAPIENTRY iluRegionf(ILfloat ULx, ILfloat ULy, ILfl | | ILAPI ILboolean ILAPIENTRY iluNoisify(ILclampf Toler | |
| oat BRx, ILfloat BRy); | | ance); | |
| //ILAPI ILvoid ILAPIENTRY iluRegioni(ILuint ULx, ILuint ULy, ILuint | | ILAPI ILboolean ILAPIENTRY iluPixelize(ILuint PixSiz | |
| BRx, ILuint BRy); | | e); | |
| ILAPI ILboolean ILAPIENTRY iluReplaceColour(ILubyte Red, ILu | | //ILAPI ILvoid ILAPIENTRY iluRegionf(ILfloat ULx, ILfloat U | |
| byte Green, ILubyte Blue, ILfloat Tolerance); | | Ly, ILfloat BRx, ILfloat BRy); | |
| ILAPI ILboolean ILAPIENTRY iluRotate(ILfloat Angle); | | //ILAPI ILvoid ILAPIENTRY iluRegioni(ILuint ULx, ILuint ULy | |
| ILAPI ILboolean ILAPIENTRY iluRotate3D(ILfloat x, ILfloat y, | | , ILuint BRx, ILuint BRy); | |
| ILfloat z, ILfloat Angle); | | ILAPI ILboolean ILAPIENTRY iluReplaceColour(ILubyte | |
| ILAPI ILboolean ILAPIENTRY iluSaturate1f(ILfloat Saturation) | | Red, ILubyte Green, ILubyte Blue, ILfloat Tolerance); | |
| ; | | ILAPI ILboolean ILAPIENTRY iluRotate(ILfloat Angle); | |
| ILAPI ILboolean ILAPIENTRY iluSaturate4f(ILfloat r, ILfloat | | ILAPI ILboolean ILAPIENTRY iluRotate3D(ILfloat x, IL | |
| g, ILfloat b, ILfloat Saturation); | | float y, ILfloat z, ILfloat Angle); | |
| ILAPI ILboolean ILAPIENTRY iluScale(ILuint Width, ILuint Hei | | ILAPI ILboolean ILAPIENTRY iluSaturate1f(ILfloat Sat | |
| ght, ILuint Depth); | | uration); | |
| ILAPI ILboolean ILAPIENTRY iluScaleColours(ILfloat r, ILfloa | | ILAPI ILboolean ILAPIENTRY iluSaturate4f(ILfloat r, | |
| t g, ILfloat b); | | ILfloat g, ILfloat b, ILfloat Saturation); | |
| ILAPI ILboolean ILAPIENTRY iluSharpen(ILfloat Factor, ILuint | | ILAPI ILboolean ILAPIENTRY iluScale(ILuint Width, IL | |
| Iter); | | uint Height, ILuint Depth); | |
| ILAPI ILboolean ILAPIENTRY iluSwapColours(ILvoid); | | ILAPI ILboolean ILAPIENTRY iluScaleColours(ILfloat r | |
| ILAPI ILboolean ILAPIENTRY iluWave(ILfloat Angle); | | , ILfloat g, ILfloat b); | |
| | | ILAPI ILboolean ILAPIENTRY iluSharpen(ILfloat Factor | |
| | | , ILuint Iter); | |
| | | ILAPI ILboolean ILAPIENTRY iluSwapColours(ILvoid); | |
| | | ILAPI ILboolean ILAPIENTRY iluWave(ILfloat Angle); | |
| | | | |
| #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 | |
| | | | |
| | | | |
End of changes. 5 change blocks. |
| 58 lines changed or deleted | | 67 lines changed or added | |
|