From 34f90c07a2bc7ea7fd15db6e84fb70cf0b7717b4 Mon Sep 17 00:00:00 2001
From: Pavel Krajcevski <pavel@cs.unc.edu>
Date: Mon, 26 Jan 2015 15:11:35 -0500
Subject: [PATCH] Qualify namespace

---
 Core/include/FasTC/CompressedImage.h | 2 ++
 Core/src/CompressedImage.cpp         | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Core/include/FasTC/CompressedImage.h b/Core/include/FasTC/CompressedImage.h
index 1ffc5fa..e181da4 100644
--- a/Core/include/FasTC/CompressedImage.h
+++ b/Core/include/FasTC/CompressedImage.h
@@ -62,6 +62,8 @@ class CompressedImage : public FasTC::Image<FasTC::Pixel> {
   FasTC::ECompressionFormat m_Format;
   uint8 *m_CompressedData;
 
+  typedef FasTC::Image<FasTC::Pixel> UncompressedImage;
+
  public:
   CompressedImage(const CompressedImage &);
   CompressedImage &operator=(const CompressedImage &);
diff --git a/Core/src/CompressedImage.cpp b/Core/src/CompressedImage.cpp
index b48b503..0efdce6 100644
--- a/Core/src/CompressedImage.cpp
+++ b/Core/src/CompressedImage.cpp
@@ -71,7 +71,7 @@ using FasTC::DecompressionJob;
 using FasTC::ECompressionFormat;
 
 CompressedImage::CompressedImage( const CompressedImage &other )
-  : Image(other)
+  : UncompressedImage(other)
   , m_Format(other.m_Format)
   , m_CompressedData(0)
 {
@@ -88,7 +88,7 @@ CompressedImage::CompressedImage(
   const ECompressionFormat format,
   const unsigned char *data
 )
-  : FasTC::Image<>(width, height, reinterpret_cast<uint32 *>(NULL))
+  : UncompressedImage(width, height, reinterpret_cast<uint32 *>(NULL))
   , m_Format(format)
   , m_CompressedData(0)
 {
@@ -101,7 +101,7 @@ CompressedImage::CompressedImage(
 }
 
 CompressedImage &CompressedImage::operator=(const CompressedImage &other) {
-  Image::operator=(other);
+  UncompressedImage::operator=(other);
   m_Format = other.m_Format;
   if(other.m_CompressedData) {
     uint32 cmpSz = GetCompressedSize();