Fix build.

src/nvtt/tools/cmdline.h

@@ -57,7 +57,7 @@ struct MyAssertHandler : public nv::AssertHandler {
 	}
 	
 	// Handler method, note that func might be NULL!
-	virtual int assert( const char *exp, const char *file, int line, const char *func ) {
+	virtual int assertion( const char *exp, const char *file, int line, const char *func ) {
 		fprintf(stderr, "Assertion failed: %s\nIn %s:%d\n", exp, file, line);
 		nv::debug::dumpInfo();
 		exit(1);

src/nvtt/tools/ddsview.cpp

@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
 	uint w = dds.width();
 	uint h = dds.height();
 
-	// @@ Clamp window size is texture larger than desktop?
+	// @@ Clamp window size if texture larger than desktop?
 
 
 	glutInit(&argc, argv);

src/nvtt/tools/imgdiff.cpp

@@ -23,7 +23,6 @@
 
 #include <nvcore/StrLib.h>
 #include <nvcore/StdStream.h>
-#include <nvcore/Containers.h>
 
 #include <nvimage/Image.h>
 #include <nvimage/DirectDrawSurface.h>
@@ -123,7 +122,7 @@ struct NormalError
 		vc = nv::normalize(2.0f * (vc / 255.0f) - 1.0f);
 
 		ade += acosf(nv::clamp(dot(vo, vc), -1.0f, 1.0f));
-		mse += length_squared((vo - vc) * (255 / 2.0f));
+		mse += lengthSquared((vo - vc) * (255 / 2.0f));
 		
 		samples++;
 	}

src/nvtt/tools/resize.cpp

@@ -24,7 +24,6 @@
 #include <nvcore/Ptr.h>
 #include <nvcore/StrLib.h>
 #include <nvcore/StdStream.h>
-#include <nvcore/Containers.h>
 
 #include <nvimage/Image.h>
 #include <nvimage/ImageIO.h>

src/nvtt/tools/thumbnailer.cpp

@@ -24,7 +24,6 @@
 #include <nvcore/Ptr.h>
 #include <nvcore/StrLib.h>
 #include <nvcore/StdStream.h>
-#include <nvcore/Containers.h>
 
 #include <nvimage/Image.h>
 #include <nvimage/ImageIO.h>