Scoped enums.

This commit is contained in:
Leonardo Zide
2021-11-14 19:10:16 -08:00
parent 7d884e6b5f
commit 2a24933fa8
12 changed files with 80 additions and 78 deletions
+14 -14
View File
@@ -5,7 +5,7 @@
static void CopyFromQImage(const QImage& Src, Image& Dest)
{
const bool Alpha = Src.hasAlphaChannel();
Dest.Allocate(Src.width(), Src.height(), Alpha ? LC_PIXEL_FORMAT_R8G8B8A8 : LC_PIXEL_FORMAT_R8G8B8);
Dest.Allocate(Src.width(), Src.height(), Alpha ? lcPixelFormat::R8G8B8A8 : lcPixelFormat::R8G8B8);
quint8* Bytes = (quint8*)Dest.mData;
@@ -30,7 +30,7 @@ Image::Image()
mData = nullptr;
mWidth = 0;
mHeight = 0;
mFormat = LC_PIXEL_FORMAT_INVALID;
mFormat = lcPixelFormat::Invalid;
}
Image::Image(Image&& Other)
@@ -43,7 +43,7 @@ Image::Image(Image&& Other)
Other.mData = nullptr;
Other.mWidth = 0;
Other.mHeight = 0;
Other.mFormat = LC_PIXEL_FORMAT_INVALID;
Other.mFormat = lcPixelFormat::Invalid;
}
Image::~Image()
@@ -55,15 +55,15 @@ int Image::GetBPP() const
{
switch (mFormat)
{
case LC_PIXEL_FORMAT_INVALID:
case lcPixelFormat::Invalid:
return 0;
case LC_PIXEL_FORMAT_A8:
case lcPixelFormat::A8:
return 1;
case LC_PIXEL_FORMAT_L8A8:
case lcPixelFormat::L8A8:
return 2;
case LC_PIXEL_FORMAT_R8G8B8:
case lcPixelFormat::R8G8B8:
return 3;
case LC_PIXEL_FORMAT_R8G8B8A8:
case lcPixelFormat::R8G8B8A8:
return 4;
}
@@ -74,15 +74,15 @@ bool Image::HasAlpha() const
{
switch (mFormat)
{
case LC_PIXEL_FORMAT_INVALID:
case lcPixelFormat::Invalid:
return false;
case LC_PIXEL_FORMAT_A8:
case lcPixelFormat::A8:
return true;
case LC_PIXEL_FORMAT_L8A8:
case lcPixelFormat::L8A8:
return true;
case LC_PIXEL_FORMAT_R8G8B8:
case lcPixelFormat::R8G8B8:
return false;
case LC_PIXEL_FORMAT_R8G8B8A8:
case lcPixelFormat::R8G8B8A8:
return true;
}
@@ -95,7 +95,7 @@ void Image::FreeData()
mData = nullptr;
mWidth = 0;
mHeight = 0;
mFormat = LC_PIXEL_FORMAT_INVALID;
mFormat = lcPixelFormat::Invalid;
}
void Image::Allocate(int Width, int Height, lcPixelFormat Format)