quick/Quake-III-Arena-VS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug with insufficient buffer size to store image data (we should use scaled image dimensions, not original ones).

Browse Source
This commit is contained in:
Artem Kharytoniuk 2017-05-28 00:40:22 +03:00
parent 6079758830
commit 02e075e0f5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/engine/renderer/tr_image.c
View File

@ -520,9 +520,6 @@ struct Image_Upload_Data {
}; };
static Image_Upload_Data generate_image_upload_data(const byte* data, int width, int height, qboolean mipmap, qboolean picmip) { static Image_Upload_Data generate_image_upload_data(const byte* data, int width, int height, qboolean mipmap, qboolean picmip) {
Image_Upload_Data upload_data;
upload_data.buffer = (byte*) ri.Hunk_AllocateTempMemory(2 * 4 * width * height);
// //
// convert to exact power of 2 sizes // convert to exact power of 2 sizes
// //
@ -537,6 +534,9 @@ static Image_Upload_Data generate_image_upload_data(const byte* data, int width
if ( r_roundImagesDown->integer && scaled_height > height ) if ( r_roundImagesDown->integer && scaled_height > height )
scaled_height >>= 1; scaled_height >>= 1;
Image_Upload_Data upload_data;
upload_data.buffer = (byte*) ri.Hunk_AllocateTempMemory(2 * 4 * scaled_width * scaled_height);
byte* resampled_buffer = nullptr; byte* resampled_buffer = nullptr;
if ( scaled_width != width || scaled_height != height ) { if ( scaled_width != width || scaled_height != height ) {
resampled_buffer = (byte*) ri.Hunk_AllocateTempMemory( scaled_width * scaled_height * 4 ); resampled_buffer = (byte*) ri.Hunk_AllocateTempMemory( scaled_width * scaled_height * 4 );