libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

COMMON: Add MKTAG16 for 16-bit multi-character constants

Browse Source
This commit is contained in:
Matthew Hoops 2012-08-26 12:38:35 -04:00
parent c7222ed5a4
commit 6f9d84665f
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/endian.h
View File

@ -146,6 +146,12 @@
*/
#define MKTAG(a0,a1,a2,a3) ((uint32)((a3) | ((a2) << 8) | ((a1) << 16) | ((a0) << 24)))
/**
* A wrapper macro used around two character constants, like 'wb', to
* ensure portability. Typical usage: MKTAG16('w','b').
*/
#define MKTAG16(a0,a1) ((uint16)((a1) | ((a0) << 8)))
// Functions for reading/writing native integers.
// They also transparently handle the need for alignment.

2
common/winexe_pe.cpp
View File

@ -64,7 +64,7 @@ bool PEResources::loadFromEXE(SeekableReadStream *stream) {
if (!stream)
return false;
if (stream->readUint16BE() != 'MZ')
if (stream->readUint16BE() != MKTAG16('M', 'Z'))
return false;
stream->skip(58);

6
video/avi_decoder.cpp
View File

@ -334,14 +334,14 @@ void AVIDecoder::readNextPacket() {
_fileStream->skip(chunkSize & 1);
if (track->getTrackType() == Track::kTrackTypeAudio) {
if (getStreamType(nextTag) != 'wb')
if (getStreamType(nextTag) != MKTAG16('w', 'b'))
error("Invalid audio track tag '%s'", tag2str(nextTag));
((AVIAudioTrack *)track)->queueSound(chunk);
} else {
AVIVideoTrack *videoTrack = (AVIVideoTrack *)track;
if (getStreamType(nextTag) == 'pc') {
if (getStreamType(nextTag) == MKTAG16('p', 'c')) {
// Palette Change
byte firstEntry = chunk->readByte();
uint16 numEntries = chunk->readByte();
@ -362,7 +362,7 @@ void AVIDecoder::readNextPacket() {
delete chunk;
videoTrack->markPaletteDirty();
} else if (getStreamType(nextTag) == 'db') {
} else if (getStreamType(nextTag) == MKTAG16('d', 'b')) {
// TODO: Check if this really is uncompressed. Many videos
// falsely put compressed data in here.
error("Uncompressed AVI frame found");