From 56543e1a92ca0272a3c55ec56f0e04e1c9fc1159 Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Wed, 18 Mar 2009 04:05:39 +0000
Subject: [PATCH] Merge changes from 2.0

---
 ChangeLog                   | 19 +++++++++++++++++--
 src/nvimage/Filter.cpp      |  4 ++--
 src/nvimage/FloatImage.h    |  1 +
 src/nvtt/cuda/CudaUtils.cpp |  1 -
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6643a34..64eeeb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,12 +8,27 @@ NVIDIA Texture Tools version 2.1.0
  * Fix loading of EXR files using OpenEXR.
  * Use FreeImage as primary image loading library. Fixes issue 31. Reverted.
  * Output swizzle codes like AMD's tools.
- * Select the fastest CUDA device.
  * Added support for saving PNGs by Frank Richter. Fixes issue 79 and 80.
  * Added gnome thumbnailer by Frank Richter. Fixes issue 82.
  * Cleanup sources removing files that are not strictly required.
+
+NVIDIA Texture Tools version 2.0.6
+ * Fix dll version checking.
+ * Detect CUDA 2.1 and future CUDA versions correctly.
+ * Print CUDA detection message in nvcompress.
+ * Select the fastest CUDA device.
+ * Compile squish with -fPIC. Fixes issue 74.
+ * Fix warnings under gcc 4.3.2.
+ * Fix nvzoom option typo by Frank Richter. Fixes issue 81.
+ * Do not use CUDA to compress small mipmaps. Fixes issue 76.
  * Compute mipmaps of semi-transparent images correctly.
- * Do not use CUDA to compress small mipmaps.
+
+NVIDIA Texture Tools version 2.0.5
+ * Fix error in single color compressor. Fixes issue 66.
+ * Detect mismatch between CUDA runtime and driver, and disable CUDA in that case.
+ * Fix cmake files when compiling NVTT as a shared library.
+ * When linking nvtt dynamically on unix, link all libraries dynamically.
+ * Select fastest CUDA device.
 
 NVIDIA Texture Tools version 2.0.4
  * Fix error in RGB format output; reported by jonsoh. See issue 49.
diff --git a/src/nvimage/Filter.cpp b/src/nvimage/Filter.cpp
index 8edddfa..43c9ef7 100644
--- a/src/nvimage/Filter.cpp
+++ b/src/nvimage/Filter.cpp
@@ -26,10 +26,10 @@
  * http://www.xmission.com/~legalize/zoom.html
  * 
  * Reconstruction Filters in Computer Graphics
- * http://www.mentallandscape.com/Papers_siggraph88.pdf 
+ * http://www.mentallandscape.com/Papers_siggraph88.pdf
  *
  * More references:
- * http://www.worldserver.com/turk/computergraphics/ResamplingFilters.pdf 
+ * http://www.worldserver.com/turk/computergraphics/ResamplingFilters.pdf
  * http://www.dspguide.com/ch16.htm
  */
 
diff --git a/src/nvimage/FloatImage.h b/src/nvimage/FloatImage.h
index d9a4c8d..d58feb8 100644
--- a/src/nvimage/FloatImage.h
+++ b/src/nvimage/FloatImage.h
@@ -75,6 +75,7 @@ public:
 	NVIMAGE_API FloatImage * downSample(const Filter & filter, WrapMode wm) const;
 	NVIMAGE_API FloatImage * downSample(const Filter & filter, WrapMode wm, uint alpha) const;
 	NVIMAGE_API FloatImage * resize(const Filter & filter, uint w, uint h, WrapMode wm) const;
+
 	NVIMAGE_API FloatImage * resize(const Filter & filter, uint w, uint h, WrapMode wm, uint alpha) const;
 	//@}
 
diff --git a/src/nvtt/cuda/CudaUtils.cpp b/src/nvtt/cuda/CudaUtils.cpp
index a17cc4c..324744a 100644
--- a/src/nvtt/cuda/CudaUtils.cpp
+++ b/src/nvtt/cuda/CudaUtils.cpp
@@ -117,7 +117,6 @@ static bool isCudaDriverAvailable(int version)
 }
 
 
-
 /// Determine if CUDA is available.
 bool nv::cuda::isHardwarePresent()
 {