From dbe3546690b16e6665307211e2c7df5b6fdcc1c3 Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Wed, 10 Oct 2007 23:59:08 +0000
Subject: [PATCH] small fixes.

---
 src/nvimage/PixelFormat.h        | 3 +--
 src/nvimage/nvtt/CompressRGB.cpp | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/nvimage/PixelFormat.h b/src/nvimage/PixelFormat.h
index 2101ace..0106f3d 100644
--- a/src/nvimage/PixelFormat.h
+++ b/src/nvimage/PixelFormat.h
@@ -24,7 +24,6 @@
 #ifndef NV_IMAGE_PIXELFORMAT_H
 #define NV_IMAGE_PIXELFORMAT_H
 
-
 #include <nvimage/nvimage.h>
 
 
@@ -53,7 +52,7 @@ namespace nv
 		}
 
 		// Get pixel component shift and size given its mask.
-		static void maskShiftAndSize(uint mask, uint * shift, uint * size)
+		inline void maskShiftAndSize(uint mask, uint * shift, uint * size)
 		{
 			if (!mask)
 			{
diff --git a/src/nvimage/nvtt/CompressRGB.cpp b/src/nvimage/nvtt/CompressRGB.cpp
index 78e37b6..3ef7dad 100644
--- a/src/nvimage/nvtt/CompressRGB.cpp
+++ b/src/nvimage/nvtt/CompressRGB.cpp
@@ -45,12 +45,12 @@ namespace
 		return ((p + 3) / 4) * 4;
 	}
 
-	static void convert_to_a8r8g8b8(const void * src, void * dst, uint w)
+	inline void convert_to_a8r8g8b8(const void * src, void * dst, uint w)
 	{
 		memcpy(dst, src, 4 * w);
 	}
 
-	static void convert_to_x8r8g8b8(const void * src, void * dst, uint w)
+	inline void convert_to_x8r8g8b8(const void * src, void * dst, uint w)
 	{
 		memcpy(dst, src, 4 * w);
 	}