config.h   config.h 
skipping to change at line 41 skipping to change at line 41
/* #undef IL_NO_TGA */ /* #undef IL_NO_TGA */
/* #undef IL_NO_TIF */ /* #undef IL_NO_TIF */
/* #undef IL_NO_WAL */ /* #undef IL_NO_WAL */
/* #undef IL_NO_XPM */ /* #undef IL_NO_XPM */
#define IL_USE_JPEGLIB_UNMODIFIED 1 #define IL_USE_JPEGLIB_UNMODIFIED 1
/* Supported api (ilut) */ /* Supported api (ilut) */
/* #undef ILUT_USE_ALLEGRO */ /* #undef ILUT_USE_ALLEGRO */
/* #undef ILUT_USE_DIRECTX8 */ /* #undef ILUT_USE_DIRECTX8 */
/* #undef ILUT_USE_DIRECTX9 */
#define ILUT_USE_OPENGL 1 #define ILUT_USE_OPENGL 1
#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.5" #define VERSION "1.6.6"
/* 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. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 devil_internal_exports.h   devil_internal_exports.h 
skipping to change at line 16 skipping to change at line 16
// //
// Filename: IL/devil_internal_exports.h // Filename: IL/devil_internal_exports.h
// //
// Description: Internal stuff for DevIL (IL, ILU and ILUT) // Description: Internal stuff for DevIL (IL, ILU and ILUT)
// //
//------------------------------------------------------------------------- ---- //------------------------------------------------------------------------- ----
#ifndef IL_EXPORTS_H #ifndef IL_EXPORTS_H
#define IL_EXPORTS_H #define IL_EXPORTS_H
#ifdef __cplusplus
extern "C" {
#endif
#define IL_MAX(a,b) (((a) > (b)) ? (a) : (b)) #define IL_MAX(a,b) (((a) > (b)) ? (a) : (b))
#define IL_MIN(a,b) (((a) < (b)) ? (a) : (b)) #define IL_MIN(a,b) (((a) < (b)) ? (a) : (b))
// Basic Palette struct // Basic Palette struct
typedef struct ILpal typedef struct ILpal
{ {
ILubyte *Palette; // the image palette (if any) ILubyte *Palette; // the image palette (if any)
ILuint PalSize; // size of the palette (in bytes) ILuint PalSize; // size of the palette (in bytes)
ILenum PalType; // the palette types below (0x0500 r ange) ILenum PalType; // the palette types below (0x0500 r ange)
} ILpal; } ILpal;
skipping to change at line 82 skipping to change at line 86
// //
// Utility functions // Utility functions
// //
ILAPI ILubyte ILAPIENTRY ilGetBppFormat(ILenum Format); ILAPI ILubyte ILAPIENTRY ilGetBppFormat(ILenum Format);
ILAPI ILubyte ILAPIENTRY ilGetBppPal(ILenum PalType); ILAPI ILubyte ILAPIENTRY ilGetBppPal(ILenum PalType);
ILAPI ILubyte ILAPIENTRY ilGetBppType(ILenum Type); ILAPI ILubyte ILAPIENTRY ilGetBppType(ILenum Type);
ILAPI ILenum ILAPIENTRY ilGetTypeBpc(ILubyte Bpc); ILAPI ILenum ILAPIENTRY ilGetTypeBpc(ILubyte Bpc);
ILAPI ILenum ILAPIENTRY ilGetPalBaseType(ILenum PalType); ILAPI ILenum ILAPIENTRY ilGetPalBaseType(ILenum PalType);
ILAPI ILuint ILAPIENTRY ilNextPower2(ILuint Num); ILAPI ILuint ILAPIENTRY ilNextPower2(ILuint Num);
ILAPI ILenum ILAPIENTRY ilTypeFromExt(const ILstring FileName); ILAPI ILenum ILAPIENTRY ilTypeFromExt(const ILstring FileName);
ILAPI ILvoid ILAPIENTRY ilReplaceCurImage(ILimage *Image);
// //
// Image functions // Image functions
// //
ILAPI ILvoid ILAPIENTRY iBindImageTemp(ILvoid); ILAPI ILvoid ILAPIENTRY iBindImageTemp(ILvoid);
ILAPI ILboolean ILAPIENTRY ilClearImage_(ILimage *Image); ILAPI ILboolean ILAPIENTRY ilClearImage_(ILimage *Image);
ILAPI ILvoid ILAPIENTRY ilCloseImage(ILimage *Image); ILAPI ILvoid ILAPIENTRY ilCloseImage(ILimage *Image);
ILAPI ILvoid ILAPIENTRY ilClosePal(ILpal *Palette); ILAPI ILvoid ILAPIENTRY ilClosePal(ILpal *Palette);
ILAPI ILpal* ILAPIENTRY iCopyPal(ILvoid); ILAPI ILpal* ILAPIENTRY iCopyPal(ILvoid);
ILAPI ILboolean ILAPIENTRY ilCopyImageAttr(ILimage *Dest, ILima ge *Src); ILAPI ILboolean ILAPIENTRY ilCopyImageAttr(ILimage *Dest, ILima ge *Src);
skipping to change at line 110 skipping to change at line 115
ILAPI ILvoid* ILAPIENTRY ilConvertBuffer(ILuint SizeOfData, ILenum Sr cFormat, ILenum DestFormat, ILenum SrcType, ILenum DestType, ILvoid *Buffer ); ILAPI ILvoid* ILAPIENTRY ilConvertBuffer(ILuint SizeOfData, ILenum Sr cFormat, ILenum DestFormat, ILenum SrcType, ILenum DestType, ILvoid *Buffer );
ILAPI ILimage* ILAPIENTRY iConvertImage(ILimage *Image, ILenum DestFor mat, ILenum DestType); ILAPI ILimage* ILAPIENTRY iConvertImage(ILimage *Image, ILenum DestFor mat, ILenum DestType);
ILAPI ILpal* ILAPIENTRY iConvertPal(ILpal *Pal, ILenum DestFormat); ILAPI ILpal* ILAPIENTRY iConvertPal(ILpal *Pal, ILenum DestFormat);
ILAPI ILubyte* ILAPIENTRY iGetFlipped(ILimage *Image); ILAPI ILubyte* ILAPIENTRY iGetFlipped(ILimage *Image);
// Internal library functions in ILU // Internal library functions in ILU
ILAPI ILimage* ILAPIENTRY iluRotate_(ILimage *Image, ILfloat Angle); ILAPI ILimage* ILAPIENTRY iluRotate_(ILimage *Image, ILfloat Angle);
ILAPI ILimage* ILAPIENTRY iluRotate3D_(ILimage *Image, ILfloat x, ILfloat y , ILfloat z, ILfloat Angle); ILAPI ILimage* ILAPIENTRY iluRotate3D_(ILimage *Image, ILfloat x, ILfloat y , ILfloat z, ILfloat Angle);
ILAPI ILimage* ILAPIENTRY iluScale_(ILimage *Image, ILuint Width, ILuint He ight, ILuint Depth); ILAPI ILimage* ILAPIENTRY iluScale_(ILimage *Image, ILuint Width, ILuint He ight, ILuint Depth);
#ifdef __cplusplus
}
#endif
#endif//IL_EXPORTS_H #endif//IL_EXPORTS_H
 End of changes. 3 change blocks. 
0 lines changed or deleted 9 lines changed or added


 il.h   il.h 
skipping to change at line 159 skipping to change at line 159
#define IL_DOUBLE 0x14 0A #define IL_DOUBLE 0x14 0A
#define IL_VENDOR 0x1F 00 #define IL_VENDOR 0x1F 00
#define IL_LOAD_EXT 0x1F 01 #define IL_LOAD_EXT 0x1F 01
#define IL_SAVE_EXT 0x1F 02 #define IL_SAVE_EXT 0x1F 02
// //
// IL-specific #define's // IL-specific #define's
// //
#define IL_VERSION_1_6_1 1 #define IL_VERSION_1_6_6 1
#define IL_VERSION 161 #define IL_VERSION 166
// 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 374 skipping to change at line 374
#define IL_ACTIVE_IMAGE 0x0D F4 #define IL_ACTIVE_IMAGE 0x0D F4
#define IL_ACTIVE_MIPMAP 0x0DF5 #define IL_ACTIVE_MIPMAP 0x0DF5
#define IL_ACTIVE_LAYER 0x0D F6 #define IL_ACTIVE_LAYER 0x0D F6
#define IL_CUR_IMAGE 0x0DF7 #define IL_CUR_IMAGE 0x0DF7
#define IL_IMAGE_DURATION 0x0DF8 #define IL_IMAGE_DURATION 0x0DF8
#define IL_IMAGE_PLANESIZE 0x0DF9 #define IL_IMAGE_PLANESIZE 0x0DF9
#define IL_IMAGE_BPC 0x0DFA #define IL_IMAGE_BPC 0x0DFA
#define IL_IMAGE_OFFX 0x0DFB #define IL_IMAGE_OFFX 0x0DFB
#define IL_IMAGE_OFFY 0x0DFC #define IL_IMAGE_OFFY 0x0DFC
#define IL_IMAGE_CUBEFLAGS 0x0DFD #define IL_IMAGE_CUBEFLAGS 0x0DFD
#define IL_IMAGE_ORIGIN 0x0DFE
// //
// Section shamelessly modified from the glut header. // Section shamelessly modified from the glut header.
// //
// This is from Win32's <windef.h> // This is from Win32's <windef.h>
#if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC_ _) || defined(__LCC__) #if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC_ _) || defined(__LCC__)
#define ILAPIENTRY __stdcall #define ILAPIENTRY __stdcall
#define IL_PACKSTRUCT #define IL_PACKSTRUCT
#elif linux #elif defined(linux) || defined(MACOSX)
#define ILAPIENTRY #define ILAPIENTRY
#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
skipping to change at line 535 skipping to change at line 536
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* Jpeg DecompressorPtr); ILAPI ILboolean ILAPIENTRY ilLoadFromJpegStruct(ILvoid* Jpeg DecompressorPtr);
ILAPI ILboolean ILAPIENTRY ilSaveFromJpegStruct(ILvoid* Jpeg CompressorPtr); ILAPI ILboolean ILAPIENTRY ilSaveFromJpegStruct(ILvoid* Jpeg 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 ALTIVEC
#define imemclear(x,y) vec_memclear(x,y);
#else
#define imemclear(x,y) memset(x,0,y);
#endif
#ifdef ALTIVEC
void vec_memclear( ILvoid *, ILuint );
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif // __IL_H__ #endif // __IL_H__
#endif // __il_h__ #endif // __il_h__
 End of changes. 4 change blocks. 
3 lines changed or deleted 14 lines changed or added


 ilu.h   ilu.h 
skipping to change at line 39 skipping to change at line 39
#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 || __BORLANDC__ #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_6 1
#define ILU_VERSION 161 #define ILU_VERSION 166
#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 69 skipping to change at line 69
#define ILU_INVALID_PARAM 0x0509 #define ILU_INVALID_PARAM 0x0509
// Values // Values
#define ILU_PLACEMENT 0x0700 #define ILU_PLACEMENT 0x0700
#define ILU_LOWER_LEFT 0x0701 #define ILU_LOWER_LEFT 0x0701
#define ILU_LOWER_RIGHT 0x07 02 #define ILU_LOWER_RIGHT 0x07 02
#define ILU_UPPER_LEFT 0x0703 #define ILU_UPPER_LEFT 0x0703
#define ILU_UPPER_RIGHT 0x07 04 #define ILU_UPPER_RIGHT 0x07 04
#define ILU_CENTER 0x07 05 #define ILU_CENTER 0x07 05
#define ILU_CONVOLUTION_MATRIX 0x0710 #define ILU_CONVOLUTION_MATRIX 0x0710
#define ILU_VERSION_NUM 0x0D #define ILU_VERSION_NUM IL_V
E2 ERSION_NUM
#define ILU_VENDOR IL_V
ENDOR
// Filters // Filters
/* /*
#define ILU_FILTER_BLUR 0x08 03 #define ILU_FILTER_BLUR 0x08 03
#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. 2 change blocks. 
4 lines changed or deleted 6 lines changed or added


 ilut.h   ilut.h 
skipping to change at line 40 skipping to change at line 40
#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 || __BORLANDC__ #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_6 1
#define ILUT_VERSION 161 #define ILUT_VERSION 166
// 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
skipping to change at line 76 skipping to change at line 76
#define ILUT_MAXTEX_DEPTH 0x0632 #define ILUT_MAXTEX_DEPTH 0x0632
#define ILUT_GL_USE_S3TC 0x0634 #define ILUT_GL_USE_S3TC 0x0634
#define ILUT_D3D_USE_DXTC 0x0634 #define ILUT_D3D_USE_DXTC 0x0634
#define ILUT_GL_GEN_S3TC 0x0635 #define ILUT_GL_GEN_S3TC 0x0635
#define ILUT_D3D_GEN_DXTC 0x0635 #define ILUT_D3D_GEN_DXTC 0x0635
#define ILUT_S3TC_FORMAT 0x0705 #define ILUT_S3TC_FORMAT 0x0705
#define ILUT_DXTC_FORMAT 0x0705 #define ILUT_DXTC_FORMAT 0x0705
#define ILUT_D3D_POOL 0x0706 #define ILUT_D3D_POOL 0x0706
// Values // Values
#define ILUT_VERSION_NUM 0x0DE2 #define ILUT_VERSION_NUM IL_VERSION_N
UM
#define ILUT_VENDOR IL_V
ENDOR
// 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 ILstring 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?
#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 #define ILUT_DIRECT3D8 3
#define ILUT_DIRECT3D9 4
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 136 skipping to change at line 138
#else #else
/* /*
* We are surely using a *nix so the configure script * We are surely using a *nix so the configure script
* may have written the configured config.h header * may have written the configured config.h header
*/ */
#include "config.h" #include "config.h"
#endif #endif
// ImageLib Utility Toolkit's OpenGL Functions // ImageLib Utility Toolkit's OpenGL Functions
#ifdef ILUT_USE_OPENGL #ifdef ILUT_USE_OPENGL
#ifdef _MSC_VER #if defined(_MSC_VER) || defined(_WIN32)
//#define WIN32_LEAN_AND_MEAN //#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#endif//_MSC_VER #endif//_MSC_VER
#ifdef __APPLE__ #ifdef __APPLE__
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
skipping to change at line 184 skipping to change at line 186
#endif//ILUT_USE_SDL #endif//ILUT_USE_SDL
// ImageLib Utility Toolkit's BeOS Functions // ImageLib Utility Toolkit's BeOS Functions
#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 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 );
ILAPI ILboolean ILAPIENTRY ilutWinPrint(ILuint XPos, ILuint YPos, ILuint Width, ILuint Height, HDC hDC); ILAPI ILboolean ILAPIENTRY ilutWinPrint(ILuint XPos, ILuint YPos, ILuint Width, ILuint Height, HDC hDC);
ILAPI ILboolean ILAPIENTRY ilutWinSaveImage(const ILstring F ileName, HBITMAP Bitmap); ILAPI ILboolean ILAPIENTRY ilutWinSaveImage(const ILstring F ileName, HBITMAP Bitmap);
#endif//_WIN32 #endif//_WIN32
#endif//ILUT_USE_WIN32 #endif//ILUT_USE_WIN32
#ifdef ILUT_USE_DIRECTX9
#ifdef _WIN32
#include <d3d9.h>
// ILAPI ILvoid ILAPIENTRY ilutD3D9MipFunc(ILuint NumLevels)
;
ILAPI IDirect3DTexture9* ILAPIENTRY ilutD3D9Texture(IDirect3
DDevice9 *Device);
ILAPI IDirect3DVolumeTexture9* ILAPIENTRY ilutD3D9VolumeText
ure(IDirect3DDevice9 *Device);
ILAPI ILboolean ILAPIENTRY ilutD3D9TexFromFile(IDirect3DDevi
ce9 *Device, char *FileName, IDirect3DTexture9 **Texture);
ILAPI ILboolean ILAPIENTRY ilutD3D9VolTexFromFile(IDirect3DD
evice9 *Device, char *FileName, IDirect3DVolumeTexture9 **Texture);
ILAPI ILboolean ILAPIENTRY ilutD3D9TexFromFileInMemory(IDire
ct3DDevice9 *Device, ILvoid *Lump, ILuint Size, IDirect3DTexture9 **Texture
);
ILAPI ILboolean ILAPIENTRY ilutD3D9VolTexFromFileInMemory(ID
irect3DDevice9 *Device, ILvoid *Lump, ILuint Size, IDirect3DVolumeTexture9
**Texture);
ILAPI ILboolean ILAPIENTRY ilutD3D9TexFromFileHandle(IDirect
3DDevice9 *Device, ILHANDLE File, IDirect3DTexture9 **Texture);
ILAPI ILboolean ILAPIENTRY ilutD3D9VolTexFromFileHandle(IDir
ect3DDevice9 *Device, ILHANDLE File, IDirect3DVolumeTexture9 **Texture);
// These two are not tested yet.
ILAPI ILboolean ILAPIENTRY ilutD3D9TexFromResource(IDirect3D
Device9 *Device, HMODULE SrcModule, char *SrcResource, IDirect3DTexture9 **
Texture);
ILAPI ILboolean ILAPIENTRY ilutD3D9VolTexFromResource(IDirec
t3DDevice9 *Device, HMODULE SrcModule, char *SrcResource, IDirect3DVolumeTe
xture9 **Texture);
ILAPI ILboolean ILAPIENTRY ilutD3D9LoadSurface(IDirect3DDevi
ce9 *Device, IDirect3DSurface9 *Surface);
#endif//_WIN32
#endif//ILUT_USE_DIRECTX9
// ImageLib Utility Toolkit's DirectX 8 Functions // ImageLib Utility Toolkit's DirectX 8 Functions
#ifdef ILUT_USE_DIRECTX8 #ifdef ILUT_USE_DIRECTX8
#ifdef _WIN32 #ifdef _WIN32
#ifndef _D3D8_H_
#include <d3d8.h> #include <d3d8.h>
ILAPI ILvoid ILAPIENTRY ilutD3D8MipFunc(ILuint NumLevels) #endif
; // ILAPI ILvoid ILAPIENTRY ilutD3D8MipFunc(ILuint NumLevels)
;
ILAPI IDirect3DTexture8* ILAPIENTRY ilutD3D8Texture(IDirect3 DDevice8 *Device); ILAPI IDirect3DTexture8* ILAPIENTRY ilutD3D8Texture(IDirect3 DDevice8 *Device);
ILAPI IDirect3DVolumeTexture8* ILAPIENTRY ilutD3D8VolumeText ure(IDirect3DDevice8 *Device); ILAPI IDirect3DVolumeTexture8* ILAPIENTRY ilutD3D8VolumeText ure(IDirect3DDevice8 *Device);
ILAPI ILboolean ILAPIENTRY ilutD3D8TexFromFile(IDirect3DDevi ce8 *Device, char *FileName, IDirect3DTexture8 **Texture); ILAPI ILboolean ILAPIENTRY ilutD3D8TexFromFile(IDirect3DDevi ce8 *Device, char *FileName, IDirect3DTexture8 **Texture);
ILAPI ILboolean ILAPIENTRY ilutD3D8VolTexFromFile(IDirect3DD evice8 *Device, char *FileName, IDirect3DVolumeTexture8 **Texture); ILAPI ILboolean ILAPIENTRY ilutD3D8VolTexFromFile(IDirect3DD evice8 *Device, char *FileName, IDirect3DVolumeTexture8 **Texture);
ILAPI ILboolean ILAPIENTRY ilutD3D8TexFromFileInMemory(IDire ct3DDevice8 *Device, ILvoid *Lump, ILuint Size, IDirect3DTexture8 **Texture ); ILAPI ILboolean ILAPIENTRY ilutD3D8TexFromFileInMemory(IDire ct3DDevice8 *Device, ILvoid *Lump, ILuint Size, IDirect3DTexture8 **Texture );
ILAPI ILboolean ILAPIENTRY ilutD3D8VolTexFromFileInMemory(ID irect3DDevice8 *Device, ILvoid *Lump, ILuint Size, IDirect3DVolumeTexture8 **Texture); ILAPI ILboolean ILAPIENTRY ilutD3D8VolTexFromFileInMemory(ID irect3DDevice8 *Device, ILvoid *Lump, ILuint Size, IDirect3DVolumeTexture8 **Texture);
ILAPI ILboolean ILAPIENTRY ilutD3D8TexFromFileHandle(IDirect 3DDevice8 *Device, ILHANDLE File, IDirect3DTexture8 **Texture); ILAPI ILboolean ILAPIENTRY ilutD3D8TexFromFileHandle(IDirect 3DDevice8 *Device, ILHANDLE File, IDirect3DTexture8 **Texture);
ILAPI ILboolean ILAPIENTRY ilutD3D8VolTexFromFileHandle(IDir ect3DDevice8 *Device, ILHANDLE File, IDirect3DVolumeTexture8 **Texture); ILAPI ILboolean ILAPIENTRY ilutD3D8VolTexFromFileHandle(IDir ect3DDevice8 *Device, ILHANDLE File, IDirect3DVolumeTexture8 **Texture);
// These two are not tested yet. // These two are not tested yet.
ILAPI ILboolean ILAPIENTRY ilutD3D8TexFromResource(IDirect3D Device8 *Device, HMODULE SrcModule, char *SrcResource, IDirect3DTexture8 ** Texture); ILAPI ILboolean ILAPIENTRY ilutD3D8TexFromResource(IDirect3D Device8 *Device, HMODULE SrcModule, char *SrcResource, IDirect3DTexture8 ** Texture);
 End of changes. 9 change blocks. 
8 lines changed or deleted 50 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/