Skip to content

Commit

Permalink
Merge branch 'craftablescience:main' into feat/sht
Browse files Browse the repository at this point in the history
  • Loading branch information
Trico-Everfire authored Dec 4, 2024
2 parents 1f4c06a + ac56a7f commit 568712d
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/vtfpp/ImageConversion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1323,6 +1323,7 @@ std::vector<std::byte> ImageConversion::convertFileToImageData(std::span<const s
inPixels.begin(), inPixels.end(), outPixels.begin(), [](uint16_t pixel) -> ImagePixel::RGBA16161616 {
return {pixel, 0, 0, 0xffff};
});
return out;
}
case 2: {
struct RG1616 {
Expand All @@ -1337,6 +1338,7 @@ std::vector<std::byte> ImageConversion::convertFileToImageData(std::span<const s
inPixels.begin(), inPixels.end(), outPixels.begin(), [](RG1616 pixel) -> ImagePixel::RGBA16161616 {
return {pixel.r, pixel.g, 0, 0xffff};
});
return out;
}
case 3: {
struct RGB161616 {
Expand All @@ -1352,6 +1354,7 @@ std::vector<std::byte> ImageConversion::convertFileToImageData(std::span<const s
inPixels.begin(), inPixels.end(), outPixels.begin(), [](RGB161616 pixel) -> ImagePixel::RGBA16161616 {
return {pixel.r, pixel.g, pixel.b, 0xffff};
});
return out;
}
default:
return {};
Expand Down

0 comments on commit 568712d

Please sign in to comment.