UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion] Coding style

Browse Source
This commit is contained in:
Émilie Feral
2020-09-18 17:59:38 +02:00
committed by EmilieNumworks
parent 7535abc298
commit 33425e04c0
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ion/src/simulator/linux/images.cpp
View File

@@ -23,7 +23,10 @@ void ReadDataFromMemory(png_structp png, png_bytep outBytes, png_size_t byteSize
bool readPNG(unsigned char * start, size_t size, unsigned char ** bitmapData, unsigned int * width, unsigned int * height, unsigned int * bytesPerPixel, Uint32 * pixelFormat) {
readSize = 0;
png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
if (!png) { return false; } // Memory failure
if (!png) {
// Memory failure
return false;
}
png_infop info = png_create_info_struct(png);
if (!info) {
// Memory failure
@@ -31,7 +34,10 @@ bool readPNG(unsigned char * start, size_t size, unsigned char ** bitmapData, un
return false;
}
static constexpr size_t k_pngSignatureLength = 8;
if(png_sig_cmp((png_const_bytep)start, 0, k_pngSignatureLength) != 0) { return false; } // Corrupted PNG
if (png_sig_cmp((png_const_bytep)start, 0, k_pngSignatureLength) != 0) {
// Corrupted PNG
return false;
}
png_set_read_fn(png, start, ReadDataFromMemory);
@@ -48,9 +54,8 @@ bool readPNG(unsigned char * start, size_t size, unsigned char ** bitmapData, un
const png_uint_32 bytesPerRow = png_get_rowbytes(png, info);
*bitmapData = new unsigned char[*height * bytesPerRow];
unsigned char * rowData = *bitmapData;
// read single row at a time
for(unsigned int rowIndex = 0; rowIndex < *height; rowIndex++) {
png_read_row(png, (png_bytep)rowData, nullptr);
for (unsigned int rowIndex = 0; rowIndex < *height; rowIndex++) {
png_read_row(png, static_cast<png_bytep>(rowData), nullptr);
rowData += bytesPerRow;
}