From bcf7c5c389ae62748fcbb35d7ceca2a5df661e5e Mon Sep 17 00:00:00 2001
From: Pavel Krajcevski <pavel@cs.unc.edu>
Date: Tue, 15 Oct 2013 10:32:38 -0400
Subject: [PATCH] Some more compiler error and warning fixes.

---
 Base/include/CompressionJob.h   | 4 ++--
 Base/include/VectorBase.h       | 4 ++--
 PVRTCEncoder/src/PVRTCImage.cpp | 2 +-
 PVRTCEncoder/src/PVRTCImage.h   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Base/include/CompressionJob.h b/Base/include/CompressionJob.h
index 1e3b25c..2543ada 100755
--- a/Base/include/CompressionJob.h
+++ b/Base/include/CompressionJob.h
@@ -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;
diff --git a/Base/include/VectorBase.h b/Base/include/VectorBase.h
index 45b0fba..dc78d01 100644
--- a/Base/include/VectorBase.h
+++ b/Base/include/VectorBase.h
@@ -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;
   }
 
diff --git a/PVRTCEncoder/src/PVRTCImage.cpp b/PVRTCEncoder/src/PVRTCImage.cpp
index a992df3..c06fbf4 100644
--- a/PVRTCEncoder/src/PVRTCImage.cpp
+++ b/PVRTCEncoder/src/PVRTCImage.cpp
@@ -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;
diff --git a/PVRTCEncoder/src/PVRTCImage.h b/PVRTCEncoder/src/PVRTCImage.h
index cc5b96c..44058b2 100644
--- a/PVRTCEncoder/src/PVRTCImage.h
+++ b/PVRTCEncoder/src/PVRTCImage.h
@@ -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;
 };