yyc12345/libcmo21
1
0
Fork 0
Code Activity

fix: fix misc naming issue

Browse Source
This commit is contained in:
yyc12345
2026-01-25 21:07:55 +08:00
parent a79d09a66c
commit fd591f8a62
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
LibCmo/LibCmo/CK2/CKBitmapData.cpp
View File

@@ -11,8 +11,8 @@ namespace LibCmo::CK2 {
#pragma region Assist RW Functions #pragma region Assist RW Functions
constexpr CKDWORD c_SpecificFmtHasTransparent = 2; constexpr CKDWORD SPECIFIC_FMT_HAS_TRANSPARENT = 2;
constexpr CKDWORD c_SpecificFmtNoTransparent = 1; constexpr CKDWORD SPECIFIC_FMT_NO_TRANSPARENT = 1;
bool CKBitmapData::ReadSpecificFormatBitmap(CKStateChunk* chk, VxMath::VxImageDescEx* slot) { bool CKBitmapData::ReadSpecificFormatBitmap(CKStateChunk* chk, VxMath::VxImageDescEx* slot) {
// read transparent prop // read transparent prop
@@ -52,7 +52,7 @@ namespace LibCmo::CK2 {
VxMath::VxDoBlit(&cache, slot); VxMath::VxDoBlit(&cache, slot);
// proc image alpha // proc image alpha
if (transprop == c_SpecificFmtHasTransparent) { if (transprop == SPECIFIC_FMT_HAS_TRANSPARENT) {
CKDWORD alphacount; CKDWORD alphacount;
chk->ReadStruct(alphacount); chk->ReadStruct(alphacount);
if (alphacount == 1) { if (alphacount == 1) {
@@ -145,7 +145,7 @@ namespace LibCmo::CK2 {
// write basic data // write basic data
// whether has transparent // whether has transparent
chk->WriteStruct(canSaveAlpha ? c_SpecificFmtNoTransparent : c_SpecificFmtHasTransparent); chk->WriteStruct(canSaveAlpha ? SPECIFIC_FMT_NO_TRANSPARENT : SPECIFIC_FMT_HAS_TRANSPARENT);
// write ext and guid // write ext and guid
chk->WriteBufferNoSize(savefmt->m_Ext.GetExt(), savefmt->m_Ext.GetSize()); chk->WriteBufferNoSize(savefmt->m_Ext.GetExt(), savefmt->m_Ext.GetSize());
chk->WriteStruct(savefmt->m_ReaderGuid); chk->WriteStruct(savefmt->m_ReaderGuid);

2
LibCmo/LibCmo/CK2/CKContext.cpp
View File

@@ -267,7 +267,7 @@ namespace LibCmo::CK2 {
XContainer::XString result(YYCC::StringHelper::VPrintf(fmt, argptr)); XContainer::XString result(YYCC::StringHelper::VPrintf(fmt, argptr));
va_end(argptr); va_end(argptr);
// use c_str(), not XContainer::NSXString::ToCKSTRING because we want make sure this paramter is not nullptr. // use c_str(), not XContainer::NSXString::ToCKSTRING because we want make sure this parameter is not nullptr.
// we always output a valid C style string, even if no chars need to write. // we always output a valid C style string, even if no chars need to write.
m_OutputCallback(result.c_str()); m_OutputCallback(result.c_str());
} }

26
LibCmo/LibCmo/CK2/CKDefines.hpp
View File

@@ -73,25 +73,25 @@ namespace LibCmo::CK2 {
class CKFileExtension { class CKFileExtension {
public: public:
CKFileExtension() : m_Data() { CKFileExtension() : m_Data() {
std::memset(m_Data, 0, c_DataLen); std::memset(m_Data, 0, DATA_LEN);
} }
CKFileExtension(CKSTRING s) : CKFileExtension() { CKFileExtension(CKSTRING s) : CKFileExtension() {
SetExt(s); SetExt(s);
} }
CKFileExtension(const CKFileExtension& rhs) : CKFileExtension() { CKFileExtension(const CKFileExtension& rhs) : CKFileExtension() {
std::memcpy(m_Data, rhs.m_Data, c_DataLen); std::memcpy(m_Data, rhs.m_Data, DATA_LEN);
} }
CKFileExtension(CKFileExtension&& rhs) : CKFileExtension() { CKFileExtension(CKFileExtension&& rhs) noexcept : CKFileExtension() {
std::memmove(m_Data, rhs.m_Data, c_DataLen); std::memmove(m_Data, rhs.m_Data, DATA_LEN);
std::memset(rhs.m_Data, 0, c_DataLen); std::memset(rhs.m_Data, 0, DATA_LEN);
} }
CKFileExtension& operator=(const CKFileExtension& rhs) { CKFileExtension& operator=(const CKFileExtension& rhs) {
std::memcpy(m_Data, rhs.m_Data, c_DataLen); std::memcpy(m_Data, rhs.m_Data, DATA_LEN);
return *this; return *this;
} }
CKFileExtension& operator=(CKFileExtension&& rhs) { CKFileExtension& operator=(CKFileExtension&& rhs) noexcept {
std::memmove(m_Data, rhs.m_Data, c_DataLen); std::memmove(m_Data, rhs.m_Data, DATA_LEN);
std::memset(rhs.m_Data, 0, c_DataLen); std::memset(rhs.m_Data, 0, DATA_LEN);
return *this; return *this;
} }
@@ -101,7 +101,7 @@ namespace LibCmo::CK2 {
} else { } else {
if (s[0] == u8'.') ++s; // skip dot if (s[0] == u8'.') ++s; // skip dot
CKDWORD len = CKStrLen(s); CKDWORD len = CKStrLen(s);
if (len > (c_DataLen - 1)) len = c_DataLen - 1; if (len > (DATA_LEN - 1)) len = DATA_LEN - 1;
std::memcpy(m_Data, s, len); std::memcpy(m_Data, s, len);
} }
} }
@@ -111,7 +111,7 @@ namespace LibCmo::CK2 {
} }
CKDWORD GetSize() const { CKDWORD GetSize() const {
return c_DataLen; return DATA_LEN;
} }
bool operator==(const CKFileExtension& rhs) const { bool operator==(const CKFileExtension& rhs) const {
@@ -119,8 +119,8 @@ namespace LibCmo::CK2 {
} }
protected: protected:
static constexpr size_t c_DataLen = 4u; static constexpr size_t DATA_LEN = 4u;
CKCHAR m_Data[c_DataLen]; CKCHAR m_Data[DATA_LEN];
}; };
/** /**