Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Supress conversion warnings #72

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Supress conversion warnings #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tsf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,13 +739,13 @@ static void tsf_load_samples(float** fontSamples, unsigned int* fontSampleCount,
{
// Read sample data into float format buffer.
float* out; unsigned int samplesLeft, samplesToRead, samplesToConvert;
samplesLeft = *fontSampleCount = chunkSmpl->size / sizeof(short);
samplesLeft = *fontSampleCount = chunkSmpl->size / (unsigned int)sizeof(short);
out = *fontSamples = (float*)TSF_MALLOC(samplesLeft * sizeof(float));
for (; samplesLeft; samplesLeft -= samplesToRead)
{
short sampleBuffer[1024], *in = sampleBuffer;;
samplesToRead = (samplesLeft > 1024 ? 1024 : samplesLeft);
stream->read(stream->data, sampleBuffer, samplesToRead * sizeof(short));
stream->read(stream->data, sampleBuffer, samplesToRead * (unsigned int)sizeof(short));

// Convert from signed 16-bit to float.
for (samplesToConvert = samplesToRead; samplesToConvert > 0; --samplesToConvert)
Expand Down Expand Up @@ -1358,7 +1358,7 @@ TSFDEF int tsf_active_voice_count(tsf* f)
TSFDEF void tsf_render_short(tsf* f, short* buffer, int samples, int flag_mixing)
{
float *floatSamples;
int channelSamples = (f->outputmode == TSF_MONO ? 1 : 2) * samples, floatBufferSize = channelSamples * sizeof(float);
int channelSamples = (f->outputmode == TSF_MONO ? 1 : 2) * samples, floatBufferSize = channelSamples * (int)sizeof(float);
short* bufferEnd = buffer + channelSamples;
if (floatBufferSize > f->outputSampleSize)
{
Expand Down