summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenton Woods <devil.imagelib@gmail.com>2009-02-06 06:09:33 +0000
committerDenton Woods <devil.imagelib@gmail.com>2009-02-06 06:09:33 +0000
commit9500c465951eb55f58b5ff4ad95fafbfb953888a (patch)
treea408341cc449cf5c7dae44e593992374a090bb82
parent2ede4b90eb0e4d3218676018f7be6dcfcf242e23 (diff)
downloaddevil-9500c465951eb55f58b5ff4ad95fafbfb953888a.tar.gz
* il_rle.c:20: Changed size_t cast to ILint to resolve compiler warning.
* il.def: Added definitions. * Updated version numbers to 1.7.7 everywhere.
-rw-r--r--DevIL/ChangeLog7
-rw-r--r--DevIL/README2
-rw-r--r--DevIL/TODO2
-rw-r--r--DevIL/configure.ac2
-rw-r--r--DevIL/include/IL/il.h8
-rw-r--r--DevIL/include/IL/ilu.h6
-rw-r--r--DevIL/include/IL/ilut.h6
-rw-r--r--DevIL/projects/msvc8/ImageLib Unicode.sln17
-rw-r--r--DevIL/src-IL/msvc8/IL Unicode.rc10
-rw-r--r--DevIL/src-IL/msvc8/IL Unicode.vcproj6
-rw-r--r--DevIL/src-IL/msvc8/IL.rc10
-rw-r--r--DevIL/src-IL/msvc8/il.def7
-rw-r--r--DevIL/src-IL/msvc9/IL Unicode.rc10
-rw-r--r--DevIL/src-IL/msvc9/IL.rc10
-rw-r--r--DevIL/src-IL/msvc9/il.def10
-rw-r--r--DevIL/src-IL/src/il_rle.c2
-rw-r--r--DevIL/src-IL/src/il_states.c2
-rw-r--r--DevIL/src-ILU/msvc8/ILU Unicode.rc10
-rw-r--r--DevIL/src-ILU/msvc8/ILU.rc10
-rw-r--r--DevIL/src-ILU/msvc9/ILU Unicode.rc10
-rw-r--r--DevIL/src-ILU/msvc9/ILU.rc10
-rw-r--r--DevIL/src-ILU/src/ilu_states.c2
-rw-r--r--DevIL/src-ILUT/msvc8/ILUT Unicode.rc10
-rw-r--r--DevIL/src-ILUT/msvc8/ILUT.rc10
-rw-r--r--DevIL/src-ILUT/msvc9/ILUT Unicode.rc10
-rw-r--r--DevIL/src-ILUT/msvc9/ILUT.rc10
-rw-r--r--DevIL/src-ILUT/src/ilut_states.c4
27 files changed, 104 insertions, 99 deletions
diff --git a/DevIL/ChangeLog b/DevIL/ChangeLog
index 54ddce0c..462943dd 100644
--- a/DevIL/ChangeLog
+++ b/DevIL/ChangeLog
@@ -346,4 +346,9 @@ Up to 2009-01-02 (since 1.7.5 release) Denton Woods <doomwiz@users.sf.net>
* ilut_opengl.c:160: Changed checks to see if less than 0.
* il_fits.c: Got this reading FITS files properly.
-
+2009-02-04 Denton Woods <doomwiz@users.sf.net>
+ * il_tga.c: Fixed bug loading malformed RLE Targa images.
+ * il_rle.c:20: Changed size_t cast to ILint to resolve compiler warning.
+ * il.def: Added definitions.
+ * Updated version numbers to 1.7.7 everywhere.
+ \ No newline at end of file
diff --git a/DevIL/README b/DevIL/README
index edc659bb..711648de 100644
--- a/DevIL/README
+++ b/DevIL/README
@@ -1,4 +1,4 @@
-Developer's Image Library version 1.7.5 Readme, Notes and Quick Use
+Developer's Image Library version 1.7.7 Readme, Notes and Quick Use
-------------------------------------------------------------------
<DZA[afk]> DevIL song: "la la la, a cross-platform image library utilizing a
diff --git a/DevIL/TODO b/DevIL/TODO
index b98d6aa6..f7bdb184 100644
--- a/DevIL/TODO
+++ b/DevIL/TODO
@@ -5,6 +5,8 @@ DevIL TODO:
Denton:
By next release:
+- NVTT.dll as a delay-loaded DLL.
+- New functions in il.def.
- Change version numbers.
- Update docs with next DXT code, new mipmap/cubemap access, new SaveL code.
- Mention Unicode and 64-bit compatibility on website.
diff --git a/DevIL/configure.ac b/DevIL/configure.ac
index 25b95e01..8bdb2972 100644
--- a/DevIL/configure.ac
+++ b/DevIL/configure.ac
@@ -9,7 +9,7 @@ dnl configure.ac initialization
dnl we use some macros that are in m4 directory
dnl
AC_INIT([DevIL],
- 1.7.6,
+ 1.7.7,
[bubla@users.sourceforge.net])
dnl Minimum Autoconf version
AC_PREREQ(2.52)
diff --git a/DevIL/include/IL/il.h b/DevIL/include/IL/il.h
index 9227f73f..d8cdcb6f 100644
--- a/DevIL/include/IL/il.h
+++ b/DevIL/include/IL/il.h
@@ -2,7 +2,7 @@
//
// ImageLib Sources
// Copyright (C) 2000-2009 by Denton Woods
-// Last modified: 02/01/2009
+// Last modified: 02/05/2009
//
// Filename: IL/il.h
//
@@ -161,8 +161,8 @@ typedef long long unsigned int ILuint64;
// IL-specific #define's
//
-#define IL_VERSION_1_7_5 1
-#define IL_VERSION 175
+#define IL_VERSION_1_7_7 1
+#define IL_VERSION 177
// Attribute Bits
@@ -544,6 +544,7 @@ ILAPI ILboolean ILAPIENTRY ilDisable(ILenum Mode);
ILAPI ILboolean ILAPIENTRY ilDxtcDataToImage(void);
ILAPI ILboolean ILAPIENTRY ilDxtcDataToSurface(void);
ILAPI ILboolean ILAPIENTRY ilEnable(ILenum Mode);
+ILAPI void ILAPIENTRY ilFlipSurfaceDxtcData(void);
ILAPI ILboolean ILAPIENTRY ilFormatFunc(ILenum Mode);
ILAPI void ILAPIENTRY ilGenImages(ILsizei Num, ILuint *Images);
ILAPI ILuint ILAPIENTRY ilGenImage(void);
@@ -559,6 +560,7 @@ ILAPI ILuint ILAPIENTRY ilGetLumpPos(void);
ILAPI ILubyte* ILAPIENTRY ilGetPalette(void);
ILAPI ILconst_string ILAPIENTRY ilGetString(ILenum StringName);
ILAPI void ILAPIENTRY ilHint(ILenum Target, ILenum Mode);
+ILAPI ILboolean ILAPIENTRY ilInvertSurfaceDxtcDataAlpha(void);
ILAPI void ILAPIENTRY ilInit(void);
ILAPI ILboolean ILAPIENTRY ilImageToDxtcData(ILenum Format);
ILAPI ILboolean ILAPIENTRY ilIsDisabled(ILenum Mode);
diff --git a/DevIL/include/IL/ilu.h b/DevIL/include/IL/ilu.h
index 10283919..f86c17a2 100644
--- a/DevIL/include/IL/ilu.h
+++ b/DevIL/include/IL/ilu.h
@@ -2,7 +2,7 @@
//
// ImageLib Utility Sources
// Copyright (C) 2000-2009 by Denton Woods
-// Last modified: 02/01/2009
+// Last modified: 02/05/2009
//
// Filename: IL/ilu.h
//
@@ -37,8 +37,8 @@ extern "C" {
#endif
-#define ILU_VERSION_1_7_5 1
-#define ILU_VERSION 175
+#define ILU_VERSION_1_7_7 1
+#define ILU_VERSION 177
#define ILU_FILTER 0x2600
diff --git a/DevIL/include/IL/ilut.h b/DevIL/include/IL/ilut.h
index bd080058..83dd27a4 100644
--- a/DevIL/include/IL/ilut.h
+++ b/DevIL/include/IL/ilut.h
@@ -2,7 +2,7 @@
//
// ImageLib Utility Toolkit Sources
// Copyright (C) 2000-2009 by Denton Woods
-// Last modified: 02/01/2009
+// Last modified: 02/05/2009
//
// Filename: IL/ilut.h
//
@@ -29,8 +29,8 @@
// Defines
//-----------------------------------------------------------------------------
-#define ILUT_VERSION_1_7_5 1
-#define ILUT_VERSION 175
+#define ILUT_VERSION_1_7_7 1
+#define ILUT_VERSION 177
// Attribute Bits
diff --git a/DevIL/projects/msvc8/ImageLib Unicode.sln b/DevIL/projects/msvc8/ImageLib Unicode.sln
index 79e8e0ba..704df5b2 100644
--- a/DevIL/projects/msvc8/ImageLib Unicode.sln
+++ b/DevIL/projects/msvc8/ImageLib Unicode.sln
@@ -33,8 +33,6 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
- Dynamic|Win32 = Dynamic|Win32
- Dynamic|x64 = Dynamic|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
@@ -43,10 +41,6 @@ Global
{B46B180B-6079-4CE6-8647-A7D712774255}.Debug|Win32.Build.0 = Debug|Win32
{B46B180B-6079-4CE6-8647-A7D712774255}.Debug|x64.ActiveCfg = Debug|x64
{B46B180B-6079-4CE6-8647-A7D712774255}.Debug|x64.Build.0 = Debug|x64
- {B46B180B-6079-4CE6-8647-A7D712774255}.Dynamic|Win32.ActiveCfg = Debug|Win32
- {B46B180B-6079-4CE6-8647-A7D712774255}.Dynamic|Win32.Build.0 = Debug|Win32
- {B46B180B-6079-4CE6-8647-A7D712774255}.Dynamic|x64.ActiveCfg = Debug|x64
- {B46B180B-6079-4CE6-8647-A7D712774255}.Dynamic|x64.Build.0 = Debug|x64
{B46B180B-6079-4CE6-8647-A7D712774255}.Release|Win32.ActiveCfg = Release|Win32
{B46B180B-6079-4CE6-8647-A7D712774255}.Release|Win32.Build.0 = Release|Win32
{B46B180B-6079-4CE6-8647-A7D712774255}.Release|x64.ActiveCfg = Release|x64
@@ -55,10 +49,6 @@ Global
{CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Debug|Win32.Build.0 = Debug|Win32
{CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Debug|x64.ActiveCfg = Debug|x64
{CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Debug|x64.Build.0 = Debug|x64
- {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Dynamic|Win32.ActiveCfg = Debug|Win32
- {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Dynamic|Win32.Build.0 = Debug|Win32
- {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Dynamic|x64.ActiveCfg = Debug|x64
- {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Dynamic|x64.Build.0 = Debug|x64
{CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Release|Win32.ActiveCfg = Release|Win32
{CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Release|Win32.Build.0 = Release|Win32
{CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Release|x64.ActiveCfg = Release|x64
@@ -67,10 +57,6 @@ Global
{7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Debug|Win32.Build.0 = Debug|Win32
{7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Debug|x64.ActiveCfg = Debug|x64
{7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Debug|x64.Build.0 = Debug|x64
- {7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Dynamic|Win32.ActiveCfg = Debug|Win32
- {7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Dynamic|Win32.Build.0 = Debug|Win32
- {7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Dynamic|x64.ActiveCfg = Debug|x64
- {7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Dynamic|x64.Build.0 = Debug|x64
{7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Release|Win32.ActiveCfg = Release|Win32
{7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Release|Win32.Build.0 = Release|Win32
{7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Release|x64.ActiveCfg = Release|x64
@@ -78,9 +64,6 @@ Global
{22B03048-FD11-4D7F-88F5-C2628F8B6777}.Debug|Win32.ActiveCfg = Debug|Win32
{22B03048-FD11-4D7F-88F5-C2628F8B6777}.Debug|Win32.Build.0 = Debug|Win32
{22B03048-FD11-4D7F-88F5-C2628F8B6777}.Debug|x64.ActiveCfg = Debug|Win32
- {22B03048-FD11-4D7F-88F5-C2628F8B6777}.Dynamic|Win32.ActiveCfg = Dynamic|Win32
- {22B03048-FD11-4D7F-88F5-C2628F8B6777}.Dynamic|Win32.Build.0 = Dynamic|Win32
- {22B03048-FD11-4D7F-88F5-C2628F8B6777}.Dynamic|x64.ActiveCfg = Dynamic|Win32
{22B03048-FD11-4D7F-88F5-C2628F8B6777}.Release|Win32.ActiveCfg = Release|Win32
{22B03048-FD11-4D7F-88F5-C2628F8B6777}.Release|Win32.Build.0 = Release|Win32
{22B03048-FD11-4D7F-88F5-C2628F8B6777}.Release|x64.ActiveCfg = Release|Win32
diff --git a/DevIL/src-IL/msvc8/IL Unicode.rc b/DevIL/src-IL/msvc8/IL Unicode.rc
index f2233321..bd1f9c63 100644
--- a/DevIL/src-IL/msvc8/IL Unicode.rc
+++ b/DevIL/src-IL/msvc8/IL Unicode.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
1 VERSIONINFO
- FILEVERSION 0,1,7,5
- PRODUCTVERSION 0,1,7,5
+ FILEVERSION 0,1,7,7
+ PRODUCTVERSION 0,1,7,7
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,14 +46,14 @@ BEGIN
VALUE "Comments", "DevIL: A portable image library in development"
VALUE "CompanyName", "Abysmal Software"
VALUE "FileDescription", "DevIL: A portable image library in development"
- VALUE "FileVersion", "1.7.5"
+ VALUE "FileVersion", "1.7.7"
VALUE "InternalName", "Developer's Image Library (DevIL)"
VALUE "LegalCopyright", "Copyright © 2000-2008"
VALUE "LegalTrademarks", "Under LGPL License"
VALUE "OriginalFilename", "DevIL.dll"
VALUE "PrivateBuild", "Open Source"
VALUE "ProductName", "Developer's Image Library (DevIL)"
- VALUE "ProductVersion", "1.7.5 Unicode"
+ VALUE "ProductVersion", "1.7.7 Unicode"
VALUE "SpecialBuild", "Unicode"
END
END
@@ -100,7 +100,7 @@ END
STRINGTABLE
BEGIN
- IDC_OPENIL "Developer's Image Library, Version 1.7.5"
+ IDC_OPENIL "Developer's Image Library, Version 1.7.7"
END
#endif // English (U.S.) resources
diff --git a/DevIL/src-IL/msvc8/IL Unicode.vcproj b/DevIL/src-IL/msvc8/IL Unicode.vcproj
index c6819057..643e85e7 100644
--- a/DevIL/src-IL/msvc8/IL Unicode.vcproj
+++ b/DevIL/src-IL/msvc8/IL Unicode.vcproj
@@ -185,7 +185,7 @@
AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames=""
ModuleDefinitionFile=".\il.def"
- DelayLoadDLLs=""
+ DelayLoadDLLs="NVTT.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../lib/vc8/x64/debug/devil.pdb"
ImportLibrary=".\../../lib/vc8/unicode/x64/debug/devil.lib"
@@ -287,7 +287,7 @@
AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames=""
ModuleDefinitionFile=".\il.def"
- DelayLoadDLLs=""
+ DelayLoadDLLs="NVTT.dll"
ProgramDatabaseFile=".\../../lib/vc8/x86/DevIL.pdb"
OptimizeForWindows98="1"
ImportLibrary=".\../../lib/vc8/unicode/x86/DevIL.lib"
@@ -389,7 +389,7 @@
AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames=""
ModuleDefinitionFile=".\il.def"
- DelayLoadDLLs=""
+ DelayLoadDLLs="NVTT.dll"
ProgramDatabaseFile=".\../../lib/vc8/x64/DevIL.pdb"
OptimizeForWindows98="1"
ImportLibrary=".\../../lib/vc8/unicode/x64/DevIL.lib"
diff --git a/DevIL/src-IL/msvc8/IL.rc b/DevIL/src-IL/msvc8/IL.rc
index dabe3d97..ead20cb9 100644
--- a/DevIL/src-IL/msvc8/IL.rc
+++ b/DevIL/src-IL/msvc8/IL.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
1 VERSIONINFO
- FILEVERSION 0,1,7,5
- PRODUCTVERSION 0,1,7,5
+ FILEVERSION 0,1,7,7
+ PRODUCTVERSION 0,1,7,7
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,14 +46,14 @@ BEGIN
VALUE "Comments", "DevIL: A portable image library in development"
VALUE "CompanyName", "Abysmal Software"
VALUE "FileDescription", "DevIL: A portable image library in development"
- VALUE "FileVersion", "1.7.5"
+ VALUE "FileVersion", "1.7.7"
VALUE "InternalName", "Developer's Image Library (DevIL)"
VALUE "LegalCopyright", "Copyright © 2000-2008"
VALUE "LegalTrademarks", "Under LGPL License"
VALUE "OriginalFilename", "DevIL.dll"
VALUE "PrivateBuild", "Open Source"
VALUE "ProductName", "Developer's Image Library (DevIL)"
- VALUE "ProductVersion", "1.7.5 Ansi"
+ VALUE "ProductVersion", "1.7.7 Ansi"
VALUE "SpecialBuild", "Ansi"
END
END
@@ -104,7 +104,7 @@ END
STRINGTABLE
BEGIN
- IDC_OPENIL "Developer's Image Library, Version 1.7.5"
+ IDC_OPENIL "Developer's Image Library, Version 1.7.7"
END
#endif // English (U.S.) resources
diff --git a/DevIL/src-IL/msvc8/il.def b/DevIL/src-IL/msvc8/il.def
index 2806a585..c9391184 100644
--- a/DevIL/src-IL/msvc8/il.def
+++ b/DevIL/src-IL/msvc8/il.def
@@ -1,6 +1,7 @@
; To remove an export, add a semicolon at the beginning of the line to comment it out.
EXPORTS
+ilActiveFace
ilActiveImage
ilActiveLayer
ilActiveMipmap
@@ -26,6 +27,8 @@ ilDetermineType
ilDetermineTypeF
ilDetermineTypeL
ilDisable
+ilDxtcDataToImage
+ilDxtcDataToSurface
ilEnable
ilFormatFunc
ilGenImage
@@ -53,6 +56,7 @@ ilGetTypeBpc
ilHint
ilInit
ilInitImage
+ilImageToDxtcData
ilIsDisabled
ilIsEnabled
ilIsImage
@@ -75,6 +79,7 @@ ilPushAttrib
ilRegisterFormat
ilRegisterLoad
ilRegisterMipNum
+ilRegisterNumFaces
ilRegisterNumImages
ilRegisterOrigin
ilRegisterPal
@@ -104,7 +109,9 @@ ilSetPixels
ilSetString
ilSetWrite
ilShutDown
+ilSurfaceToDxtcData
ilTexImage
+ilTexImageDxtc
ilTypeFromExt
ilTypeFunc
ilLoadData
diff --git a/DevIL/src-IL/msvc9/IL Unicode.rc b/DevIL/src-IL/msvc9/IL Unicode.rc
index 057dbba1..3382438e 100644
--- a/DevIL/src-IL/msvc9/IL Unicode.rc
+++ b/DevIL/src-IL/msvc9/IL Unicode.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
1 VERSIONINFO
- FILEVERSION 0,1,7,5
- PRODUCTVERSION 0,1,7,5
+ FILEVERSION 0,1,7,7
+ PRODUCTVERSION 0,1,7,7
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,14 +46,14 @@ BEGIN
VALUE "Comments", "DevIL: A portable image library in development"
VALUE "CompanyName", "Abysmal Software"
VALUE "FileDescription", "DevIL: A portable image library in development"
- VALUE "FileVersion", "1.7.5"
+ VALUE "FileVersion", "1.7.7"
VALUE "InternalName", "Developer's Image Library (DevIL)"
VALUE "LegalCopyright", "Copyright © 2000-2008"
VALUE "LegalTrademarks", "Under LGPL License"
VALUE "OriginalFilename", "DevIL.dll"
VALUE "PrivateBuild", "Open Source"
VALUE "ProductName", "Developer's Image Library (DevIL)"
- VALUE "ProductVersion", "1.7.5 Unicode"
+ VALUE "ProductVersion", "1.7.7 Unicode"
VALUE "SpecialBuild", "Unicode"
END
END
@@ -104,7 +104,7 @@ END
STRINGTABLE
BEGIN
- IDC_OPENIL "Developer's Image Library, Version 1.7.5"
+ IDC_OPENIL "Developer's Image Library, Version 1.7.7"
END
#endif // English (U.S.) resources
diff --git a/DevIL/src-IL/msvc9/IL.rc b/DevIL/src-IL/msvc9/IL.rc
index b3a34621..84bfc964 100644
--- a/DevIL/src-IL/msvc9/IL.rc
+++ b/DevIL/src-IL/msvc9/IL.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
1 VERSIONINFO
- FILEVERSION 0,1,7,5
- PRODUCTVERSION 0,1,7,5
+ FILEVERSION 0,1,7,7
+ PRODUCTVERSION 0,1,7,7
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,14 +46,14 @@ BEGIN
VALUE "Comments", "DevIL: A portable image library in development"
VALUE "CompanyName", "Abysmal Software"
VALUE "FileDescription", "DevIL: A portable image library in development"
- VALUE "FileVersion", "1.7.5"
+ VALUE "FileVersion", "1.7.7"
VALUE "InternalName", "Developer's Image Library (DevIL)"
VALUE "LegalCopyright", "Copyright © 2000-2008"
VALUE "LegalTrademarks", "Under LGPL License"
VALUE "OriginalFilename", "DevIL.dll"
VALUE "PrivateBuild", "Open Source"
VALUE "ProductName", "Developer's Image Library (DevIL)"
- VALUE "ProductVersion", "1.7.5 Ansi"
+ VALUE "ProductVersion", "1.7.7 Ansi"
VALUE "SpecialBuild", "Ansi"
END
END
@@ -100,7 +100,7 @@ END
STRINGTABLE
BEGIN
- IDC_OPENIL "Developer's Image Library, Version 1.7.5"
+ IDC_OPENIL "Developer's Image Library, Version 1.7.7"
END
#endif // English (U.S.) resources
diff --git a/DevIL/src-IL/msvc9/il.def b/DevIL/src-IL/msvc9/il.def
index d550cd00..c9391184 100644
--- a/DevIL/src-IL/msvc9/il.def
+++ b/DevIL/src-IL/msvc9/il.def
@@ -1,6 +1,7 @@
; To remove an export, add a semicolon at the beginning of the line to comment it out.
EXPORTS
+ilActiveFace
ilActiveImage
ilActiveLayer
ilActiveMipmap
@@ -8,6 +9,7 @@ ilApplyProfile
ilApplyPal
ilBindImage
ilBlit
+ilClampNTSC
ilClearColour
ilClearImage
ilCloneCurImage
@@ -25,6 +27,8 @@ ilDetermineType
ilDetermineTypeF
ilDetermineTypeL
ilDisable
+ilDxtcDataToImage
+ilDxtcDataToSurface
ilEnable
ilFormatFunc
ilGenImage
@@ -52,6 +56,7 @@ ilGetTypeBpc
ilHint
ilInit
ilInitImage
+ilImageToDxtcData
ilIsDisabled
ilIsEnabled
ilIsImage
@@ -74,6 +79,7 @@ ilPushAttrib
ilRegisterFormat
ilRegisterLoad
ilRegisterMipNum
+ilRegisterNumFaces
ilRegisterNumImages
ilRegisterOrigin
ilRegisterPal
@@ -103,7 +109,9 @@ ilSetPixels
ilSetString
ilSetWrite
ilShutDown
+ilSurfaceToDxtcData
ilTexImage
+ilTexImageDxtc
ilTypeFromExt
ilTypeFunc
ilLoadData
@@ -126,10 +134,8 @@ ilCopyImage_
iGetFlipped
ilIsValidPal
ilNewImage
-ilNVidiaCompressDXT
ilResizeImage
ilSetCurImage
-ilSquishCompressDXT
ilTexImage_
ilTexSubImage_
ialloc
diff --git a/DevIL/src-IL/src/il_rle.c b/DevIL/src-IL/src/il_rle.c
index b8f09726..5644f8e3 100644
--- a/DevIL/src-IL/src/il_rle.c
+++ b/DevIL/src-IL/src/il_rle.c
@@ -17,7 +17,7 @@ ILboolean ilRleCompressLine(ILubyte *p, ILuint n, ILubyte bpp,
ILint SameCount; // number of identical adjacent pixels
ILint RLEBufSize = 0; // count of number of bytes encoded
ILint MaxRun;
- const ILint bmp_pad_to_even = 1 - ((size_t)q - *DestWidth) % 2;
+ const ILint bmp_pad_to_even = 1 - ((ILint)q - *DestWidth) % 2;
switch( CompressMode ) {
case IL_TGACOMP:
diff --git a/DevIL/src-IL/src/il_states.c b/DevIL/src-IL/src/il_states.c
index 67f4a152..0245e9f2 100644
--- a/DevIL/src-IL/src/il_states.c
+++ b/DevIL/src-IL/src/il_states.c
@@ -20,7 +20,7 @@
#include <stdlib.h>
ILconst_string _ilVendor = IL_TEXT("Abysmal Software");
-ILconst_string _ilVersion = IL_TEXT("Developer's Image Library (DevIL) 1.7.5");
+ILconst_string _ilVersion = IL_TEXT("Developer's Image Library (DevIL) 1.7.7");
char* _ilLoadExt = "" IL_BMP_EXT IL_CUT_EXT IL_DCX_EXT IL_DDS_EXT
diff --git a/DevIL/src-ILU/msvc8/ILU Unicode.rc b/DevIL/src-ILU/msvc8/ILU Unicode.rc
index b2597eee..75ef9e97 100644
--- a/DevIL/src-ILU/msvc8/ILU Unicode.rc
+++ b/DevIL/src-ILU/msvc8/ILU Unicode.rc
@@ -59,8 +59,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,7,5
- PRODUCTVERSION 0,1,7,5
+ FILEVERSION 0,1,7,7
+ PRODUCTVERSION 0,1,7,7
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x29L
@@ -78,14 +78,14 @@ BEGIN
VALUE "Comments", "ILU: A portable image library in development"
VALUE "CompanyName", "Abysmal Software"
VALUE "FileDescription", "ILU: A portable image library in development"
- VALUE "FileVersion", "1.7.5"
+ VALUE "FileVersion", "1.7.7"
VALUE "InternalName", "ILU"
VALUE "LegalCopyright", "Copyright © 2000-2008"
VALUE "LegalTrademarks", "Under LGPL License"
VALUE "OriginalFilename", "ILU.dll"
VALUE "PrivateBuild", "Open Source"
VALUE "ProductName", "Developer's Image Utilities Library"
- VALUE "ProductVersion", "1.7.5 Unicode"
+ VALUE "ProductVersion", "1.7.7 Unicode"
VALUE "SpecialBuild", "Unicode"
END
END
@@ -112,7 +112,7 @@ IDI_ICON1 ICON "resources\\IL Logo.ico"
STRINGTABLE
BEGIN
- IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.4"
+ IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.7"
END
#endif // English (U.S.) resources
diff --git a/DevIL/src-ILU/msvc8/ILU.rc b/DevIL/src-ILU/msvc8/ILU.rc
index d4fcb306..81e48dd1 100644
--- a/DevIL/src-ILU/msvc8/ILU.rc
+++ b/DevIL/src-ILU/msvc8/ILU.rc
@@ -59,8 +59,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,7,4
- PRODUCTVERSION 0,1,7,4
+ FILEVERSION 0,1,7,7
+ PRODUCTVERSION 0,1,7,7
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x29L
@@ -78,14 +78,14 @@ BEGIN
VALUE "Comments", "ILU: A portable image library in development"
VALUE "CompanyName", "Abysmal Software"
VALUE "FileDescription", "ILU: A portable image library in development"
- VALUE "FileVersion", "1.7.4"
+ VALUE "FileVersion", "1.7.7"
VALUE "InternalName", "ILU"
VALUE "LegalCopyright", "Copyright © 2000-2008"
VALUE "LegalTrademarks", "Under LGPL License"
VALUE "OriginalFilename", "ILU.dll"
VALUE "PrivateBuild", "Open Source"
VALUE "ProductName", "Developer's Image Utilities Library"
- VALUE "ProductVersion", "1.7.4 Ansi"
+ VALUE "ProductVersion", "1.7.7 Ansi"
VALUE "SpecialBuild", "Ansi"
END
END
@@ -112,7 +112,7 @@ IDI_ICON1 ICON "resources\\IL Logo.ico"
STRINGTABLE
BEGIN
- IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.4"
+ IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.7"
END
#endif // English (U.S.) resources
diff --git a/DevIL/src-ILU/msvc9/ILU Unicode.rc b/DevIL/src-ILU/msvc9/ILU Unicode.rc
index 531c90b8..75ef9e97 100644
--- a/DevIL/src-ILU/msvc9/ILU Unicode.rc
+++ b/DevIL/src-ILU/msvc9/ILU Unicode.rc
@@ -59,8 +59,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,7,5
- PRODUCTVERSION 0,1,7,5
+ FILEVERSION 0,1,7,7
+ PRODUCTVERSION 0,1,7,7
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x29L
@@ -78,14 +78,14 @@ BEGIN
VALUE "Comments", "ILU: A portable image library in development"
VALUE "CompanyName", "Abysmal Software"
VALUE "FileDescription", "ILU: A portable image library in development"
- VALUE "FileVersion", "1.7.5"
+ VALUE "FileVersion", "1.7.7"
VALUE "InternalName", "ILU"
VALUE "LegalCopyright", "Copyright © 2000-2008"
VALUE "LegalTrademarks", "Under LGPL License"
VALUE "OriginalFilename", "ILU.dll"
VALUE "PrivateBuild", "Open Source"
VALUE "ProductName", "Developer's Image Utilities Library"
- VALUE "ProductVersion", "1.7.5 Unicode"
+ VALUE "ProductVersion", "1.7.7 Unicode"
VALUE "SpecialBuild", "Unicode"
END
END
@@ -112,7 +112,7 @@ IDI_ICON1 ICON "resources\\IL Logo.ico"
STRINGTABLE
BEGIN
- IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.5"
+ IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.7"
END
#endif // English (U.S.) resources
diff --git a/DevIL/src-ILU/msvc9/ILU.rc b/DevIL/src-ILU/msvc9/ILU.rc
index cd4318f6..81e48dd1 100644
--- a/DevIL/src-ILU/msvc9/ILU.rc
+++ b/DevIL/src-ILU/msvc9/ILU.rc
@@ -59,8 +59,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,7,5
- PRODUCTVERSION 0,1,7,5
+ FILEVERSION 0,1,7,7
+ PRODUCTVERSION 0,1,7,7
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x29L
@@ -78,14 +78,14 @@ BEGIN
VALUE "Comments", "ILU: A portable image library in development"
VALUE "CompanyName", "Abysmal Software"
VALUE "FileDescription", "ILU: A portable image library in development"
- VALUE "FileVersion", "1.7.5"
+ VALUE "FileVersion", "1.7.7"
VALUE "InternalName", "ILU"
VALUE "LegalCopyright", "Copyright © 2000-2008"
VALUE "LegalTrademarks", "Under LGPL License"
VALUE "OriginalFilename", "ILU.dll"
VALUE "PrivateBuild", "Open Source"
VALUE "ProductName", "Developer's Image Utilities Library"
- VALUE "ProductVersion", "1.7.5 Ansi"
+ VALUE "ProductVersion", "1.7.7 Ansi"
VALUE "SpecialBuild", "Ansi"
END
END
@@ -112,7 +112,7 @@ IDI_ICON1 ICON "resources\\IL Logo.ico"
STRINGTABLE
BEGIN
- IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.5"
+ IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.7"
END
#endif // English (U.S.) resources
diff --git a/DevIL/src-ILU/src/ilu_states.c b/DevIL/src-ILU/src/ilu_states.c
index 3861a4c4..dbdf4b9a 100644
--- a/DevIL/src-ILU/src/ilu_states.c
+++ b/DevIL/src-ILU/src/ilu_states.c
@@ -16,7 +16,7 @@
ILconst_string _iluVendor = IL_TEXT("Abysmal Software");
-ILconst_string _iluVersion = IL_TEXT("Developer's Image Library Utilities (ILU) 1.7.5 ");// IL_TEXT(__DATE__));
+ILconst_string _iluVersion = IL_TEXT("Developer's Image Library Utilities (ILU) 1.7.7 ");// IL_TEXT(__DATE__));
ILstring ILAPIENTRY iluGetString(ILenum StringName)
diff --git a/DevIL/src-ILUT/msvc8/ILUT Unicode.rc b/DevIL/src-ILUT/msvc8/ILUT Unicode.rc
index a60be503..d08691ee 100644
--- a/DevIL/src-ILUT/msvc8/ILUT Unicode.rc
+++ b/DevIL/src-ILUT/msvc8/ILUT Unicode.rc
@@ -59,8 +59,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,7,5
- PRODUCTVERSION 0,1,7,5
+ FILEVERSION 0,1,7,7
+ PRODUCTVERSION 0,1,7,7
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x29L
@@ -78,14 +78,14 @@ BEGIN
VALUE "Comments", "ILUT: A portable image library in development"
VALUE "CompanyName", "Abysmal Software"
VALUE "FileDescription", "ILUT: A portable image library in development"
- VALUE "FileVersion", "1.7.5"
+ VALUE "FileVersion", "1.7.7"
VALUE "InternalName", "ILUT"
VALUE "LegalCopyright", "Copyright © 2000-2008"
VALUE "LegalTrademarks", "Under LGPL License"
VALUE "OriginalFilename", "ILUT.dll"
VALUE "PrivateBuild", "Open Source"
VALUE "ProductName", "Developer's Image Utility Toolkit Library"
- VALUE "ProductVersion", "1.7.5 Unicode"
+ VALUE "ProductVersion", "1.7.7 Unicode"
VALUE "SpecialBuild", "Unicode"
END
END
@@ -112,7 +112,7 @@ IDI_ICON1 ICON "resources\\IL Logo.ico"
STRINGTABLE
BEGIN
- IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.7.5"
+ IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.7.7"
END
#endif // English (U.S.) resources
diff --git a/DevIL/src-ILUT/msvc8/ILUT.rc b/DevIL/src-ILUT/msvc8/ILUT.rc
index 5589ca75..d9ec4b3b 100644
--- a/DevIL/src-ILUT/msvc8/ILUT.rc
+++ b/DevIL/src-ILUT/msvc8/ILUT.rc
@@ -59,8 +59,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,7,5
- PRODUCTVERSION 0,1,7,5
+ FILEVERSION 0,1,7,7
+ PRODUCTVERSION 0,1,7,7
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x29L
@@ -78,14 +78,14 @@ BEGIN
VALUE "Comments", "ILUT: A portable image library in development"
VALUE "CompanyName", "Abysmal Software"
VALUE "FileDescription", "ILUT: A portable image library in development"
- VALUE "FileVersion", "1.7.5"
+ VALUE "FileVersion", "1.7.7"
VALUE "InternalName", "ILUT"
VALUE "LegalCopyright", "Copyright © 2000-2008"
VALUE "LegalTrademarks", "Under LGPL License"
VALUE "OriginalFilename", "ILUT.dll"
VALUE "PrivateBuild", "Open Source"
VALUE "ProductName", "Developer's Image Utility Toolkit Library"
- VALUE "ProductVersion", "1.7.5 Ansi"
+ VALUE "ProductVersion", "1.7.7 Ansi"
VALUE "SpecialBuild", "Ansi"
END
END
@@ -112,7 +112,7 @@ IDI_ICON1 ICON "resources\\IL Logo.ico"
STRINGTABLE
BEGIN
- IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.7.5"
+ IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.7.7"
END
#endif // English (U.S.) resources
diff --git a/DevIL/src-ILUT/msvc9/ILUT Unicode.rc b/DevIL/src-ILUT/msvc9/ILUT Unicode.rc
index a60be503..d08691ee 100644
--- a/DevIL/src-ILUT/msvc9/ILUT Unicode.rc
+++ b/DevIL/src-ILUT/msvc9/ILUT Unicode.rc
@@ -59,8 +59,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,7,5
- PRODUCTVERSION 0,1,7,5
+ FILEVERSION 0,1,7,7
+ PRODUCTVERSION 0,1,7,7
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x29L
@@ -78,14 +78,14 @@ BEGIN
VALUE "Comments", "ILUT: A portable image library in development"
VALUE "CompanyName", "Abysmal Software"
VALUE "FileDescription", "ILUT: A portable image library in development"
- VALUE "FileVersion", "1.7.5"
+ VALUE "FileVersion", "1.7.7"
VALUE "InternalName", "ILUT"
VALUE "LegalCopyright", "Copyright © 2000-2008"
VALUE "LegalTrademarks", "Under LGPL License"
VALUE "OriginalFilename", "ILUT.dll"
VALUE "PrivateBuild", "Open Source"
VALUE "ProductName", "Developer's Image Utility Toolkit Library"
- VALUE "ProductVersion", "1.7.5 Unicode"
+ VALUE "ProductVersion", "1.7.7 Unicode"
VALUE "SpecialBuild", "Unicode"
END
END
@@ -112,7 +112,7 @@ IDI_ICON1 ICON "resources\\IL Logo.ico"
STRINGTABLE
BEGIN
- IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.7.5"
+ IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.7.7"
END
#endif // English (U.S.) resources
diff --git a/DevIL/src-ILUT/msvc9/ILUT.rc b/DevIL/src-ILUT/msvc9/ILUT.rc
index 5589ca75..d9ec4b3b 100644
--- a/DevIL/src-ILUT/msvc9/ILUT.rc
+++ b/DevIL/src-ILUT/msvc9/ILUT.rc
@@ -59,8 +59,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,7,5
- PRODUCTVERSION 0,1,7,5
+ FILEVERSION 0,1,7,7
+ PRODUCTVERSION 0,1,7,7
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x29L
@@ -78,14 +78,14 @@ BEGIN
VALUE "Comments", "ILUT: A portable image library in development"
VALUE "CompanyName", "Abysmal Software"
VALUE "FileDescription", "ILUT: A portable image library in development"
- VALUE "FileVersion", "1.7.5"
+ VALUE "FileVersion", "1.7.7"
VALUE "InternalName", "ILUT"
VALUE "LegalCopyright", "Copyright © 2000-2008"
VALUE "LegalTrademarks", "Under LGPL License"
VALUE "OriginalFilename", "ILUT.dll"
VALUE "PrivateBuild", "Open Source"
VALUE "ProductName", "Developer's Image Utility Toolkit Library"
- VALUE "ProductVersion", "1.7.5 Ansi"
+ VALUE "ProductVersion", "1.7.7 Ansi"
VALUE "SpecialBuild", "Ansi"
END
END
@@ -112,7 +112,7 @@ IDI_ICON1 ICON "resources\\IL Logo.ico"
STRINGTABLE
BEGIN
- IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.7.5"
+ IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.7.7"
END
#endif // English (U.S.) resources
diff --git a/DevIL/src-ILUT/src/ilut_states.c b/DevIL/src-ILUT/src/ilut_states.c
index 97888d44..13acf65b 100644
--- a/DevIL/src-ILUT/src/ilut_states.c
+++ b/DevIL/src-ILUT/src/ilut_states.c
@@ -19,8 +19,8 @@
ILconst_string _ilutVendor = IL_TEXT("Abysmal Software");
-//ILconst_string _ilutVersion = IL_TEXT("Developer's Image Library Utility Toolkit (ILUT) 1.7.5 " IL_TEXT(__DATE__));
-ILconst_string _ilutVersion = IL_TEXT("Developer's Image Library Utility Toolkit (ILUT) 1.7.5 ");
+//ILconst_string _ilutVersion = IL_TEXT("Developer's Image Library Utility Toolkit (ILUT) 1.7.7 " IL_TEXT(__DATE__));
+ILconst_string _ilutVersion = IL_TEXT("Developer's Image Library Utility Toolkit (ILUT) 1.7.7 ");
// Set all states to their defaults