WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 06:53:43 +00:00
Code Issues Projects Releases Wiki Activity

Switch to zip archive format for resource data, prep work for moving from PICT/snd to BMP/WAV

Browse Source
This commit is contained in:
elasota
2020-01-18 08:37:57 -05:00
parent e01cd4ef2e
commit d8331eaeb7
298 changed files with 79115 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ConvertColorCursors/ConvertColorCursors.cpp
View File

@@ -94,7 +94,7 @@ void ConvertCursors(PortabilityLayer::ResourceFile *resFile)
for (size_t i = 0; i < numRefs; i++)
{
const int resID = typeList->m_firstRef[i].m_resID;
const THandle<void> resHdl = resFile->GetResource('crsr', resID, true);
const THandle<void> resHdl = resFile->LoadResource('crsr', resID);
const void *cursorDataBase = *resHdl;
const void *cursorData = cursorDataBase;
@@ -234,6 +234,7 @@ void ConvertCursors(PortabilityLayer::ResourceFile *resFile)
delete[] colorValues;
delete[] pixelDataRGBA;
resHdl.Dispose();
}
}
@@ -247,11 +248,15 @@ void ConvertIconFamily(PortabilityLayer::ResourceFile *resFile, int32_t iconBitm
for (size_t i = 0; i < numRefs; i++)
{
const int resID = typeList->m_firstRef[i].m_resID;
const THandle<void> bwBlock = resFile->GetResource(iconBitmapType, resID, true);
const THandle<void> colorBlock = resFile->GetResource(iconColorType, resID, true);
const THandle<void> bwBlock = resFile->LoadResource(iconBitmapType, resID);
const THandle<void> colorBlock = resFile->LoadResource(iconColorType, resID);
if (!bwBlock || !colorBlock)
{
bwBlock.Dispose();
colorBlock.Dispose();
continue;
}
const uint8_t *bwIconData = static_cast<const uint8_t*>(*bwBlock);
const uint8_t *bwMaskData = bwIconData + (dimension * dimension / 8);
@@ -309,6 +314,8 @@ void ConvertIconFamily(PortabilityLayer::ResourceFile *resFile, int32_t iconBitm
}
delete[] pixelData;
bwBlock.Dispose();
colorBlock.Dispose();
}
}