- Updating version numbers to 1.8.0

10 files changed, 149 insertions, 151 deletions

diff --git a/DevIL/include/IL/il.h b/DevIL/include/IL/il.h
index 71eab078..2b1ecc42 100644
--- a/DevIL/include/IL/il.h
+++ b/DevIL/include/IL/il.h
@@ -161,8 +161,8 @@ typedef long long unsigned int ILuint64;
 // IL-specific #define's
 //
 
-#define IL_VERSION_1_7_8 1
-#define IL_VERSION       178
+#define IL_VERSION_1_8_0 1
+#define IL_VERSION       180
 
 
 // Attribute Bits
diff --git a/DevIL/include/IL/ilu.h b/DevIL/include/IL/ilu.h
index cdedfc40..d593856f 100644
--- a/DevIL/include/IL/ilu.h
+++ b/DevIL/include/IL/ilu.h
@@ -37,8 +37,8 @@ extern "C" {
 #endif
 
 
-#define ILU_VERSION_1_7_8 1
-#define ILU_VERSION       178
+#define ILU_VERSION_1_8_0 1
+#define ILU_VERSION       180
 
 
 #define ILU_FILTER         0x2600
diff --git a/DevIL/include/IL/ilut.h b/DevIL/include/IL/ilut.h
index 9594d67e..2f78165c 100644
--- a/DevIL/include/IL/ilut.h
+++ b/DevIL/include/IL/ilut.h
@@ -29,8 +29,8 @@
 // Defines
 //-----------------------------------------------------------------------------
 
-#define ILUT_VERSION_1_7_8 1
-#define ILUT_VERSION       178
+#define ILUT_VERSION_1_8_0 1
+#define ILUT_VERSION       180
 
 
 // Attribute Bits
diff --git a/DevIL/src-IL/msvc/IL.rc b/DevIL/src-IL/msvc/IL.rc
index 9f5c7953..22bba201 100644
--- a/DevIL/src-IL/msvc/IL.rc
+++ b/DevIL/src-IL/msvc/IL.rc
@@ -1,120 +1,122 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////// FILEVERSION 0,1,7,8//////////////////////////////////////
-//
-// Version
-//
-
-1 VERSIONINFO
- FILEVERSION 0,1,7,8
- PRODUCTVERSION 0,1,7,8
- FILEFLAGSMASK 0x0L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        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.8"
-            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.8 Ansi"
-            VALUE "SpecialBuild", "Ansi"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON1               ICON                    "resources\\IL Logo.ico"
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.\0"
-END
-
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDC_OPENIL              "Developer's Image Library, Version 1.7.8"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource."

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (United States) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 1,8,0,0

+ PRODUCTVERSION 1,8,0,0

+ FILEFLAGSMASK 0x0L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        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.8.0.0"

+            VALUE "InternalName", "Developer's Image Library (DevIL)"

+            VALUE "LegalCopyright", "Copyright © 2000-2016"

+            VALUE "LegalTrademarks", "Under LGPL License"

+            VALUE "OriginalFilename", "DevIL.dll"

+            VALUE "PrivateBuild", "Open Source"

+            VALUE "ProductName", "Developer's Image Library (DevIL)"

+            VALUE "ProductVersion", "1.8.0 Ansi"

+            VALUE "SpecialBuild", "Ansi"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDI_ICON1               ICON                    "resources\\IL Logo.ico"

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "\r\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// String Table

+//

+

+STRINGTABLE

+BEGIN

+    IDC_OPENIL              "Developer's Image Library, Version 1.7.8"

+END

+

+#endif    // English (United States) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+


+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/DevIL/src-IL/src/il_dds-save.cpp b/DevIL/src-IL/src/il_dds-save.cpp
index 0e8820c9..a771f5a8 100644
--- a/DevIL/src-IL/src/il_dds-save.cpp
+++ b/DevIL/src-IL/src/il_dds-save.cpp
@@ -733,7 +733,7 @@ ILuint Compress(ILimage *Image, ILenum DXTCFormat)
 			if (DXTCFormat == IL_DXT1 || DXTCFormat == IL_DXT1A || DXTCFormat == IL_DXT3 || DXTCFormat == IL_DXT5) {
 				// libsquish needs data as RGBA 32-bit.
 				if (Image->Format != IL_RGBA || Image->Type != IL_UNSIGNED_BYTE) {  // No need to convert if already this format/type.
-					ByteData = ilConvertBuffer(Image->SizeOfData, Image->Format, IL_RGBA, Image->Type, IL_UNSIGNED_BYTE, NULL, Image->Data);
+					ByteData = (ILubyte*)ilConvertBuffer(Image->SizeOfData, Image->Format, IL_RGBA, Image->Type, IL_UNSIGNED_BYTE, NULL, Image->Data);
 					if (ByteData == NULL)
 						return 0;
 				}
diff --git a/DevIL/src-IL/src/il_states.cpp b/DevIL/src-IL/src/il_states.cpp
index 96291887..4b516397 100644
--- a/DevIL/src-IL/src/il_states.cpp
+++ b/DevIL/src-IL/src/il_states.cpp
@@ -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.8");
+ILconst_string _ilVersion		= IL_TEXT("Developer's Image Library (DevIL) 1.8.0");
 
 
 char* _ilLoadExt		= "" IL_BLP_EXT IL_BMP_EXT IL_CUT_EXT IL_DCX_EXT IL_DDS_EXT
diff --git a/DevIL/src-ILU/msvc/ILU.rc b/DevIL/src-ILU/msvc/ILU.rc
index 1351cefe..7a768206 100644
--- a/DevIL/src-ILU/msvc/ILU.rc
+++ b/DevIL/src-ILU/msvc/ILU.rc
@@ -16,13 +16,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -59,8 +57,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,7,8
- PRODUCTVERSION 0,1,7,8
+ FILEVERSION 1,8,0,0
+ PRODUCTVERSION 1,8,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x29L
@@ -78,14 +76,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.8"
+            VALUE "FileVersion", "1.8.0.0"
             VALUE "InternalName", "ILU"
-            VALUE "LegalCopyright", "Copyright © 2000-2008"
+            VALUE "LegalCopyright", "Copyright © 2000-2016"
             VALUE "LegalTrademarks", "Under LGPL License"
             VALUE "OriginalFilename", "ILU.dll"
             VALUE "PrivateBuild", "Open Source"
             VALUE "ProductName", "Developer's Image Utilities Library"
-            VALUE "ProductVersion", "1.7.8 Ansi"
+            VALUE "ProductVersion", "1.8.0 Ansi"
             VALUE "SpecialBuild", "Ansi"
         END
     END
@@ -110,12 +108,12 @@ IDI_ICON1               ICON                    "resources\\IL Logo.ico"
 // String Table
 //
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDC_OPENILU             "Developer's Image Utilities Library, Version 1.7.8"
 END
 
-#endif    // English (U.S.) resources
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/DevIL/src-ILU/src/ilu_states.cpp b/DevIL/src-ILU/src/ilu_states.cpp
index 4d11ef0a..e30f7fd9 100644
--- a/DevIL/src-ILU/src/ilu_states.cpp
+++ b/DevIL/src-ILU/src/ilu_states.cpp
@@ -16,7 +16,7 @@
 
 
 ILconst_string _iluVendor	= IL_TEXT("Abysmal Software");
-ILconst_string _iluVersion	= IL_TEXT("Developer's Image Library Utilities (ILU) 1.7.8");// IL_TEXT(__DATE__));
+ILconst_string _iluVersion	= IL_TEXT("Developer's Image Library Utilities (ILU) 1.8.0");// IL_TEXT(__DATE__));
 
 
 ILstring ILAPIENTRY iluGetString(ILenum StringName)
diff --git a/DevIL/src-ILUT/msvc/ILUT.rc b/DevIL/src-ILUT/msvc/ILUT.rc
index 55045ff6..ce2c3682 100644
--- a/DevIL/src-ILUT/msvc/ILUT.rc
+++ b/DevIL/src-ILUT/msvc/ILUT.rc
@@ -16,13 +16,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -59,8 +57,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,7,8
- PRODUCTVERSION 0,1,7,8
+ FILEVERSION 1,8,0,0
+ PRODUCTVERSION 1,8,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x29L
@@ -78,14 +76,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.8"
+            VALUE "FileVersion", "1.8.0.0"
             VALUE "InternalName", "ILUT"
-            VALUE "LegalCopyright", "Copyright © 2000-2008"
+            VALUE "LegalCopyright", "Copyright © 2000-2016"
             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.8 Ansi"
+            VALUE "ProductVersion", "1.8.0 Ansi"
             VALUE "SpecialBuild", "Ansi"
         END
     END
@@ -110,12 +108,12 @@ IDI_ICON1               ICON                    "resources\\IL Logo.ico"
 // String Table
 //
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDC_OPENILUT            "Developer's Image Utility Toolkit Library, Version 1.7.8"
 END
 
-#endif    // English (U.S.) resources
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/DevIL/src-ILUT/src/ilut_states.c b/DevIL/src-ILUT/src/ilut_states.c
index 46c0cb1b..0062f7da 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.8 " IL_TEXT(__DATE__));
-ILconst_string _ilutVersion	= IL_TEXT("Developer's Image Library Utility Toolkit (ILUT) 1.7.8");
+//ILconst_string _ilutVersion	= IL_TEXT("Developer's Image Library Utility Toolkit (ILUT) 1.8.0 " IL_TEXT(__DATE__));
+ILconst_string _ilutVersion	= IL_TEXT("Developer's Image Library Utility Toolkit (ILUT) 1.8.0");
 
 
 // Set all states to their defaults