config.h   config.h 
skipping to change at line 52 skipping to change at line 52
#define ILUT_USE_SDL 1 #define ILUT_USE_SDL 1
/* #undef ILUT_USE_WIN32 */ /* #undef ILUT_USE_WIN32 */
/* Define if you have the <dlfcn.h> header file. */ /* Define if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1 #define HAVE_DLFCN_H 1
/* Name of package */ /* Name of package */
#define PACKAGE "DevIL" #define PACKAGE "DevIL"
/* Version number of package */ /* Version number of package */
#define VERSION "1.6.1" #define VERSION "1.6.5"
/* Define if your processor stores words with the most significant byte fir st /* Define if your processor stores words with the most significant byte fir st
(like Motorola and SPARC, unlike Intel and VAX). */ (like Motorola and SPARC, unlike Intel and VAX). */
/* #undef WORDS_BIGENDIAN */ /* #undef WORDS_BIGENDIAN */
/* Define if the X Window System is missing or not being used. */ /* Define if the X Window System is missing or not being used. */
/* #undef X_DISPLAY_MISSING */ /* #undef X_DISPLAY_MISSING */
#endif /* __CONFIG_H__ */ #endif /* __CONFIG_H__ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 devil_internal_exports.h   devil_internal_exports.h 
skipping to change at line 64 skipping to change at line 64
ILuint ProfileSize; // colour profile size ILuint ProfileSize; // colour profile size
ILuint OffX, OffY; // offset of the image ILuint OffX, OffY; // offset of the image
ILubyte *DxtcData; // compressed data ILubyte *DxtcData; // compressed data
ILenum DxtcFormat; // compressed data format ILenum DxtcFormat; // compressed data format
ILuint DxtcSize; // compressed data size ILuint DxtcSize; // compressed data size
} ILimage; } ILimage;
// Memory functions // Memory functions
ILAPI ILvoid* ILAPIENTRY ialloc(ILuint Size); ILAPI ILvoid* ILAPIENTRY ialloc(ILuint Size);
ILAPI ILvoid ILAPIENTRY ifree(ILvoid *Ptr); ILAPI ILvoid ILAPIENTRY ifree(ILvoid *Ptr);
ILAPI ILvoid* ILAPIENTRY icalloc(ILuint Size, ILuint Num);
// Internal library functions in IL // Internal library functions in IL
ILAPI ILimage* ILAPIENTRY ilGetCurImage(ILvoid); ILAPI ILimage* ILAPIENTRY ilGetCurImage(ILvoid);
ILAPI ILvoid ILAPIENTRY ilSetCurImage(ILimage *Image); ILAPI ILvoid ILAPIENTRY ilSetCurImage(ILimage *Image);
ILAPI ILvoid ILAPIENTRY ilSetError(ILenum Error); ILAPI ILvoid ILAPIENTRY ilSetError(ILenum Error);
ILAPI ILvoid ILAPIENTRY ilSetPal(ILpal *Pal); ILAPI ILvoid ILAPIENTRY ilSetPal(ILpal *Pal);
// //
// Utility functions // Utility functions
// //
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 il.h   il.h 
skipping to change at line 90 skipping to change at line 90
#define IL_NO_JPG #define IL_NO_JPG
#define IL_NO_MNG #define IL_NO_MNG
#define IL_NO_PNG #define IL_NO_PNG
#define IL_NO_TIF #define IL_NO_TIF
#define IL_NO_LCMS #define IL_NO_LCMS
#endif//__APPLE__*/ #endif//__APPLE__*/
#ifdef _WIN32 #ifdef _WIN32
//#define IL_USE_IJL // Whether we use the Intel Jpeg Library (else use libjpeg). //#define IL_USE_IJL // Whether we use the Intel Jpeg Library (else use libjpeg).
#ifndef IL_STATIC_LIB #ifndef IL_STATIC_LIB
#ifdef _MSC_VER #if defined(_MSC_VER) || defined(__BORLANDC__)
#ifndef _IL_BUILD_LIBRARY #ifndef _IL_BUILD_LIBRARY
#ifdef IL_DEBUG #ifdef IL_DEBUG
#pragma comment(lib, "devil-d.lib") #pragma comment(lib, "devil-d.lib")
#else #else
#pragma comment(lib, "devil.lib") #pragma comment(lib, "devil.lib")
#endif//IL_DEBUG #endif//IL_DEBUG
#endif//_IL_BUILD_LIBRARY #endif//_IL_BUILD_LIBRARY
#endif//_MSC_VER #endif//_MSC_VER || __BORLANDC__
#endif//IL_STATIC_LIB #endif//IL_STATIC_LIB
#endif//_WIN32 #endif//_WIN32
#include <stdio.h> #include <stdio.h>
typedef unsigned int ILenum; typedef unsigned int ILenum;
typedef unsigned char ILboolean; typedef unsigned char ILboolean;
typedef unsigned int ILbitfield; typedef unsigned int ILbitfield;
typedef char ILbyte; typedef char ILbyte;
typedef short ILshort; typedef short ILshort;
skipping to change at line 140 skipping to change at line 140
#define IL_TRUE 1 #define IL_TRUE 1
// Matches OpenGL's right now. // Matches OpenGL's right now.
#define IL_COLOUR_INDEX 0x19 00 #define IL_COLOUR_INDEX 0x19 00
#define IL_COLOR_INDEX 0x1900 #define IL_COLOR_INDEX 0x1900
#define IL_RGB 0x19 07 #define IL_RGB 0x19 07
#define IL_RGBA 0x1908 #define IL_RGBA 0x1908
#define IL_BGR 0x80 E0 #define IL_BGR 0x80 E0
#define IL_BGRA 0x80E1 #define IL_BGRA 0x80E1
#define IL_LUMINANCE 0x1909 #define IL_LUMINANCE 0x1909
#define IL_LUMINANCE_ALPHA 0x190A
#define IL_BYTE 0x1400 #define IL_BYTE 0x1400
#define IL_UNSIGNED_BYTE 0x1401 #define IL_UNSIGNED_BYTE 0x1401
#define IL_SHORT 0x14 02 #define IL_SHORT 0x14 02
#define IL_UNSIGNED_SHORT 0x1403 #define IL_UNSIGNED_SHORT 0x1403
#define IL_INT 0x14 04 #define IL_INT 0x14 04
#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
skipping to change at line 527 skipping to change at line 528
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);
ILAPI ILboolean ILAPIENTRY ilLoadFromJpegStruct(ILvoid* JpegDecompre ILAPI ILboolean ILAPIENTRY ilLoadFromJpegStruct(ILvoid* Jpeg
ssorPtr); DecompressorPtr);
ILAPI ILboolean ILAPIENTRY ilSaveFromJpegStruct(ILvoid* JpegCompress ILAPI ILboolean ILAPIENTRY ilSaveFromJpegStruct(ILvoid* Jpeg
orPtr); CompressorPtr);
// 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. 4 change blocks. 
6 lines changed or deleted 7 lines changed or added


 ilu.h   ilu.h 
skipping to change at line 27 skipping to change at line 27
#define __ILU_H__ #define __ILU_H__
#include <IL/il.h> #include <IL/il.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#ifndef IL_STATIC_LIB #ifndef IL_STATIC_LIB
#ifdef _MSC_VER #if defined(_MSC_VER) || defined(__BORLANDC__)
#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 || __BORLANDC__
#endif//IL_STATIC_LIB #endif//IL_STATIC_LIB
#endif//_WIN32 #endif//_WIN32
#define ILU_VERSION_1_6_1 1 #define ILU_VERSION_1_6_1 1
#define ILU_VERSION 161 #define ILU_VERSION 161
#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
skipping to change at line 108 skipping to change at line 108
ILenum Origin; // origin of the image ILenum Origin; // origin of the image
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;
typedef struct ILpointf
{
ILfloat x, y;
} ILpointf;
typedef struct ILpointi
{
ILint x, y;
} ILpointi;
// 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 It er); ILAPI ILboolean ILAPIENTRY iluBlurGaussian(ILuint It er);
ILAPI ILboolean ILAPIENTRY iluBuildMipmaps(ILvoid); ILAPI ILboolean ILAPIENTRY iluBuildMipmaps(ILvoid);
ILAPI ILuint ILAPIENTRY iluColoursUsed(ILvoid); ILAPI ILuint ILAPIENTRY iluColoursUsed(ILvoid);
ILAPI ILboolean ILAPIENTRY iluCompareImage(ILuint Co mp); ILAPI ILboolean ILAPIENTRY iluCompareImage(ILuint Co mp);
ILAPI ILboolean ILAPIENTRY iluContrast(ILfloat Contr ast); ILAPI ILboolean ILAPIENTRY iluContrast(ILfloat Contr ast);
ILAPI ILboolean ILAPIENTRY iluCrop(ILuint XOff, ILui nt YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth); ILAPI ILboolean ILAPIENTRY iluCrop(ILuint XOff, ILui nt YOff, ILuint ZOff, ILuint Width, ILuint Height, ILuint Depth);
ILAPI ILvoid ILAPIENTRY iluDeleteImage(ILuint Id); ILAPI ILvoid ILAPIENTRY iluDeleteImage(ILuint Id);
skipping to change at line 141 skipping to change at line 151
ILAPI ILvoid ILAPIENTRY iluGetIntegerv(ILenum Mode, ILint *Param); 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, I Lenum Param); ILAPI ILvoid ILAPIENTRY iluImageParameter(ILenum PName, I Lenum Param);
ILAPI ILvoid ILAPIENTRY iluInit(ILvoid); ILAPI ILvoid ILAPIENTRY iluInit(ILvoid);
ILAPI ILboolean ILAPIENTRY iluInvertAlpha(ILvoid); ILAPI ILboolean ILAPIENTRY iluInvertAlpha(ILvoid);
ILAPI ILuint ILAPIENTRY iluLoadImage(const ILstring FileN ame); ILAPI ILuint ILAPIENTRY iluLoadImage(const ILstring FileN ame);
ILAPI ILboolean ILAPIENTRY iluMirror(ILvoid); ILAPI ILboolean ILAPIENTRY iluMirror(ILvoid);
ILAPI ILboolean ILAPIENTRY iluNegative(ILvoid); ILAPI ILboolean ILAPIENTRY iluNegative(ILvoid);
ILAPI ILboolean ILAPIENTRY iluNoisify(ILclampf Toler ance); ILAPI ILboolean ILAPIENTRY iluNoisify(ILclampf Toler ance);
ILAPI ILboolean ILAPIENTRY iluPixelize(ILuint PixSiz e); ILAPI ILboolean ILAPIENTRY iluPixelize(ILuint PixSiz e);
//ILAPI ILvoid ILAPIENTRY iluRegionf(ILfloat ULx, ILfloat U ILAPI ILvoid ILAPIENTRY iluRegionfv(ILpointf *Points, ILu
Ly, ILfloat BRx, ILfloat BRy); int n);
//ILAPI ILvoid ILAPIENTRY iluRegioni(ILuint ULx, ILuint ULy ILAPI ILvoid ILAPIENTRY iluRegioniv(ILpointi *Points, ILu
, ILuint BRx, ILuint BRy); int n);
ILAPI ILboolean ILAPIENTRY iluReplaceColour(ILubyte Red, ILubyte Green, ILubyte Blue, ILfloat Tolerance); ILAPI ILboolean ILAPIENTRY iluReplaceColour(ILubyte Red, ILubyte Green, ILubyte Blue, ILfloat Tolerance);
ILAPI ILboolean ILAPIENTRY iluRotate(ILfloat Angle); ILAPI ILboolean ILAPIENTRY iluRotate(ILfloat Angle);
ILAPI ILboolean ILAPIENTRY iluRotate3D(ILfloat x, IL float y, ILfloat z, ILfloat Angle); ILAPI ILboolean ILAPIENTRY iluRotate3D(ILfloat x, IL float y, ILfloat z, ILfloat Angle);
ILAPI ILboolean ILAPIENTRY iluSaturate1f(ILfloat Sat uration); ILAPI ILboolean ILAPIENTRY iluSaturate1f(ILfloat Sat uration);
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, IL uint Height, ILuint Depth); ILAPI ILboolean ILAPIENTRY iluScale(ILuint Width, IL uint Height, ILuint Depth);
ILAPI ILboolean ILAPIENTRY iluScaleColours(ILfloat r , ILfloat g, ILfloat b); ILAPI ILboolean ILAPIENTRY iluScaleColours(ILfloat r , ILfloat 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);
 End of changes. 4 change blocks. 
6 lines changed or deleted 16 lines changed or added


 ilut.h   ilut.h 
skipping to change at line 28 skipping to change at line 28
#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
#ifndef IL_STATIC_LIB #ifndef IL_STATIC_LIB
#ifdef _MSC_VER #if defined(_MSC_VER) || defined(__BORLANDC__)
#ifndef _ILUT_BUILD_LIBRARY #ifndef _ILUT_BUILD_LIBRARY
#ifdef IL_DEBUG #ifdef IL_DEBUG
#pragma comment(lib, "ilut-d.lib") #pragma comment(lib, "ilut-d.lib")
#else #else
#pragma comment(lib, "ilut.lib") #pragma comment(lib, "ilut.lib")
#endif//_DEBUG #endif//_DEBUG
#endif//_ILUT_BUILD_LIBRARY #endif//_ILUT_BUILD_LIBRARY
#endif//_MSC_VER #endif//_MSC_VER || __BORLANDC__
#endif//IL_STATIC_LIB #endif//IL_STATIC_LIB
#endif//_WIN32 #endif//_WIN32
#define ILUT_VERSION_1_6_1 1 #define ILUT_VERSION_1_6_1 1
#define ILUT_VERSION 161 #define ILUT_VERSION 161
// 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
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/