Makes the allocation more C++-friendly

This commit is contained in:
Jean-Marc Valin 2011-08-29 16:31:52 -04:00
parent ebec87a287
commit 0abd1b0dea
3 changed files with 4 additions and 4 deletions

View file

@ -46,7 +46,7 @@ int main(int _argc,char **_argv){
else else
seed = time(NULL); seed = time(NULL);
/*Testing encoding of raw bit values.*/ /*Testing encoding of raw bit values.*/
ptr = malloc(DATA_SIZE); ptr = (unsigned char *)malloc(DATA_SIZE);
ec_enc_init(&enc,ptr, DATA_SIZE); ec_enc_init(&enc,ptr, DATA_SIZE);
for(ft=2;ft<1024;ft++){ for(ft=2;ft<1024;ft++){
for(i=0;i<ft;i++){ for(i=0;i<ft;i++){

View file

@ -31,7 +31,7 @@ int main(void)
unsigned char *ptr; unsigned char *ptr;
int val[10000], decay[10000]; int val[10000], decay[10000];
ALLOC_STACK; ALLOC_STACK;
ptr = malloc(DATA_SIZE); ptr = (unsigned char *)malloc(DATA_SIZE);
ec_enc_init(&enc,ptr,DATA_SIZE); ec_enc_init(&enc,ptr,DATA_SIZE);
val[0] = 3; decay[0] = 6000; val[0] = 3; decay[0] = 6000;

View file

@ -201,7 +201,7 @@ OpusMSEncoder *opus_multistream_encoder_create(
) )
{ {
int ret; int ret;
OpusMSEncoder *st = opus_alloc(opus_multistream_encoder_get_size(streams, coupled_streams)); OpusMSEncoder *st = (OpusMSEncoder *)opus_alloc(opus_multistream_encoder_get_size(streams, coupled_streams));
if (st==NULL) if (st==NULL)
{ {
if (error) if (error)
@ -510,7 +510,7 @@ OpusMSDecoder *opus_multistream_decoder_create(
) )
{ {
int ret; int ret;
OpusMSDecoder *st = opus_alloc(opus_multistream_decoder_get_size(streams, coupled_streams)); OpusMSDecoder *st = (OpusMSDecoder *)opus_alloc(opus_multistream_decoder_get_size(streams, coupled_streams));
if (st==NULL) if (st==NULL)
{ {
if (error) if (error)