thunderbrewhq/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2025-12-12 11:12:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(whoa): update thunderbrew to use the refactored squall error/validation and bc allocation macros

Browse source
This commit is contained in:
phaneron 2025-03-31 23:52:37 -04:00
parent 1aeacd0d2e
commit 46843880ef
66 changed files with 459 additions and 457 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/gx/texture/CBLPFile.cpp
View file

@ -4,7 +4,7 @@
#include "util/Unimplemented.hpp"
#include <cstring>
#include <storm/Error.hpp>
#include <storm/Memory.hpp>
#include <bc/Memory.hpp>
TSGrowableArray<uint8_t> CBLPFile::s_blpFileLoadBuffer;
@ -259,7 +259,7 @@ int32_t CBLPFile::Lock2(const char* fileName, PIXEL_FORMAT format, uint32_t mipL
switch (this->m_header.colorEncoding) {
case COLOR_JPEG:
STORM_PANIC("%s: JPEG decompression not enabled", fileName);
SErrPrepareAppFatal(__FILE__, __LINE__); SErrDisplayAppFatal("%s: JPEG decompression not enabled", fileName);
return 0;
case COLOR_PAL:
@ -340,8 +340,9 @@ int32_t CBLPFile::LockChain2(const char* fileName, PIXEL_FORMAT format, MipBits*
}
int32_t CBLPFile::Open(const char* filename, int32_t a3) {
STORM_ASSERT(filename);
STORM_VALIDATE(filename, ERROR_INVALID_PARAMETER, 0);
STORM_VALIDATE_BEGIN;
STORM_VALIDATE(filename);
STORM_VALIDATE_END;
this->m_inMemoryImage = nullptr;

37
src/gx/texture/CTgaFile.cpp
View file

@ -1,12 +1,15 @@
#include "gx/texture/CTgaFile.hpp"
#include <storm/Memory.hpp>
#include <bc/Memory.hpp>
#include <storm/Error.hpp>
#include <cstring>
int32_t CTgaFile::Open(const char* filename, int32_t a3) {
STORM_VALIDATE_STRING(filename, ERROR_INVALID_PARAMETER, 0);
STORM_VALIDATE_BEGIN;
STORM_VALIDATE(filename);
STORM_VALIDATE(*filename);
STORM_VALIDATE_END;
this->Close();
@ -40,9 +43,15 @@ int32_t CTgaFile::Open(const char* filename, int32_t a3) {
}
// 3 pixels with alpha channel makes no sense
STORM_VALIDATE(!(this->m_header.bPixelDepth == 24 && this->m_header.desc.bAlphaChannelBits == 8), 0x8720012E, 0);
if (this->m_header.bPixelDepth == 24 && this->m_header.desc.bAlphaChannelBits == 8) {
SErrSetLastError(0x8720012E);
return 0;
}
// 4 pixels with no alpha channel makes no sense
STORM_VALIDATE(!(this->m_header.bPixelDepth == 32 && this->m_header.desc.bAlphaChannelBits == 0), 0x8720012F, 0);
if (this->m_header.bPixelDepth == 32 && this->m_header.desc.bAlphaChannelBits == 0) {
SErrSetLastError(0x8720012F);
return 0;
}
return 1;
}
@ -123,7 +132,10 @@ void CTgaFile::SetTopDown(int32_t set) {
return;
}
STORM_VALIDATE(this->m_header.bImageType >= TGA_RLE_COLOR_MAPPED && this->m_header.bImageType <= TGA_RLE_BLACK_N_WHITE, 0xF7200083);
if (!(this->m_header.bImageType >= TGA_RLE_COLOR_MAPPED && this->m_header.bImageType <= TGA_RLE_BLACK_N_WHITE)) {
SErrSetLastError(0xF7200083);
return;
}
auto newImage = static_cast<uint8_t*>(SMemAlloc(this->Bytes(), __FILE__, __LINE__, 0x0));
@ -405,7 +417,10 @@ void CTgaFile::ConvertColorMapped(uint32_t flags) {
}
int32_t CTgaFile::ReadColorMappedImage(uint32_t flags) {
STORM_VALIDATE(this->m_header.bColorMapType, 0xF7200084, 0);
if (!this->m_header.bColorMapType) {
SErrSetLastError(0xF7200084);
return 0;
}
int32_t status;
@ -421,8 +436,14 @@ int32_t CTgaFile::ReadColorMappedImage(uint32_t flags) {
}
int32_t CTgaFile::LoadImageData(uint32_t flags) {
STORM_VALIDATE(this->m_image == nullptr, ERROR_INVALID_PARAMETER, 1);
STORM_VALIDATE(this->m_file, 0xF720007E, 1);
if (this->m_image) {
SErrSetLastError(ERROR_INVALID_PARAMETER);
return 1;
}
if (!this->m_file) {
SErrSetLastError(0xF720007E);
return 1;
}
this->m_imageBytes = this->Bytes();