diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-09-11 15:11:01 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-11 15:11:01 +1000 |
commit | 7852ad9cf2efdf359132c986f46b0e34acbd28ba (patch) | |
tree | 8b16b62548e221d5a0357680ea2d3d237fed17ad /source/core | |
parent | 8457c2e9542230ce6c71d7fc696d4f79e4a5456c (diff) | |
parent | 1f5e8a462908a7c6e7eac5b53c70749837d29c64 (diff) |
Merge pull request #112 from floydinator-git/image-fix
Fix images added by assets.add not working in-game.
Diffstat (limited to 'source/core')
-rw-r--r-- | source/core/StarImage.cpp | 6 | ||||
-rw-r--r-- | source/core/StarImage.hpp | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/source/core/StarImage.cpp b/source/core/StarImage.cpp index 82e3b05..52c2370 100644 --- a/source/core/StarImage.cpp +++ b/source/core/StarImage.cpp @@ -17,6 +17,12 @@ void readPngData(png_structp pngPtr, png_bytep data, png_size_t length) { ((IODevice*)png_get_io_ptr(pngPtr))->readFull((char*)data, length); }; +bool Image::isPng(IODevicePtr device) { + png_byte header[8]; + device->readAbsolute(0, (char*)header, sizeof(header)); + return !png_sig_cmp(header, 0, sizeof(header)); +} + Image Image::readPng(IODevicePtr device) { png_byte header[8]; device->readFull((char*)header, sizeof(header)); diff --git a/source/core/StarImage.hpp b/source/core/StarImage.hpp index 478d074..aac0105 100644 --- a/source/core/StarImage.hpp +++ b/source/core/StarImage.hpp @@ -27,6 +27,7 @@ STAR_CLASS(Image); class Image { public: static Image readPng(IODevicePtr device); + static bool isPng(IODevicePtr device); // Returns the size and pixel format that would be constructed from the given // png file, without actually loading it. static tuple<Vec2U, PixelFormat> readPngMetadata(IODevicePtr device); |