Fix typos and merge changes from trunk.

ChangeLog

@@ -1,5 +1,6 @@
 NVIDIA Texture Tools version 2.0.9
  * Fix invalid assert when reading paletted TGA images. Fixes issue 125.
+ * Add support for luminance flag. Fixes issue 126.
 
 NVIDIA Texture Tools version 2.0.8
  * Fix float to fixed image conversion. Patch provided by Alex Pfaffe. Fixes issue 121.

src/nvimage/DirectDrawSurface.cpp

@@ -406,10 +406,14 @@ namespace nv
 		s << pf.flags;
 		s << pf.fourcc;
 		s << pf.bitcount;
-		s << pf.rmask;
+        s.serialize(&pf.rmask, sizeof(pf.rmask));
-		s << pf.gmask;
+        s.serialize(&pf.gmask, sizeof(pf.gmask));
-		s << pf.bmask;
+        s.serialize(&pf.bmask, sizeof(pf.bmask));
-		s << pf.amask;
+        s.serialize(&pf.amask, sizeof(pf.amask));
+        //	s << pf.rmask;
+        //	s << pf.gmask;
+        //	s << pf.bmask;
+        //	s << pf.amask;
 		return s;
 	}
 
@@ -445,7 +449,9 @@ namespace nv
 		s << header.pitch;
 		s << header.depth;
 		s << header.mipmapcount;
-		s.serialize(header.reserved, 11 * sizeof(uint));
+        for (int i = 0; i < 11; i++) {
+            s << header.reserved[i];
+        }
 		s << header.pf;
 		s << header.caps;
 		s << header.notused;
@@ -569,8 +575,8 @@ void DDSHeader::setHeight(uint h)
 
 void DDSHeader::setDepth(uint d)
 {
-	this->flags |= DDSD_DEPTH;
+    this->flags |= DDSD_DEPTH;
-	this->height = d;
+    this->depth = d;
 }
 
 void DDSHeader::setMipmapCount(uint count)
@@ -598,14 +604,16 @@ void DDSHeader::setMipmapCount(uint count)
 
 void DDSHeader::setTexture2D()
 {
-	this->header10.resourceDimension = D3D10_RESOURCE_DIMENSION_TEXTURE2D;
+    this->header10.resourceDimension = D3D10_RESOURCE_DIMENSION_TEXTURE2D;
+    this->header10.arraySize = 1;
 }
 
 void DDSHeader::setTexture3D()
 {
-	this->caps.caps2 = DDSCAPS2_VOLUME;
+    this->caps.caps2 = DDSCAPS2_VOLUME;
-	
+
-	this->header10.resourceDimension = D3D10_RESOURCE_DIMENSION_TEXTURE3D;
+    this->header10.resourceDimension = D3D10_RESOURCE_DIMENSION_TEXTURE3D;
+    this->header10.arraySize = 1;
 }
 
 void DDSHeader::setTextureCube()
@@ -662,17 +670,25 @@ void DDSHeader::setPixelFormat(uint bitcount, uint rmask, uint gmask, uint bmask
 	nvCheck((gmask & amask) == 0);
 	nvCheck((bmask & amask) == 0);
 
-	if (rmask > 0 && gmask == 0 && bmask == 0)
+    if (rmask != 0 || gmask != 0 || bmask != 0)
-	{
+    {
-		this->pf.flags = DDPF_LUMINANCE;
+		if (gmask == 0 && bmask == 0)
-	}
+		{
-	else
+			this->pf.flags = DDPF_LUMINANCE;
-	{
+		}
-		this->pf.flags = DDPF_RGB;
+		else
-	}
+		{
-	if (amask != 0) {
+			this->pf.flags = DDPF_RGB;
-		this->pf.flags |= DDPF_ALPHAPIXELS;
+		}
-	}
+
+        if (amask != 0) {
+            this->pf.flags |= DDPF_ALPHAPIXELS;
+        }
+    }
+    else if (amask != 0)
+    {
+        this->pf.flags |= DDPF_ALPHA;
+    }
 
 	if (bitcount == 0)
 	{
@@ -1248,7 +1264,7 @@ void DirectDrawSurface::printInfo() const
 	printf("Pixel Format:\n");
 	printf("\tFlags: 0x%.8X\n", header.pf.flags);
 	if (header.pf.flags & DDPF_RGB) printf("\t\tDDPF_RGB\n");
-	if (header.pf.flags & DDPF_LUMINANCE) printf("\t\DDPF_LUMINANCE\n");
+	if (header.pf.flags & DDPF_LUMINANCE) printf("\t\tDDPF_LUMINANCE\n");
 	if (header.pf.flags & DDPF_FOURCC) printf("\t\tDDPF_FOURCC\n");
 	if (header.pf.flags & DDPF_ALPHAPIXELS) printf("\t\tDDPF_ALPHAPIXELS\n");
 	if (header.pf.flags & DDPF_ALPHA) printf("\t\tDDPF_ALPHA\n");

src/nvtt/tools/compress.cpp

@@ -405,9 +405,19 @@ int main(int argc, char *argv[])
 
 	nvtt::CompressionOptions compressionOptions;
 	compressionOptions.setFormat(format);
-	if (luminance)
+	if (format == nvtt::Format_RGBA)
 	{
-		compressionOptions.setPixelFormat(8, 0xff, 0, 0, 0);
+		if (luminance)
+		{
+			compressionOptions.setPixelFormat(8, 0xff, 0, 0, 0);
+		}
+		else {
+			// @@ Edit this to choose the desired pixel format:
+			//	compressionOptions.setPixelType(nvtt::PixelType_Float);
+			//	compressionOptions.setPixelFormat(16, 16, 16, 16);
+			//	compressionOptions.setPixelType(nvtt::PixelType_UnsignedNorm);
+			//	compressionOptions.setPixelFormat(16, 0, 0, 0);
+		}
 	}
 	if (fast)
 	{