Some more compiler error and warning fixes.

This commit is contained in:
Pavel Krajcevski 2013-10-15 10:32:38 -04:00
parent 89110be602
commit bcf7c5c389
4 changed files with 6 additions and 6 deletions

View file

@ -115,10 +115,10 @@ struct CompressionJobList {
bool AddJob(const CompressionJob &);
// Get the maximum number of jobs that this list can hold.
const uint32 GetTotalNumJobs() const { return m_TotalNumJobs; }
uint32 GetTotalNumJobs() const { return m_TotalNumJobs; }
// Get the current number of jobs in the list.
const uint32 GetNumJobs() const { return m_NumJobs; }
uint32 GetNumJobs() const { return m_NumJobs; }
// Returns the specified job.
const CompressionJob *GetJob(uint32 idx) const;

View file

@ -195,7 +195,7 @@ namespace FasTC {
static inline VectorType ScalarMultiply(const VectorType &v, const ScalarType &s) {
VectorType a;
for(int i = 0; i < VectorType::Size; i++)
a(i) = static_cast<VectorType::ScalarType>(v(i) * s);
a(i) = static_cast<typename VectorType::ScalarType>(v(i) * s);
return a;
}
@ -212,7 +212,7 @@ namespace FasTC {
static inline VectorType ScalarDivide(const VectorType &v, const ScalarType &s) {
VectorType a;
for(int i = 0; i < VectorType::Size; i++)
a(i) = static_cast<VectorType::ScalarType>(v(i) / s);
a(i) = static_cast<typename VectorType::ScalarType>(v(i) / s);
return a;
}

View file

@ -502,7 +502,7 @@ const FasTC::Pixel &Image::GetPixel(int32 i, int32 j, EWrapMode wrapMode) const
return GetPixels()[GetPixelIndex(i, j, wrapMode)];
}
const uint32 Image::GetPixelIndex(int32 i, int32 j, EWrapMode wrapMode) const {
uint32 Image::GetPixelIndex(int32 i, int32 j, EWrapMode wrapMode) const {
while(i < 0) {
if(wrapMode == eWrapMode_Clamp) {
i = 0;

View file

@ -100,7 +100,7 @@ class Image : public FasTC::Image<FasTC::Pixel> {
private:
FasTC::Pixel *m_FractionalPixels;
const uint32 GetPixelIndex(int32 i, int32 j, EWrapMode wrapMode = eWrapMode_Clamp) const;
uint32 GetPixelIndex(int32 i, int32 j, EWrapMode wrapMode = eWrapMode_Clamp) const;
const FasTC::Pixel &GetPixel(int32 i, int32 j, EWrapMode wrapMode = eWrapMode_Clamp) const;
};