yuzu-emu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC.git synced 2024-11-27 23:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Qualify namespace

Browse Source
This commit is contained in:
Pavel Krajcevski 2015-01-26 15:11:35 -05:00
parent 43aa8266b6
commit 34f90c07a2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/include/FasTC/CompressedImage.h
View File

@ -62,6 +62,8 @@ class CompressedImage : public FasTC::Image<FasTC::Pixel> {
FasTC::ECompressionFormat m_Format; FasTC::ECompressionFormat m_Format;
uint8 *m_CompressedData; uint8 *m_CompressedData;
typedef FasTC::Image<FasTC::Pixel> UncompressedImage;
public: public:
CompressedImage(const CompressedImage &); CompressedImage(const CompressedImage &);
CompressedImage &operator=(const CompressedImage &); CompressedImage &operator=(const CompressedImage &);

6
Core/src/CompressedImage.cpp
View File

@ -71,7 +71,7 @@ using FasTC::DecompressionJob;
using FasTC::ECompressionFormat; using FasTC::ECompressionFormat;
CompressedImage::CompressedImage( const CompressedImage &other ) CompressedImage::CompressedImage( const CompressedImage &other )
: Image(other) : UncompressedImage(other)
, m_Format(other.m_Format) , m_Format(other.m_Format)
, m_CompressedData(0) , m_CompressedData(0)
{ {
@ -88,7 +88,7 @@ CompressedImage::CompressedImage(
const ECompressionFormat format, const ECompressionFormat format,
const unsigned char *data const unsigned char *data
) )
: FasTC::Image<>(width, height, reinterpret_cast<uint32 *>(NULL)) : UncompressedImage(width, height, reinterpret_cast<uint32 *>(NULL))
, m_Format(format) , m_Format(format)
, m_CompressedData(0) , m_CompressedData(0)
{ {
@ -101,7 +101,7 @@ CompressedImage::CompressedImage(
} }
CompressedImage &CompressedImage::operator=(const CompressedImage &other) { CompressedImage &CompressedImage::operator=(const CompressedImage &other) {
Image::operator=(other); UncompressedImage::operator=(other);
m_Format = other.m_Format; m_Format = other.m_Format;
if(other.m_CompressedData) { if(other.m_CompressedData) {
uint32 cmpSz = GetCompressedSize(); uint32 cmpSz = GetCompressedSize();