From fb2b0cb38c5acd8b2947ddfb9c045c75e547a4ab Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Mon, 19 May 2008 18:23:42 +0000
Subject: [PATCH] Fix bug reported by Noel Llopis. Make sure FreeImage
 declarations are not used when FreeImage is not available.

---
 src/nvimage/FloatImage.cpp | 2 +-
 src/nvimage/ImageIO.cpp    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/nvimage/FloatImage.cpp b/src/nvimage/FloatImage.cpp
index 93de5aa..0fcea3c 100644
--- a/src/nvimage/FloatImage.cpp
+++ b/src/nvimage/FloatImage.cpp
@@ -423,7 +423,7 @@ FloatImage * FloatImage::fastDownSample() const
 	{
 		const uint n = w * h;
 		
-		if (n & 1)
+		if ((m_width * m_height) & 1)
 		{
 			const float scale = 1.0f / (2 * n + 1);
 			
diff --git a/src/nvimage/ImageIO.cpp b/src/nvimage/ImageIO.cpp
index 264c945..24ff439 100644
--- a/src/nvimage/ImageIO.cpp
+++ b/src/nvimage/ImageIO.cpp
@@ -62,9 +62,10 @@ namespace {
 	
 } // namespace
 
+#if defined(HAVE_FREEIMAGE)
 static Image * loadFreeImage(FREE_IMAGE_FORMAT fif, Stream & s);
 static FloatImage * loadFloatFreeImage(FREE_IMAGE_FORMAT fif, Stream & s);
-
+#endif
 
 Image * nv::ImageIO::load(const char * fileName)
 {