Skip to content

Commit 27facf2

Browse files
committed
Fix compiler errors
1 parent 774d604 commit 27facf2

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/BKContext.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ BKInt BKContextGenerateToTime(BKContext* ctx, BKTime endTime, BKInt (*write)(BKF
298298
// write frames if buffer filled or end time is reached
299299
if (BKBufferSize(&ctx->channels[0]) >= BK_MAX_GENERATE_SAMPLES || BKTimeIsGreaterEqual(ctx->currentTime, endTime)) {
300300
BKInt size;
301-
BKFrame* frames = alloca(ctx->numChannels * BK_MAX_GENERATE_SAMPLES);
301+
BKFrame* frames = (BKFrame*)alloca(sizeof(BKFrame) * ctx->numChannels * BK_MAX_GENERATE_SAMPLES);
302302

303303
size = BKContextRead(ctx, frames, BK_MAX_GENERATE_SAMPLES);
304304
numFrames += size;

src/BKData.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ static BKInt BKDataConvertFromBits(BKFrame* outFrames, void const* data, BKUInt
474474

475475
dataSize -= (dataSize % (mask * numChannels));
476476

477-
for (charData = data; (void*)charData < data + dataSize;) {
477+
for (charData = data; charData < (unsigned char*)data + dataSize;) {
478478
switch (numBits) {
479479
case 1: {
480480
c = charData[0];
@@ -522,7 +522,7 @@ static BKInt BKDataConvertFromBits(BKFrame* outFrames, void const* data, BKUInt
522522
}
523523
case 16: {
524524
if (reverseEndian) {
525-
outFrames[0] = (charData[0] << 8) | (charData[1] >> 8);
525+
outFrames[0] = ((BKFrame)charData[0] << 8) | ((BKFrame)charData[1] >> 8);
526526
}
527527
else {
528528
outFrames[0] = (*(BKFrame*)charData);

src/BKSequence.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ static BKInt BKSequenceFuncSimpleCreate(BKSequence** outSequence, BKSequenceFunc
1010
if (sequence) {
1111
memset(sequence, 0, sizeof(*sequence));
1212

13-
sequence->values = (void*)sequence + sizeof(*sequence);
13+
sequence->values = (char*)sequence + sizeof(*sequence);
1414

1515
memcpy(sequence->values, values, size);
1616

@@ -112,7 +112,7 @@ static BKInt BKSequenceFuncSimpleCopy(BKSequence** outCopy, BKSequence const* se
112112
BKSequence* copy = malloc(sizeof(*copy) + size);
113113

114114
if (copy) {
115-
values = (void*)copy + sizeof(*copy);
115+
values = (BKInt*)((char*)copy + sizeof(*copy));
116116
copy->values = values;
117117

118118
memcpy(copy, sequence, sizeof(*copy));
@@ -202,7 +202,7 @@ static BKInt BKSequenceFuncEnvelopeCreate(BKSequence** outSequence, BKSequenceFu
202202
if (sequence) {
203203
memset(sequence, 0, sizeof(*sequence));
204204

205-
sequence->values = (void*)sequence + sizeof(*sequence);
205+
sequence->values = (char*)sequence + sizeof(*sequence);
206206

207207
memcpy(sequence->values, values, size);
208208

@@ -355,7 +355,7 @@ static BKInt BKSequenceFuncEnvelopeCopy(BKSequence** outCopy, BKSequence const*
355355
copy = malloc(sizeof(*copy) + size);
356356

357357
if (copy) {
358-
values = (void*)copy + sizeof(*copy);
358+
values = (BKSequencePhase*)((char*)copy + sizeof(*copy));
359359
copy->values = values;
360360

361361
memcpy(copy, sequence, sizeof(*copy));

src/BKTrack.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ BKInt BKTrackGetEffect(BKTrack const* track, BKEnum effect, void* outValues, BKU
916916
// copy values
917917
memcpy(outValues, values, outSize);
918918
// empty trailing data
919-
memset((void*)outValues + outSize, 0, BKMax(0, (BKInt)size - outSize));
919+
memset((char*)outValues + outSize, 0, BKMax(0, (BKInt)size - outSize));
920920

921921
return 0;
922922
}

0 commit comments

Comments
 (0)