diff options
| author | hizzlekizzle | 2019-03-12 21:49:57 -0500 |
|---|---|---|
| committer | GitHub | 2019-03-12 21:49:57 -0500 |
| commit | 949ed5baf43dbb3ef3b51f43498f050e2d1e4c40 (patch) | |
| tree | 21c36156454215ff99d5e270e910fa998d9be606 /libpcsxcore | |
| parent | 5a49b8a2620bfdfaaf59ae25aa51bde44610371b (diff) | |
| parent | 1d6abe26ddb1f893cf96ccd3e251f25b1afbba2a (diff) | |
| download | pcsx_rearmed-949ed5baf43dbb3ef3b51f43498f050e2d1e4c40.tar.gz pcsx_rearmed-949ed5baf43dbb3ef3b51f43498f050e2d1e4c40.tar.bz2 pcsx_rearmed-949ed5baf43dbb3ef3b51f43498f050e2d1e4c40.zip | |
Merge pull request #244 from retro-wertz/sync_to_upstream
fetch new updates from upstream
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); |