Support OpenGL in ILUT on FreeBSD just like on Linux

DevIL-docs/Design Documents/New File Formats.tex

@@ -0,0 +1,84 @@
+\documentclass[letterpaper,10pt]{article}
+\title{Adding New File Formats to DevIL}
+\author{Denton Woods}
+\date{March 2009}
+\usepackage{amsmath,graphicx,fullpage}
+\begin{document}
+\maketitle
+
+\section*{Adding the .c or .cpp File}
+Make sure that the new .c or .cpp file is added to the Subversion repository using the \emph{svn add} command.
+
+\subsubsection*{Microsoft Visual C++}
+The .c or .cpp file must be added to the Microsoft Visual C++ 9 projects \emph{src-IL/projects/msvc9/ImageLib Unicode.sln} and \emph{src-IL/projects/msvc9/ImageLib.sln}.  The file must also be added to the MSVC++ 8 projects \emph{src-IL/projects/msvc8/ImageLib Unicode.sln} and \emph{src-IL/projects/msvc8/ImageLib.sln}.
+
+\subsubsection*{Linux, Cygwin and Mac OS X}
+For the Linux/Cygwin/Mac OS X makefile system, add the filename to the libIL\_la\_SOURCES line of lib/Makefile.am.
+
+
+\section*{configure.ac}
+Add the format to configure.ac around line 320, with a description.
+
+
+\section*{DevIL_manual.texi}
+Add the file format to the appendix entitled \emph{Supported File Formats} in the TexInfo manual.
+
+
+\section*{il.h}
+Add the appropriate IL\_XXX define to il.h (around line 240).  Make sure to include a commented description in Doxygen format.
+
+
+\section*{il\_internal.h}
+Add the function declarations to il\_internal.h around line 224.
+
+
+\section*{il\_io.c}
+
+\subsubsection*{Validation}
+If \textbf{ilIsValid*} functions are created for the new format, the function calls must be implemented in \textbf{ilDetermineTypeF}, \textbf{ilDetermineTypeL}, \textbf{ilIsValid}, \textbf{ilIsValidF} and \textbf{ilIsValidL}.
+
+\subsubsection*{Loading}
+The first thing that needs to be added is checks for the extensions in \textbf{ilTypeFromExt}.
+
+Next add the appropriate function calls to \textbf{ilLoad}, \textbf{ilLoadF}, \textbf{ilLoadL} and \textbf{ilLoadImage}.  Make sure to put the IL\_XXX define in the Doxygen comment before the function!
+
+\subsubsection*{Saving}
+Add the function calls to \textbf{ilSave}, \textbf{ilSaveF}, \textbf{ilSaveL} and \textbf{ilSaveImage}.  Make sure to put the IL\_XXX define in the Doxygen comment before the function!
+
+
+\section*{il\_states.c and il\_states.h}
+Change \_ilLoadExt and/or \_ilSaveExt to include the new format name in il\_states.c.  Also add the format to il\_states.h.
+
+\section*{Website}
+Add to the list of types the DevIL can load on the About and the Features pages.
+
+
+\section*{Summary of Changes to Make}
+\begin{itemize}
+\item Run \emph{svn ci}.
+\item Add to MSVC++ 8 projects.
+\item Add to MSVC++ 9 projects.
+\item Add to lib/Makefile.am sources line.
+\item Add to configure.ac with description.
+\item Add to DevIL_manual.texi appendix.
+\item Add IL\_XXX to il.h.
+\item Add function declarations to il\_internal.h.
+\item Add validation functions if they exist.
+\item For loading functions:
+	\begin {itemize}
+		\item \textbf{ilTypeFromExt}
+		\item \textbf{ilLoad}, \textbf{ilLoadF}, \textbf{ilLoadL} and \textbf{ilLoadImage}
+		\item Add Doxygen comments to \textbf{ilLoad}, \textbf{ilLoadF}, \textbf{ilLoadL} and \textbf{ilLoadImage}.
+	\end {itemize}
+\item For saving functions:
+	\begin {itemize}
+		\item \textbf{ilSave}, \textbf{ilSaveF}, \textbf{ilSaveL} and \textbf{ilSaveImage}
+		\item Add Doxygen comments to \textbf{ilSave}, \textbf{ilSaveF}, \textbf{ilSaveL} and \textbf{ilSaveImage}.
+	\end {itemize}
+\item Add to il\_states.c and il\_states.h.
+\item Add to website (about and features pages).
+\end{itemize}
+
+
+\end{document}
+

DevIL-docs/Design Documents/Version Number.tex

@@ -0,0 +1,34 @@
+\documentclass[letterpaper,10pt]{article}
+\title{Changing DevIL Version Number}
+\author{Denton Woods}
+\date{March 2009}
+\usepackage{amsmath,graphicx,fullpage}
+\begin{document}
+\maketitle
+
+\section*{Microsoft Visual C++ Resource Files}
+\subsection*{Unicode Resource Files}
+\emph{src-IL/msvc9/IL Unicode.rc}, \emph{src-IL/msvc8/IL Unicode.rc}, \emph{src-ILU/msvc9/ILU Unicode.rc}, \emph{src-ILU/msvc8/ILU Unicode.rc}, \emph{src-ILUT/msvc9/ILUT Unicode.rc} and \emph{src-ILUT/msvc8/ILUT Unicode.rc} must all be updated with the new version number.  Look for the lines starting with \emph{FILEVERSION}, \emph{PRODUCTVERSION}, \emph{VALUE $\backslash$``FileVersion$\backslash$''}, \emph{VALUE $\backslash$``ProductVersion$\backslash$''} and \emph{IDC\_OPENIL}.
+
+\subsection*{Ansi Resource Files}
+\emph{src-IL/msvc9/IL.rc}, \emph{src-IL/msvc8/IL.rc}, \emph{src-ILU/msvc9/ILU.rc}, \emph{src-ILU/msvc8/ILU.rc}, \emph{src-ILUT/msvc9/ILUT.rc} and \emph{src-ILUT/msvc8/ILUT.rc} all have the same format as the Unicode resource files.
+
+
+\section*{configure.ac}
+Change the version number on line 12.
+
+
+\section*{IL.h, ILU.h, ILUT.h}
+At about line 164 in IL.h, change IL\_VERSION\_ and IL\_VERSION to reflect the new version number.  The equivalent lines are at line 40 in ilu.h and line 32 in ilut.h.
+
+
+\section*{README}
+Change the first line of README to the new version number.
+
+
+\section*{il\_states.c, ilu\_states.c and ilut\_states.c}
+At the top of each of these files, change the \_il(u(t))Vendor and \_il(u(t))Version lines to the new version number.
+
+
+\end{document}
+

DevIL-utils/DevIL Version/DevIL Version.cpp

@@ -24,8 +24,9 @@ int main()
 	string	OldLine, NewLine;
 	fstream	file;
 	string	line;
-	int		pos1, pos2;
-	//streamoff pos1, pos2;
+	//int		pos1, pos2;
+	streamoff pos1, pos2;
+	//fpos_t pos1, pos2;
 
 	//oldversion[0] = '1';
 	//oldversion[1] = '7';
@@ -58,28 +59,29 @@ int main()
 
 //
 //
-// src-IL/msvc/IL.rc and src-IL/msvc8/IL.rc
+// src-IL/msvc9/IL.rc and src-IL/msvc8/IL.rc
 //
 //
-	for (int i = 0; i < 2; i++) {
-		string ILrc[2] = {"src-IL/msvc8/IL.rc", "src-IL/msvc/IL.rc"};
+	/*for (int i = 0; i < 2; i++) {
+		string ILrc[2] = {"src-IL/msvc8/IL.rc", "src-IL/msvc9/IL.rc"};
 		file.open(ILrc[i].c_str(), fstream::in | fstream::out);
 		if (!file.is_open()) {
 			cout << "Unable to open " << ILrc[i] << endl;
 			return 0;
 		}
 		do {
-			pos1 = file.tellg().seekpos();
+			pos1 = file.tellg();//.seekpos();
 			getline(file, line);
 			int linelen = line.length();
-			pos2 = file.tellg().seekpos();
+			pos2 = file.tellg();//.seekpos();
 
 			OldLine = string(" FILEVERSION 0,") + string(oldversion[0]) + "," + string(oldversion[1]) + "," + string(oldversion[2]);
 			if (line == OldLine) {
 				file.seekp(pos1, ios_base::beg);
 				NewLine = string(" FILEVERSION 0,") + string(newversion[0]) + "," + string(newversion[1]) + "," + string(newversion[2]);
 				file << NewLine;
 				file.seekg(pos2, ios_base::beg);
+				int j = file.tellg();
 			}
 			OldLine = string(" PRODUCTVERSION 0,") + string(oldversion[0]) + "," + string(oldversion[1]) + "," + string(oldversion[2]);
 			if (line == OldLine) {
@@ -112,17 +114,17 @@ int main()
 		} while (!file.eof());
 		file.close();
 		file.clear();
-	}
+	}*/
 
 
 
 //
 //
-// src-IL/msvc/IL Unicode.rc and src-IL/msvc8/IL Unicode.rc
+// src-IL/msvc9/IL Unicode.rc and src-IL/msvc/IL Unicode.rc
 //
 //
 	for (int i = 0; i < 2; i++) {
-		string ILrc[2] = {"src-IL/msvc/IL Unicode.rc", "src-IL/msvc8/IL Unicode.rc"};
+		string ILrc[2] = {"src-IL/msvc9/IL Unicode.rc", "src-IL/msvc8/IL Unicode.rc"};
 		file.open(ILrc[i].c_str(), fstream::in | fstream::out);
 		if (!file.is_open()) {
 			cout << "Unable to open IL Unicode.rc" << endl;
@@ -138,7 +140,8 @@ int main()
 				file.seekp(pos1);
 				NewLine = string(" FILEVERSION 0,") + string(newversion[0]) + "," + string(newversion[1]) + "," + string(newversion[2]);
 				file << NewLine;
-				file.seekg(pos2);
+				file.seekg(pos1);
+				file.seekp(pos1);
 			}
 			OldLine = string(" PRODUCTVERSION 0,") + string(oldversion[0]) + "," + string(oldversion[1]) + "," + string(oldversion[2]);
 			if (line == OldLine) {

DevIL/ChangeLog

@@ -1,3 +1,123 @@
+2009-06-16 Matěj Týč <[email protected]>
+	* m4/devil-definitions.m4: Fixed handling of nvtt and libsquish as C++
+	libraries instead of C (caused header found but could not be compiled
+	error)
+
+2009-03-? Matěj Týč <[email protected]> NOTE: COMMIT PROBABLY NEVER HAPPENED
+IN THIS BRANCH
+	* configure.ac: Corrected example compilation report
+	* m4/devil-definitions.m4: Added correct LCMS absence handling
+
+2009-03-16 Denton Woods <[email protected]>
+	* ilu_error-italian.h: Added Italian translation of error messages.
+	* ilu_error.c: Added Italian support.
+	* ilu.h: Added ILU_ITALIAN.
+
+2009-03-14 Denton Woods <[email protected]>
+	* il_alloc.c:130: Fixed bug #2671858 (used Ptr instead of ptr).
+
+2009-03-11 Matěj Týč <[email protected]>
+	* configure.ac: Removed "Break on warnings" option.
+	* tests/format_test/ilu_checks.sh: Added ILU test
+
+2009-03-10 Denton Woods <[email protected]>
+	* lib/Makefile.am: Added ilut_config.h.
+
+2009-03-08 Matěj Týč <[email protected]>
+	* docs/Makefile.am: Fixed distcheck by overriding dvi target.
+	* lib/Makefile.am: Renoved ilu_mipmap.h file
+	* configure.ac: Added option to disable checks for 'nvidia texture tools' and
+	'libsquish'
+
+2009-03-08 Denton Woods <[email protected]>
+	* il_ilbm.c:410: Changed to IL_BGR from IL_RGB.
+	* il_iff.c (ilLoadIffF/ilLoadIffL): Changed to call Lbm loading functions
+	  if Iff loading fails, since they both can have the .iff extension.
+	* il_ilbm.c:416: Added origin reference.
+	* configure.ac: Added more file formats to the format checks.
+	* Makefile.am: Removed ilu_mipmap.h.  Added ilu_error-french.h.
+
+2009-03-07 Denton Woods <[email protected]>
+	* Updated version numbers to 1.7.8 project-wide.
+	* DevIL_manual.texi: Added several file formats to the appendix.
+	* il_io.c: Updated Doxygen comments for loading/saving functions.
+	* libraries.txt: Updated with new libraries.
+	* il_io.c (ilTypeFromExt): Changed return value of FITS files to IL_FITS.
+		Added DICOM, FTX, Rot and Texture checks.
+	* il_states.c/.h: Updated with newer file formats.
+	* il_blp.c:649: Fixed ilNewImageFull call to use color index.
+			   659: Fixed memcpy from base image to new mipmap.
+	* il_dcx.c, il_exr.cpp and many more: Checks return value of ilFixImage now.
+	* il_iff.c:271: Got rid of ilConvertImage call.
+
+2009-03-06 Denton Woods <[email protected]>
+	* Updated VC8 projects to use il_mp3.c.
+	* il.h: Added description to IL_WDP.
+
+2009-03-05 Denton Woods <[email protected]>
+	* il_mp3.c: Added this file.
+	* il_io.c: Added loading calls for .mp3 files.
+	* il_internal.h: Added .mp3 loading declarations.
+	* Makefile.am: Added il_mp3.c to source line.
+	* il.h: Added IL_MP3 define.
+
+2009-03-04 Denton Woods <[email protected]>
+	* il_utx.cpp: Started cleanup of file using C++ constructs.
+	* Updated VC8 projects to use il_utx.cpp.
+
+2009-03-03 Denton Woods <[email protected]>
+	* ilu_error-french.h: Added French translation of errors.
+	* ilu.h: Added ILU_FRENCH define.
+	* Changed il_utx.c to il_utx.cpp.
+
+2009-03-02 Denton Woods <[email protected]>
+	* il_utx.c: Added DXT1 loading in UTX files.
+	* il_utx.h: Added this file.
+	* lib/Makefile.am: Added il_utx.h to include line.
+	* il_utx.c: Fixed loading of larger images.
+	* windows_example.rc: Fixed accelerator for menu.
+
+2009-03-01 Denton Woods <[email protected]>
+	* il_utx.c: Added this file.
+	* lib/Makefile.am: Added il_utx.c to source line.
+	* il_internal.h: Added .utx loading declarations.
+	* il_io.c: Added loading calls for .utx files.
+
+2009-02-28 Denton Woods <[email protected]>
+	* il_states.c / il_states.h: Added ilVtfCompression to IL_STATES.
+	* il_vtf.c: Added more formats to saving.
+	* il.h: Added IL_VTF_COMP define.
+	* il_io.c: Added saving calls for .vtf files.
+	* il_dds.c: Added DecompressARGB16 to load a2r10g10b10 and a2b10g10r10 formats.
+	* il_convbuff (iSwitchTypes): Added several missing break statements.
+	* il_convbuff:1988: Changed to check types instead of bpc.
+
+2009-02-27 Denton Woods <[email protected]>
+	* il_dpx.c / il_dpx.h: Got basic dpx loading working.
+	* WindowsTest.cpp: Fixed memory leak when loading files.
+	* il_vtf.c (iGetVtfHead): Added support for headers of 64 bytes.
+	* il_iwi.c (iLoadIwiInternal): Added IL_INVALID_FILE_HEADER error.
+	* il_vtf.c: Added VTF writing functions.
+
+2009-02-26 Denton Woods <[email protected]>
+	* configure.ac, lib/Makefile.am, il.h, il_internal.h, il_ilbm.c, il_io.c: Added
+	  patch from Ben Campbell for ILBM files at
+	  https://sourceforge.net/tracker2/index.php?func=detail&aid=2635333&group_id=4470&atid=304470.
+	* il_dpx.c / il_dpx.h: Added these files.
+	* lib/Makefile.am: Added il_dpx.c and il_dpx.h to source/include lines.
+	* il_internal.h: Added .dpx loading declarations.
+	* il_io.c: Added loading calls for .dpx files.
+
+2009-02-25 Denton Woods <[email protected]>
+	* il_iwi.c:329: Changed IL_MAX parameter from 16 to 8 (copy+paste error).
+	* WindowsTest.cpp: Added mipmap functionality to 0-9 keys (0 goes to main image).
+
+2009-02-24 Denton Woods <[email protected]>
+	* vc9 Unicode projects: Changed settings to use x64 and x86 directories for .obj files.
+	* test/in: Removed this directory.
+	* Added "Test Images" to SVN.
+	* il_dds.c (DecompressFloat): Added proper support for G16B16, G32B32, R16 and R32 images.
+
 2009-02-23 Denton Woods <[email protected]>
 	* il_pnm.c: Fixed bug at https://sourceforge.net/forum/message.php?msg_id=6491617 -
 	  Changed order of lines 448 and 450.
@@ -85,7 +205,7 @@
 	* il_blp.c (iLoadBlpInternal): Added loading for BLP2 RAW with 1-bit alpha.
 
 2009-02-13 Denton Woods <[email protected]>
-	* WindowsTest.cpp: Added slideshows capabilities with Page Up and Page Down.
+	* WindowsTest.cpp: Added slideshow capabilities with Page Up and Page Down.
 	* il_jpeg.c:357: Added ilFixImage call.
 	* il_jpeg.c (ilLoadFromJpegStruct): Changed return value to the return of ilFixImage.
 	* il_blp.c:466-467: Fixed to read these images properly.

DevIL/Libraries.txt

@@ -6,17 +6,21 @@ Libraries needed to compile DevIL* :
 
 Libpng for .png (and some .ico) support available at http://www.libpng.org/pub/png/libpng.html
 ZLib for .png (and some .ico) support available at http://www.gzip.org/zlib/
-Libjpeg for .jpg support from http://www.ijg.org/
+Libjpeg for .jpg (and some .blp) support from http://www.ijg.org/
 Libtiff for .tif support from http://www.libtiff.org/
 Libmng for .mng and .jng support from http://www.libmng.com/
 JasPer for .jp2 (and some .icns) support available at http://www.ece.uvic.ca/~mdadams/jasper/
+HD Photo Device Porting Kit for .wdp/.hdp support from http://www.microsoft.com/Downloads/details.aspx?FamilyID=285eeffd-d86c-48c3-ab93-3abd5ee7f1ce&displaylang=en.
 Little CMS for color profiles (ILU) from http://www.littlecms.com/
 Colour Picker lib for WindowsTest from http://www.fluidstudios.com/freeware.html
 Freeglut (or glut) for GLTest from http://freeglut.sourceforge.net
 glext.h from http://oss.sgi.com/projects/ogl-sample/ABI/glext.h (as <gl/glext.h> if using OpenGL)
+libsquish for DXT compression from http://code.google.com/p/libsquish/
+nVidia Texture Tools for DXT compression from http://developer.nvidia.com/object/nv_texture_tools.html.
 
 MSVC++ precompiled versions of libpng, zlib, libjpeg, libtiff, lcms and JasPer can be found
-at http://openil.sourceforge.net/libs/LibCompiled.zip
+at http://openil.sourceforge.net/libs/LibCompiled-vc8.zip or
+http://openil.sourceforge.net/libs/LibCompiled-vc9.zip.
 
 Sources of libpng, zlib, libjpeg, libmng, libungif, libtiff, lcms and JasPer can be
 found at http://openil.sourceforge.net/libs/LibSrc.zip
@@ -27,7 +31,7 @@ Intel Jpeg Library from
 
 MAC OS X
 These library are not still uploaded!
-To know how to install these libraries read README.macosx
+To learn how to install these libraries, read README.macosx
 
 Source of external framework, downloaded from the previous sites
 http://openil.sourceforge.net/libs/ExternFrameworksSrc.sitx

DevIL/Makefile.am

@@ -10,4 +10,4 @@ EXTRA_DIST = README.unix README.win Libraries.txt CREDITS MSVC++.txt configure.b
 # Actually it has to be commented now... It is currently very troublesome to include the projects in the distribution archive...
 #SUBDIRS += projects
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-ILU --enable-ILUT --with-examples --disable-dvi
+DISTCHECK_CONFIGURE_FLAGS = --enable-ILU --enable-ILUT --with-examples --enable-debug