Merge pull request #1234 from marauder2k9-torque/virtuals-override

Virtuals override
This commit is contained in:
Brian Roberts 2024-03-21 10:43:26 -05:00 committed by GitHub
commit 05a083ca6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
710 changed files with 6353 additions and 6324 deletions

View file

@ -177,14 +177,14 @@ struct DDSFile
static S32 smActiveCopies;
DDSFile():
mBytesPerPixel(0),
mHeight(0),
mWidth(0),
mDepth(0),
mFormat(GFXFormat_FIRST),
mFourCC(0),
mPitchOrLinearSize(0),
mMipMapCount(0),
mPitchOrLinearSize(0)
mFormat(GFXFormat_FIRST),
mBytesPerPixel(0),
mFourCC(0)
{
VECTOR_SET_ASSOCIATION( mSurfaces );
smActiveCopies++;

View file

@ -78,7 +78,7 @@ namespace ImageUtil
: pSrc(srcRGBA),pDst(dst), width(w), height(h), format(compressFormat),quality(compressQuality) {}
protected:
virtual void execute()
void execute() override
{
rawCompress(pSrc,pDst, width, height, format,quality);
}