libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-07 18:31:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed potential conflict with standard memset

Browse Source 
svn-id: r20552
This commit is contained in:
Chris Apers 2006-02-11 17:16:26 +00:00
parent fc556b789a
commit a76f3f1b6e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lure/decode.cpp
View File

@ -41,7 +41,7 @@ void PictureDecoder::writeByte(MemoryBlock *dest, byte v) {
void PictureDecoder::writeBytes(MemoryBlock *dest, byte v, uint16 numBytes) { void PictureDecoder::writeBytes(MemoryBlock *dest, byte v, uint16 numBytes) {
if (outputOffset + numBytes > dest->size()) if (outputOffset + numBytes > dest->size())
error("Decoded data exceeded allocated output buffer size"); error("Decoded data exceeded allocated output buffer size");
dest->memset(v, outputOffset, numBytes); dest->memorySet(v, outputOffset, numBytes);
outputOffset += numBytes; outputOffset += numBytes;
} }

4
lure/hotspots.cpp
View File

@ -104,7 +104,7 @@ void Hotspot::setAnimation(HotspotAnimData *newRecord) {
_numFrames = 1; _numFrames = 1;
_frameNumber = 0; _frameNumber = 0;
_frames = new Surface(1, 1); _frames = new Surface(1, 1);
_frames->data().memset(_data->colourOffset, 0, 1); _frames->data().memorySet(_data->colourOffset, 0, 1);
return; return;
} }
@ -124,7 +124,7 @@ void Hotspot::setAnimation(HotspotAnimData *newRecord) {
_frames = new Surface(_data->width * _numFrames, _data->height); _frames = new Surface(_data->width * _numFrames, _data->height);
_frames->data().memset(_data->colourOffset, 0, _frames->data().size()); _frames->data().memorySet(_data->colourOffset, 0, _frames->data().size());
byte *pSrc = dest->data() + 0x40; byte *pSrc = dest->data() + 0x40;
byte *pDest; byte *pDest;

2
lure/memory.cpp
View File

@ -66,7 +66,7 @@ void MemoryBlock::empty() {
::memset(_data, 0, _size); ::memset(_data, 0, _size);
} }
void MemoryBlock::memset(int c, size_t startIndex, size_t num) { void MemoryBlock::memorySet(int c, size_t startIndex, size_t num) {
byte *p = _data + startIndex; byte *p = _data + startIndex;
::memset(p, c, num); ::memset(p, c, num);
} }

2
lure/memory.h
View File

@ -42,7 +42,7 @@ public:
uint32 size() { return _size; } uint32 size() { return _size; }
void empty(); void empty();
void memset(int c, size_t startIndex, size_t num); void memorySet(int c, size_t startIndex, size_t num);
void copyFrom(MemoryBlock *src); void copyFrom(MemoryBlock *src);
void copyFrom(MemoryBlock *src, uint32 srcPos, uint32 destPos, uint32 srcLen); void copyFrom(MemoryBlock *src, uint32 srcPos, uint32 destPos, uint32 srcLen);
void copyFrom(const byte *src, uint32 srcPos, uint32 destPos, uint32 srcLen); void copyFrom(const byte *src, uint32 srcPos, uint32 destPos, uint32 srcLen);