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