Merge changes from 2.0

2009-03-18 04:05:39 +00:00
parent 72543c9307
commit 56543e1a92
4 changed files with 20 additions and 5 deletions
--- 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
 */

--- 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;
 	//@}

--- 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()
 {