From 08c919d965b94dc67661de0c93ee87c44fea255d Mon Sep 17 00:00:00 2001 From: Pavel Krajcevski Date: Mon, 28 Jan 2013 17:04:58 -0500 Subject: [PATCH] Fix some linker errors... --- BPTCEncoder/src/BC7Compressor.cpp | 6 ++++-- BPTCEncoder/src/RGBAEndpoints.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/BPTCEncoder/src/BC7Compressor.cpp b/BPTCEncoder/src/BC7Compressor.cpp index b74e29b..21490c3 100755 --- a/BPTCEncoder/src/BC7Compressor.cpp +++ b/BPTCEncoder/src/BC7Compressor.cpp @@ -1477,7 +1477,8 @@ namespace BC7C // implementation has an 4:1 compression ratio. void CompressImageBC7(const unsigned char *inBuf, unsigned char *outBuf, unsigned int width, unsigned int height) { - BC7CompressionMode::MaxAnnealingIterations = min(BC7CompressionMode::kMaxAnnealingIterations, GetQualityLevel()); + const int kMaxIters = BC7CompressionMode::kMaxAnnealingIterations; + BC7CompressionMode::MaxAnnealingIterations = min(kMaxIters, GetQualityLevel()); for(uint32 j = 0; j < height; j += 4) { @@ -1519,7 +1520,8 @@ namespace BC7C unsigned int height, BlockStatManager &statManager ) { - BC7CompressionMode::MaxAnnealingIterations = min(BC7CompressionMode::kMaxAnnealingIterations, GetQualityLevel()); + const int kMaxIters = BC7CompressionMode::kMaxAnnealingIterations; + BC7CompressionMode::MaxAnnealingIterations = min(kMaxIters, GetQualityLevel()); for(uint32 j = 0; j < height; j += 4) { diff --git a/BPTCEncoder/src/RGBAEndpoints.h b/BPTCEncoder/src/RGBAEndpoints.h index a9793f9..844edde 100755 --- a/BPTCEncoder/src/RGBAEndpoints.h +++ b/BPTCEncoder/src/RGBAEndpoints.h @@ -420,6 +420,6 @@ private: }; extern uint8 QuantizeChannel(const uint8 val, const uint8 mask, const int pBit = -1); -extern uint32 GetPrincipalAxis(int nPts, const RGBAVector *pts, RGBADir &axis, double &eigOne, double *eigTwo); +extern uint32 GetPrincipalAxis(uint32 nPts, const RGBAVector *pts, RGBADir &axis, double &eigOne, double *eigTwo); #endif //__RGBA_ENDPOINTS_H__