TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

pnmimagetypes: fix allocation efficiency in PNG reader

Browse Source 
Rather than making one allocation per row, it instead makes one allocation for all rows.
This commit is contained in:
rdb 2018-12-30 20:10:50 +01:00
parent 62781c154b
commit 42405dff2e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/pnmimagetypes/pnmFileTypePNG.cxx
View File

@ -338,11 +338,12 @@ read_data(xel *array, xelval *alpha_data) {
// format, mainly because we keep array and alpha data separately, and there // format, mainly because we keep array and alpha data separately, and there
// doesn't appear to be good support to get this stuff out row-at-a-time for // doesn't appear to be good support to get this stuff out row-at-a-time for
// interlaced files. // interlaced files.
png_bytep *rows = (png_bytep *)PANDA_MALLOC_ARRAY(num_rows * sizeof(png_bytep)); png_bytep *rows = (png_bytep *)alloca(num_rows * sizeof(png_bytep));
int yi; int yi;
png_byte *alloc = (png_byte *)PANDA_MALLOC_ARRAY(row_byte_length * sizeof(png_byte) * num_rows);
for (yi = 0; yi < num_rows; yi++) { for (yi = 0; yi < num_rows; yi++) {
rows[yi] = (png_byte *)PANDA_MALLOC_ARRAY(row_byte_length * sizeof(png_byte)); rows[yi] = alloc + (row_byte_length * sizeof(png_byte)) * yi;
} }
png_read_image(_png, rows); png_read_image(_png, rows);
@ -402,12 +403,10 @@ read_data(xel *array, xelval *alpha_data) {
} }
nassertr(source <= rows[yi] + row_byte_length, yi); nassertr(source <= rows[yi] + row_byte_length, yi);
PANDA_FREE_ARRAY(rows[yi]);
} }
PANDA_FREE_ARRAY(rows);
png_read_end(_png, nullptr); png_read_end(_png, nullptr);
PANDA_FREE_ARRAY(alloc);
return _y_size; return _y_size;
} }