Skip to content

Commit

Permalink
Merge branch 'ign-common3' into mjcarroll/image_to_buffer
Browse files Browse the repository at this point in the history
  • Loading branch information
Nate Koenig committed Apr 6, 2021
2 parents 8089509 + 6a12f59 commit 152d289
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ callback system.

# Install

See the [installation tutorial](https://ignitionrobotics.org/api/common/3.9/tutorials.html).
See the [installation tutorial](https://ignitionrobotics.org/api/common/3.11/tutorials.html).

# Usage

Expand Down
2 changes: 1 addition & 1 deletion av/src/AudioDecoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ bool AudioDecoder::Decode(uint8_t **_outBuffer, unsigned int *_outBufferSize)

if (*_outBuffer)
{
delete [] *_outBuffer;
free(*_outBuffer);
*_outBuffer = nullptr;
}

Expand Down
2 changes: 1 addition & 1 deletion av/src/AudioDecoder_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ TEST(AudioDecoder, DataBuffer)
EXPECT_TRUE(audio.Decode(&dataBuffer, &dataBufferSize));

unsigned int dataBufferSize2;
uint8_t *dataBuffer2 = new uint8_t[5];
uint8_t *dataBuffer2 = static_cast<uint8_t *>(malloc(5));
EXPECT_TRUE(audio.Decode(&dataBuffer2, &dataBufferSize2));

EXPECT_EQ(dataBufferSize2, dataBufferSize);
Expand Down

0 comments on commit 152d289

Please sign in to comment.