diff options
author | retro-wertz | 2019-03-13 09:22:23 +0800 |
---|---|---|
committer | retro-wertz | 2019-03-13 09:23:56 +0800 |
commit | 1bedbd6f272bd83af54c80eb0089ae1d6f4561a2 (patch) | |
tree | 03e541dd603cafb9961d3579f741c879d21bc29d /libpcsxcore | |
parent | 5a49b8a2620bfdfaaf59ae25aa51bde44610371b (diff) | |
parent | 8a55ebcc07d4f860633db8c77bb9e16bcfa03313 (diff) | |
download | pcsx_rearmed-1bedbd6f272bd83af54c80eb0089ae1d6f4561a2.tar.gz pcsx_rearmed-1bedbd6f272bd83af54c80eb0089ae1d6f4561a2.tar.bz2 pcsx_rearmed-1bedbd6f272bd83af54c80eb0089ae1d6f4561a2.zip |
merge remote-tracking branch 'notaz/master'
Diffstat (limited to 'libpcsxcore')
-rw-r--r-- | libpcsxcore/cdriso.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index cf1a59e..6f59579 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -1089,7 +1089,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) return ret; } -static int uncomp2(void *out, unsigned long *out_size, void *in, unsigned long in_size) +static int uncompress2_pcsx(void *out, unsigned long *out_size, void *in, unsigned long in_size) { static z_stream z; int ret = 0; @@ -1169,7 +1169,7 @@ static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector) if (is_compressed) { cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift; cdbuffer_size = cdbuffer_size_expect; - ret = uncomp2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); + ret = uncompress2_pcsx(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); if (ret != 0) { SysPrintf("uncompress failed with %d for block %d, sector %d\n", ret, block, sector); |