Add proper credits.

Tag 2.0.1
2008-02-28 22:52:00 +00:00 · 2008-02-28 22:37:49 +00:00
37 changed files with 2145 additions and 736 deletions
--- a/10
+++ b/10
@ -1,13 +1,3 @@
-NVIDIA Texture Tools version 2.0.2
- * Fix copy ctor error reported by Richard Sim.
- * Fix indexMirror error reported by Chris Lambert.
- * Fix vc8 post build command, reported by Richard Sim.
- * Fix RGBA modes with less than 32 bpp by Viktor Linder.
- * Fix alpha decompression by Amorilia. See issue 40.
- * Avoid default-initialized constructors for POD types, reported by Jim Tilander.
- * Add single color compresor for DXT1a.
- * Set swizzle code to ATI2 files. See issue 41.
-
 NVIDIA Texture Tools version 2.0.1
 * Fix memory leaks.
 * Pre-allocate device memory for CUDA compressor.
--- a/2
+++ b/2
@ -1 +1 @@
-2.0.2
+2.0.1
--- a/cmake/FindCUDA.cmake
+++ b/cmake/FindCUDA.cmake
@ -46,9 +46,9 @@ FIND_LIBRARY (CUDA_RUNTIME_LIBRARY
 	DOC "The CUDA runtime library")

 IF (CUDA_INCLUDE_PATH AND CUDA_RUNTIME_LIBRARY)
-	SET (CUDA_FOUND TRUE)
+	SET (CUDA_FOUND 1 CACHE STRING "Set to 1 if CUDA is found, 0 otherwise")
 ELSE (CUDA_INCLUDE_PATH AND CUDA_RUNTIME_LIBRARY)
-	SET (CUDA_FOUND FALSE)
+	SET (CUDA_FOUND 0 CACHE STRING "Set to 1 if CUDA is found, 0 otherwise")
 ENDIF (CUDA_INCLUDE_PATH AND CUDA_RUNTIME_LIBRARY)

 SET (CUDA_LIBRARIES ${CUDA_RUNTIME_LIBRARY})
--- a/project/vc8/nvassemble/nvassemble.vcproj
+++ b/project/vc8/nvassemble/nvassemble.vcproj
@ -278,7 +278,6 @@
 				AdditionalDependencies="libpng.lib jpeg.lib tiff.lib"
 				OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).exe"
 				AdditionalLibraryDirectories="..\..\..\gnuwin32\lib"
-				LinkTimeCodeGeneration="1"
 				TargetMachine="17"
 			/>
 			<Tool
--- a/project/vc8/nvddsinfo/nvddsinfo.vcproj
+++ b/project/vc8/nvddsinfo/nvddsinfo.vcproj
@ -277,7 +277,6 @@
 				AdditionalDependencies="libpng.lib jpeg.lib tiff.lib"
 				OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).exe"
 				AdditionalLibraryDirectories="..\..\..\gnuwin32\lib"
-				LinkTimeCodeGeneration="1"
 				TargetMachine="17"
 			/>
 			<Tool
--- a/project/vc8/nvmath/nvmath.vcproj
+++ b/project/vc8/nvmath/nvmath.vcproj
@ -278,7 +278,11 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\..\src\nvmath\Plane.cpp"
+				RelativePath="..\..\..\src\nvmath\Eigen.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\nvmath\Fitting.cpp"
 				>
 			</File>
 		</Filter>
@ -296,11 +300,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\nvmath\Matrix.h"
+				RelativePath="..\..\..\src\nvmath\Eigen.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\nvmath\Plane.h"
+				RelativePath="..\..\..\src\nvmath\Fitting.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\nvmath\Matrix.h"
 				>
 			</File>
 			<File
--- a/project/vc8/nvtt/nvtt.rc
+++ b/project/vc8/nvtt/nvtt.rc
@ -53,8 +53,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,2,0
- PRODUCTVERSION 2,0,2,0
+ FILEVERSION 2,0,1,0
+ PRODUCTVERSION 2,0,1,0
 FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@ -71,12 +71,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "NVIDIA Corporation"
            VALUE "FileDescription", "NVIDIA Texture Tools Dynamic Link Library"
-            VALUE "FileVersion", "2, 0, 2, 0"
+            VALUE "FileVersion", "2, 0, 1, 0"
            VALUE "InternalName", "nvtt"
            VALUE "LegalCopyright", "Copyright (C) 2007"
            VALUE "OriginalFilename", "nvtt.dll"
            VALUE "ProductName", "NVIDIA Texture Tools Dynamic Link Library"
-            VALUE "ProductVersion", "2, 0, 2, 0"
+            VALUE "ProductVersion", "2, 0, 1, 0"
        END
    END
    BLOCK "VarFileInfo"
--- a/project/vc8/nvtt/nvtt.vcproj
+++ b/project/vc8/nvtt/nvtt.vcproj
@ -97,7 +97,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copying header files..."
-				CommandLine="xcopy /y /f /i &quot;$(SolutionDir)\..\..\src\nvtt\nvtt*.h&quot; &quot;$(SolutionDir)\$(ConfigurationName).$(PlatformName)\include\nvtt\&quot;"
+				CommandLine="xcopy /y /f /i $(SolutionDir)\..\..\src\nvtt\nvtt*.h $(SolutionDir)\$(ConfigurationName).$(PlatformName)\include\"
 			/>
 		</Configuration>
 		<Configuration
@ -261,7 +261,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copying header files..."
-				CommandLine="xcopy /y /f /i &quot;$(SolutionDir)\..\..\src\nvtt\nvtt*.h&quot; &quot;$(SolutionDir)\$(ConfigurationName).$(PlatformName)\include\nvtt\&quot;"
+				CommandLine="xcopy /y /f /i $(SolutionDir)\..\..\src\nvtt\nvtt*.h $(SolutionDir)\$(ConfigurationName).$(PlatformName)\include\"
 			/>
 		</Configuration>
 		<Configuration
@ -425,7 +425,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copying header files..."
-				CommandLine="xcopy /y /f /i &quot;$(SolutionDir)\..\..\src\nvtt\nvtt*.h&quot; &quot;$(SolutionDir)\$(ConfigurationName).$(PlatformName)\include\nvtt\&quot;"
+				CommandLine="xcopy /y /f /i $(SolutionDir)\..\..\src\nvtt\nvtt*.h $(SolutionDir)\$(ConfigurationName).$(PlatformName)\include\"
 			/>
 		</Configuration>
 		<Configuration
@ -585,7 +585,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copying header files..."
-				CommandLine="xcopy /y /f /i &quot;$(SolutionDir)\..\..\src\nvtt\nvtt*.h&quot; &quot;$(SolutionDir)\$(ConfigurationName).$(PlatformName)\include\nvtt\&quot;"
+				CommandLine="xcopy /y /f /i $(SolutionDir)\..\..\src\nvtt\nvtt*.h $(SolutionDir)\$(ConfigurationName).$(PlatformName)\include\"
 			/>
 		</Configuration>
 		<Configuration
@ -691,7 +691,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="&quot;$(CUDA_BIN_PATH)\nvcc.exe&quot; -m32 -ccbin &quot;$(VCInstallDir)bin&quot; -c -D_DEBUG -DWIN32 -D_CONSOLE -D_MBCS -Xcompiler /EHsc,/W3,/nologo,/Wp64,/Od,/Zi,/RTC1,/MDd -I&quot;$(CUDA_INC_PATH)&quot; -I./ -o $(IntDir)\$(InputName).obj ..\\..\\..\\src\\nvtt\\cuda\\CompressKernel.cu&#x0D;&#x0A;"
+						CommandLine="&quot;$(CUDA_BIN_PATH)\nvcc.exe&quot; -keep -ccbin &quot;$(VCInstallDir)bin&quot; -c -D_DEBUG -DWIN32 -D_CONSOLE -D_MBCS -Xcompiler /EHsc,/W3,/nologo,/Wp64,/Od,/Zi,/RTC1,/MDd -I&quot;$(CUDA_INC_PATH)&quot; -I./ -o $(IntDir)\$(InputName).obj ..\\..\\..\\src\\nvtt\\cuda\\CompressKernel.cu&#x0D;&#x0A;"
 						AdditionalDependencies="CudaMath.h"
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
@ -701,7 +701,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="&quot;$(CUDA_BIN_PATH)\nvcc.exe&quot; -m64 -ccbin &quot;$(VCInstallDir)bin&quot; -c -D_DEBUG -DWIN32 -D_CONSOLE -D_MBCS -Xcompiler /EHsc,/W3,/nologo,/Wp64,/Od,/Zi,/RTC1,/MDd -I&quot;$(CUDA_INC_PATH)&quot; -I./ -o $(IntDir)\$(InputName).obj ..\\..\\..\\src\\nvtt\\cuda\\CompressKernel.cu&#x0D;&#x0A;"
+						CommandLine="&quot;$(CUDA_BIN_PATH)\nvcc.exe&quot; -keep -ccbin &quot;$(VCInstallDir)bin&quot; -c -D_DEBUG -DWIN32 -D_CONSOLE -D_MBCS -Xcompiler /EHsc,/W3,/nologo,/Wp64,/Od,/Zi,/RTC1,/MDd -I&quot;$(CUDA_INC_PATH)&quot; -I./ -o $(IntDir)\$(InputName).obj ..\\..\\..\\src\\nvtt\\cuda\\CompressKernel.cu&#x0D;&#x0A;"
 						AdditionalDependencies="CudaMath.h"
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
@ -711,7 +711,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="&quot;$(CUDA_BIN_PATH)\nvcc.exe&quot; -m32 -ccbin &quot;$(VCInstallDir)bin&quot; -c -DNDEBUG -DWIN32 -D_CONSOLE -D_MBCS -Xcompiler /EHsc,/W3,/nologo,/Wp64,/O2,/Zi,/MD -I&quot;$(CUDA_INC_PATH)&quot; -I./ -o $(IntDir)\$(InputName).obj ..\\..\\..\\src\\nvtt\\cuda\\CompressKernel.cu"
+						CommandLine="&quot;$(CUDA_BIN_PATH)\nvcc.exe&quot; -keep -ccbin &quot;$(VCInstallDir)bin&quot; -c -DNDEBUG -DWIN32 -D_CONSOLE -D_MBCS -Xcompiler /EHsc,/W3,/nologo,/Wp64,/O2,/Zi,/MD -I&quot;$(CUDA_INC_PATH)&quot; -I./ -o $(IntDir)\$(InputName).obj ..\\..\\..\\src\\nvtt\\cuda\\CompressKernel.cu&#x0D;&#x0A;"
 						AdditionalDependencies="CudaMath.h"
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
@ -721,7 +721,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="&quot;$(CUDA_BIN_PATH)\nvcc.exe&quot; -m64 -ccbin &quot;$(VCInstallDir)bin&quot; -c -DNDEBUG -DWIN32 -D_CONSOLE -D_MBCS -Xcompiler /EHsc,/W3,/nologo,/Wp64,/O2,/Zi,/MD -I&quot;$(CUDA_INC_PATH)&quot; -I./ -o $(IntDir)\$(InputName).obj ..\\..\\..\\src\\nvtt\\cuda\\CompressKernel.cu&#x0D;&#x0A;"
+						CommandLine="&quot;$(CUDA_BIN_PATH)\nvcc.exe&quot; -keep -ccbin &quot;$(VCInstallDir)bin&quot; -c -DNDEBUG -DWIN32 -D_CONSOLE -D_MBCS -Xcompiler /EHsc,/W3,/nologo,/Wp64,/O2,/Zi,/MD -I&quot;$(CUDA_INC_PATH)&quot; -I./ -o $(IntDir)\$(InputName).obj ..\\..\\..\\src\\nvtt\\cuda\\CompressKernel.cu&#x0D;&#x0A;"
 						AdditionalDependencies="CudaMath.h"
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -50,7 +50,6 @@ ENDIF(CG_FOUND)
 # CUDA
 INCLUDE(${NV_CMAKE_DIR}/FindCUDA.cmake)
 IF(CUDA_FOUND)
-	SET(HAVE_CUDA ${CUDA_FOUND} CACHE BOOL "Set to TRUE if CUDA is found, FALSE otherwise")
 	MESSAGE(STATUS "Looking for CUDA - found")
 ELSE(CUDA_FOUND)
 	MESSAGE(STATUS "Looking for CUDA - not found")
@ -59,7 +58,7 @@ ENDIF(CUDA_FOUND)
 # Maya
 INCLUDE(${NV_CMAKE_DIR}/FindMaya.cmake)
 IF(MAYA_FOUND)
-	SET(HAVE_MAYA ${MAYA_FOUND} CACHE BOOL "Set to TRUE if Maya is found, FALSE otherwise")
+	SET(HAVE_MAYA MAYA_FOUND)
 	MESSAGE(STATUS "Looking for Maya - found")
 ELSE(MAYA_FOUND)
 	MESSAGE(STATUS "Looking for Maya - not found")
@ -68,7 +67,7 @@ ENDIF(MAYA_FOUND)
 # JPEG
 INCLUDE(FindJPEG)
 IF(JPEG_FOUND)
-	SET(HAVE_JPEG ${JPEG_FOUND} CACHE BOOL "Set to TRUE if JPEG is found, FALSE otherwise")
+	SET(HAVE_JPEG JPEG_FOUND)
 	MESSAGE(STATUS "Looking for JPEG - found")
 ELSE(JPEG_FOUND)
 	MESSAGE(STATUS "Looking for JPEG - not found")
@ -77,7 +76,7 @@ ENDIF(JPEG_FOUND)
 # PNG
 INCLUDE(FindPNG)
 IF(PNG_FOUND)
-	SET(HAVE_PNG ${PNG_FOUND} CACHE BOOL "Set to TRUE if PNG is found, FALSE otherwise")
+	SET(HAVE_PNG PNG_FOUND)
 	MESSAGE(STATUS "Looking for PNG - found")
 ELSE(PNG_FOUND)
 	MESSAGE(STATUS "Looking for PNG - not found")
@ -86,7 +85,7 @@ ENDIF(PNG_FOUND)
 # TIFF
 INCLUDE(FindTIFF)
 IF(TIFF_FOUND)
-	SET(HAVE_TIFF ${TIFF_FOUND} CACHE BOOL "Set to TRUE if TIFF is found, FALSE otherwise")
+	SET(HAVE_TIFF TIFF_FOUND)
 	MESSAGE(STATUS "Looking for TIFF - found")
 ELSE(TIFF_FOUND)
 	MESSAGE(STATUS "Looking for TIFF - not found")
@ -95,7 +94,7 @@ ENDIF(TIFF_FOUND)
 # OpenEXR
 INCLUDE(${NV_CMAKE_DIR}/FindOpenEXR.cmake)
 IF(OPENEXR_FOUND)
-	SET(HAVE_OPENEXR ${OPENEXR_FOUND} CACHE BOOL "Set to TRUE if OpenEXR is found, FALSE otherwise")
+	SET(HAVE_OPENEXR OPENEXR_FOUND)
 	MESSAGE(STATUS "Looking for OpenEXR - found")
 ELSE(OPENEXR_FOUND)
 	MESSAGE(STATUS "Looking for OpenEXR - not found")
--- a/src/nvcore/CMakeLists.txt
+++ b/src/nvcore/CMakeLists.txt
@ -18,6 +18,8 @@ SET(CORE_SRCS
 	TextReader.cpp
 	TextWriter.h
 	TextWriter.cpp
+	Tokenizer.h
+	Tokenizer.cpp
 	Radix.h
 	Radix.cpp)

--- a/src/nvcore/Containers.h
+++ b/src/nvcore/Containers.h
@ -446,7 +446,7 @@ namespace nv
 			
 			// Call default constructors
 			for( i = old_size; i < new_size; i++ ) {
-				new(m_buffer+i) T;	// placement new
+				new(m_buffer+i) T();	// placement new
 			}
 		}
 	
--- a/src/nvcore/Debug.cpp
+++ b/src/nvcore/Debug.cpp
@ -74,9 +74,7 @@ namespace

 	// TODO write minidump
 	
-	static LONG WINAPI nvTopLevelFilter( struct _EXCEPTION_POINTERS * pExceptionInfo)
-	{
-		NV_UNUSED(pExceptionInfo);
+	static LONG WINAPI nvTopLevelFilter( struct _EXCEPTION_POINTERS *pExceptionInfo ) {
 	/*	BOOL (WINAPI * Dump) (HANDLE, DWORD, HANDLE, MINIDUMP_TYPE, PMINIDUMP_EXCEPTION_INFORMATION, PMINIDUMP_USER_STREAM_INFORMATION, PMINIDUMP_CALLBACK_INFORMATION );
 	
 		AutoString dbghelp_path(512);
--- a/src/nvcore/Memory.cpp
+++ b/src/nvcore/Memory.cpp
@ -18,8 +18,6 @@ void * nv::mem::malloc(size_t size)

 void * nv::mem::malloc(size_t size, const char * file, int line)
 {
-	NV_UNUSED(file);
-	NV_UNUSED(line);
 	return ::malloc(size);
 }

--- a/src/nvimage/ColorBlock.cpp
+++ b/src/nvimage/ColorBlock.cpp
@ -307,6 +307,15 @@ void ColorBlock::boundsRangeAlpha(Color32 * start, Color32 * end) const
 }


+void ColorBlock::bestFitRange(Color32 * start, Color32 * end) const
+{
+	nvDebugCheck(start != NULL);
+	nvDebugCheck(end != NULL);
+
+	Vector3 axis = bestFitLine().direction();
+	computeRange(axis, start, end);
+}
+
 /// Sort colors by abosolute value in their 16 bit representation.
 void ColorBlock::sortColorsByAbsoluteValue()
 {
@ -384,6 +393,19 @@ void ColorBlock::sortColors(const Vector3 & axis)
 }


+/// Get least squares line that best approxiamtes the points of the color block.
+Line3 ColorBlock::bestFitLine() const
+{
+	Array<Vector3> pointArray(16);
+	
+	for(int i = 0; i < 16; i++) {
+		pointArray.append(Vector3(m_color[i].r, m_color[i].g, m_color[i].b));
+	}
+	
+	return Fit::bestLine(pointArray);
+}
+
+
 /// Get the volume of the color block.
 float ColorBlock::volume() const
 {
--- a/src/nvimage/ColorBlock.h
+++ b/src/nvimage/ColorBlock.h
@ -4,6 +4,7 @@
 #define NV_IMAGE_COLORBLOCK_H

 #include <nvmath/Color.h>
+#include <nvmath/Fitting.h>	// Line3

 namespace nv
 {
@ -32,13 +33,16 @@ namespace nv
 		void luminanceRange(Color32 * start, Color32 * end) const;
 		void boundsRange(Color32 * start, Color32 * end) const;
 		void boundsRangeAlpha(Color32 * start, Color32 * end) const;
+		void bestFitRange(Color32 * start, Color32 * end) const;
 		
 		void sortColorsByAbsoluteValue();
 		
 		void computeRange(const Vector3 & axis, Color32 * start, Color32 * end) const;
 		void sortColors(const Vector3 & axis);
 		
+		Line3 bestFitLine() const;
 		float volume() const;
+		Line3 diameterLine() const;
 		
 		// Accessors
 		const Color32 * colors() const;
--- a/src/nvimage/DirectDrawSurface.cpp
+++ b/src/nvimage/DirectDrawSurface.cpp
@ -54,10 +54,6 @@ namespace
 	static const uint FOURCC_ATI1 = MAKEFOURCC('A', 'T', 'I', '1');
 	static const uint FOURCC_ATI2 = MAKEFOURCC('A', 'T', 'I', '2');

-	static const uint FOURCC_A2XY = MAKEFOURCC('A', '2', 'X', 'Y');
-	
-	static const uint FOURCC_DX10 = MAKEFOURCC('D', 'X', '1', '0');
-
 	// 32 bit RGB formats.
 	static const uint D3DFMT_R8G8B8 = 20;
 	static const uint D3DFMT_A8R8G8B8 = 21;
@ -257,144 +253,6 @@ namespace
 		D3D10_RESOURCE_DIMENSION_TEXTURE3D = 4,
 	};

-
-	const char * getDxgiFormatString(DXGI_FORMAT dxgiFormat)
-	{
-#define CASE(format) case DXGI_FORMAT_##format: return #format
-		switch(dxgiFormat)
-		{
-			CASE(UNKNOWN);
-			
-			CASE(R32G32B32A32_TYPELESS);
-			CASE(R32G32B32A32_FLOAT);
-			CASE(R32G32B32A32_UINT);
-			CASE(R32G32B32A32_SINT);
-			
-			CASE(R32G32B32_TYPELESS);
-			CASE(R32G32B32_FLOAT);
-			CASE(R32G32B32_UINT);
-			CASE(R32G32B32_SINT);
-			
-			CASE(R16G16B16A16_TYPELESS);
-			CASE(R16G16B16A16_FLOAT);
-			CASE(R16G16B16A16_UNORM);
-			CASE(R16G16B16A16_UINT);
-			CASE(R16G16B16A16_SNORM);
-			CASE(R16G16B16A16_SINT);
-			
-			CASE(R32G32_TYPELESS);
-			CASE(R32G32_FLOAT);
-			CASE(R32G32_UINT);
-			CASE(R32G32_SINT);
-			
-			CASE(R32G8X24_TYPELESS);
-			CASE(D32_FLOAT_S8X24_UINT);
-			CASE(R32_FLOAT_X8X24_TYPELESS);
-			CASE(X32_TYPELESS_G8X24_UINT);
-			
-			CASE(R10G10B10A2_TYPELESS);
-			CASE(R10G10B10A2_UNORM);
-			CASE(R10G10B10A2_UINT);
-			
-			CASE(R11G11B10_FLOAT);
-			
-			CASE(R8G8B8A8_TYPELESS);
-			CASE(R8G8B8A8_UNORM);
-			CASE(R8G8B8A8_UNORM_SRGB);
-			CASE(R8G8B8A8_UINT);
-			CASE(R8G8B8A8_SNORM);
-			CASE(R8G8B8A8_SINT);
-			
-			CASE(R16G16_TYPELESS);
-			CASE(R16G16_FLOAT);
-			CASE(R16G16_UNORM);
-			CASE(R16G16_UINT);
-			CASE(R16G16_SNORM);
-			CASE(R16G16_SINT);
-			
-			CASE(R32_TYPELESS);
-			CASE(D32_FLOAT);
-			CASE(R32_FLOAT);
-			CASE(R32_UINT);
-			CASE(R32_SINT);
-			
-			CASE(R24G8_TYPELESS);
-			CASE(D24_UNORM_S8_UINT);
-			CASE(R24_UNORM_X8_TYPELESS);
-			CASE(X24_TYPELESS_G8_UINT);
-			
-			CASE(R8G8_TYPELESS);
-			CASE(R8G8_UNORM);
-			CASE(R8G8_UINT);
-			CASE(R8G8_SNORM);
-			CASE(R8G8_SINT);
-			
-			CASE(R16_TYPELESS);
-			CASE(R16_FLOAT);
-			CASE(D16_UNORM);
-			CASE(R16_UNORM);
-			CASE(R16_UINT);
-			CASE(R16_SNORM);
-			CASE(R16_SINT);
-			
-			CASE(R8_TYPELESS);
-			CASE(R8_UNORM);
-			CASE(R8_UINT);
-			CASE(R8_SNORM);
-			CASE(R8_SINT);
-			CASE(A8_UNORM);
-
-			CASE(R1_UNORM);
-		
-			CASE(R9G9B9E5_SHAREDEXP);
-			
-			CASE(R8G8_B8G8_UNORM);
-			CASE(G8R8_G8B8_UNORM);
-
-			CASE(BC1_TYPELESS);
-			CASE(BC1_UNORM);
-			CASE(BC1_UNORM_SRGB);
-		
-			CASE(BC2_TYPELESS);
-			CASE(BC2_UNORM);
-			CASE(BC2_UNORM_SRGB);
-		
-			CASE(BC3_TYPELESS);
-			CASE(BC3_UNORM);
-			CASE(BC3_UNORM_SRGB);
-		
-			CASE(BC4_TYPELESS);
-			CASE(BC4_UNORM);
-			CASE(BC4_SNORM);
-		
-			CASE(BC5_TYPELESS);
-			CASE(BC5_UNORM);
-			CASE(BC5_SNORM);
-
-			CASE(B5G6R5_UNORM);
-			CASE(B5G5R5A1_UNORM);
-			CASE(B8G8R8A8_UNORM);
-			CASE(B8G8R8X8_UNORM);
-
-			default: 
-				return "UNKNOWN";
-		}
-#undef CASE
-	}
-	
-	const char * getD3d10ResourceDimensionString(D3D10_RESOURCE_DIMENSION resourceDimension)
-	{
-		switch(resourceDimension)
-		{
-			default:
-			case D3D10_RESOURCE_DIMENSION_UNKNOWN: return "UNKNOWN";
-			case D3D10_RESOURCE_DIMENSION_BUFFER: return "BUFFER";
-			case D3D10_RESOURCE_DIMENSION_TEXTURE1D: return "TEXTURE1D";
-			case D3D10_RESOURCE_DIMENSION_TEXTURE2D: return "TEXTURE2D";
-			case D3D10_RESOURCE_DIMENSION_TEXTURE3D: return "TEXTURE3D";
-		}
-	}
-
 } // namespace

 namespace nv
@ -532,7 +390,7 @@ DDSHeader::DDSHeader()

 	// Store version information on the reserved header attributes.
 	this->reserved[9] = MAKEFOURCC('N', 'V', 'T', 'T');
-	this->reserved[10] = (2 << 16) | (0 << 8) | (2);	// major.minor.revision
+	this->reserved[10] = (0 << 16) | (9 << 8) | (5);	// major.minor.revision

 	this->pf.size = 32;
 	this->pf.flags = 0;
@ -636,16 +494,7 @@ void DDSHeader::setFourCC(uint8 c0, uint8 c1, uint8 c2, uint8 c3)
 	// set fourcc pixel format.
 	this->pf.flags = DDPF_FOURCC;
 	this->pf.fourcc = MAKEFOURCC(c0, c1, c2, c3);
-	
-	if (this->pf.fourcc == FOURCC_ATI2)
-	{
-		this->pf.bitcount = FOURCC_A2XY;
-	}
-	else
-	{
-		this->pf.bitcount = 0;
-	}
-	
+	this->pf.bitcount = 0;
 	this->pf.rmask = 0;
 	this->pf.gmask = 0;
 	this->pf.bmask = 0;
@ -681,9 +530,9 @@ void DDSHeader::setPixelFormat(uint bitcount, uint rmask, uint gmask, uint bmask
 	nvCheck(bitcount > 0 && bitcount <= 32);

 	// Align to 8.
-	if (bitcount <= 8) bitcount = 8;
-	else if (bitcount <= 16) bitcount = 16;
-	else if (bitcount <= 24) bitcount = 24;
+	if (bitcount < 8) bitcount = 8;
+	else if (bitcount < 16) bitcount = 16;
+	else if (bitcount < 24) bitcount = 24;
 	else bitcount = 32;

 	this->pf.fourcc = 0; //findD3D9Format(bitcount, rmask, gmask, bmask, amask);
@ -696,8 +545,7 @@ void DDSHeader::setPixelFormat(uint bitcount, uint rmask, uint gmask, uint bmask

 void DDSHeader::setDX10Format(uint format)
 {
-	//this->pf.flags = 0;
-	this->pf.fourcc = FOURCC_DX10;
+	this->pf.flags = 0;
 	this->header10.dxgiFormat = format;
 }

@ -745,8 +593,7 @@ void DDSHeader::swapBytes()

 bool DDSHeader::hasDX10Header() const
 {
-	return this->pf.fourcc == FOURCC_DX10;  // @@ This is according to AMD
-	//return this->pf.flags == 0;             // @@ This is according to MS
+	return this->pf.flags == 0;
 }


@ -776,7 +623,7 @@ bool DirectDrawSurface::isValid() const
 		return false;
 	}
 	
-	const uint required = (DDSD_WIDTH|DDSD_HEIGHT/*|DDSD_CAPS|DDSD_PIXELFORMAT*/);
+	const uint required = (DDSD_WIDTH|DDSD_HEIGHT|DDSD_CAPS|DDSD_PIXELFORMAT);
 	if( (header.flags & required) != required ) {
 		return false;
 	}
@ -796,46 +643,40 @@ bool DirectDrawSurface::isSupported() const
 {
 	nvDebugCheck(isValid());
 	
-	if (header.hasDX10Header())
+	if (header.pf.flags & DDPF_FOURCC)
 	{
+		if (header.pf.fourcc != FOURCC_DXT1 &&
+		    header.pf.fourcc != FOURCC_DXT2 &&
+		    header.pf.fourcc != FOURCC_DXT3 &&
+		    header.pf.fourcc != FOURCC_DXT4 &&
+		    header.pf.fourcc != FOURCC_DXT5 &&
+		    header.pf.fourcc != FOURCC_RXGB &&
+		    header.pf.fourcc != FOURCC_ATI1 &&
+		    header.pf.fourcc != FOURCC_ATI2)
+		{
+			// Unknown fourcc code.
+			return false;
+		}
+	}
+	else if (header.pf.flags & DDPF_RGB)
+	{
+		// All RGB formats are supported now.
 	}
 	else
 	{
-		if (header.pf.flags & DDPF_FOURCC)
-		{
-			if (header.pf.fourcc != FOURCC_DXT1 &&
-				header.pf.fourcc != FOURCC_DXT2 &&
-				header.pf.fourcc != FOURCC_DXT3 &&
-				header.pf.fourcc != FOURCC_DXT4 &&
-				header.pf.fourcc != FOURCC_DXT5 &&
-				header.pf.fourcc != FOURCC_RXGB &&
-				header.pf.fourcc != FOURCC_ATI1 &&
-				header.pf.fourcc != FOURCC_ATI2)
-			{
-				// Unknown fourcc code.
-				return false;
-			}
-		}
-		else if (header.pf.flags & DDPF_RGB)
-		{
-			// All RGB formats are supported now.
-		}
-		else
-		{
-			return false;
-		}
-		
-		if (isTextureCube() && (header.caps.caps2 & DDSCAPS2_CUBEMAP_ALL_FACES) != DDSCAPS2_CUBEMAP_ALL_FACES)
-		{
-			// Cubemaps must contain all faces.
-			return false;
-		}
-		
-		if (isTexture3D())
-		{
-			// @@ 3D textures not supported yet.
-			return false;
-		}
+		return false;
+	}
+	
+	if (isTextureCube() && (header.caps.caps2 & DDSCAPS2_CUBEMAP_ALL_FACES) != DDSCAPS2_CUBEMAP_ALL_FACES)
+	{
+		// Cubemaps must contain all faces.
+		return false;
+	}
+	
+	if (isTexture3D())
+	{
+		// @@ 3D textures not supported yet.
+		return false;
 	}
 	
 	return true;
@ -871,40 +712,16 @@ uint DirectDrawSurface::depth() const
 	else return 1;
 }

-bool DirectDrawSurface::isTexture1D() const
-{
-	nvDebugCheck(isValid());
-	if (header.hasDX10Header())
-	{
-		return header.header10.resourceDimension == D3D10_RESOURCE_DIMENSION_TEXTURE1D;
-	}
-	return false;
-}
-
 bool DirectDrawSurface::isTexture2D() const
 {
 	nvDebugCheck(isValid());
-	if (header.hasDX10Header())
-	{
-		return header.header10.resourceDimension == D3D10_RESOURCE_DIMENSION_TEXTURE2D;
-	}
-	else
-	{
-		return !isTexture3D() && !isTextureCube();
-	}
+	return !isTexture3D() && !isTextureCube();
 }

 bool DirectDrawSurface::isTexture3D() const
 {
 	nvDebugCheck(isValid());
-	if (header.hasDX10Header())
-	{
-		return header.header10.resourceDimension == D3D10_RESOURCE_DIMENSION_TEXTURE3D;
-	}
-	else
-	{
-		return (header.caps.caps2 & DDSCAPS2_VOLUME) != 0;
-	}
+	return (header.caps.caps2 & DDSCAPS2_VOLUME) != 0;
 }

 bool DirectDrawSurface::isTextureCube() const
@ -913,12 +730,6 @@ bool DirectDrawSurface::isTextureCube() const
 	return (header.caps.caps2 & DDSCAPS2_CUBEMAP) != 0;
 }

-void DirectDrawSurface::setNormalFlag(bool b)
-{
-	nvDebugCheck(isValid());
-	header.setNormalFlag(b);
-}
-
 void DirectDrawSurface::mipmap(Image * img, uint face, uint mipmap)
 {
 	nvDebugCheck(isValid());
@ -969,13 +780,7 @@ void DirectDrawSurface::readLinearImage(Image * img)

 	uint byteCount = (header.pf.bitcount + 7) / 8;

-	// set image format: RGB or ARGB
-	// alpha channel exists if and only if the alpha mask is non-zero
-	if (header.pf.amask == 0)
- 	{
-		img->setFormat(Image::Format_RGB);
-	}
-	else
+	if (header.pf.amask != 0)
 	{
 		img->setFormat(Image::Format_ARGB);
 	}
@ -1003,20 +808,7 @@ void DirectDrawSurface::readBlockImage(Image * img)
 {
 	nvDebugCheck(stream != NULL);
 	nvDebugCheck(img != NULL);
-
-	// set image format: RGB or ARGB
-	if (header.pf.fourcc == FOURCC_RXGB ||
-		header.pf.fourcc == FOURCC_ATI1 ||
-		header.pf.fourcc == FOURCC_ATI2 ||
-		header.pf.flags & DDPF_NORMAL)
-	{
-		img->setFormat(Image::Format_RGB);
-	}
-	else
-	{
-		img->setFormat(Image::Format_ARGB);
-	}
-
+	
 	const uint w = img->width();
 	const uint h = img->height();
 	
@ -1252,23 +1044,8 @@ void DirectDrawSurface::printInfo() const
 	if (header.pf.flags & DDPF_ALPHAPREMULT) printf("\t\tDDPF_ALPHAPREMULT\n");
 	if (header.pf.flags & DDPF_NORMAL) printf("\t\tDDPF_NORMAL\n");
 	
-	printf("\tFourCC: '%c%c%c%c'\n",
-		((header.pf.fourcc >> 0) & 0xFF),
-		((header.pf.fourcc >> 8) & 0xFF),
-		((header.pf.fourcc >> 16) & 0xFF),
-		((header.pf.fourcc >> 24) & 0xFF));
-	if ((header.pf.fourcc & DDPF_FOURCC) && (header.pf.bitcount != 0))
-	{
-		printf("\tSwizzle: '%c%c%c%c'\n", 
-			(header.pf.bitcount >> 0) & 0xFF,
-			(header.pf.bitcount >> 8) & 0xFF,
-			(header.pf.bitcount >> 16) & 0xFF,
-			(header.pf.bitcount >> 24) & 0xFF);
-	}
-	else
-	{
-		printf("\tBit count: %d\n", header.pf.bitcount);
-	}
+	printf("\tFourCC: '%c%c%c%c'\n", ((header.pf.fourcc >> 0) & 0xFF), ((header.pf.fourcc >> 8) & 0xFF), ((header.pf.fourcc >> 16) & 0xFF), ((header.pf.fourcc >> 24) & 0xFF));
+	printf("\tBit count: %d\n", header.pf.bitcount);
 	printf("\tRed mask: 0x%.8X\n", header.pf.rmask);
 	printf("\tGreen mask: 0x%.8X\n", header.pf.gmask);
 	printf("\tBlue mask: 0x%.8X\n", header.pf.bmask);
@ -1299,11 +1076,11 @@ void DirectDrawSurface::printInfo() const
 	printf("\tCaps 3: 0x%.8X\n", header.caps.caps3);
 	printf("\tCaps 4: 0x%.8X\n", header.caps.caps4);

-	if (header.hasDX10Header())
+	if (header.pf.flags == 0)
 	{
 		printf("DX10 Header:\n");
-		printf("\tDXGI Format: %u (%s)\n", header.header10.dxgiFormat, getDxgiFormatString((DXGI_FORMAT)header.header10.dxgiFormat));
-		printf("\tResource dimension: %u (%s)\n", header.header10.resourceDimension, getD3d10ResourceDimensionString((D3D10_RESOURCE_DIMENSION)header.header10.resourceDimension));
+		printf("\tDXGI Format: %u\n", header.header10.dxgiFormat);
+		printf("\tResource dimension: %u\n", header.header10.resourceDimension);
 		printf("\tMisc flag: %u\n", header.header10.miscFlag);
 		printf("\tArray size: %u\n", header.header10.arraySize);
 	}
--- a/src/nvimage/DirectDrawSurface.h
+++ b/src/nvimage/DirectDrawSurface.h
@ -119,12 +119,9 @@ namespace nv
 		uint width() const;
 		uint height() const;
 		uint depth() const;
-		bool isTexture1D() const;
 		bool isTexture2D() const;
 		bool isTexture3D() const;
 		bool isTextureCube() const;
-
-		void setNormalFlag(bool b);
 		
 		void mipmap(Image * img, uint f, uint m);
 		//	void mipmap(FloatImage * img, uint f, uint m);
--- a/src/nvimage/FloatImage.h
+++ b/src/nvimage/FloatImage.h
@ -228,12 +228,12 @@ inline uint FloatImage::indexMirror(int x, int y) const
 {
 	x = abs(x);
 	while (x >= m_width) {
-		x = abs(m_width + m_width - x - 2);
+		x = m_width + m_width - x - 2;
 	}

 	y = abs(y);
 	while (y >= m_height) {
-		y = abs(m_height + m_height - y - 2);
+		y = m_height + m_height - y - 2;
 	}

 	return index(x, y);
--- a/src/nvimage/HoleFilling.cpp
+++ b/src/nvimage/HoleFilling.cpp
@ -296,7 +296,7 @@ static bool downsample(const FloatImage * src, const BitMap * srcMask, const Flo
 	return true;
 }

-// This is the filter used in the Lumigraph paper.
+// This is the filter used in the Lumigraph paper. The Unreal engine uses something similar.
 void nv::fillPullPush(FloatImage * img, const BitMap * bmap)
 {
 	nvCheck(img != NULL);
@ -644,8 +644,8 @@ struct LocalPixels



-// This is a quadratic extrapolation filter from Charles Bloom (DoPixelSeamFix). Used with his permission.
-void nv::fillQuadraticExtrapolate(int passCount, FloatImage * img, BitMap * bmap, int coverageIndex /*= -1*/)
+// This is a cubic extrapolation filter from Charles Bloom (DoPixelSeamFix).
+void nv::fillCubicExtrapolate(int passCount, FloatImage * img, BitMap * bmap, int coverageIndex /*= -1*/)
 {
 	nvCheck(passCount > 0);
 	nvCheck(img != NULL);
--- a/src/nvimage/HoleFilling.h
+++ b/src/nvimage/HoleFilling.h
@ -89,7 +89,7 @@ namespace nv
 	NVIMAGE_API void fillPullPush(FloatImage * img, const BitMap * bmap);
 	
 	NVIMAGE_API void fillExtrapolate(int passCount, FloatImage * img, BitMap * bmap);
-	NVIMAGE_API void fillQuadraticExtrapolate(int passCount, FloatImage * img, BitMap * bmap, int coverageIndex = -1);
+	NVIMAGE_API void fillCubicExtrapolate(int passCount, FloatImage * img, BitMap * bmap, int coverageIndex = -1);
 	
 } // nv namespace

--- a/src/nvimage/Image.cpp
+++ b/src/nvimage/Image.cpp
@ -15,7 +15,7 @@ Image::Image() : m_width(0), m_height(0), m_format(Format_RGB), m_data(NULL)
 {
 }

-Image::Image(const Image & img) : m_data(NULL)
+Image::Image(const Image & img)
 {
 	allocate(img.m_width, img.m_height);
 	m_format = img.m_format;
--- a/src/nvmath/CMakeLists.txt
+++ b/src/nvmath/CMakeLists.txt
@ -7,6 +7,8 @@ SET(MATH_SRCS
 	Quaternion.h
 	Box.h
 	Color.h
+	Eigen.h Eigen.cpp
+	Fitting.h Fitting.cpp
 	Montecarlo.h Montecarlo.cpp
 	Random.h Random.cpp
 	SphericalHarmonic.h SphericalHarmonic.cpp
--- a/src/nvmath/Eigen.cpp
+++ b/src/nvmath/Eigen.cpp
@ -0,0 +1,533 @@
+// This code is in the public domain -- castanyo@yahoo.es
+
+#include "Eigen.h"
+
+using namespace nv;
+
+static const float EPS = 0.00001f;
+static const int MAX_ITER = 100;
+
+static void semi_definite_symmetric_eigen(const float *mat, int n, float *eigen_vec, float *eigen_val);
+
+
+// Use power method to find the first eigenvector.
+// http://www.miislita.com/information-retrieval-tutorial/matrix-tutorial-3-eigenvalues-eigenvectors.html
+Vector3 nv::firstEigenVector(float matrix[6])
+{
+	// Number of iterations. @@ Use a variable number of iterations.
+	const int NUM = 8;
+
+	Vector3 v(1, 1, 1);
+	for(int i = 0; i < NUM; i++) {
+		float x = v.x() * matrix[0] + v.y() * matrix[1] + v.z() * matrix[2];
+		float y = v.x() * matrix[1] + v.y() * matrix[3] + v.z() * matrix[4];
+		float z = v.x() * matrix[2] + v.y() * matrix[4] + v.z() * matrix[5];
+		
+		float norm = max(max(x, y), z);
+		float iv = 1.0f / norm;
+		if (norm == 0.0f) {
+			return Vector3(zero);
+		}
+		
+		v.set(x*iv, y*iv, z*iv);
+	}
+
+	return v;
+}
+
+
+/// Solve eigen system.
+void Eigen::solve() {
+	semi_definite_symmetric_eigen(matrix, N, eigen_vec, eigen_val);
+}
+
+/// Solve eigen system.
+void Eigen3::solve() {
+	// @@ Use lengyel code that seems to be more optimized.
+#if 1
+	float v[3*3];
+	semi_definite_symmetric_eigen(matrix, 3, v, eigen_val);
+
+	eigen_vec[0].set(v[0], v[1], v[2]);
+	eigen_vec[1].set(v[3], v[4], v[5]);
+	eigen_vec[2].set(v[6], v[7], v[8]);
+#else
+	const int maxSweeps = 32;
+	const float epsilon = 1.0e-10f;
+	
+	float m11 = matrix[0]; // m(0,0);
+	float m12 = matrix[1]; // m(0,1);
+	float m13 = matrix[2]; // m(0,2);
+	float m22 = matrix[3]; // m(1,1);
+	float m23 = matrix[4]; // m(1,2);
+	float m33 = matrix[5]; // m(2,2);
+	
+	//r.SetIdentity();	
+	eigen_vec[0].set(1, 0, 0);
+	eigen_vec[1].set(0, 1, 0);
+	eigen_vec[2].set(0, 0, 1);
+	
+	for (int a = 0; a < maxSweeps; a++)
+	{
+		// Exit if off-diagonal entries small enough
+		if ((fabs(m12) < epsilon) && (fabs(m13) < epsilon) && (fabs(m23) < epsilon))
+		{
+			break;
+		}
+		
+		// Annihilate (1,2) entry
+		if (m12 != 0.0f)
+		{
+			float u = (m22 - m11) * 0.5f / m12;
+			float u2 = u * u;
+			float u2p1 = u2 + 1.0f;
+			float t = (u2p1 != u2) ? ((u < 0.0f) ? -1.0f : 1.0f) * (sqrt(u2p1) - fabs(u)) : 0.5f / u;
+			float c = 1.0f / sqrt(t * t + 1.0f);
+			float s = c * t;
+			
+			m11 -= t * m12;
+			m22 += t * m12;
+			m12 = 0.0f;
+			
+			float temp = c * m13 - s * m23;
+			m23 = s * m13 + c * m23;
+			m13 = temp;
+			
+			for (int i = 0; i < 3; i++)
+			{
+				float temp = c * eigen_vec[i].x - s * eigen_vec[i].y;
+				eigen_vec[i].y = s * eigen_vec[i].x + c * eigen_vec[i].y;
+				eigen_vec[i].x = temp;
+			}
+		}
+		
+		// Annihilate (1,3) entry
+		if (m13 != 0.0f)
+		{
+			float u = (m33 - m11) * 0.5f / m13;
+			float u2 = u * u;
+			float u2p1 = u2 + 1.0f;
+			float t = (u2p1 != u2) ? ((u < 0.0f) ? -1.0f : 1.0f) * (sqrt(u2p1) - fabs(u)) : 0.5f / u;
+			float c = 1.0f / sqrt(t * t + 1.0f);
+			float s = c * t;
+			
+			m11 -= t * m13;
+			m33 += t * m13;
+			m13 = 0.0f;
+			
+			float temp = c * m12 - s * m23;
+			m23 = s * m12 + c * m23;
+			m12 = temp;
+			
+			for (int i = 0; i < 3; i++)
+			{
+				float temp = c * eigen_vec[i].x - s * eigen_vec[i].z;
+				eigen_vec[i].z = s * eigen_vec[i].x + c * eigen_vec[i].z;
+				eigen_vec[i].x = temp;
+			}
+		}
+		
+		// Annihilate (2,3) entry
+		if (m23 != 0.0f)
+		{
+			float u = (m33 - m22) * 0.5f / m23;
+			float u2 = u * u;
+			float u2p1 = u2 + 1.0f;
+			float t = (u2p1 != u2) ? ((u < 0.0f) ? -1.0f : 1.0f) * (sqrt(u2p1) - fabs(u)) : 0.5f / u;
+			float c = 1.0f / sqrt(t * t + 1.0f);
+			float s = c * t;
+			
+			m22 -= t * m23;
+			m33 += t * m23;
+			m23 = 0.0f;
+			
+			float temp = c * m12 - s * m13;
+			m13 = s * m12 + c * m13;
+			m12 = temp;
+			
+			for (int i = 0; i < 3; i++)
+			{
+				float temp = c * eigen_vec[i].y - s * eigen_vec[i].z;
+				eigen_vec[i].z = s * eigen_vec[i].y + c * eigen_vec[i].z;
+				eigen_vec[i].y = temp;
+			}
+		}
+	}
+	
+	eigen_val[0] = m11;
+	eigen_val[1] = m22;
+	eigen_val[2] = m33;
+#endif
+}
+
+
+/*---------------------------------------------------------------------------
+	Functions
+---------------------------------------------------------------------------*/
+    
+
+/** @@ I don't remember where did I get this function.
+ * computes the eigen values and eigen vectors   
+ * of a semi definite symmetric matrix
+ *
+ * -  matrix is stored in column symmetric storage, i.e.
+ *     matrix = { m11, m12, m22, m13, m23, m33, m14, m24, m34, m44 ... }
+ *     size = n(n+1)/2
+ *
+ * - eigen_vectors (return) = { v1, v2, v3, ..., vn } where vk = vk0, vk1, ..., vkn
+ *     size = n^2, must be allocated by caller
+ *
+ * - eigen_values  (return) are in decreasing order
+ *     size = n,   must be allocated by caller
+ */
+
+void semi_definite_symmetric_eigen(
+    const float *mat, int n, float *eigen_vec, float *eigen_val
+) {
+    float *a,*v;
+    float a_norm,a_normEPS,thr,thr_nn;
+    int nb_iter = 0;
+    int jj;
+    int i,j,k,ij,ik,l,m,lm,mq,lq,ll,mm,imv,im,iq,ilv,il,nn;
+    int *index;
+    float a_ij,a_lm,a_ll,a_mm,a_im,a_il;
+    float a_lm_2;
+    float v_ilv,v_imv;
+    float x;
+    float sinx,sinx_2,cosx,cosx_2,sincos;
+    float delta;
+        
+    // Number of entries in mat
+        
+    nn = (n*(n+1))/2;
+        
+    // Step 1: Copy mat to a
+        
+    a = new float[nn];
+        
+    for( ij=0; ij<nn; ij++ ) {
+        a[ij] = mat[ij];
+    }
+        
+    // Ugly Fortran-porting trick: indices for a are between 1 and n
+    a--;
+        
+    // Step 2 : Init diagonalization matrix as the unit matrix
+    v = new float[n*n];
+        
+    ij = 0;
+    for( i=0; i<n; i++ ) {
+        for( j=0; j<n; j++ ) {
+            if( i==j ) {
+                v[ij++] = 1.0;
+            } else {
+                v[ij++] = 0.0;
+            }
+        }
+    }
+        
+    // Ugly Fortran-porting trick: indices for v are between 1 and n
+    v--;
+        
+    // Step 3 : compute the weight of the non diagonal terms 
+    ij     = 1  ;
+    a_norm = 0.0;
+    for( i=1; i<=n; i++ ) {
+        for( j=1; j<=i; j++ ) {
+            if( i!=j ) {
+                a_ij    = a[ij];
+                a_norm += a_ij*a_ij;
+            }
+            ij++;
+        }
+    }
+        
+    if( a_norm != 0.0 ) {
+        
+        a_normEPS = a_norm*EPS;
+        thr       = a_norm    ;
+    
+        // Step 4 : rotations
+        while( thr > a_normEPS   &&   nb_iter < MAX_ITER ) {
+        
+            nb_iter++;
+            thr_nn = thr / nn;
+            
+            for( l=1  ; l< n; l++ ) {
+                for( m=l+1; m<=n; m++ ) {
+                    
+                    // compute sinx and cosx 
+                    
+                    lq   = (l*l-l)/2;
+                    mq   = (m*m-m)/2;
+                    
+                    lm     = l+mq;
+                    a_lm   = a[lm];
+                    a_lm_2 = a_lm*a_lm;
+                    
+                    if( a_lm_2 < thr_nn ) {
+                        continue ;
+                    }
+                    
+                    ll   = l+lq;
+                    mm   = m+mq;
+                    a_ll = a[ll];
+                    a_mm = a[mm];
+                    
+                    delta = a_ll - a_mm;
+                    
+                    if( delta == 0.0f ) {
+                        x = - PI/4 ; 
+                    } else {
+                        x = - atanf( (a_lm+a_lm) / delta ) / 2.0f ;
+                    }
+
+                    sinx    = sinf(x);
+                    cosx    = cosf(x);
+                    sinx_2  = sinx*sinx;
+                    cosx_2  = cosx*cosx;
+                    sincos  = sinx*cosx;
+                    
+                    // rotate L and M columns 
+       
+                    ilv = n*(l-1);
+                    imv = n*(m-1);
+                    
+                    for( i=1; i<=n;i++ ) {
+                        if( (i!=l) && (i!=m) ) {
+                            iq = (i*i-i)/2;
+                            
+                            if( i<m )  { 
+                                im = i + mq; 
+                            } else {
+                                im = m + iq;
+                            }
+                            a_im = a[im];
+                            
+                            if( i<l ) {
+                                il = i + lq; 
+                            } else {
+                                il = l + iq;
+                            }
+                            a_il = a[il];
+                            
+                            a[il] =  a_il*cosx - a_im*sinx;
+                            a[im] =  a_il*sinx + a_im*cosx;
+                        }
+                        
+                        ilv++;
+                        imv++;
+                        
+                        v_ilv = v[ilv];
+                        v_imv = v[imv];
+                        
+                        v[ilv] = cosx*v_ilv - sinx*v_imv;
+                        v[imv] = sinx*v_ilv + cosx*v_imv;
+                    } 
+                    
+                    x = a_lm*sincos; x+=x;
+                    
+                    a[ll] =  a_ll*cosx_2 + a_mm*sinx_2 - x;
+                    a[mm] =  a_ll*sinx_2 + a_mm*cosx_2 + x;
+                    a[lm] =  0.0;
+                    
+                    thr = fabs( thr - a_lm_2 );
+                }
+            }
+        }         
+    }
+        
+    // Step 5: index conversion and copy eigen values 
+        
+    // back from Fortran to C++
+    a++;
+        
+    for( i=0; i<n; i++ ) {
+        k = i + (i*(i+1))/2;
+        eigen_val[i] = a[k];
+    }
+     
+    delete[] a;
+        
+    // Step 6: sort the eigen values and eigen vectors 
+        
+    index = new int[n];
+    for( i=0; i<n; i++ ) {
+        index[i] = i;
+    }
+        
+    for( i=0; i<(n-1); i++ ) {
+        x = eigen_val[i];
+        k = i;
+            
+        for( j=i+1; j<n; j++ ) {
+            if( x < eigen_val[j] ) {
+                k = j;
+                x = eigen_val[j];
+            }
+        }
+            
+        eigen_val[k] = eigen_val[i];
+        eigen_val[i] = x;
+          
+        jj       = index[k];
+        index[k] = index[i];
+        index[i] = jj;
+    }
+
+
+    // Step 7: save the eigen vectors 
+    
+    v++; // back from Fortran to to C++
+        
+    ij = 0;
+    for( k=0; k<n; k++ ) {
+        ik = index[k]*n;
+        for( i=0; i<n; i++ ) {
+            eigen_vec[ij++] = v[ik++];
+        }
+    }
+    
+    delete[] v    ;
+    delete[] index;
+    return;
+}
+    
+//_________________________________________________________
+
+
+// Eric Lengyel code:
+// http://www.terathon.com/code/linear.html
+#if 0 
+
+const float epsilon = 1.0e-10F;
+const int maxSweeps = 32;
+
+
+struct Matrix3D
+{
+	float n[3][3];
+	
+	float& operator()(int i, int j)
+	{
+		return (n[j][i]);
+	}
+	
+	const float& operator()(int i, int j) const
+	{
+		return (n[j][i]);
+	}
+	
+	void SetIdentity(void)
+	{
+		n[0][0] = n[1][1] = n[2][2] = 1.0F;
+		n[0][1] = n[0][2] = n[1][0] = n[1][2] = n[2][0] = n[2][1] = 0.0F;
+	}
+};
+
+
+void CalculateEigensystem(const Matrix3D& m, float *lambda, Matrix3D& r)
+{
+	float m11 = m(0,0);
+	float m12 = m(0,1);
+	float m13 = m(0,2);
+	float m22 = m(1,1);
+	float m23 = m(1,2);
+	float m33 = m(2,2);
+	
+	r.SetIdentity();
+	for (int a = 0; a < maxSweeps; a++)
+	{
+		// Exit if off-diagonal entries small enough
+		if ((Fabs(m12) < epsilon) && (Fabs(m13) < epsilon) &&
+			(Fabs(m23) < epsilon)) break;
+		
+		// Annihilate (1,2) entry
+		if (m12 != 0.0F)
+		{
+			float u = (m22 - m11) * 0.5F / m12;
+			float u2 = u * u;
+			float u2p1 = u2 + 1.0F;
+			float t = (u2p1 != u2) ?
+					((u < 0.0F) ? -1.0F : 1.0F) * (sqrt(u2p1) - fabs(u)) : 0.5F / u;
+			float c = 1.0F / sqrt(t * t + 1.0F);
+			float s = c * t;
+			
+			m11 -= t * m12;
+			m22 += t * m12;
+			m12 = 0.0F;
+			
+			float temp = c * m13 - s * m23;
+			m23 = s * m13 + c * m23;
+			m13 = temp;
+			
+			for (int i = 0; i < 3; i++)
+			{
+				float temp = c * r(i,0) - s * r(i,1);
+				r(i,1) = s * r(i,0) + c * r(i,1);
+				r(i,0) = temp;
+			}
+		}
+		
+		// Annihilate (1,3) entry
+		if (m13 != 0.0F)
+		{
+			float u = (m33 - m11) * 0.5F / m13;
+			float u2 = u * u;
+			float u2p1 = u2 + 1.0F;
+			float t = (u2p1 != u2) ?
+				((u < 0.0F) ? -1.0F : 1.0F) * (sqrt(u2p1) - fabs(u)) : 0.5F / u;
+			float c = 1.0F / sqrt(t * t + 1.0F);
+			float s = c * t;
+			
+			m11 -= t * m13;
+			m33 += t * m13;
+			m13 = 0.0F;
+			
+			float temp = c * m12 - s * m23;
+			m23 = s * m12 + c * m23;
+			m12 = temp;
+			
+			for (int i = 0; i < 3; i++)
+			{
+				float temp = c * r(i,0) - s * r(i,2);
+				r(i,2) = s * r(i,0) + c * r(i,2);
+				r(i,0) = temp;
+			}
+		}
+		
+		// Annihilate (2,3) entry
+		if (m23 != 0.0F)
+		{
+			float u = (m33 - m22) * 0.5F / m23;
+			float u2 = u * u;
+			float u2p1 = u2 + 1.0F;
+			float t = (u2p1 != u2) ?
+				((u < 0.0F) ? -1.0F : 1.0F) * (sqrt(u2p1) - fabs(u)) : 0.5F / u;
+			float c = 1.0F / sqrt(t * t + 1.0F);
+			float s = c * t;
+			
+			m22 -= t * m23;
+			m33 += t * m23;
+			m23 = 0.0F;
+			
+			float temp = c * m12 - s * m13;
+			m13 = s * m12 + c * m13;
+			m12 = temp;
+			
+			for (int i = 0; i < 3; i++)
+			{
+				float temp = c * r(i,1) - s * r(i,2);
+				r(i,2) = s * r(i,1) + c * r(i,2);
+				r(i,1) = temp;
+			}
+		}
+	}
+	
+	lambda[0] = m11;
+	lambda[1] = m22;
+	lambda[2] = m33;
+}
+
+
+#endif
--- a/src/nvmath/Eigen.h
+++ b/src/nvmath/Eigen.h
@ -0,0 +1,140 @@
+// This code is in the public domain -- castanyo@yahoo.es
+
+#ifndef NV_MATH_EIGEN_H
+#define NV_MATH_EIGEN_H
+
+#include <nvcore/Containers.h> // swap
+#include <nvmath/nvmath.h>
+#include <nvmath/Vector.h>
+
+namespace nv
+{
+
+	// Compute first eigen vector using the power method.
+	Vector3 firstEigenVector(float matrix[6]);
+	
+	/// Generic eigen-solver.
+	class Eigen
+	{
+	public:
+		
+		/// Ctor.
+		Eigen(uint n) : N(n)
+		{
+			uint size = n * (n + 1) / 2;
+			matrix = new float[size];
+			eigen_vec = new float[N*N];
+			eigen_val = new float[N];
+		}
+		
+		/// Dtor.
+		~Eigen()
+		{
+			delete [] matrix;
+			delete [] eigen_vec;
+			delete [] eigen_val;
+		}
+		
+		NVMATH_API void solve();
+		
+		/// Matrix accesor.
+		float & operator()(uint x, uint y)
+		{
+			if( x > y ) {
+				swap(x, y);
+			}
+			return matrix[y * (y + 1) / 2 + x];
+		}
+		
+		/// Matrix const accessor.
+		float operator()(uint x, uint y) const
+		{
+			if( x > y ) {
+				swap(x, y);
+			}
+			return matrix[y * (y + 1) / 2 + x];
+		}
+		
+		Vector3 eigenVector3(uint i) const
+		{
+			nvCheck(3 == N);
+			nvCheck(i < N);
+			return Vector3(eigen_vec[i*N+0], eigen_vec[i*N+1], eigen_vec[i*N+2]);
+		}
+		
+		Vector4 eigenVector4(uint i) const
+		{
+			nvCheck(4 == N);
+			nvCheck(i < N);
+			return Vector4(eigen_vec[i*N+0], eigen_vec[i*N+1], eigen_vec[i*N+2], eigen_vec[i*N+3]);
+		}
+		
+		float eigenValue(uint i) const
+		{
+			nvCheck(i < N);
+			return eigen_val[i];
+		}
+	
+	private:
+		const uint N;
+		float * matrix;
+		float * eigen_vec;
+		float * eigen_val;
+	};
+	
+	
+	/// 3x3 eigen-solver. 
+	/// Based on Eric Lengyel's code:
+	/// http://www.terathon.com/code/linear.html
+	class Eigen3
+	{
+	public:
+		
+		/** Ctor. */
+		Eigen3() {}
+		
+		NVMATH_API void solve();
+		
+		/// Matrix accesor.
+		float & operator()(uint x, uint y)
+		{
+			nvDebugCheck( x < 3 && y < 3 );
+			if( x > y ) {
+				swap(x, y);
+			}
+			return matrix[y * (y + 1) / 2 + x];
+		}
+		
+		/// Matrix const accessor.
+		float operator()(uint x, uint y) const
+		{
+			nvDebugCheck( x < 3 && y < 3 );
+			if( x > y ) {
+				swap(x, y);
+			}
+			return matrix[y * (y + 1) / 2 + x];
+		}
+		
+		/// Get ith eigen vector.
+		Vector3 eigenVector(uint i) const
+		{
+			nvCheck(i < 3);
+			return eigen_vec[i];
+		}
+		
+		/** Get ith eigen value. */
+		float eigenValue(uint i) const
+		{
+			nvCheck(i < 3);
+			return eigen_val[i];
+		}
+	
+	private:
+		float matrix[3+2+1];
+		Vector3 eigen_vec[3];
+		float eigen_val[3];
+	};
+
+} // nv namespace
+
+#endif // NV_MATH_EIGEN_H
--- a/src/nvmath/Fitting.cpp
+++ b/src/nvmath/Fitting.cpp
@ -0,0 +1,134 @@
+// License: Wild Magic License Version 3
+// http://geometrictools.com/License/WildMagic3License.pdf
+
+#include "Fitting.h"
+#include "Eigen.h"
+
+using namespace nv;
+
+
+/** Fit a 3d line to the given set of points. 
+ *
+ * Based on code from:
+ * http://geometrictools.com/
+ */
+Line3 Fit::bestLine(const Array<Vector3> & pointArray)
+{
+	nvDebugCheck(pointArray.count() > 0);
+	
+	Line3 line;
+	
+	const uint pointCount = pointArray.count();
+	const float inv_num = 1.0f / pointCount;
+
+	// compute the mean of the points
+	Vector3 center(zero);
+	for(uint i = 0; i < pointCount; i++) {
+		center += pointArray[i];
+	}
+	line.setOrigin(center * inv_num);
+
+	// compute the covariance matrix of the points
+	float covariance[6] = {0, 0, 0, 0, 0, 0};
+	for(uint i = 0; i < pointCount; i++) {
+		Vector3 diff = pointArray[i] - line.origin();
+		covariance[0] += diff.x() * diff.x();
+		covariance[1] += diff.x() * diff.y();
+		covariance[2] += diff.x() * diff.z();
+		covariance[3] += diff.y() * diff.y();
+		covariance[4] += diff.y() * diff.z();
+		covariance[5] += diff.z() * diff.z();
+	}
+	
+	line.setDirection(normalizeSafe(firstEigenVector(covariance), Vector3(zero), 0.0f));
+	
+	// @@ This variant is from David Eberly... I'm not sure how that works.
+	/*sum_xx *= inv_num;
+	sum_xy *= inv_num;
+	sum_xz *= inv_num;
+	sum_yy *= inv_num;
+	sum_yz *= inv_num;
+	sum_zz *= inv_num;
+
+    // set up the eigensolver
+	Eigen3 ES;
+	ES(0,0) = sum_yy + sum_zz;
+	ES(0,1) = -sum_xy;
+	ES(0,2) = -sum_xz;
+	ES(1,1) = sum_xx + sum_zz;
+	ES(1,2) = -sum_yz;
+	ES(2,2) = sum_xx + sum_yy;
+
+    // compute eigenstuff, smallest eigenvalue is in last position
+	ES.solve();
+
+	line.setDirection(ES.eigenVector(2));
+	
+	nvCheck( isNormalized(line.direction()) );
+	*/
+	return line;
+}
+
+
+/** Fit a 3d plane to the given set of points. 
+ *
+ * Based on code from:
+ * http://geometrictools.com/
+ */
+Vector4 Fit::bestPlane(const Array<Vector3> & pointArray)
+{
+	Vector3 center(zero);
+	
+	const uint pointCount = pointArray.count();
+	const float inv_num = 1.0f / pointCount;
+
+    // compute the mean of the points
+	for(uint i = 0; i < pointCount; i++) {
+		center += pointArray[i];
+	}
+	center *= inv_num;
+
+    // compute the covariance matrix of the points
+	float sum_xx = 0.0f;
+	float sum_xy = 0.0f;
+	float sum_xz = 0.0f;
+	float sum_yy = 0.0f;
+	float sum_yz = 0.0f;
+	float sum_zz = 0.0f;
+	
+	for(uint i = 0; i < pointCount; i++) {
+		Vector3 diff = pointArray[i] - center;
+		sum_xx += diff.x() * diff.x();
+		sum_xy += diff.x() * diff.y();
+		sum_xz += diff.x() * diff.z();
+		sum_yy += diff.y() * diff.y();
+		sum_yz += diff.y() * diff.z();
+		sum_zz += diff.z() * diff.z();
+	}
+	
+	sum_xx *= inv_num;
+	sum_xy *= inv_num;
+	sum_xz *= inv_num;
+	sum_yy *= inv_num;
+	sum_yz *= inv_num;
+	sum_zz *= inv_num;
+
+    // set up the eigensolver
+	Eigen3 ES;
+	ES(0,0) = sum_yy + sum_zz;
+	ES(0,1) = -sum_xy;
+	ES(0,2) = -sum_xz;
+	ES(1,1) = sum_xx + sum_zz;
+	ES(1,2) = -sum_yz;
+	ES(2,2) = sum_xx + sum_yy;
+
+    // compute eigenstuff, greatest eigenvalue is in first position
+	ES.solve();
+
+	Vector3 normal = ES.eigenVector(0);
+	nvCheck(isNormalized(normal));
+	
+	float offset = dot(normal, center);
+
+	return Vector4(normal, offset);
+}
--- a/src/nvmath/Fitting.h
+++ b/src/nvmath/Fitting.h
@ -0,0 +1,78 @@
+// This code is in the public domain -- castanyo@yahoo.es
+
+#ifndef NV_MATH_FITTING_H
+#define NV_MATH_FITTING_H
+
+#include <nvmath/Vector.h>
+
+namespace nv
+{
+
+	/// 3D Line.
+	struct Line3
+	{
+		/// Ctor.
+		Line3() : m_origin(zero), m_direction(zero)
+		{
+		}
+		
+		/// Copy ctor.
+		Line3(const Line3 & l) : m_origin(l.m_origin), m_direction(l.m_direction)
+		{
+		}
+		
+		/// Ctor.
+		Line3(Vector3::Arg o, Vector3::Arg d) : m_origin(o), m_direction(d)
+		{
+		}
+	
+		/// Normalize the line.
+		void normalize()
+		{
+			m_direction = nv::normalize(m_direction);
+		}
+		
+		/// Project a point onto the line.
+		Vector3 projectPoint(Vector3::Arg point) const
+		{
+			nvDebugCheck(isNormalized(m_direction));
+			
+			Vector3 v = point - m_origin;
+			return m_origin + m_direction * dot(m_direction, v);
+		}
+		
+		/// Compute distance to line.
+		float distanceToPoint(Vector3::Arg point) const
+		{
+			nvDebugCheck(isNormalized(m_direction));
+			
+			Vector3 v = point - m_origin;
+			Vector3 l = v - m_direction * dot(m_direction, v);
+			
+			return length(l);
+		}
+		
+		const Vector3 & origin() const { return m_origin; }
+		void setOrigin(Vector3::Arg value) { m_origin = value; }
+	
+		const Vector3 & direction() const { return m_direction; }
+		void setDirection(Vector3::Arg value) { m_direction = value; }
+		
+		
+	private:	
+		Vector3 m_origin;
+		Vector3 m_direction;
+	};
+
+	
+	namespace Fit
+	{
+		
+		NVMATH_API Line3 bestLine(const Array<Vector3> & pointArray);
+		NVMATH_API Vector4 bestPlane(const Array<Vector3> & pointArray);
+		
+	} // Fit namespace
+
+} // nv namespace
+
+#endif // _PI_MATHLIB_FITTING_H_
--- a/src/nvmath/Plane.cpp
+++ b/src/nvmath/Plane.cpp
@ -1,17 +0,0 @@
-// This code is in the public domain -- castanyo@yahoo.es
-
-#include "Plane.h"
-#include "Matrix.h"
-
-namespace nv
-{
-	Plane transformPlane(const Matrix& m, Plane::Arg p)
-	{
-		Vector3 newVec = transformVector(m, p.vector());
-
-		Vector3 ptInPlane = p.offset() * p.vector();
-		ptInPlane = transformPoint(m, ptInPlane);
-
-		return Plane(newVec, ptInPlane);
-	}
-}
--- a/src/nvmath/Plane.h
+++ b/src/nvmath/Plane.h
@ -1,77 +0,0 @@
-// This code is in the public domain -- castanyo@yahoo.es
-
-#ifndef NV_MATH_PLANE_H
-#define NV_MATH_PLANE_H
-
-#include <nvmath/nvmath.h>
-#include <nvmath/Vector.h>
-
-namespace nv
-{
-	class Matrix;
-
-
-	class NVMATH_CLASS Plane
-	{
-	public:
-		typedef Plane const & Arg;
-		
-		Plane();
-		Plane(float x, float y, float z, float w);
-		Plane(Vector4::Arg v);
-		Plane(Vector3::Arg v, float d);
-		Plane(Vector3::Arg normal, Vector3::Arg point);
-		
-		const Plane & operator=(Plane::Arg v);
-		
-		Vector3 vector() const;
-		scalar offset() const;
-		
-		const Vector4 & asVector() const;
-		Vector4 & asVector();
-		
-		void operator*=(scalar s);
-
-	private:
-		Vector4 p;
-	};
-
-	inline Plane::Plane() {}
-	inline Plane::Plane(float x, float y, float z, float w) : p(x, y, z, w) {}
-	inline Plane::Plane(Vector4::Arg v) : p(v) {}
-	inline Plane::Plane(Vector3::Arg v, float d) : p(v, d) {}
-	inline Plane::Plane(Vector3::Arg normal, Vector3::Arg point) : p(normal, dot(normal, point)) {}
-	
-	inline const Plane & Plane::operator=(Plane::Arg v) { p = v.p; return *this; }
-	
-	inline Vector3 Plane::vector() const { return p.xyz(); }
-	inline scalar Plane::offset() const { return p.w(); }
-
-	inline const Vector4 & Plane::asVector() const { return p; }
-	inline Vector4 & Plane::asVector() { return p; }
-
-	// Normalize plane.
-	inline Plane normalize(Plane::Arg plane, float epsilon = NV_EPSILON)
-	{
-		const float len = length(plane.vector());
-		nvDebugCheck(!isZero(len, epsilon));
-		const float inv = 1.0f / len;
-		return Plane(plane.asVector() * inv);
-	}
-
-	// Get the distance from the given point to this plane.
-	inline float distance(Plane::Arg plane, Vector3::Arg point)
-	{
-		return dot(plane.vector(), point) - plane.offset();
-	}
-
-	inline void Plane::operator*=(scalar s)
-	{
-		scale(p, s);
-	}
-
-	Plane transformPlane(const Matrix&, Plane::Arg);
-	
-} // nv namespace
-
-#endif // NV_MATH_PLANE_H
--- a/src/nvtt/CompressDXT.cpp
+++ b/src/nvtt/CompressDXT.cpp
@ -98,15 +98,7 @@ void nv::fastCompressDXT1a(const Image * image, const OutputOptions::Private & o
 		for (uint x = 0; x < w; x += 4) {
 			rgba.init(image, x, y);
 			
-			// @@ We could do better here: check for single RGB, but varying alpha.
-			if (rgba.isSingleColor())
-			{
-				QuickCompress::compressDXT1a(rgba.color(0), &block);
-			}
-			else
-			{
-				QuickCompress::compressDXT1a(rgba, &block);
-			}
+			QuickCompress::compressDXT1a(rgba, &block);
 			
 			if (outputOptions.outputHandler != NULL) {
 				outputOptions.outputHandler->writeData(&block, sizeof(block));
@ -127,7 +119,7 @@ void nv::fastCompressDXT3(const Image * image, const nvtt::OutputOptions::Privat
 	for (uint y = 0; y < h; y += 4) {
 		for (uint x = 0; x < w; x += 4) {
 			rgba.init(image, x, y);
-			QuickCompress::compressDXT3(rgba, &block);
+			compressBlock_BoundsRange(rgba, &block);
 			
 			if (outputOptions.outputHandler != NULL) {
 				outputOptions.outputHandler->writeData(&block, sizeof(block));
@ -148,8 +140,7 @@ void nv::fastCompressDXT5(const Image * image, const nvtt::OutputOptions::Privat
 	for (uint y = 0; y < h; y += 4) {
 		for (uint x = 0; x < w; x += 4) {
 			rgba.init(image, x, y);
-			//QuickCompress::compressDXT5(rgba, &block);	// @@ Use fast version!!
-			nv::compressBlock_BoundsRange(rgba, &block);
+			compressBlock_BoundsRange(rgba, &block);
 			
 			if (outputOptions.outputHandler != NULL) {
 				outputOptions.outputHandler->writeData(&block, sizeof(block));
@ -173,9 +164,8 @@ void nv::fastCompressDXT5n(const Image * image, const nvtt::OutputOptions::Priva
 			
 			// copy X coordinate to alpha channel and Y coordinate to green channel.
 			rgba.swizzleDXT5n();
-
-			//QuickCompress::compressDXT5(rgba, &block);	// @@ Use fast version!!
-			nv::compressBlock_BoundsRange(rgba, &block);
+			
+			compressBlock_BoundsRange(rgba, &block);
 			
 			if (outputOptions.outputHandler != NULL) {
 				outputOptions.outputHandler->writeData(&block, sizeof(block));
@ -201,7 +191,7 @@ void nv::fastCompressBC5(const Image * image, const nvtt::OutputOptions::Private

 void nv::doPrecomputation()
 {
-	static bool done = false;	// @@ Stop using statics for reentrancy. Although the worst that could happen is that this stuff is precomputed multiple times.
+	static bool done = false;	// @@ Stop using statics for reentrancy.
 	
 	if (!done)
 	{
@ -266,16 +256,10 @@ void nv::compressDXT1a(const Image * image, const OutputOptions::Private & outpu
 			
 			rgba.init(image, x, y);
 			
-			if (rgba.isSingleColor())
-			{
-				QuickCompress::compressDXT1a(rgba.color(0), &block);
-			}
-			else
-			{
-				squish::ColourSet colours((uint8 *)rgba.colors(), squish::kDxt1|squish::kWeightColourByAlpha);
-				fit.SetColourSet(&colours, squish::kDxt1);
-				fit.Compress(&block);
-			}
+			// Compress color.
+			squish::ColourSet colours((uint8 *)rgba.colors(), squish::kDxt1|squish::kWeightColourByAlpha);
+			fit.SetColourSet(&colours, squish::kDxt1);
+			fit.Compress(&block);
 			
 			if (outputOptions.outputHandler != NULL) {
 				outputOptions.outputHandler->writeData(&block, sizeof(block));
@ -302,7 +286,7 @@ void nv::compressDXT3(const Image * image, const OutputOptions::Private & output
 			rgba.init(image, x, y);
 			
 			// Compress explicit alpha.
-			QuickCompress::compressDXT3A(rgba, &block.alpha);
+			compressBlock(rgba, &block.alpha);
 			
 			// Compress color.
 			squish::ColourSet colours((uint8 *)rgba.colors(), squish::kWeightColourByAlpha);
@ -333,13 +317,14 @@ void nv::compressDXT5(const Image * image, const OutputOptions::Private & output
 			rgba.init(image, x, y);

 			// Compress alpha.
+			uint error;
 			if (compressionOptions.quality == Quality_Highest)
 			{
-				compressBlock_BruteForce(rgba, &block.alpha);
+				error = compressBlock_BruteForce(rgba, &block.alpha);
 			}
 			else
 			{
-				QuickCompress::compressDXT5A(rgba, &block.alpha);
+				error = compressBlock_Iterative(rgba, &block.alpha);
 			}

 			// Compress color.
@ -374,13 +359,10 @@ void nv::compressDXT5n(const Image * image, const OutputOptions::Private & outpu
 			rgba.swizzleDXT5n();			
 			
 			// Compress X.
+			uint error = compressBlock_Iterative(rgba, &block.alpha);
 			if (compressionOptions.quality == Quality_Highest)
 			{
-				compressBlock_BruteForce(rgba, &block.alpha);
-			}
-			else
-			{
-				QuickCompress::compressDXT5A(rgba, &block.alpha);
+				error = compressBlock_BruteForce(rgba, &block.alpha);
 			}
 			
 			// Compress Y.
@ -402,20 +384,24 @@ void nv::compressBC4(const Image * image, const nvtt::OutputOptions::Private & o
 	ColorBlock rgba;
 	AlphaBlockDXT5 block;
 	
+	uint totalError = 0;
+	
 	for (uint y = 0; y < h; y += 4) {
 		for (uint x = 0; x < w; x += 4) {
 			
 			rgba.init(image, x, y);

+			//error = compressBlock_BoundsRange(rgba, &block);
+			uint error = compressBlock_Iterative(rgba, &block);
+
 			if (compressionOptions.quality == Quality_Highest)
 			{
-				compressBlock_BruteForce(rgba, &block);
-			}
-			else
-			{
-				QuickCompress::compressDXT5A(rgba, &block);
+				// Try brute force algorithm.
+				error = compressBlock_BruteForce(rgba, &block);
 			}

+			totalError += error;
+
 			if (outputOptions.outputHandler != NULL) {
 				outputOptions.outputHandler->writeData(&block, sizeof(block));
 			}
@ -443,15 +429,18 @@ void nv::compressBC5(const Image * image, const nvtt::OutputOptions::Private & o
 			ycolor.init(image, x, y);
 			ycolor.splatY();

+			// @@ Compute normal error, instead of separate xy errors.
+			uint xerror, yerror;
+			
 			if (compressionOptions.quality == Quality_Highest)
 			{
-				compressBlock_BruteForce(xcolor, &block.x);
-				compressBlock_BruteForce(ycolor, &block.y);
+				xerror = compressBlock_BruteForce(xcolor, &block.x);
+				yerror = compressBlock_BruteForce(ycolor, &block.y);
 			}
 			else
 			{
-				QuickCompress::compressDXT5A(xcolor, &block.x);
-				QuickCompress::compressDXT5A(ycolor, &block.y);
+				xerror = compressBlock_Iterative(xcolor, &block.x);
+				yerror = compressBlock_Iterative(ycolor, &block.y);
 			}

 			if (outputOptions.outputHandler != NULL) {
--- a/src/nvtt/CompressRGB.cpp
+++ b/src/nvtt/CompressRGB.cpp
@ -115,18 +115,12 @@ void nv::compressRGB(const Image * image, const OutputOptions::Private & outputO
 				c |= PixelFormat::convert(src[x].b, 8, bsize) << bshift;
 				c |= PixelFormat::convert(src[x].a, 8, asize) << ashift;
 				
-				// Output one byte at a time.
+				// Output one byte at a time. @@ Not tested... Does this work on LE and BE?
 				for (uint i = 0; i < byteCount; i++)
 				{
-					*(dst + x * byteCount + i) = (c >> (i * 8)) & 0xFF;
+					*(dst + x * byteCount) = (c >> (i * 8)) & 0xFF;
 				}
 			}
-			
-			// Zero padding.
-			for (uint x = w; x < pitch; x++)
-			{
-				*(dst + x) = 0;
-			}
 		}

 		if (outputOptions.outputHandler != NULL)
--- a/src/nvtt/Compressor.cpp
+++ b/src/nvtt/Compressor.cpp
@ -338,7 +338,7 @@ bool Compressor::Private::outputHeader(const InputOptions::Private & inputOption
 	
 	if (compressionOptions.format == Format_RGBA)
 	{
-		header.setPitch(computePitch(inputOptions.targetWidth, compressionOptions.bitcount));
+		header.setPitch(4 * inputOptions.targetWidth);
 		header.setPixelFormat(compressionOptions.bitcount, compressionOptions.rmask, compressionOptions.gmask, compressionOptions.bmask, compressionOptions.amask);
 	}
 	else
--- a/src/nvtt/FastCompressDXT.cpp
+++ b/src/nvtt/FastCompressDXT.cpp
--- a/src/nvtt/FastCompressDXT.h
+++ b/src/nvtt/FastCompressDXT.h
@ -38,37 +38,40 @@ namespace nv
 	// Color compression:

 	// Compressor that uses the extremes of the luminance axis.
-//	void compressBlock_DiameterAxis(const ColorBlock & rgba, BlockDXT1 * block);
+	void compressBlock_DiameterAxis(const ColorBlock & rgba, BlockDXT1 * block);

 	// Compressor that uses the extremes of the luminance axis.
-//	void compressBlock_LuminanceAxis(const ColorBlock & rgba, BlockDXT1 * block);
+	void compressBlock_LuminanceAxis(const ColorBlock & rgba, BlockDXT1 * block);

 	// Compressor that uses bounding box.
 	void compressBlock_BoundsRange(const ColorBlock & rgba, BlockDXT1 * block);

 	// Compressor that uses bounding box and takes alpha into account.
-//	void compressBlock_BoundsRangeAlpha(const ColorBlock & rgba, BlockDXT1 * block);
+	void compressBlock_BoundsRangeAlpha(const ColorBlock & rgba, BlockDXT1 * block);
+
+	// Compressor that uses the best fit axis.
+	void compressBlock_BestFitAxis(const ColorBlock & rgba, BlockDXT1 * block);


 	// Simple, but slow compressor that tests all color pairs.
-//	void compressBlock_TestAllPairs(const ColorBlock & rgba, BlockDXT1 * block);
+	void compressBlock_TestAllPairs(const ColorBlock & rgba, BlockDXT1 * block);
 	
 	// Brute force 6d search along the best fit axis.
-//	void compressBlock_AnalyzeBestFitAxis(const ColorBlock & rgba, BlockDXT1 * block);
+	void compressBlock_AnalyzeBestFitAxis(const ColorBlock & rgba, BlockDXT1 * block);

 	// Spatial greedy search.
-//	void refineSolution_1dSearch(const ColorBlock & rgba, BlockDXT1 * block);
-//	void refineSolution_3dSearch(const ColorBlock & rgba, BlockDXT1 * block);
-//	void refineSolution_6dSearch(const ColorBlock & rgba, BlockDXT1 * block);
+	void refineSolution_1dSearch(const ColorBlock & rgba, BlockDXT1 * block);
+	void refineSolution_3dSearch(const ColorBlock & rgba, BlockDXT1 * block);
+	void refineSolution_6dSearch(const ColorBlock & rgba, BlockDXT1 * block);
 	
 	// Brute force compressor for DXT5n
-//	void compressGreenBlock_BruteForce(const ColorBlock & rgba, BlockDXT1 * block);
+	void compressGreenBlock_BruteForce(const ColorBlock & rgba, BlockDXT1 * block);

 	// Minimize error of the endpoints.
-//	void optimizeEndPoints(const ColorBlock & rgba, BlockDXT1 * block);
+	void optimizeEndPoints(const ColorBlock & rgba, BlockDXT1 * block);
 	
-//	uint blockError(const ColorBlock & rgba, const BlockDXT1 & block);
-//	uint blockError(const ColorBlock & rgba, const AlphaBlockDXT5 & block);
+	uint blockError(const ColorBlock & rgba, const BlockDXT1 & block);
+	uint blockError(const ColorBlock & rgba, const AlphaBlockDXT5 & block);

 	// Alpha compression:
 	void compressBlock(const ColorBlock & rgba, AlphaBlockDXT3 * block);
@ -77,7 +80,7 @@ namespace nv

 	uint compressBlock_BoundsRange(const ColorBlock & rgba, AlphaBlockDXT5 * block);
 	uint compressBlock_BruteForce(const ColorBlock & rgba, AlphaBlockDXT5 * block);
-//	uint compressBlock_Iterative(const ColorBlock & rgba, AlphaBlockDXT5 * block);
+	uint compressBlock_Iterative(const ColorBlock & rgba, AlphaBlockDXT5 * block);

 } // nv namespace

--- a/src/nvtt/QuickCompressDXT.cpp
+++ b/src/nvtt/QuickCompressDXT.cpp
@ -288,219 +288,62 @@ static void optimizeEndPoints4(Vector3 block[16], BlockDXT1 * dxtBlock)
 	dxtBlock->indices = computeIndices3(block, a, b);
 }*/

-namespace
+
+static void optimizeAlpha8(const ColorBlock & rgba, AlphaBlockDXT5 * block)
 {
-	static int computeGreenError(const ColorBlock & rgba, const BlockDXT1 * block)
+	float alpha2_sum = 0;
+	float beta2_sum = 0;
+	float alphabeta_sum = 0;
+	float alphax_sum = 0;
+	float betax_sum = 0;
+
+	for (int i = 0; i < 16; i++)
 	{
-		nvDebugCheck(block != NULL);
-
-		int palette[4];
-		palette[0] = (block->col0.g << 2) | (block->col0.g >> 4);
-		palette[1] = (block->col1.g << 2) | (block->col1.g >> 4);
-		palette[2] = (2 * palette[0] + palette[1]) / 3;
-		palette[3] = (2 * palette[1] + palette[0]) / 3;
-
-		int totalError = 0;
-
-		for (int i = 0; i < 16; i++)
-		{
-			const int green = rgba.color(i).g;
-			
-			int error = abs(green - palette[0]);
-			error = min(error, abs(green - palette[1]));
-			error = min(error, abs(green - palette[2]));
-			error = min(error, abs(green - palette[3]));
-			
-			totalError += error;
-		}
-
-		return totalError;
-	}
-
-	static uint computeGreenIndices(const ColorBlock & rgba, const Color32 palette[4])
-	{
-		const int color0 = palette[0].g;
-		const int color1 = palette[1].g;
-		const int color2 = palette[2].g;
-		const int color3 = palette[3].g;
+		uint idx = block->index(i);
+		float alpha;
+		if (idx < 2) alpha = 1.0f - idx;
+		else alpha = (8.0f - idx) / 7.0f;
 		
-		uint indices = 0;
-		for (int i = 0; i < 16; i++)
-		{
-			const int color = rgba.color(i).g;
-			
-			uint d0 = abs(color0 - color);
-			uint d1 = abs(color1 - color);
-			uint d2 = abs(color2 - color);
-			uint d3 = abs(color3 - color);
-			
-			uint b0 = d0 > d3;
-			uint b1 = d1 > d2;
-			uint b2 = d0 > d2;
-			uint b3 = d1 > d3;
-			uint b4 = d2 > d3;
-			
-			uint x0 = b1 & b2;
-			uint x1 = b0 & b3;
-			uint x2 = b0 & b4;
-			
-			indices |= (x2 | ((x0 | x1) << 1)) << (2 * i);
-		}
-
-		return indices;
+		float beta = 1 - alpha;
+		
+		alpha2_sum += alpha * alpha;
+		beta2_sum += beta * beta;
+		alphabeta_sum += alpha * beta;
+		alphax_sum += alpha * rgba.color(i).a;
+		betax_sum += beta * rgba.color(i).a;
 	}

-} // namespace
+	const float factor = 1.0f / (alpha2_sum * beta2_sum - alphabeta_sum * alphabeta_sum);

-namespace
-{
+	float a = (alphax_sum * beta2_sum - betax_sum * alphabeta_sum) * factor;
+	float b = (betax_sum * alpha2_sum - alphax_sum * alphabeta_sum) * factor;

-	static uint computeAlphaIndices(const ColorBlock & rgba, AlphaBlockDXT5 * block)
+	uint alpha0 = uint(min(max(a, 0.0f), 255.0f));
+	uint alpha1 = uint(min(max(b, 0.0f), 255.0f));
+
+	if (alpha0 < alpha1)
 	{
-		uint8 alphas[8];
-		block->evaluatePalette(alphas);
-
-		uint totalError = 0;
-
-		for (uint i = 0; i < 16; i++)
-		{
-			uint8 alpha = rgba.color(i).a;
-
-			uint besterror = 256*256;
-			uint best = 8;
-			for(uint p = 0; p < 8; p++)
-			{
-				int d = alphas[p] - alpha;
-				uint error = d * d;
-
-				if (error < besterror)
-				{
-					besterror = error;
-					best = p;
-				}
-			}
-			nvDebugCheck(best < 8);
-
-			totalError += besterror;
-			block->setIndex(i, best);
-		}
-
-		return totalError;
-	}
-
-	static void optimizeAlpha8(const ColorBlock & rgba, AlphaBlockDXT5 * block)
-	{
-		float alpha2_sum = 0;
-		float beta2_sum = 0;
-		float alphabeta_sum = 0;
-		float alphax_sum = 0;
-		float betax_sum = 0;
-
+		swap(alpha0, alpha1);
+		
+		// Flip indices:
 		for (int i = 0; i < 16; i++)
 		{
 			uint idx = block->index(i);
-			float alpha;
-			if (idx < 2) alpha = 1.0f - idx;
-			else alpha = (8.0f - idx) / 7.0f;
-			
-			float beta = 1 - alpha;
-
-			alpha2_sum += alpha * alpha;
-			beta2_sum += beta * beta;
-			alphabeta_sum += alpha * beta;
-			alphax_sum += alpha * rgba.color(i).a;
-			betax_sum += beta * rgba.color(i).a;
+			if (idx < 2) block->setIndex(i, 1 - idx);
+			else block->setIndex(i, 9 - idx);
 		}
-
-		const float factor = 1.0f / (alpha2_sum * beta2_sum - alphabeta_sum * alphabeta_sum);
-
-		float a = (alphax_sum * beta2_sum - betax_sum * alphabeta_sum) * factor;
-		float b = (betax_sum * alpha2_sum - alphax_sum * alphabeta_sum) * factor;
-
-		uint alpha0 = uint(min(max(a, 0.0f), 255.0f));
-		uint alpha1 = uint(min(max(b, 0.0f), 255.0f));
-
-		if (alpha0 < alpha1)
-		{
-			swap(alpha0, alpha1);
-
-			// Flip indices:
-			for (int i = 0; i < 16; i++)
-			{
-				uint idx = block->index(i);
-				if (idx < 2) block->setIndex(i, 1 - idx);
-				else block->setIndex(i, 9 - idx);
-			}
-		}
-		else if (alpha0 == alpha1)
-		{
-			for (int i = 0; i < 16; i++)
-			{
-				block->setIndex(i, 0);
-			}
-		}
-
-		block->alpha0 = alpha0;
-		block->alpha1 = alpha1;
 	}
-
-	/*
-	static void optimizeAlpha6(const ColorBlock & rgba, AlphaBlockDXT5 * block)
+	else if (alpha0 == alpha1)
 	{
-		float alpha2_sum = 0;
-		float beta2_sum = 0;
-		float alphabeta_sum = 0;
-		float alphax_sum = 0;
-		float betax_sum = 0;
-
 		for (int i = 0; i < 16; i++)
 		{
-			uint8 x = rgba.color(i).a;
-			if (x == 0 || x == 255) continue;
-
-			uint bits = block->index(i);
-			if (bits == 6 || bits == 7) continue;
-
-			float alpha;
-			if (bits == 0) alpha = 1.0f;
-			else if (bits == 1) alpha = 0.0f;
-			else alpha = (6.0f - block->index(i)) / 5.0f;
-			
-			float beta = 1 - alpha;
-
-			alpha2_sum += alpha * alpha;
-			beta2_sum += beta * beta;
-			alphabeta_sum += alpha * beta;
-			alphax_sum += alpha * x;
-			betax_sum += beta * x;
+			block->setIndex(i, 0);
 		}
-
-		const float factor = 1.0f / (alpha2_sum * beta2_sum - alphabeta_sum * alphabeta_sum);
-
-		float a = (alphax_sum * beta2_sum - betax_sum * alphabeta_sum) * factor;
-		float b = (betax_sum * alpha2_sum - alphax_sum * alphabeta_sum) * factor;
-
-		uint alpha0 = uint(min(max(a, 0.0f), 255.0f));
-		uint alpha1 = uint(min(max(b, 0.0f), 255.0f));
-
-		if (alpha0 > alpha1)
-		{
-			swap(alpha0, alpha1);
-		}
-
-		block->alpha0 = alpha0;
-		block->alpha1 = alpha1;
-	}
-	*/
-
-	static bool sameIndices(const AlphaBlockDXT5 & block0, const AlphaBlockDXT5 & block1)
-	{
-		const uint64 mask = ~uint64(0xFFFF);
-		return (block0.u | mask) == (block1.u | mask);
 	}

-} // namespace
-
+	block->alpha0 = alpha0;
+	block->alpha1 = alpha1;
+}



@ -555,20 +398,6 @@ void QuickCompress::compressDXT1(const ColorBlock & rgba, BlockDXT1 * dxtBlock)
 }


-void QuickCompress::compressDXT1a(Color32 rgba, BlockDXT1 * dxtBlock)
-{
-	if (rgba.a == 0)
-	{
-		dxtBlock->col0.u = 0;
-		dxtBlock->col1.u = 0;
-		dxtBlock->indices = 0xFFFFFFFF;
-	}
-	else
-	{
-		compressDXT1(rgba, dxtBlock);
-	}
-}
-
 void QuickCompress::compressDXT1a(const ColorBlock & rgba, BlockDXT1 * dxtBlock)
 {
 	if (!rgba.hasAlpha())
@ -607,6 +436,66 @@ void QuickCompress::compressDXT1a(const ColorBlock & rgba, BlockDXT1 * dxtBlock)
 }


+static int computeGreenError(const ColorBlock & rgba, const BlockDXT1 * block)
+{
+	nvDebugCheck(block != NULL);
+
+	int palette[4];
+	palette[0] = (block->col0.g << 2) | (block->col0.g >> 4);
+	palette[1] = (block->col1.g << 2) | (block->col1.g >> 4);
+	palette[2] = (2 * palette[0] + palette[1]) / 3;
+	palette[3] = (2 * palette[1] + palette[0]) / 3;
+
+	int totalError = 0;
+
+	for (int i = 0; i < 16; i++)
+	{
+		const int green = rgba.color(i).g;
+		
+		int error = abs(green - palette[0]);
+		error = min(error, abs(green - palette[1]));
+		error = min(error, abs(green - palette[2]));
+		error = min(error, abs(green - palette[3]));
+		
+		totalError += error;
+	}
+
+	return totalError;
+}
+
+static uint computeGreenIndices(const ColorBlock & rgba, const Color32 palette[4])
+{
+	const int color0 = palette[0].g;
+	const int color1 = palette[1].g;
+	const int color2 = palette[2].g;
+	const int color3 = palette[3].g;
+	
+	uint indices = 0;
+	for (int i = 0; i < 16; i++)
+	{
+		const int color = rgba.color(i).g;
+		
+		uint d0 = abs(color0 - color);
+		uint d1 = abs(color1 - color);
+		uint d2 = abs(color2 - color);
+		uint d3 = abs(color3 - color);
+		
+		uint b0 = d0 > d3;
+		uint b1 = d1 > d2;
+		uint b2 = d0 > d2;
+		uint b3 = d1 > d3;
+		uint b4 = d2 > d3;
+		
+		uint x0 = b1 & b2;
+		uint x1 = b0 & b3;
+		uint x2 = b0 & b4;
+		
+		indices |= (x2 | ((x0 | x1) << 1)) << (2 * i);
+	}
+
+	return indices;
+}
+
 // Brute force green channel compressor
 void QuickCompress::compressDXT1G(const ColorBlock & rgba, BlockDXT1 * block)
 {
@ -669,7 +558,6 @@ void QuickCompress::compressDXT1G(const ColorBlock & rgba, BlockDXT1 * block)

 void QuickCompress::compressDXT3A(const ColorBlock & rgba, AlphaBlockDXT3 * dxtBlock)
 {
-	// @@ Round instead of truncate. When rounding take into account bit expansion.
 	dxtBlock->alpha0 = rgba.color(0).a >> 4;
 	dxtBlock->alpha1 = rgba.color(1).a >> 4;
 	dxtBlock->alpha2 = rgba.color(2).a >> 4;
@ -694,49 +582,9 @@ void QuickCompress::compressDXT3(const ColorBlock & rgba, BlockDXT3 * dxtBlock)
 	compressDXT3A(rgba, &dxtBlock->alpha);
 }

-
 void QuickCompress::compressDXT5A(const ColorBlock & rgba, AlphaBlockDXT5 * dxtBlock)
 {
-	uint8 alpha0 = 0;
-	uint8 alpha1 = 255;
-	
-	// Get min/max alpha.
-	for (uint i = 0; i < 16; i++)
-	{
-		uint8 alpha = rgba.color(i).a;
-		alpha0 = max(alpha0, alpha);
-		alpha1 = min(alpha1, alpha);
-	}
-	
-	AlphaBlockDXT5 block;
-	block.alpha0 = alpha0 - (alpha0 - alpha1) / 34;
-	block.alpha1 = alpha1 + (alpha0 - alpha1) / 34;
-	uint besterror = computeAlphaIndices(rgba, &block);
-	
-	AlphaBlockDXT5 bestblock = block;
-	
-	while(true)
-	{
-		optimizeAlpha8(rgba, &block);
-		uint error = computeAlphaIndices(rgba, &block);
-		
-		if (error >= besterror)
-		{
-			// No improvement, stop.
-			break;
-		}
-		if (sameIndices(block, bestblock))
-		{
-			bestblock = block;
-			break;
-		}
-		
-		besterror = error;
-		bestblock = block;
-	};
-	
-	// Copy best block to result;
-	*dxtBlock = bestblock;
+	// @@ TODO
 }

 void QuickCompress::compressDXT5(const ColorBlock & rgba, BlockDXT5 * dxtBlock)
--- a/src/nvtt/QuickCompressDXT.h
+++ b/src/nvtt/QuickCompressDXT.h
@ -37,9 +37,8 @@ namespace nv

 	namespace QuickCompress
 	{
-		void compressDXT1(Color32 rgba, BlockDXT1 * dxtBlock);
+		void compressDXT1(const Color32 rgba, BlockDXT1 * dxtBlock);
 		void compressDXT1(const ColorBlock & rgba, BlockDXT1 * dxtBlock);
-		void compressDXT1a(Color32 rgba, BlockDXT1 * dxtBlock);
 		void compressDXT1a(const ColorBlock & rgba, BlockDXT1 * dxtBlock);
 		void compressDXT1G(const ColorBlock & rgba, BlockDXT1 * block);
 		
--- a/src/nvtt/cuda/CudaCompressDXT.cpp
+++ b/src/nvtt/cuda/CudaCompressDXT.cpp
@ -24,12 +24,13 @@
 #include <nvcore/Debug.h>
 #include <nvcore/Containers.h>
 #include <nvmath/Color.h>
+#include <nvmath/Fitting.h>
 #include <nvimage/Image.h>
 #include <nvimage/ColorBlock.h>
 #include <nvimage/BlockDXT.h>
 #include <nvtt/CompressionOptions.h>
 #include <nvtt/OutputOptions.h>
-#include <nvtt/QuickCompressDXT.h>
+#include <nvtt/FastCompressDXT.h>

 #include "CudaCompressDXT.h"
 #include "CudaUtils.h"
@ -227,7 +228,7 @@ void CudaCompressor::compressDXT3(const Image * image, const OutputOptions::Priv
 		for (uint i = 0; i < count; i++)
 		{
 			ColorBlock rgba(blockLinearImage + (bn + i) * 16);
-			QuickCompress::compressDXT3A(rgba, alphaBlocks + i);
+			compressBlock(rgba, alphaBlocks + i);
 		}

 		// Check for errors.
@ -311,7 +312,7 @@ void CudaCompressor::compressDXT5(const Image * image, const OutputOptions::Priv
 		for (uint i = 0; i < count; i++)
 		{
 			ColorBlock rgba(blockLinearImage + (bn + i) * 16);
-			QuickCompress::compressDXT5A(rgba, alphaBlocks + i);
+			compressBlock_Iterative(rgba, alphaBlocks + i);
 		}

 		// Check for errors.
--- a/src/nvtt/nvtt_wrapper.h
+++ b/src/nvtt/nvtt_wrapper.h
@ -207,6 +207,7 @@ NVTT_API void nvttDestroyCompressionOptions(NvttCompressionOptions * compression
 NVTT_API void nvttSetCompressionOptionsFormat(NvttCompressionOptions * compressionOptions, NvttFormat format);
 NVTT_API void nvttSetCompressionOptionsQuality(NvttCompressionOptions * compressionOptions, NvttQuality quality);
 NVTT_API void nvttSetCompressionOptionsColorWeights(NvttCompressionOptions * compressionOptions, float red, float green, float blue, float alpha);
+NVTT_API void nvttEnableCompressionOptionsCudaCompression(NvttCompressionOptions * compressionOptions, NvttBoolean enable);
 NVTT_API void nvttSetCompressionOptionsPixelFormat(NvttCompressionOptions * compressionOptions, unsigned int bitcount, unsigned int rmask, unsigned int gmask, unsigned int bmask, unsigned int amask);
 NVTT_API void nvttSetCompressionOptionsQuantization(NvttCompressionOptions * compressionOptions, NvttBoolean colorDithering, NvttBoolean alphaDithering, NvttBoolean binaryAlpha, int alphaThreshold);
Author	SHA1	Message	Date
castano	fa4a7b9af7	Add proper credits.	2008-02-28 22:52:00 +00:00
castano	f111d23637	Tag 2.0.1	2008-02-28 22:37:49 +00:00
 @ -1 +1 @@
 .0.2
 .0.1