zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 19:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor png writer fixups

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6803 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-04-04 20:48:10 +00:00
parent 5214bc68dc
commit 3d0a4c37d4
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/build/include/pngwrite.h
View file

@ -32,6 +32,6 @@ typedef struct
void png_set_pal(uint8_t const * const data, int numentries); void png_set_pal(uint8_t const * const data, int numentries);
void png_set_text(char const * const keyword, char const * const text); void png_set_text(char const * const keyword, char const * const text);
void png_write(FILE * const file, uint32_t const width, uint32_t const height, uint8_t type, uint8_t const * const data); void png_write(FILE * const file, uint32_t const width, uint32_t const height, uint8_t const type, uint8_t const * const data);
#endif #endif

16
source/build/src/pngwrite.cpp
View file

@ -6,11 +6,10 @@ pngwrite_t png;
#define png_write_buf(p, size) Bfwrite(p, size, 1, png.file) #define png_write_buf(p, size) Bfwrite(p, size, 1, png.file)
static void png_write_uint32(uint32_t const in) static FORCE_INLINE void png_write_uint32(uint32_t const in)
{ {
uint8_t buf[4]; uint32_t const buf = B_BIG32(in);
*(uint32_t *)buf = B_BIG32(in); png_write_buf(&buf, sizeof(uint32_t));
png_write_buf(buf, sizeof(uint32_t));
} }
static void png_write_chunk(uint32_t const size, char const *const type, static void png_write_chunk(uint32_t const size, char const *const type,
@ -59,7 +58,7 @@ void png_set_text(char const * const keyword, char const * const text)
} }
void png_write(FILE * const file, uint32_t const width, uint32_t const height, void png_write(FILE * const file, uint32_t const width, uint32_t const height,
uint8_t type, uint8_t const * const data) uint8_t const type, uint8_t const * const data)
{ {
png.file = file; png.file = file;
@ -77,13 +76,16 @@ void png_write(FILE * const file, uint32_t const width, uint32_t const height,
uint32_t const bytesPerPixel = (type == PNG_TRUECOLOR ? 3 : 1); uint32_t const bytesPerPixel = (type == PNG_TRUECOLOR ? 3 : 1);
uint32_t const bytesPerLine = width * bytesPerPixel; uint32_t const bytesPerLine = width * bytesPerPixel;
if (type == PNG_INDEXED) if (png.pal_data)
{
png_write_chunk(png.pal_entries * 3, "PLTE", png.pal_data, 0); png_write_chunk(png.pal_entries * 3, "PLTE", png.pal_data, 0);
DO_FREE_AND_NULL(png.pal_data);
}
unsigned const linesiz = height * bytesPerLine + height; unsigned const linesiz = height * bytesPerLine + height;
uint8_t *lines = (uint8_t *) Xcalloc(1, linesiz); uint8_t *lines = (uint8_t *) Xcalloc(1, linesiz);
for (unsigned i = 0; i < height; i++) for (unative_t i = 0; i < height; i++)
Bmemcpy(lines + i * bytesPerLine + i + 1, data + i * bytesPerLine, bytesPerLine); Bmemcpy(lines + i * bytesPerLine + i + 1, data + i * bytesPerLine, bytesPerLine);
png_write_chunk(linesiz, "IDAT", lines, CHUNK_COMPRESSED); png_write_chunk(linesiz, "IDAT", lines, CHUNK_COMPRESSED);