libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify DXAPlayer::decodeZlib, and use common/zlib.h instead of system's zlib.h

Browse Source 
svn-id: r34824
This commit is contained in:
Max Horn 2008-10-18 22:56:43 +00:00
parent 53163a4284
commit 2f92b31235
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
graphics/dxa_player.cpp
View File

@ -29,11 +29,7 @@
#include "common/util.h"
#ifdef USE_ZLIB
#ifdef __SYMBIAN32__
#include <zlib\zlib.h>
#else
#include <zlib.h>
#endif
#include "common/zlib.h"
#endif
namespace Graphics {
@ -218,18 +214,8 @@ void DXAPlayer::copyFrameToBuffer(byte *dst, uint x, uint y, uint pitch) {
void DXAPlayer::decodeZlib(byte *data, int size, int totalSize) {
#ifdef USE_ZLIB
z_stream _d_stream;
_d_stream.zalloc = (alloc_func)0;
_d_stream.zfree = (free_func)0;
_d_stream.opaque = (voidpf)0;
_d_stream.next_in = _inBuffer;
_d_stream.avail_in = size;
_d_stream.total_in = size;
_d_stream.next_out = data;
_d_stream.avail_out = totalSize;
inflateInit(&_d_stream);
inflate(&_d_stream, Z_FINISH);
inflateEnd(&_d_stream);
unsigned long dstLen = totalSize;
Common::uncompress(data, &dstLen, _inBuffer, size);
#endif
}