zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-10 23:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor fixes

Browse source
This commit is contained in:
Tom M 2017-08-04 12:07:16 +02:00 committed by GitHub
parent c254b437d3
commit b338db1ebc
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fluidsynth/src/sfloader/fluid_defsfont.c
View file

@ -1865,9 +1865,10 @@ static sf_count_t
sfvio_read(void* ptr, sf_count_t count, void* user_data) sfvio_read(void* ptr, sf_count_t count, void* user_data)
{ {
fluid_sample_t *sample = (fluid_sample_t *)user_data; fluid_sample_t *sample = (fluid_sample_t *)user_data;
sf_count_t remain = sfvio_get_filelen(user_data) - (sf_count_t)sample->userdata;
if (count > sfvio_get_filelen(user_data) - (sf_count_t)sample->userdata)
count = sfvio_get_filelen(user_data) - (sf_count_t)sample->userdata; if (count > remain)
count = remain;
memcpy(ptr, (char *)sample->data + sample->start + (sf_count_t)sample->userdata, count); memcpy(ptr, (char *)sample->data + sample->start + (sf_count_t)sample->userdata, count);
sample->userdata = (void *)((sf_count_t)sample->userdata + count); sample->userdata = (void *)((sf_count_t)sample->userdata + count);
@ -1913,7 +1914,7 @@ fluid_sample_import_sfont(fluid_sample_t* sample, SFSample* sfsample, fluid_defs
short *sampledata_ogg; short *sampledata_ogg;
// initialize file position indicator and SF_INFO structure // initialize file position indicator and SF_INFO structure
sample->userdata = NULL; g_assert(sample->userdata == NULL);
memset(&sfinfo, 0, sizeof(sfinfo)); memset(&sfinfo, 0, sizeof(sfinfo));
// open sample as a virtual file in memory // open sample as a virtual file in memory