mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-27 20:20:40 +00:00
- removed Build dependencies in libsmackerdec.
It was all just some warning blockers for old and defective compilers that required including these.
This commit is contained in:
parent
7bc8d2baff
commit
83642d0510
2 changed files with 2 additions and 10 deletions
|
@ -20,7 +20,6 @@
|
||||||
#ifndef _SmackerFileStream_h_
|
#ifndef _SmackerFileStream_h_
|
||||||
#define _SmackerFileStream_h_
|
#define _SmackerFileStream_h_
|
||||||
|
|
||||||
#include "compat.h"
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "files.h"
|
#include "files.h"
|
||||||
|
|
||||||
|
|
|
@ -45,10 +45,9 @@
|
||||||
#include "SmackerDecoder.h"
|
#include "SmackerDecoder.h"
|
||||||
#include "HuffmanVLC.h"
|
#include "HuffmanVLC.h"
|
||||||
#include "LogError.h"
|
#include "LogError.h"
|
||||||
|
#include "printf.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "compat.h"
|
|
||||||
#include "baselayer.h"
|
|
||||||
|
|
||||||
std::vector<class SmackerDecoder*> classInstances;
|
std::vector<class SmackerDecoder*> classInstances;
|
||||||
|
|
||||||
|
@ -93,9 +92,8 @@ void Smacker_Close(SmackerHandle &handle)
|
||||||
handle.isValid = false;
|
handle.isValid = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t Smacker_GetNumAudioTracks(SmackerHandle &handle)
|
uint32_t Smacker_GetNumAudioTracks(SmackerHandle &)
|
||||||
{
|
{
|
||||||
UNREFERENCED_PARAMETER(handle);
|
|
||||||
// TODO: fixme
|
// TODO: fixme
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -411,7 +409,6 @@ bool SmackerDecoder::Open(const char *fileName)
|
||||||
// determine max buffer sizes for audio tracks
|
// determine max buffer sizes for audio tracks
|
||||||
// file.Seek(nextPos, SmackerCommon::FileStream::kSeekStart);
|
// file.Seek(nextPos, SmackerCommon::FileStream::kSeekStart);
|
||||||
|
|
||||||
uint32_t UNUSED(frameSize) = frameSizes[0] & (~3);
|
|
||||||
uint8_t frameFlag = frameFlags[0];
|
uint8_t frameFlag = frameFlags[0];
|
||||||
|
|
||||||
// skip over palette
|
// skip over palette
|
||||||
|
@ -588,8 +585,6 @@ int SmackerDecoder::DecodeHeaderTree(SmackerCommon::BitReader &bits, std::vector
|
||||||
{
|
{
|
||||||
DecodeTree(bits, &tmp2, 0, 0);
|
DecodeTree(bits, &tmp2, 0, 0);
|
||||||
|
|
||||||
uint32_t UNUSED(end) = bits.GetPosition();
|
|
||||||
|
|
||||||
bits.SkipBits(1);
|
bits.SkipBits(1);
|
||||||
|
|
||||||
VLC_InitTable(ctx.v2, tmp2.maxlength, tmp2.current, &tmp2.lengths[0], &tmp2.bits[0]);
|
VLC_InitTable(ctx.v2, tmp2.maxlength, tmp2.current, &tmp2.lengths[0], &tmp2.bits[0]);
|
||||||
|
@ -809,8 +804,6 @@ int SmackerDecoder::DecodeFrame(uint32_t frameSize)
|
||||||
|
|
||||||
stride = frameWidth;
|
stride = frameWidth;
|
||||||
|
|
||||||
uint32_t UNUSED(fileStart) = file.GetPosition();
|
|
||||||
|
|
||||||
SmackerCommon::BitReader bits(file, frameSize);
|
SmackerCommon::BitReader bits(file, frameSize);
|
||||||
|
|
||||||
while (blk < blocks)
|
while (blk < blocks)
|
||||||
|
|
Loading…
Reference in a new issue