yyc12345/libcmo21
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finish CKStateChunk refactor

Browse Source
This commit is contained in:
yyc12345
2023-09-18 16:37:05 +08:00
parent 50784e719c
commit 81d1e80d14
5 changed files with 289 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
LibCmo/CK2/CKBitmapData.cpp
View File

@ -30,16 +30,18 @@ namespace LibCmo::CK2 {
chk->ReadStruct(imgbytesize);
if (imgbytesize != 0) {
// get image data ptr
const void* imgdata = nullptr;
if (!chk->ReadDryBuffer(&imgdata, imgbytesize)) {
auto imgdata = chk->LockReadBufferWrapper(imgbytesize);
if (imgdata == nullptr) {
return false;
}
// parse image
VxMath::VxImageDescEx cache;
if (!reader->ReadMemory(imgdata, imgbytesize, &cache)) {
if (!reader->ReadMemory(imgdata.get(), imgbytesize, &cache)) {
return false;
}
// unlock buffer
imgdata.reset();
// post proc image (copy to slot)
VxMath::VxDoBlit(&cache, slot);
@ -53,9 +55,7 @@ namespace LibCmo::CK2 {
chk->ReadStruct(globalalpha);
VxMath::VxDoAlphaBlit(slot, static_cast<CKBYTE>(globalalpha));
} else {
CKStateChunk::TBuffer alphabuf;
CKDWORD buflen;
chk->ReadBufferWrapper(&alphabuf, &buflen);
auto alphabuf = chk->ReadBufferWrapper();
VxMath::VxDoAlphaBlit(slot, reinterpret_cast<CKBYTE*>(alphabuf.get()));
}
}
@ -78,7 +78,7 @@ namespace LibCmo::CK2 {
chk->ReadStruct(blueMask);
// read RGBA buffer
CKStateChunk::TBuffer redBuffer, greenBuffer, blueBuffer, alphaBuffer;
CKStateChunk::Buffer_t redBuffer, greenBuffer, blueBuffer, alphaBuffer;
CKDWORD bufsize;
CKDWORD bufopt;
chk->ReadStruct(bufopt);
@ -90,11 +90,11 @@ namespace LibCmo::CK2 {
// so return false simply
return false;
} else {
chk->ReadBufferWrapper(&blueBuffer, &bufsize);
chk->ReadBufferWrapper(&greenBuffer, &bufsize);
chk->ReadBufferWrapper(&redBuffer, &bufsize);
blueBuffer = chk->ReadBufferWrapper();
greenBuffer = chk->ReadBufferWrapper();
redBuffer = chk->ReadBufferWrapper();
}
chk->ReadBufferWrapper(&alphaBuffer, &bufsize);
alphaBuffer = chk->ReadBufferWrapper();
// write into file
if (redBuffer != nullptr && greenBuffer != nullptr && blueBuffer != nullptr) {