Readying for new release

18 files changed, 83 insertions, 46 deletions

diff --git a/DevIL/ChangeLog b/DevIL/ChangeLog
index a0928687..81ac5c80 100644
--- a/DevIL/ChangeLog
+++ b/DevIL/ChangeLog
@@ -6,7 +6,6 @@
 - Added MSVC++ 8 projects back.
 - Added MSVC++ Unicode projects.
 
-
 1.7.1
 ---
 - Added Mac OS X .icns support
diff --git a/DevIL/MSVC++.txt b/DevIL/MSVC++.txt
index 545748d3..ca1f70c1 100644
--- a/DevIL/MSVC++.txt
+++ b/DevIL/MSVC++.txt
@@ -10,20 +10,18 @@ with a bit of luck, these projects will just work.
 Installation
 ------------
 
-Run configure.bat to tell DevIL what external libraries you are using.
+Edit config.h to tell DevIL what external libraries you are using.
 
 Then go to Tools - Options - Directories to add in the include and lib
 directories for DevIL.
 
+All MSVC++ project files are in the projects/msvc or projects/msvc8 folders.
+
 
 
 Usage
 -----
 
-In the Post-Build step, a Copy command used to copy the resultant dlls to the
-Windows\System directory.  If your Windows System directory is not
-c:\Windows\System, edit the post-build step for all the DevIL* projects.
-
 When compiling a program that uses DevIL*, it must be configured to use the
 multithreaded dll version of the libc runtime.  To do this, go to Project
 Settings - C/C++ tab - Change "Category" to 'Code Generation' - Change
diff --git a/DevIL/README b/DevIL/README
index 4ce2ff0d..939570b1 100644
--- a/DevIL/README
+++ b/DevIL/README
@@ -1,4 +1,4 @@
-Developer's Image Library version 1.7.1 Readme, Notes and Quick Use
+Developer's Image Library version 1.7.2 Readme, Notes and Quick Use
 -------------------------------------------------------------------
 
 <DZA[afk]> DevIL song: "la la la, a cross-platform image library utilizing a
@@ -19,7 +19,7 @@ own project.
 Where can I find it?
 --------------------
 
-DevIL can be found at http://www.imagelib.org and http://openil.sourceforge.net
+DevIL can be found at http://openil.sourceforge.net
 
 
 How do I build and install the 3 libraries ?
@@ -38,7 +38,7 @@ More Extensive Documentation
 
 This file is only a quick guide to point you to more detailed information on
 how to use DevIL.  More extensive documentation can currently be found on the
-DevIL site at http://www.imagelib.org and in the /Docs directory in a normal
+DevIL site at http://openil.sf.net and in the /Docs directory in a normal
 install.
 
 
@@ -156,7 +156,7 @@ Windows right now but showcases several of DevIL's features through various
 menus.
 
 If you want more in-depth tutorials, you can find them on
-http://www.imagelib.org, or they may be in your installation under the /examples
+http://openil.sf.net, or they may be in your installation under the /examples
 directory.  Documents are also available in the /docs directory.
 
 
@@ -173,4 +173,4 @@ Legalese
 --------
 
 All contents of this file are intellectual property of Denton Woods,
-copyright 2001-2004.
+copyright 2001-2008.
diff --git a/DevIL/README.win b/DevIL/README.win
index 04f936ab..89b9efa7 100644
--- a/DevIL/README.win
+++ b/DevIL/README.win
@@ -1,4 +1,4 @@
-Where do I find the projects files ?
+Where do I find the project files ?
 -----------------------------------------
 
 MSVC++ projects are in \DevIL\projects\MSVC.
diff --git a/DevIL/configure.ac b/DevIL/configure.ac
index 6bb87310..0cdf0344 100644
--- a/DevIL/configure.ac
+++ b/DevIL/configure.ac
@@ -16,7 +16,7 @@ AC_PREREQ(2.52)
 
 DEVIL_MAJOR=1
 DEVIL_MINOR=7
-DEVIL_REVISION=1
+DEVIL_REVISION=2
 DEVIL_VERSION=$DEVIL_MAJOR$DEVIL_MINOR$DEVIL_REVISION
 
 dnl
@@ -35,7 +35,7 @@ dnl
 SUPPORTED_FORMATS=""
 SUPPORTED_API=""
 SUPPORTED_EXTENSION=""
-AC_REVISION($Revision: 1.32 $)
+AC_REVISION($Revision: 1.33 $)
 AC_CONFIG_AUX_DIR(libtools)
 AC_PREFIX_DEFAULT(/usr/local)
 AC_CANONICAL_HOST
diff --git a/DevIL/include/IL/config.h.win b/DevIL/include/IL/config.h.win
index ac08be70..376eb2fc 100644
--- a/DevIL/include/IL/config.h.win
+++ b/DevIL/include/IL/config.h.win
@@ -111,7 +111,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-//#define IL_VERSION "1.7.0"
+//#define IL_VERSION "1.7.2"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/DevIL/include/IL/il.h b/DevIL/include/IL/il.h
index 72dcebf4..7d2ffb47 100644
--- a/DevIL/include/IL/il.h
+++ b/DevIL/include/IL/il.h
@@ -143,8 +143,8 @@ typedef void           ILvoid;
 // IL-specific #define's
 //
 
-#define IL_VERSION_1_7_1 1
-#define IL_VERSION       171
+#define IL_VERSION_1_7_2 1
+#define IL_VERSION       172
 
 
 // Attribute Bits
diff --git a/DevIL/include/IL/ilu.h b/DevIL/include/IL/ilu.h
index 3c53b10c..84671595 100644
--- a/DevIL/include/IL/ilu.h
+++ b/DevIL/include/IL/ilu.h
@@ -33,8 +33,8 @@ extern "C" {
 #endif
 
 
-#define ILU_VERSION_1_7_1 1
-#define ILU_VERSION       171
+#define ILU_VERSION_1_7_2 1
+#define ILU_VERSION       172
 
 
 #define ILU_FILTER         0x2600
diff --git a/DevIL/include/IL/ilut.h b/DevIL/include/IL/ilut.h
index 223e8322..48046a5e 100644
--- a/DevIL/include/IL/ilut.h
+++ b/DevIL/include/IL/ilut.h
@@ -17,16 +17,16 @@
 #define __ilut_h_
 #define __ILUT_H__
 
-#include "IL/il.h"
-#include "IL/ilu.h"
+#include <IL/il.h>
+#include <IL/ilu.h>
 
 
 //-----------------------------------------------------------------------------
 // Defines
 //-----------------------------------------------------------------------------
 
-#define ILUT_VERSION_1_7_1 1
-#define ILUT_VERSION       171
+#define ILUT_VERSION_1_7_2 1
+#define ILUT_VERSION       172
 
 
 // Attribute Bits
diff --git a/DevIL/src-IL/include/il_states.h b/DevIL/src-IL/include/il_states.h
index 5f7cbcf9..114a14ec 100644
--- a/DevIL/src-IL/include/il_states.h
+++ b/DevIL/src-IL/include/il_states.h
@@ -141,17 +141,35 @@ IL_HINTS ilHints;
 	#define IL_DDS_EXT ""
 #endif
 
+#ifndef IL_NO_EXR
+	#define IL_EXR_EXT "exr "
+#else
+	#define IL_EXR_EXT ""
+#endif
+
 #ifndef IL_NO_GIF
 	#define IL_GIF_EXT "gif "
 #else
 	#define IL_GIF_EXT ""
 #endif
-

-#ifndef IL_NO_HDR

-	#define IL_HDR_EXT "hdr "

-#else

-	#define IL_HDR_EXT ""

-#endif

+
+
+#ifndef IL_NO_HDR
+
+	#define IL_HDR_EXT "hdr "
+
+#else
+
+	#define IL_HDR_EXT ""
+
+#endif
+
+
+#ifndef IL_NO_ICNS
+	#define IL_ICNS_EXT "icns "
+#else
+	#define IL_ICNS_EXT ""
+#endif
 
 #ifndef IL_NO_ICO
 	#define IL_ICO_EXT "ico cur "
@@ -159,6 +177,12 @@ IL_HINTS ilHints;
 	#define IL_ICO_EXT ""
 #endif
 
+#ifndef IL_NO_JP2
+	#define IL_JP2_EXT "jp2 "
+#else
+	#define IL_JP2_EXT ""
+#endif
+
 #ifndef IL_NO_JPG
 	#define IL_JPG_EXT "jpg jpe jpeg "
 #else
diff --git a/DevIL/src-IL/msvc/IL.rc b/DevIL/src-IL/msvc/IL.rc
index 8079f182..c3d6baac 100644
--- a/DevIL/src-IL/msvc/IL.rc
+++ b/DevIL/src-IL/msvc/IL.rc
@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     0,1,7,1
-    PRODUCTVERSION  0,1,7,1
+    FILEVERSION     0,1,7,2
+    PRODUCTVERSION  0,1,7,2
     FILEOS          VOS__WINDOWS32
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "DevIL: A portable image library in development\0"
             VALUE "CompanyName", "Abysmal Software\0"
             VALUE "FileDescription", "DevIL: A portable image library in development\0"
-            VALUE "FileVersion", "1.7.1\0"
+            VALUE "FileVersion", "1.7.2\0"
             VALUE "InternalName", "Developer's Image Library (DevIL)\0"
             VALUE "LegalCopyright", "Copyright © 2000-2008\0"
             VALUE "LegalTrademarks", "Under LGPL License\0"
             VALUE "OriginalFilename", "DevIL.dll\0"
             VALUE "PrivateBuild", "Open Source\0"
             VALUE "ProductName", "Developer's Image Library (DevIL)\0"
-            VALUE "ProductVersion", "1.7.1\0"
+            VALUE "ProductVersion", "1.7.2\0"
             VALUE "SpecialBuild", "eh?\0"
         END
     END
diff --git a/DevIL/src-IL/msvc/IL.vcproj b/DevIL/src-IL/msvc/IL.vcproj
index afd4ef31..68e3f57d 100644
--- a/DevIL/src-IL/msvc/IL.vcproj
+++ b/DevIL/src-IL/msvc/IL.vcproj
@@ -600,6 +600,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\README"
+				>
+			</File>
+			<File
 				RelativePath="..\..\README.unix"
 				>
 			</File>
diff --git a/DevIL/src-IL/src/il_exr.cpp b/DevIL/src-IL/src/il_exr.cpp
index a0a0b8b1..5c65f3f0 100644
--- a/DevIL/src-IL/src/il_exr.cpp
+++ b/DevIL/src-IL/src/il_exr.cpp
@@ -25,6 +25,9 @@
 //#include <ImfChannelList.h>
 
 
+// @TODO: Determine how to load from file streams and lumps.
+//   Probably need to overload RgbaInputFile.
+
 //! Reads an .exr file.
 ILboolean ilLoadExr(ILconst_string FileName)
 {
@@ -46,7 +49,7 @@ ILboolean iLoadExrInternal(ILconst_string FileName)
 	Array<Rgba> pixels;
 	Box2i displayWindow, dataWindow;
 	float pixelAspectRatio;
-    RgbaInputFile in (FileName);
+    RgbaInputFile in ((const char*)FileName);  // @TODO: This will completely fail with Unicode.
 
     displayWindow = in.displayWindow();
     dataWindow = in.dataWindow();
diff --git a/DevIL/src-IL/src/il_states.c b/DevIL/src-IL/src/il_states.c
index faa6330f..375520c4 100644
--- a/DevIL/src-IL/src/il_states.c
+++ b/DevIL/src-IL/src/il_states.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 ILstring _ilVendor		= IL_TEXT("Abysmal Software");
-ILstring _ilVersion		= IL_TEXT("Developer's Image Library (DevIL) 1.7.1");
+ILstring _ilVersion		= IL_TEXT("Developer's Image Library (DevIL) 1.7.2");
 
 
 char* _ilLoadExt		= "" IL_BMP_EXT IL_CUT_EXT IL_DCX_EXT IL_DDS_EXT
@@ -28,7 +28,8 @@ char* _ilLoadExt		= "" IL_BMP_EXT IL_CUT_EXT IL_DCX_EXT IL_DDS_EXT
 									IL_MDL_EXT IL_MNG_EXT IL_PCX_EXT IL_PIC_EXT
 									IL_PIX_EXT IL_PNG_EXT IL_PNM_EXT IL_PSD_EXT
 									IL_PSP_EXT IL_PXR_EXT IL_SGI_EXT IL_TGA_EXT
-									IL_TIF_EXT IL_WAL_EXT IL_XPM_EXT;
+									IL_TIF_EXT IL_WAL_EXT IL_XPM_EXT IL_JP2_EXT
+									IL_EXR_EXT IL_ICNS_EXT;
 char* _ilSaveExt		= "" IL_BMP_EXT IL_CHEAD_EXT IL_DDS_EXT IL_JPG_EXT
 									IL_PCX_EXT IL_PNG_EXT IL_PNM_EXT IL_PSD_EXT
 									IL_SGI_EXT IL_TGA_EXT IL_TIF_EXT;
diff --git a/DevIL/src-ILU/msvc/ILU.rc b/DevIL/src-ILU/msvc/ILU.rc
index 53d1ac58..12805120 100644
--- a/DevIL/src-ILU/msvc/ILU.rc
+++ b/DevIL/src-ILU/msvc/ILU.rc
@@ -60,8 +60,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,6,5
- PRODUCTVERSION 0,1,6,5
+ FILEVERSION 0,1,7,2
+ PRODUCTVERSION 0,1,7,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x29L
@@ -79,14 +79,14 @@ BEGIN
             VALUE "Comments", "ILU: A portable image library in development\0"
             VALUE "CompanyName", "Abysmal Software\0"
             VALUE "FileDescription", "ILU: A portable image library in development\0"
-            VALUE "FileVersion", "1.6.6\0"
+            VALUE "FileVersion", "1.7.2\0"
             VALUE "InternalName", "ILU\0"
-            VALUE "LegalCopyright", "Copyright © 2000-2002\0"
+            VALUE "LegalCopyright", "Copyright © 2000-2008\0"
             VALUE "LegalTrademarks", "Under LGPL License\0"
             VALUE "OriginalFilename", "ILU.dll\0"
             VALUE "PrivateBuild", "Open Source\0"
             VALUE "ProductName", "Developer's Image Utilities Library\0"
-            VALUE "ProductVersion", "1.6.6\0"
+            VALUE "ProductVersion", "1.7.2\0"
             VALUE "SpecialBuild", "eh?\0"
         END
     END
diff --git a/DevIL/src-ILU/msvc/ILU.vcproj b/DevIL/src-ILU/msvc/ILU.vcproj
index 2e62eb1f..11cf8723 100644
--- a/DevIL/src-ILU/msvc/ILU.vcproj
+++ b/DevIL/src-ILU/msvc/ILU.vcproj
@@ -294,6 +294,10 @@
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
+			<File
+				RelativePath=".\ILU.rc"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/DevIL/src-ILUT/msvc/ILUT.rc b/DevIL/src-ILUT/msvc/ILUT.rc
index a6c0080b..3c98a557 100644
--- a/DevIL/src-ILUT/msvc/ILUT.rc
+++ b/DevIL/src-ILUT/msvc/ILUT.rc
@@ -60,8 +60,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,6,5
- PRODUCTVERSION 0,1,6,5
+ FILEVERSION 0,1,7,2
+ PRODUCTVERSION 0,1,7,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x29L
@@ -79,14 +79,14 @@ BEGIN
             VALUE "Comments", "ILUT: A portable image library in development\0"
             VALUE "CompanyName", "Abysmal Software\0"
             VALUE "FileDescription", "ILUT: A portable image library in development\0"
-            VALUE "FileVersion", "1.6.6\0"
+            VALUE "FileVersion", "1.7.2\0"
             VALUE "InternalName", "ILUT\0"
-            VALUE "LegalCopyright", "Copyright © 2000-2002\0"
+            VALUE "LegalCopyright", "Copyright © 2000-2008\0"
             VALUE "LegalTrademarks", "Under LGPL License\0"
             VALUE "OriginalFilename", "ILUT.dll\0"
             VALUE "PrivateBuild", "Open Source\0"
             VALUE "ProductName", "Developer's Image Utility Toolkit Library\0"
-            VALUE "ProductVersion", "1.6.6\0"
+            VALUE "ProductVersion", "1.7.2\0"
             VALUE "SpecialBuild", "eh?\0"
         END
     END
diff --git a/DevIL/src-ILUT/msvc/ILUT.vcproj b/DevIL/src-ILUT/msvc/ILUT.vcproj
index 2287f42d..6fe7170b 100644
--- a/DevIL/src-ILUT/msvc/ILUT.vcproj
+++ b/DevIL/src-ILUT/msvc/ILUT.vcproj
@@ -262,6 +262,10 @@
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
+			<File
+				RelativePath=".\ILUT.rc"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>