Skip to content

Commit 5d4548d

Browse files
authored
Merge pull request #1694 from mouzedrift/beta
fix wrong palette alpha default and demo file version not being set correctly
2 parents 3090647 + 809d9ce commit 5d4548d

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
name: Windows64
3030
- os: ubuntu-latest
3131
name: Linux
32-
- os: macos-13
32+
- os: macos-latest-large
3333
name: macOS
3434

3535
steps:
@@ -137,7 +137,7 @@ jobs:
137137
run: |
138138
mkdir build
139139
cd build
140-
cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=$CONFIGURATION -DCMAKE_PREFIX_PATH=$(brew --prefix qt5) -DCI_PROVIDER="GitHub" -DBUILD_NUMBER=$GITHUB_RUN_NUMBER
140+
cmake .. -G"Unix Makefiles" -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=$CONFIGURATION -DCMAKE_PREFIX_PATH=$(brew --prefix qt@5) -DCI_PROVIDER="GitHub" -DBUILD_NUMBER=$GITHUB_RUN_NUMBER
141141
make -j4
142142
143143
# ======================================

Source/relive_lib/data_conversion/PNGFile.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,11 @@ void PNGFile::Load(const char_type* pFileName, AnimationPal& pal256, std::vector
276276
{
277277
alpha = trns.type3_alpha[i];
278278
}
279+
else
280+
{
281+
// according to the tRNS spec all remaining alpha entries should be assumed to be 255
282+
alpha = 255;
283+
}
279284

280285
if (alpha == 0)
281286
{

0 commit comments

Comments
 (0)