TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 18:03:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix assertion failures

Browse Source
This commit is contained in:
David Rose 2012-08-22 02:09:23 +00:00
parent 33d494d0f4
commit 54a29d5ece
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
panda/src/pnmimage/pfmFile.cxx
View File

@ -314,7 +314,7 @@ write(PNMWriter *writer) {
return false; return false;
} }
writer->copy_header_from(pnmimage); writer->copy_header_from(pnmimage);
bool success = writer->write_data(pnmimage.get_array(), pnmimage.get_alpha_array()); bool success = (writer->write_data(pnmimage.get_array(), pnmimage.get_alpha_array()) != 0);
delete writer; delete writer;
return success; return success;
} }
@ -726,8 +726,11 @@ resize(int new_x_size, int new_y_size) {
return; return;
} }
int new_size = new_x_size * new_y_size * _num_channels;
// We allocate a little bit bigger to allow safe overflow.
Table new_data; Table new_data;
new_data.reserve(new_x_size * new_y_size * _num_channels); new_data.reserve(new_size + 4);
PN_float32 from_x0, from_x1, from_y0, from_y1; PN_float32 from_x0, from_x1, from_y0, from_y1;
@ -826,7 +829,12 @@ resize(int new_x_size, int new_y_size) {
nassertv(false); nassertv(false);
} }
nassertv(new_data.size() == new_x_size * new_y_size * _num_channels); new_data.push_back(0.0);
new_data.push_back(0.0);
new_data.push_back(0.0);
new_data.push_back(0.0);
nassertv(new_data.size() == new_size + 4);
_table.swap(new_data); _table.swap(new_data);
_x_size = new_x_size; _x_size = new_x_size;
_y_size = new_y_size; _y_size = new_y_size;
@ -1042,7 +1050,7 @@ apply_crop(int x_begin, int x_end, int y_begin, int y_end) {
new_x_size * sizeof(PN_float32) * _num_channels); new_x_size * sizeof(PN_float32) * _num_channels);
} }
nassertv(new_table.size() == new_x_size * new_y_size * _num_channels); nassertv(new_table.size() == new_size + 4);
_table.swap(new_table); _table.swap(new_table);
_x_size = new_x_size; _x_size = new_x_size;
_y_size = new_y_size; _y_size = new_y_size;