griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix error de-duplicating BLI_file_read functions

Browse Source 
Own error in recent code de-duplication: a345f56ce3
causing issues on Windows.

Flipped argument for reading the exact size.
This commit is contained in:
Campbell Barton
2019-08-01 16:12:39 +10:00
parent 760dbd1cbf
commit 036312ecff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/intern/storage.c
View File

@@ -360,7 +360,7 @@ void *BLI_file_read_text_as_mem(const char *filepath, size_t pad_bytes, size_t *
FILE *fp = BLI_fopen(filepath, "r");
void *mem = NULL;
if (fp) {
mem = file_read_data_as_mem_impl(fp, true, pad_bytes, r_size);
mem = file_read_data_as_mem_impl(fp, false, pad_bytes, r_size);
fclose(fp);
}
return mem;
@@ -371,7 +371,7 @@ void *BLI_file_read_binary_as_mem(const char *filepath, size_t pad_bytes, size_t
FILE *fp = BLI_fopen(filepath, "rb");
void *mem = NULL;
if (fp) {
mem = file_read_data_as_mem_impl(fp, false, pad_bytes, r_size);
mem = file_read_data_as_mem_impl(fp, true, pad_bytes, r_size);
fclose(fp);
}
return mem;