| il.h | | il.h | |
| //-------------------------------------------------------------------------
---- | | //-------------------------------------------------------------------------
---- | |
| // | | // | |
| // ImageLib Sources | | // ImageLib Sources | |
| // Copyright (C) 2000-2009 by Denton Woods | | // Copyright (C) 2000-2009 by Denton Woods | |
|
| // Last modified: 02/05/2009 | | // Last modified: 03/07/2009 | |
| // | | // | |
| // Filename: IL/il.h | | // Filename: IL/il.h | |
| // | | // | |
| // Description: The main include file for DevIL | | // Description: The main include file for DevIL | |
| // | | // | |
| //-------------------------------------------------------------------------
---- | | //-------------------------------------------------------------------------
---- | |
| | | | |
| // Doxygen comment | | // Doxygen comment | |
| /*! \file il.h | | /*! \file il.h | |
| The main include file for DevIL | | The main include file for DevIL | |
| | | | |
| skipping to change at line 161 | | skipping to change at line 161 | |
| #define IL_CLAMP(x) IL_LIMIT(x,0,1) | | #define IL_CLAMP(x) IL_LIMIT(x,0,1) | |
| | | | |
| #define IL_VENDOR 0x1F00 | | #define IL_VENDOR 0x1F00 | |
| #define IL_LOAD_EXT 0x1F01 | | #define IL_LOAD_EXT 0x1F01 | |
| #define IL_SAVE_EXT 0x1F02 | | #define IL_SAVE_EXT 0x1F02 | |
| | | | |
| // | | // | |
| // IL-specific #define's | | // IL-specific #define's | |
| // | | // | |
| | | | |
|
| #define IL_VERSION_1_7_7 1 | | #define IL_VERSION_1_7_8 1 | |
| #define IL_VERSION 177 | | #define IL_VERSION 178 | |
| | | | |
| // Attribute Bits | | // Attribute Bits | |
| #define IL_ORIGIN_BIT 0x00000001 | | #define IL_ORIGIN_BIT 0x00000001 | |
| #define IL_FILE_BIT 0x00000002 | | #define IL_FILE_BIT 0x00000002 | |
| #define IL_PAL_BIT 0x00000004 | | #define IL_PAL_BIT 0x00000004 | |
| #define IL_FORMAT_BIT 0x00000008 | | #define IL_FORMAT_BIT 0x00000008 | |
| #define IL_TYPE_BIT 0x00000010 | | #define IL_TYPE_BIT 0x00000010 | |
| #define IL_COMPRESS_BIT 0x00000020 | | #define IL_COMPRESS_BIT 0x00000020 | |
| #define IL_LOADFAIL_BIT 0x00000040 | | #define IL_LOADFAIL_BIT 0x00000040 | |
| #define IL_FORMAT_SPECIFIC_BIT 0x00000080 | | #define IL_FORMAT_SPECIFIC_BIT 0x00000080 | |
| | | | |
| skipping to change at line 193 | | skipping to change at line 193 | |
| | | | |
| // Image types | | // Image types | |
| #define IL_TYPE_UNKNOWN 0x0000 | | #define IL_TYPE_UNKNOWN 0x0000 | |
| #define IL_BMP 0x0420 //!< Microsoft Windows Bitmap - .bmp extens
ion | | #define IL_BMP 0x0420 //!< Microsoft Windows Bitmap - .bmp extens
ion | |
| #define IL_CUT 0x0421 //!< Dr. Halo - .cut extension | | #define IL_CUT 0x0421 //!< Dr. Halo - .cut extension | |
| #define IL_DOOM 0x0422 //!< DooM walls - no specific extension | | #define IL_DOOM 0x0422 //!< DooM walls - no specific extension | |
| #define IL_DOOM_FLAT 0x0423 //!< DooM flats - no specific extension | | #define IL_DOOM_FLAT 0x0423 //!< DooM flats - no specific extension | |
| #define IL_ICO 0x0424 //!< Microsoft Windows Icons and Cursors -
.ico and .cur extensions | | #define IL_ICO 0x0424 //!< Microsoft Windows Icons and Cursors -
.ico and .cur extensions | |
| #define IL_JPG 0x0425 //!< JPEG - .jpg, .jpe and .jpeg extensions | | #define IL_JPG 0x0425 //!< JPEG - .jpg, .jpe and .jpeg extensions | |
| #define IL_JFIF 0x0425 //!< | | #define IL_JFIF 0x0425 //!< | |
|
| #define IL_LBM 0x0426 //!< Interlaced bitmap - .lbm extension | | #define IL_ILBM 0x0426 //!< Amiga IFF (FORM ILBM) - .iff, .ilbm, .
lbm extensions | |
| #define IL_PCD 0x0427 //!< Kodak PhotoCD - .pcd extension | | #define IL_PCD 0x0427 //!< Kodak PhotoCD - .pcd extension | |
| #define IL_PCX 0x0428 //!< ZSoft PCX - .pcx extension | | #define IL_PCX 0x0428 //!< ZSoft PCX - .pcx extension | |
| #define IL_PIC 0x0429 //!< PIC - .pic extension | | #define IL_PIC 0x0429 //!< PIC - .pic extension | |
| #define IL_PNG 0x042A //!< Portable Network Graphics - .png exten
sion | | #define IL_PNG 0x042A //!< Portable Network Graphics - .png exten
sion | |
| #define IL_PNM 0x042B //!< Portable Any Map - .pbm, .pgm, .ppm an
d .pnm extensions | | #define IL_PNM 0x042B //!< Portable Any Map - .pbm, .pgm, .ppm an
d .pnm extensions | |
| #define IL_SGI 0x042C //!< Silicon Graphics - .sgi, .bw, .rgb and
.rgba extensions | | #define IL_SGI 0x042C //!< Silicon Graphics - .sgi, .bw, .rgb and
.rgba extensions | |
| #define IL_TGA 0x042D //!< TrueVision Targa File - .tga, .vda, .i
cb and .vst extensions | | #define IL_TGA 0x042D //!< TrueVision Targa File - .tga, .vda, .i
cb and .vst extensions | |
| #define IL_TIF 0x042E //!< Tagged Image File Format - .tif and .t
iff extensions | | #define IL_TIF 0x042E //!< Tagged Image File Format - .tif and .t
iff extensions | |
| #define IL_CHEAD 0x042F //!< C-Style Header - .h extension | | #define IL_CHEAD 0x042F //!< C-Style Header - .h extension | |
| #define IL_RAW 0x0430 //!< Raw Image Data - any extension | | #define IL_RAW 0x0430 //!< Raw Image Data - any extension | |
| | | | |
| skipping to change at line 222 | | skipping to change at line 222 | |
| #define IL_PSD 0x0439 //!< Adobe PhotoShop - .psd extension | | #define IL_PSD 0x0439 //!< Adobe PhotoShop - .psd extension | |
| #define IL_EXIF 0x043A //!< | | #define IL_EXIF 0x043A //!< | |
| #define IL_PSP 0x043B //!< PaintShop Pro - .psp extension | | #define IL_PSP 0x043B //!< PaintShop Pro - .psp extension | |
| #define IL_PIX 0x043C //!< PIX - .pix extension | | #define IL_PIX 0x043C //!< PIX - .pix extension | |
| #define IL_PXR 0x043D //!< Pixar - .pxr extension | | #define IL_PXR 0x043D //!< Pixar - .pxr extension | |
| #define IL_XPM 0x043E //!< X Pixel Map - .xpm extension | | #define IL_XPM 0x043E //!< X Pixel Map - .xpm extension | |
| #define IL_HDR 0x043F //!< Radiance High Dynamic Range - .hdr ext
ension | | #define IL_HDR 0x043F //!< Radiance High Dynamic Range - .hdr ext
ension | |
| #define IL_ICNS 0x0440 //!< Macintosh Icon - .icns
extension | | #define IL_ICNS 0x0440 //!< Macintosh Icon - .icns
extension | |
| #define IL_JP2 0x0441 //!< Jpeg 2000 - .jp2 extension | | #define IL_JP2 0x0441 //!< Jpeg 2000 - .jp2 extension | |
| #define IL_EXR 0x0442 //!< OpenEXR - .exr extension | | #define IL_EXR 0x0442 //!< OpenEXR - .exr extension | |
|
| #define IL_WDP 0x0443 //!< | | #define IL_WDP 0x0443 //!< Microsoft HD Photo - .wdp and .
hdp extension | |
| #define IL_VTF 0x0444 //!< Valve Texture Format - .vtf ext
ension | | #define IL_VTF 0x0444 //!< Valve Texture Format - .vtf ext
ension | |
| #define IL_WBMP 0x0445 //!< Wireless Bitmap - .wbmp
extension | | #define IL_WBMP 0x0445 //!< Wireless Bitmap - .wbmp
extension | |
| #define IL_SUN 0x0446 //!< Sun Raster - .sun, .ras, .rs, .
im1, .im8, .im24 and .im32 extensions | | #define IL_SUN 0x0446 //!< Sun Raster - .sun, .ras, .rs, .
im1, .im8, .im24 and .im32 extensions | |
| #define IL_IFF 0x0447 //!< Interchange File Format - .iff
extension | | #define IL_IFF 0x0447 //!< Interchange File Format - .iff
extension | |
| #define IL_TPL 0x0448 //!< Gamecube Texture - .tpl extensi
on | | #define IL_TPL 0x0448 //!< Gamecube Texture - .tpl extensi
on | |
|
| | | #define IL_FITS 0x0449 //!< Flexible Image Transpor | |
| | | t System - .fit and .fits extensions | |
| | | #define IL_DICOM 0x044A //!< Digital Imaging and Communicati | |
| | | ons in Medicine (DICOM) - .dcm and .dicom extensions | |
| | | #define IL_IWI 0x044B //!< Call of Duty Infinity Ward Imag | |
| | | e - .iwi extension | |
| | | #define IL_BLP 0x044C //!< Blizzard Texture Format - .blp | |
| | | extension | |
| | | #define IL_FTX 0x044D //!< Heavy Metal: FAKK2 Texture - .f | |
| | | tx extension | |
| | | #define IL_ROT 0x044E //!< Homeworld 2 - Relic Texture - . | |
| | | rot extension | |
| | | #define IL_TEXTURE 0x044F //!< Medieval II: Total War Texture | |
| | | - .texture extension | |
| | | #define IL_DPX 0x0450 //!< Digital Picture Exchange - .dpx | |
| | | extension | |
| | | #define IL_UTX 0x0451 //!< Unreal (and Unreal Tournament) | |
| | | Texture - .utx extension | |
| | | #define IL_MP3 0x0452 //!< MPEG-1 Audio Layer 3 - .mp3 ext | |
| | | ension | |
| | | | |
| #define IL_JASC_PAL 0x0475 //!< PaintShop Pro Palette | | #define IL_JASC_PAL 0x0475 //!< PaintShop Pro Palette | |
| | | | |
| // Error Types | | // Error Types | |
| #define IL_NO_ERROR 0x0000 | | #define IL_NO_ERROR 0x0000 | |
| #define IL_INVALID_ENUM 0x0501 | | #define IL_INVALID_ENUM 0x0501 | |
| #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 346 | | skipping to change at line 356 | |
| #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 | | #define IL_PCD_PICNUM 0x0723 | |
|
| #define IL_JPG_PROGRESSIVE 0x0725 | | | |
| | | | |
| #define IL_PNG_ALPHA_INDEX 0x0724 //XIX : ILint : the color in the palette
at this index value (0-255) is considered transparent, -1 for no trasparent
color | | #define IL_PNG_ALPHA_INDEX 0x0724 //XIX : ILint : the color in the palette
at this index value (0-255) is considered transparent, -1 for no trasparent
color | |
|
| | | #define IL_JPG_PROGRESSIVE 0x0725 | |
| | | #define IL_VTF_COMP 0x0726 | |
| | | | |
| // 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_KEEP_DXTC_DATA 0x070C | |
| | | | |
| skipping to change at line 577 | | skipping to change at line 587 | |
| ILAPI ILboolean ILAPIENTRY ilRemoveLoad(ILconst_string Ext); | | ILAPI ILboolean ILAPIENTRY ilRemoveLoad(ILconst_string Ext); | |
| ILAPI ILboolean ILAPIENTRY ilRemoveSave(ILconst_string Ext); | | ILAPI ILboolean ILAPIENTRY ilRemoveSave(ILconst_string Ext); | |
| ILAPI void ILAPIENTRY ilResetMemory(void); // Deprecated | | ILAPI void ILAPIENTRY ilResetMemory(void); // Deprecated | |
| ILAPI void ILAPIENTRY ilResetRead(void); | | ILAPI void ILAPIENTRY ilResetRead(void); | |
| ILAPI void ILAPIENTRY ilResetWrite(void); | | ILAPI void ILAPIENTRY ilResetWrite(void); | |
| ILAPI ILboolean ILAPIENTRY ilSave(ILenum Type, ILconst_string FileName); | | ILAPI ILboolean ILAPIENTRY ilSave(ILenum Type, ILconst_string FileName); | |
| ILAPI ILuint ILAPIENTRY ilSaveF(ILenum Type, ILHANDLE File); | | ILAPI ILuint ILAPIENTRY ilSaveF(ILenum Type, ILHANDLE File); | |
| ILAPI ILboolean ILAPIENTRY ilSaveImage(ILconst_string FileName); | | ILAPI ILboolean ILAPIENTRY ilSaveImage(ILconst_string FileName); | |
| ILAPI ILuint ILAPIENTRY ilSaveL(ILenum Type, void *Lump, ILuint Size); | | ILAPI ILuint ILAPIENTRY ilSaveL(ILenum Type, void *Lump, ILuint Size); | |
| ILAPI ILboolean ILAPIENTRY ilSavePal(ILconst_string FileName); | | ILAPI ILboolean ILAPIENTRY ilSavePal(ILconst_string FileName); | |
|
| ILAPI ILboolean ILAPIENTRY ilSetAlpha( ILdouble AlphaValue ); | | ILAPI ILboolean ILAPIENTRY ilSetAlpha(ILdouble AlphaValue); | |
| ILAPI ILboolean ILAPIENTRY ilSetData(void *Data); | | ILAPI ILboolean ILAPIENTRY ilSetData(void *Data); | |
| ILAPI ILboolean ILAPIENTRY ilSetDuration(ILuint Duration); | | ILAPI ILboolean ILAPIENTRY ilSetDuration(ILuint Duration); | |
| ILAPI void ILAPIENTRY ilSetInteger(ILenum Mode, ILint Param); | | ILAPI void ILAPIENTRY ilSetInteger(ILenum Mode, ILint Param); | |
| ILAPI void ILAPIENTRY ilSetMemory(mAlloc, mFree); | | ILAPI void ILAPIENTRY ilSetMemory(mAlloc, mFree); | |
| ILAPI void ILAPIENTRY ilSetPixels(ILint XOff, ILint YOff, ILint ZOff,
ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, void
*Data); | | ILAPI void ILAPIENTRY ilSetPixels(ILint XOff, ILint YOff, ILint ZOff,
ILuint Width, ILuint Height, ILuint Depth, ILenum Format, ILenum Type, void
*Data); | |
| ILAPI void ILAPIENTRY ilSetRead(fOpenRProc, fCloseRProc, fEofProc, fGe
tcProc, fReadProc, fSeekRProc, fTellRProc); | | ILAPI void ILAPIENTRY ilSetRead(fOpenRProc, fCloseRProc, fEofProc, fGe
tcProc, fReadProc, fSeekRProc, fTellRProc); | |
| ILAPI void ILAPIENTRY ilSetString(ILenum Mode, const char *String); | | ILAPI void ILAPIENTRY ilSetString(ILenum Mode, const char *String); | |
| ILAPI void ILAPIENTRY ilSetWrite(fOpenWProc, fCloseWProc, fPutcProc, f
SeekWProc, fTellWProc, fWriteProc); | | ILAPI void ILAPIENTRY ilSetWrite(fOpenWProc, fCloseWProc, fPutcProc, f
SeekWProc, fTellWProc, fWriteProc); | |
| ILAPI void ILAPIENTRY ilShutDown(void); | | ILAPI void ILAPIENTRY ilShutDown(void); | |
| ILAPI ILboolean ILAPIENTRY ilSurfaceToDxtcData(ILenum Format); | | ILAPI ILboolean ILAPIENTRY ilSurfaceToDxtcData(ILenum Format); | |
| | | | |
End of changes. 8 change blocks. |
| 8 lines changed or deleted | | 28 lines changed or added | |
|
| ilu.h | | ilu.h | |
| //-------------------------------------------------------------------------
---- | | //-------------------------------------------------------------------------
---- | |
| // | | // | |
| // ImageLib Utility Sources | | // ImageLib Utility Sources | |
| // Copyright (C) 2000-2009 by Denton Woods | | // Copyright (C) 2000-2009 by Denton Woods | |
|
| // Last modified: 02/05/2009 | | // Last modified: 03/07/2009 | |
| // | | // | |
| // Filename: IL/ilu.h | | // Filename: IL/ilu.h | |
| // | | // | |
| // Description: The main include file for ILU | | // Description: The main include file for ILU | |
| // | | // | |
| //-------------------------------------------------------------------------
---- | | //-------------------------------------------------------------------------
---- | |
| | | | |
| // Doxygen comment | | // Doxygen comment | |
| /*! \file ilu.h | | /*! \file ilu.h | |
| The main include file for ILU | | The main include file for ILU | |
| | | | |
| skipping to change at line 38 | | skipping to change at line 38 | |
| #endif | | #endif | |
| | | | |
| #ifdef _WIN32 | | #ifdef _WIN32 | |
| #if (defined(IL_USE_PRAGMA_LIBS)) && (!defined(_IL_BUILD_LIBRARY)) | | #if (defined(IL_USE_PRAGMA_LIBS)) && (!defined(_IL_BUILD_LIBRARY)) | |
| #if defined(_MSC_VER) || defined(__BORLANDC__) | | #if defined(_MSC_VER) || defined(__BORLANDC__) | |
| #pragma comment(lib, "ILU.lib") | | #pragma comment(lib, "ILU.lib") | |
| #endif | | #endif | |
| #endif | | #endif | |
| #endif | | #endif | |
| | | | |
|
| #define ILU_VERSION_1_7_7 1 | | #define ILU_VERSION_1_7_8 1 | |
| #define ILU_VERSION 177 | | #define ILU_VERSION 178 | |
| | | | |
| #define ILU_FILTER 0x2600 | | #define ILU_FILTER 0x2600 | |
| #define ILU_NEAREST 0x2601 | | #define ILU_NEAREST 0x2601 | |
| #define ILU_LINEAR 0x2602 | | #define ILU_LINEAR 0x2602 | |
| #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 79 | | skipping to change at line 79 | |
| #define ILU_VERSION_NUM IL_VERSION_NUM | | #define ILU_VERSION_NUM IL_VERSION_NUM | |
| #define ILU_VENDOR IL_VENDOR | | #define ILU_VENDOR IL_VENDOR | |
| | | | |
| // Languages | | // Languages | |
| #define ILU_ENGLISH 0x0800 | | #define ILU_ENGLISH 0x0800 | |
| #define ILU_ARABIC 0x0801 | | #define ILU_ARABIC 0x0801 | |
| #define ILU_DUTCH 0x0802 | | #define ILU_DUTCH 0x0802 | |
| #define ILU_JAPANESE 0x0803 | | #define ILU_JAPANESE 0x0803 | |
| #define ILU_SPANISH 0x0804 | | #define ILU_SPANISH 0x0804 | |
| #define ILU_GERMAN 0x0805 | | #define ILU_GERMAN 0x0805 | |
|
| | | #define ILU_FRENCH 0x0806 | |
| | | | |
| // Filters | | // Filters | |
| /* | | /* | |
| #define ILU_FILTER_BLUR 0x0803 | | #define ILU_FILTER_BLUR 0x0803 | |
| #define ILU_FILTER_GAUSSIAN_3x3 0x0804 | | #define ILU_FILTER_GAUSSIAN_3x3 0x0804 | |
| #define ILU_FILTER_GAUSSIAN_5X5 0x0805 | | #define ILU_FILTER_GAUSSIAN_5X5 0x0805 | |
| #define ILU_FILTER_EMBOSS1 0x0807 | | #define ILU_FILTER_EMBOSS1 0x0807 | |
| #define ILU_FILTER_EMBOSS2 0x0808 | | #define ILU_FILTER_EMBOSS2 0x0808 | |
| #define ILU_FILTER_LAPLACIAN1 0x080A | | #define ILU_FILTER_LAPLACIAN1 0x080A | |
| #define ILU_FILTER_LAPLACIAN2 0x080B | | #define ILU_FILTER_LAPLACIAN2 0x080B | |
| | | | |
End of changes. 3 change blocks. |
| 3 lines changed or deleted | | 4 lines changed or added | |
|